Merge branch 'hotfix/1.2.2'
* hotfix/1.2.2: Updated gems
This commit is contained in:
		
						commit
						97aa0f6f72
					
				| @ -1,6 +1,10 @@ | ||||
| Changelog | ||||
| ========= | ||||
| 
 | ||||
| 1.2.2 | ||||
| ----- | ||||
| * Updated gems | ||||
| 
 | ||||
| 1.2.1 | ||||
| ----- | ||||
| * Updated gems | ||||
|  | ||||
							
								
								
									
										60
									
								
								Gemfile.lock
									
									
									
									
									
								
							
							
						
						
									
										60
									
								
								Gemfile.lock
									
									
									
									
									
								
							| @ -38,8 +38,8 @@ GEM | ||||
|       tzinfo (~> 0.3.37) | ||||
|     addressable (2.3.5) | ||||
|     arel (4.0.0) | ||||
|     atomic (1.1.13) | ||||
|     better_errors (0.9.0) | ||||
|     atomic (1.1.14) | ||||
|     better_errors (1.0.1) | ||||
|       coderay (>= 1.0.0) | ||||
|       erubis (>= 2.6.6) | ||||
|     binding_of_caller (0.7.2) | ||||
| @ -56,7 +56,7 @@ GEM | ||||
|       xpath (~> 2.0) | ||||
|     childprocess (0.3.9) | ||||
|       ffi (~> 1.0, >= 1.0.11) | ||||
|     chronic (0.9.1) | ||||
|     chronic (0.10.2) | ||||
|     coderay (1.0.9) | ||||
|     coffee-rails (4.0.0) | ||||
|       coffee-script (>= 2.2.0) | ||||
| @ -65,20 +65,19 @@ GEM | ||||
|       coffee-script-source | ||||
|       execjs | ||||
|     coffee-script-source (1.6.3) | ||||
|     colorize (0.5.8) | ||||
|     columnize (0.3.6) | ||||
|     commonjs (0.2.6) | ||||
|     coveralls (0.6.7) | ||||
|       colorize | ||||
|     commonjs (0.2.7) | ||||
|     coveralls (0.7.0) | ||||
|       multi_json (~> 1.3) | ||||
|       rest-client | ||||
|       simplecov (>= 0.7) | ||||
|       term-ansicolor | ||||
|       thor | ||||
|     crack (0.4.1) | ||||
|       safe_yaml (~> 0.9.0) | ||||
|     database_cleaner (1.1.1) | ||||
|     debug_inspector (0.0.2) | ||||
|     debugger (1.6.1) | ||||
|     debugger (1.6.2) | ||||
|       columnize (>= 0.3.1) | ||||
|       debugger-linecache (~> 1.2.0) | ||||
|       debugger-ruby_core_source (~> 1.2.3) | ||||
| @ -91,7 +90,7 @@ GEM | ||||
|       launchy (~> 2.1) | ||||
|       mail (~> 2.2) | ||||
|     erubis (2.7.0) | ||||
|     execjs (2.0.0) | ||||
|     execjs (2.0.2) | ||||
|     factory_girl (4.2.0) | ||||
|       activesupport (>= 3.0.0) | ||||
|     factory_girl_rails (4.2.1) | ||||
| @ -112,17 +111,17 @@ GEM | ||||
|     jquery-rails (3.0.4) | ||||
|       railties (>= 3.0, < 5.0) | ||||
|       thor (>= 0.14, < 2.0) | ||||
|     jquery-turbolinks (2.0.0) | ||||
|     jquery-turbolinks (2.0.1) | ||||
|       railties (>= 3.1.0) | ||||
|       turbolinks | ||||
|     kgio (2.8.0) | ||||
|     kgio (2.8.1) | ||||
|     launchy (2.3.0) | ||||
|       addressable (~> 2.3) | ||||
|     less (2.3.2) | ||||
|       commonjs (~> 0.2.6) | ||||
|     less-rails (2.3.3) | ||||
|     less (2.4.0) | ||||
|       commonjs (~> 0.2.7) | ||||
|     less-rails (2.4.2) | ||||
|       actionpack (>= 3.1) | ||||
|       less (~> 2.3.1) | ||||
|       less (~> 2.4.0) | ||||
|     libv8 (3.16.14.3) | ||||
|     mail (2.5.4) | ||||
|       mime-types (~> 1.16) | ||||
| @ -132,13 +131,13 @@ GEM | ||||
|       rack-contrib | ||||
|       railties | ||||
|     method_source (0.8.2) | ||||
|     mime-types (1.24) | ||||
|     mime-types (1.25) | ||||
|     mini_portile (0.5.1) | ||||
|     minitest (4.7.5) | ||||
|     multi_json (1.7.9) | ||||
|     multi_json (1.8.0) | ||||
|     nokogiri (1.6.0) | ||||
|       mini_portile (~> 0.5.0) | ||||
|     pg (0.16.0) | ||||
|     pg (0.17.0) | ||||
|     polyglot (0.3.3) | ||||
|     pry (0.9.12.2) | ||||
|       coderay (~> 1.0.5) | ||||
| @ -146,7 +145,7 @@ GEM | ||||
|       slop (~> 3.4) | ||||
|     pry-rails (0.3.2) | ||||
|       pry (>= 0.9.10) | ||||
|     puma (2.5.1) | ||||
|     puma (2.6.0) | ||||
|       rack (>= 1.1, < 2.0) | ||||
|     rack (1.5.2) | ||||
|     rack-contrib (1.1.0) | ||||
| @ -165,13 +164,13 @@ GEM | ||||
|       rails_serve_static_assets | ||||
|       rails_stdout_logging | ||||
|     rails_serve_static_assets (0.0.1) | ||||
|     rails_stdout_logging (0.0.1) | ||||
|     rails_stdout_logging (0.0.2) | ||||
|     railties (4.0.0) | ||||
|       actionpack (= 4.0.0) | ||||
|       activesupport (= 4.0.0) | ||||
|       rake (>= 0.8.7) | ||||
|       thor (>= 0.18.1, < 2.0) | ||||
|     raindrops (0.11.0) | ||||
|     raindrops (0.12.0) | ||||
|     rake (10.1.0) | ||||
|     ref (1.0.5) | ||||
|     rest-client (1.6.7) | ||||
| @ -181,7 +180,7 @@ GEM | ||||
|       rspec-expectations (~> 2.14.0) | ||||
|       rspec-mocks (~> 2.14.0) | ||||
|     rspec-core (2.14.5) | ||||
|     rspec-expectations (2.14.2) | ||||
|     rspec-expectations (2.14.3) | ||||
|       diff-lcs (>= 1.1.3, < 2.0) | ||||
|     rspec-mocks (2.14.3) | ||||
|     rspec-rails (2.14.0) | ||||
| @ -192,16 +191,16 @@ GEM | ||||
|       rspec-expectations (~> 2.14.0) | ||||
|       rspec-mocks (~> 2.14.0) | ||||
|     rubyzip (0.9.9) | ||||
|     safe_yaml (0.9.5) | ||||
|     sass (3.2.10) | ||||
|     safe_yaml (0.9.7) | ||||
|     sass (3.2.11) | ||||
|     sass-rails (4.0.0) | ||||
|       railties (>= 4.0.0.beta, < 5.0) | ||||
|       sass (>= 3.1.10) | ||||
|       sprockets-rails (~> 2.0.0) | ||||
|     selenium-webdriver (2.35.0) | ||||
|     selenium-webdriver (2.35.1) | ||||
|       childprocess (>= 0.2.5) | ||||
|       multi_json (~> 1.0) | ||||
|       rubyzip | ||||
|       rubyzip (< 1.0.0) | ||||
|       websocket (~> 1.0.4) | ||||
|     simplecov (0.7.1) | ||||
|       multi_json (~> 1.0) | ||||
| @ -217,27 +216,30 @@ GEM | ||||
|       actionpack (>= 3.0) | ||||
|       activesupport (>= 3.0) | ||||
|       sprockets (~> 2.8) | ||||
|     term-ansicolor (1.2.2) | ||||
|       tins (~> 0.8) | ||||
|     therubyracer (0.12.0) | ||||
|       libv8 (~> 3.16.14.0) | ||||
|       ref | ||||
|     thor (0.18.1) | ||||
|     thread_safe (0.1.2) | ||||
|     thread_safe (0.1.3) | ||||
|       atomic | ||||
|     tilt (1.4.1) | ||||
|     tins (0.11.0) | ||||
|     treetop (1.4.15) | ||||
|       polyglot | ||||
|       polyglot (>= 0.3.1) | ||||
|     turbolinks (1.3.0) | ||||
|       coffee-rails | ||||
|     tzinfo (0.3.37) | ||||
|     uglifier (2.1.2) | ||||
|     uglifier (2.2.1) | ||||
|       execjs (>= 0.3.0) | ||||
|       multi_json (~> 1.0, >= 1.0.2) | ||||
|     unicorn (4.6.3) | ||||
|       kgio (~> 2.6) | ||||
|       rack | ||||
|       raindrops (~> 0.7) | ||||
|     uniform_notifier (1.2.0) | ||||
|     uniform_notifier (1.3.0) | ||||
|     webmock (1.13.0) | ||||
|       addressable (>= 2.2.7) | ||||
|       crack (>= 0.3.2) | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user