Download as
Browse Code »

Commit 0a98c398eec673dae80dc41e5df1b156cfb74491

Authored by Heitor
1 parent b8870356
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Reversing version of sprockets to 2.12.3 

Signed off by: Pedro Scocco <pedroscocco@gmail.com>
Signed-off-by: Diego Araújo <diegoamc90@gmail.com>
Showing 2 changed files with 13 additions and 5 deletions   Show diff stats
@@ -111,6 +111,8 @@ group :development, :test do @@ -111,6 +111,8 @@ group :development, :test do
111 111
112 # Localization assistance 112 # Localization assistance
113 gem 'i18n_generators' 113 gem 'i18n_generators'
  114 +
  115 + gem 'sprockets', '~>2.12.3' # spckets 3.0.3 breaks konacha
114 end 116 end
115 117
116 # Acceptance tests 118 # Acceptance tests
@@ -123,6 +125,7 @@ group :cucumber do @@ -123,6 +125,7 @@ group :cucumber do
123 gem 'poltergeist', '~> 1.6.0' 125 gem 'poltergeist', '~> 1.6.0'
124 end 126 end
125 127
  128 +
126 # Use ActiveModel has_secure_password 129 # Use ActiveModel has_secure_password
127 # gem 'bcrypt', '~> 3.1.7' 130 # gem 'bcrypt', '~> 3.1.7'
128 131
1 GIT 1 GIT
2 remote: https://github.com/seyhunak/twitter-bootstrap-rails.git 2 remote: https://github.com/seyhunak/twitter-bootstrap-rails.git
3 - revision: cd805c7217703e60ff82576525a3ba03a3c2bc35 3 + revision: ba1e2bc2dad7f1e3c8b754f765dac7f4410fa06a
4 specs: 4 specs:
5 twitter-bootstrap-rails (3.2.1) 5 twitter-bootstrap-rails (3.2.1)
6 actionpack (>= 3.1) 6 actionpack (>= 3.1)
@@ -77,7 +77,7 @@ GEM @@ -77,7 +77,7 @@ GEM
77 rack (>= 1.0.0) 77 rack (>= 1.0.0)
78 rack-test (>= 0.5.4) 78 rack-test (>= 0.5.4)
79 xpath (~> 2.0) 79 xpath (~> 2.0)
80 - chart-js-rails (0.0.8) 80 + chart-js-rails (0.0.9)
81 railties (> 3.1) 81 railties (> 3.1)
82 cliver (0.3.2) 82 cliver (0.3.2)
83 codeclimate-test-reporter (0.4.7) 83 codeclimate-test-reporter (0.4.7)
@@ -139,6 +139,7 @@ GEM @@ -139,6 +139,7 @@ GEM
139 globalid (0.3.5) 139 globalid (0.3.5)
140 activesupport (>= 4.1.0) 140 activesupport (>= 4.1.0)
141 google-analytics-rails (0.0.6) 141 google-analytics-rails (0.0.6)
  142 + hike (1.2.3)
142 http-cookie (1.0.2) 143 http-cookie (1.0.2)
143 domain_name (~> 0.5) 144 domain_name (~> 0.5)
144 http_accept_language (2.0.5) 145 http_accept_language (2.0.5)
@@ -146,7 +147,7 @@ GEM @@ -146,7 +147,7 @@ GEM
146 i18n_generators (1.2.1) 147 i18n_generators (1.2.1)
147 mechanize 148 mechanize
148 rails (>= 3.0.0) 149 rails (>= 3.0.0)
149 - jbuilder (2.2.12) 150 + jbuilder (2.2.13)
150 activesupport (>= 3.0.0, < 5) 151 activesupport (>= 3.0.0, < 5)
151 multi_json (~> 1.2) 152 multi_json (~> 1.2)
152 jquery-rails (4.0.3) 153 jquery-rails (4.0.3)
@@ -260,7 +261,7 @@ GEM @@ -260,7 +261,7 @@ GEM
260 rspec-support (~> 3.2.0) 261 rspec-support (~> 3.2.0)
261 rspec-support (3.2.2) 262 rspec-support (3.2.2)
262 sass (3.4.13) 263 sass (3.4.13)
263 - sass-rails (5.0.2) 264 + sass-rails (5.0.3)
264 railties (>= 4.0.0, < 5.0) 265 railties (>= 4.0.0, < 5.0)
265 sass (~> 3.1) 266 sass (~> 3.1)
266 sprockets (>= 2.8, < 4.0) 267 sprockets (>= 2.8, < 4.0)
@@ -277,8 +278,11 @@ GEM @@ -277,8 +278,11 @@ GEM
277 simplecov-html (~> 0.10.0) 278 simplecov-html (~> 0.10.0)
278 simplecov-html (0.10.0) 279 simplecov-html (0.10.0)
279 spring (1.3.6) 280 spring (1.3.6)
280 - sprockets (3.0.3) 281 + sprockets (2.12.3)
  282 + hike (~> 1.2)
  283 + multi_json (~> 1.0)
281 rack (~> 1.0) 284 rack (~> 1.0)
  285 + tilt (~> 1.1, != 1.3.0)
282 sprockets-rails (2.3.0) 286 sprockets-rails (2.3.0)
283 actionpack (>= 3.0) 287 actionpack (>= 3.0)
284 activesupport (>= 3.0) 288 activesupport (>= 3.0)
@@ -358,6 +362,7 @@ DEPENDENCIES @@ -358,6 +362,7 @@ DEPENDENCIES
358 shoulda-matchers (~> 2.8.0) 362 shoulda-matchers (~> 2.8.0)
359 simplecov 363 simplecov
360 spring 364 spring
  365 + sprockets (~> 2.12.3)
361 sqlite3 366 sqlite3
362 therubyracer 367 therubyracer
363 turbolinks 368 turbolinks