Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
This commit is contained in:
		
						commit
						8381941d51
					
				
							
								
								
									
										5
									
								
								Gemfile
								
								
								
								
							
							
						
						
									
										5
									
								
								Gemfile
								
								
								
								
							|  | @ -1,5 +1,5 @@ | |||
| source 'http://rubygems.org' | ||||
| gem 'rails', '>=3.1.0', '<3.2.0' | ||||
| gem 'rails' | ||||
| 
 | ||||
| gem "brakeman" | ||||
| gem 'mime-types' | ||||
|  | @ -47,6 +47,7 @@ gem 'social-share-button' | |||
| 
 | ||||
| gem 'tinymce-rails' | ||||
| gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux") | ||||
| gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux") | ||||
| gem 'mongoid-encryptor', :require => 'mongoid/encryptor' | ||||
| gem 'rb-readline' if RUBY_PLATFORM.downcase.include?("linux") | ||||
| 
 | ||||
|  | @ -92,3 +93,5 @@ group :test, :development do | |||
|   # gem 'yard' | ||||
|   # gem "bluecloth" | ||||
| end | ||||
| 
 | ||||
| gem 'debugger' | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue