mirror of
				https://github.com/fspc/BikeShed-1.git
				synced 2025-10-31 08:55:36 -04:00 
			
		
		
		
	Get rid of twitter-bootstrap-rails gem, update others accordingly.
This commit is contained in:
		
							parent
							
								
									1191f4448f
								
							
						
					
					
						commit
						10870d0961
					
				
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @ -8,3 +8,4 @@ tmp/ | |||||||
| .DS_Store | .DS_Store | ||||||
| public/assets | public/assets | ||||||
| config/database.yml | config/database.yml | ||||||
|  | .idea/ | ||||||
							
								
								
									
										6
									
								
								Gemfile
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								Gemfile
									
									
									
									
									
								
							| @ -1,6 +1,7 @@ | |||||||
| source 'https://rubygems.org' | source 'https://rubygems.org' | ||||||
| 
 | 
 | ||||||
| gem 'rails', '3.2.13' | gem 'rails', '3.2.13' | ||||||
|  | gem 'rake', '< 11.0' | ||||||
| 
 | 
 | ||||||
| gem 'netzke-cancan' | gem 'netzke-cancan' | ||||||
| gem 'netzke-core', '~>0.8.0' | gem 'netzke-core', '~>0.8.0' | ||||||
| @ -12,7 +13,7 @@ gem 'bootstrap-will_paginate', '~> 0.0.6' | |||||||
| gem 'cancan' | gem 'cancan' | ||||||
| gem 'decent_exposure', '~> 1.0.1' | gem 'decent_exposure', '~> 1.0.1' | ||||||
| gem 'devise', '~> 2.0.4' | gem 'devise', '~> 2.0.4' | ||||||
| gem 'haml-rails', '~> 0.3.4' | gem 'haml-rails' | ||||||
| gem 'jquery-rails', '~> 2.0' | gem 'jquery-rails', '~> 2.0' | ||||||
| gem 'pg', '~> 0.17.1' | gem 'pg', '~> 0.17.1' | ||||||
| gem 'will_paginate', '~> 3.0.3' | gem 'will_paginate', '~> 3.0.3' | ||||||
| @ -21,8 +22,9 @@ gem 'jbuilder', '~> 2.0.3' | |||||||
| # Gems used only for assets and not required | # Gems used only for assets and not required | ||||||
| # in production environments by default. | # in production environments by default. | ||||||
| group :assets do | group :assets do | ||||||
|  |   gem 'sass-rails', '~> 3.0' | ||||||
|   gem 'coffee-rails', '~> 3.2.1' |   gem 'coffee-rails', '~> 3.2.1' | ||||||
|   gem "twitter-bootstrap-rails", "~> 2.0.3" |   gem 'bootstrap-sass', '~> 3.1.1' | ||||||
| 
 | 
 | ||||||
|   # See https://github.com/sstephenson/execjs#readme for more supported runtimes |   # See https://github.com/sstephenson/execjs#readme for more supported runtimes | ||||||
|   # gem 'therubyracer' |   # gem 'therubyracer' | ||||||
|  | |||||||
							
								
								
									
										41
									
								
								Gemfile.lock
									
									
									
									
									
								
							
							
						
						
									
										41
									
								
								Gemfile.lock
									
									
									
									
									
								
							| @ -41,6 +41,8 @@ GEM | |||||||
|     bcrypt (3.1.10) |     bcrypt (3.1.10) | ||||||
|     bcrypt-ruby (3.1.5) |     bcrypt-ruby (3.1.5) | ||||||
|       bcrypt (>= 3.1.3) |       bcrypt (>= 3.1.3) | ||||||
|  |     bootstrap-sass (3.1.1.1) | ||||||
|  |       sass (~> 3.2) | ||||||
|     bootstrap-will_paginate (0.0.10) |     bootstrap-will_paginate (0.0.10) | ||||||
|       will_paginate |       will_paginate | ||||||
|     builder (3.0.4) |     builder (3.0.4) | ||||||
| @ -62,7 +64,6 @@ GEM | |||||||
|       coffee-script-source |       coffee-script-source | ||||||
|       execjs |       execjs | ||||||
|     coffee-script-source (1.10.0) |     coffee-script-source (1.10.0) | ||||||
|     commonjs (0.2.7) |  | ||||||
|     database_cleaner (1.2.0) |     database_cleaner (1.2.0) | ||||||
|     decent_exposure (1.0.2) |     decent_exposure (1.0.2) | ||||||
|     devise (2.0.6) |     devise (2.0.6) | ||||||
| @ -98,11 +99,12 @@ GEM | |||||||
|       childprocess (>= 0.2.3) |       childprocess (>= 0.2.3) | ||||||
|       guard (>= 1.1) |       guard (>= 1.1) | ||||||
|       spork (>= 0.8.4) |       spork (>= 0.8.4) | ||||||
|     haml (3.1.8) |     haml (4.0.7) | ||||||
|     haml-rails (0.3.5) |       tilt | ||||||
|  |     haml-rails (0.4) | ||||||
|       actionpack (>= 3.1, < 4.1) |       actionpack (>= 3.1, < 4.1) | ||||||
|       activesupport (>= 3.1, < 4.1) |       activesupport (>= 3.1, < 4.1) | ||||||
|       haml (~> 3.1) |       haml (>= 3.1, < 4.1) | ||||||
|       railties (>= 3.1, < 4.1) |       railties (>= 3.1, < 4.1) | ||||||
|     hike (1.2.3) |     hike (1.2.3) | ||||||
|     i18n (0.6.1) |     i18n (0.6.1) | ||||||
| @ -116,12 +118,6 @@ GEM | |||||||
|     json (1.8.3) |     json (1.8.3) | ||||||
|     launchy (2.4.3) |     launchy (2.4.3) | ||||||
|       addressable (~> 2.3) |       addressable (~> 2.3) | ||||||
|     less (2.2.2) |  | ||||||
|       commonjs (~> 0.2.6) |  | ||||||
|     less-rails (2.2.6) |  | ||||||
|       actionpack (>= 3.1) |  | ||||||
|       less (~> 2.2.0) |  | ||||||
|     libv8 (3.3.10.4) |  | ||||||
|     listen (3.0.6) |     listen (3.0.6) | ||||||
|       rb-fsevent (>= 0.9.3) |       rb-fsevent (>= 0.9.3) | ||||||
|       rb-inotify (>= 0.9.7) |       rb-inotify (>= 0.9.7) | ||||||
| @ -132,7 +128,7 @@ GEM | |||||||
|     method_source (0.8.2) |     method_source (0.8.2) | ||||||
|     mime-types (1.25.1) |     mime-types (1.25.1) | ||||||
|     mini_portile2 (2.0.0) |     mini_portile2 (2.0.0) | ||||||
|     multi_json (1.11.2) |     multi_json (1.12.1) | ||||||
|     nenv (0.3.0) |     nenv (0.3.0) | ||||||
|     netzke-basepack (0.8.4) |     netzke-basepack (0.8.4) | ||||||
|       netzke-core (~> 0.8.2) |       netzke-core (~> 0.8.2) | ||||||
| @ -203,6 +199,11 @@ GEM | |||||||
|       rspec-core (~> 2.14.0) |       rspec-core (~> 2.14.0) | ||||||
|       rspec-expectations (~> 2.14.0) |       rspec-expectations (~> 2.14.0) | ||||||
|       rspec-mocks (~> 2.14.0) |       rspec-mocks (~> 2.14.0) | ||||||
|  |     sass (3.4.22) | ||||||
|  |     sass-rails (3.2.6) | ||||||
|  |       railties (~> 3.2.0) | ||||||
|  |       sass (>= 3.1.10) | ||||||
|  |       tilt (~> 1.3) | ||||||
|     shellany (0.0.1) |     shellany (0.0.1) | ||||||
|     shoulda-matchers (1.0.0) |     shoulda-matchers (1.0.0) | ||||||
|     slop (3.6.0) |     slop (3.6.0) | ||||||
| @ -212,18 +213,11 @@ GEM | |||||||
|       multi_json (~> 1.0) |       multi_json (~> 1.0) | ||||||
|       rack (~> 1.0) |       rack (~> 1.0) | ||||||
|       tilt (~> 1.1, != 1.3.0) |       tilt (~> 1.1, != 1.3.0) | ||||||
|     therubyracer (0.10.2) |     thor (0.19.4) | ||||||
|       libv8 (~> 3.3.10) |  | ||||||
|     thor (0.19.1) |  | ||||||
|     tilt (1.4.1) |     tilt (1.4.1) | ||||||
|     treetop (1.4.15) |     treetop (1.4.15) | ||||||
|       polyglot |       polyglot | ||||||
|       polyglot (>= 0.3.1) |       polyglot (>= 0.3.1) | ||||||
|     twitter-bootstrap-rails (2.0.9) |  | ||||||
|       actionpack (>= 3.1) |  | ||||||
|       less-rails (~> 2.2.2) |  | ||||||
|       railties (>= 3.1) |  | ||||||
|       therubyracer (~> 0.10.1) |  | ||||||
|     tzinfo (0.3.46) |     tzinfo (0.3.46) | ||||||
|     uglifier (2.7.2) |     uglifier (2.7.2) | ||||||
|       execjs (>= 0.3.0) |       execjs (>= 0.3.0) | ||||||
| @ -242,6 +236,7 @@ PLATFORMS | |||||||
| 
 | 
 | ||||||
| DEPENDENCIES | DEPENDENCIES | ||||||
|   acts_as_loggable! |   acts_as_loggable! | ||||||
|  |   bootstrap-sass (~> 3.1.1) | ||||||
|   bootstrap-will_paginate (~> 0.0.6) |   bootstrap-will_paginate (~> 0.0.6) | ||||||
|   cancan |   cancan | ||||||
|   capybara (~> 2.2.1) |   capybara (~> 2.2.1) | ||||||
| @ -253,7 +248,7 @@ DEPENDENCIES | |||||||
|   faker (~> 1.2.0) |   faker (~> 1.2.0) | ||||||
|   guard-rspec (~> 4.2.6) |   guard-rspec (~> 4.2.6) | ||||||
|   guard-spork (~> 1.5.1) |   guard-spork (~> 1.5.1) | ||||||
|   haml-rails (~> 0.3.4) |   haml-rails | ||||||
|   jbuilder (~> 2.0.3) |   jbuilder (~> 2.0.3) | ||||||
|   jquery-rails (~> 2.0) |   jquery-rails (~> 2.0) | ||||||
|   launchy (~> 2.4.2) |   launchy (~> 2.4.2) | ||||||
| @ -264,9 +259,13 @@ DEPENDENCIES | |||||||
|   poltergeist (~> 1.5.0) |   poltergeist (~> 1.5.0) | ||||||
|   pry (~> 0.9.8) |   pry (~> 0.9.8) | ||||||
|   rails (= 3.2.13) |   rails (= 3.2.13) | ||||||
|  |   rake (< 11.0) | ||||||
|   rspec-rails (~> 2.14.0) |   rspec-rails (~> 2.14.0) | ||||||
|  |   sass-rails (~> 3.0) | ||||||
|   shoulda-matchers (~> 1.0.0) |   shoulda-matchers (~> 1.0.0) | ||||||
|   spork (~> 0.9.2) |   spork (~> 0.9.2) | ||||||
|   twitter-bootstrap-rails (~> 2.0.3) |  | ||||||
|   uglifier (>= 1.0.3) |   uglifier (>= 1.0.3) | ||||||
|   will_paginate (~> 3.0.3) |   will_paginate (~> 3.0.3) | ||||||
|  | 
 | ||||||
|  | BUNDLED WITH | ||||||
|  |    1.13.6 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user