Download as
Browse Code »

Commit 2e3381f837fc7c97334853fa1515e2093f45cf4c

Authored by Pedro
2 parents 2ba9fdc0 0a98c398
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Merge pull request #209 from mezuro/updates 

Updates

Signed-off-by: Daniel Miranda <danielkza2@gmail.com>
Showing 4 changed files with 39 additions and 33 deletions   Show diff stats
1 -2.2.1 1 +2.2.2
1 language: ruby 1 language: ruby
2 rvm: 2 rvm:
3 - - 2.2.1 3 + - 2.2.2
4 4
5 before_script: 5 before_script:
6 - - git clone https://gist.github.com/6179925.git -b v2.1 kalibro_install 6 + - git clone https://gist.github.com/6179925.git -b v2.2 kalibro_install
7 - pushd kalibro_install 7 - pushd kalibro_install
8 # Remove bugged libzmq3 package, see https://github.com/travis-ci/travis-ci/issues/982 and https://github.com/travis-ci/travis-ci/issues/1715 for details 8 # Remove bugged libzmq3 package, see https://github.com/travis-ci/travis-ci/issues/982 and https://github.com/travis-ci/travis-ci/issues/1715 for details
9 - sudo apt-get remove libzmq3 9 - sudo apt-get remove libzmq3
@@ -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)
@@ -56,7 +56,7 @@ GEM @@ -56,7 +56,7 @@ GEM
56 binding_of_caller (0.7.2) 56 binding_of_caller (0.7.2)
57 debug_inspector (>= 0.0.1) 57 debug_inspector (>= 0.0.1)
58 builder (3.2.2) 58 builder (3.2.2)
59 - byebug (4.0.3) 59 + byebug (4.0.5)
60 columnize (= 0.9.0) 60 columnize (= 0.9.0)
61 capistrano (3.4.0) 61 capistrano (3.4.0)
62 i18n 62 i18n
@@ -65,7 +65,7 @@ GEM @@ -65,7 +65,7 @@ GEM
65 capistrano-bundler (1.1.4) 65 capistrano-bundler (1.1.4)
66 capistrano (~> 3.1) 66 capistrano (~> 3.1)
67 sshkit (~> 1.2) 67 sshkit (~> 1.2)
68 - capistrano-rails (1.1.2) 68 + capistrano-rails (1.1.3)
69 capistrano (~> 3.1) 69 capistrano (~> 3.1)
70 capistrano-bundler (~> 1.1) 70 capistrano-bundler (~> 1.1)
71 capistrano-rvm (0.1.2) 71 capistrano-rvm (0.1.2)
@@ -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)
@@ -86,11 +86,11 @@ GEM @@ -86,11 +86,11 @@ GEM
86 coffee-rails (4.1.0) 86 coffee-rails (4.1.0)
87 coffee-script (>= 2.2.0) 87 coffee-script (>= 2.2.0)
88 railties (>= 4.0.0, < 5.0) 88 railties (>= 4.0.0, < 5.0)
89 - coffee-script (2.3.0) 89 + coffee-script (2.4.1)
90 coffee-script-source 90 coffee-script-source
91 execjs 91 execjs
92 - coffee-script-source (1.9.1)  
93 - colorize (0.7.5) 92 + coffee-script-source (1.9.1.1)
  93 + colorize (0.7.7)
94 colorpicker (0.0.5) 94 colorpicker (0.0.5)
95 columnize (0.9.0) 95 columnize (0.9.0)
96 commonjs (0.2.7) 96 commonjs (0.2.7)
@@ -118,13 +118,13 @@ GEM @@ -118,13 +118,13 @@ GEM
118 warden (~> 1.2.3) 118 warden (~> 1.2.3)
119 diff-lcs (1.2.5) 119 diff-lcs (1.2.5)
120 docile (1.1.5) 120 docile (1.1.5)
121 - domain_name (0.5.23) 121 + domain_name (0.5.24)
122 unf (>= 0.0.5, < 1.0.0) 122 unf (>= 0.0.5, < 1.0.0)
123 erubis (2.7.0) 123 erubis (2.7.0)
124 exception_notification (4.0.1) 124 exception_notification (4.0.1)
125 actionmailer (>= 3.0.4) 125 actionmailer (>= 3.0.4)
126 activesupport (>= 3.0.4) 126 activesupport (>= 3.0.4)
127 - execjs (2.4.0) 127 + execjs (2.5.2)
128 factory_girl (4.5.0) 128 factory_girl (4.5.0)
129 activesupport (>= 3.0.0) 129 activesupport (>= 3.0.0)
130 factory_girl_rails (4.5.0) 130 factory_girl_rails (4.5.0)
@@ -136,7 +136,7 @@ GEM @@ -136,7 +136,7 @@ GEM
136 faraday (>= 0.7.4, < 0.10) 136 faraday (>= 0.7.4, < 0.10)
137 gherkin (2.12.2) 137 gherkin (2.12.2)
138 multi_json (~> 1.3) 138 multi_json (~> 1.3)
139 - globalid (0.3.3) 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 hike (1.2.3)
@@ -147,7 +147,7 @@ GEM @@ -147,7 +147,7 @@ GEM
147 i18n_generators (1.2.1) 147 i18n_generators (1.2.1)
148 mechanize 148 mechanize
149 rails (>= 3.0.0) 149 rails (>= 3.0.0)
150 - jbuilder (2.2.12) 150 + jbuilder (2.2.13)
151 activesupport (>= 3.0.0, < 5) 151 activesupport (>= 3.0.0, < 5)
152 multi_json (~> 1.2) 152 multi_json (~> 1.2)
153 jquery-rails (4.0.3) 153 jquery-rails (4.0.3)
@@ -157,7 +157,7 @@ GEM @@ -157,7 +157,7 @@ GEM
157 jquery-ui-rails (5.0.3) 157 jquery-ui-rails (5.0.3)
158 railties (>= 3.2.16) 158 railties (>= 3.2.16)
159 json (1.8.2) 159 json (1.8.2)
160 - kalibro_client (0.1.0) 160 + kalibro_client (0.1.1)
161 activesupport (>= 2.2.1) 161 activesupport (>= 2.2.1)
162 faraday_middleware (~> 0.9.0) 162 faraday_middleware (~> 0.9.0)
163 konacha (3.3.0) 163 konacha (3.3.0)
@@ -168,11 +168,13 @@ GEM @@ -168,11 +168,13 @@ GEM
168 sprockets 168 sprockets
169 less (2.6.0) 169 less (2.6.0)
170 commonjs (~> 0.2.7) 170 commonjs (~> 0.2.7)
171 - less-rails (2.6.0)  
172 - actionpack (>= 3.1) 171 + less-rails (2.7.0)
  172 + actionpack (>= 4.0)
173 less (~> 2.6.0) 173 less (~> 2.6.0)
  174 + sprockets (> 2, < 4)
  175 + tilt
174 libv8 (3.16.14.7) 176 libv8 (3.16.14.7)
175 - loofah (2.0.1) 177 + loofah (2.0.2)
176 nokogiri (>= 1.5.9) 178 nokogiri (>= 1.5.9)
177 mail (2.6.3) 179 mail (2.6.3)
178 mime-types (>= 1.16, < 3) 180 mime-types (>= 1.16, < 3)
@@ -186,9 +188,9 @@ GEM @@ -186,9 +188,9 @@ GEM
186 ntlm-http (~> 0.1, >= 0.1.1) 188 ntlm-http (~> 0.1, >= 0.1.1)
187 webrobots (>= 0.0.9, < 0.2) 189 webrobots (>= 0.0.9, < 0.2)
188 metaclass (0.0.4) 190 metaclass (0.0.4)
189 - mime-types (2.4.3) 191 + mime-types (2.5)
190 mini_portile (0.6.2) 192 mini_portile (0.6.2)
191 - minitest (5.5.1) 193 + minitest (5.6.1)
192 mocha (1.1.0) 194 mocha (1.1.0)
193 metaclass (~> 0.0.1) 195 metaclass (~> 0.0.1)
194 multi_json (1.11.0) 196 multi_json (1.11.0)
@@ -209,7 +211,7 @@ GEM @@ -209,7 +211,7 @@ GEM
209 cliver (~> 0.3.1) 211 cliver (~> 0.3.1)
210 multi_json (~> 1.0) 212 multi_json (~> 1.0)
211 websocket-driver (>= 0.2.0) 213 websocket-driver (>= 0.2.0)
212 - rack (1.6.0) 214 + rack (1.6.1)
213 rack-test (0.6.3) 215 rack-test (0.6.3)
214 rack (>= 1.0) 216 rack (>= 1.0)
215 rails (4.2.1) 217 rails (4.2.1)
@@ -241,9 +243,9 @@ GEM @@ -241,9 +243,9 @@ GEM
241 ref (1.0.5) 243 ref (1.0.5)
242 responders (2.1.0) 244 responders (2.1.0)
243 railties (>= 4.2.0, < 5) 245 railties (>= 4.2.0, < 5)
244 - rspec-core (3.2.2) 246 + rspec-core (3.2.3)
245 rspec-support (~> 3.2.0) 247 rspec-support (~> 3.2.0)
246 - rspec-expectations (3.2.0) 248 + rspec-expectations (3.2.1)
247 diff-lcs (>= 1.2.0, < 2.0) 249 diff-lcs (>= 1.2.0, < 2.0)
248 rspec-support (~> 3.2.0) 250 rspec-support (~> 3.2.0)
249 rspec-mocks (3.2.1) 251 rspec-mocks (3.2.1)
@@ -259,7 +261,7 @@ GEM @@ -259,7 +261,7 @@ GEM
259 rspec-support (~> 3.2.0) 261 rspec-support (~> 3.2.0)
260 rspec-support (3.2.2) 262 rspec-support (3.2.2)
261 sass (3.4.13) 263 sass (3.4.13)
262 - sass-rails (5.0.1) 264 + sass-rails (5.0.3)
263 railties (>= 4.0.0, < 5.0) 265 railties (>= 4.0.0, < 5.0)
264 sass (~> 3.1) 266 sass (~> 3.1)
265 sprockets (>= 2.8, < 4.0) 267 sprockets (>= 2.8, < 4.0)
@@ -270,18 +272,18 @@ GEM @@ -270,18 +272,18 @@ GEM
270 rdoc (~> 4.0) 272 rdoc (~> 4.0)
271 shoulda-matchers (2.8.0) 273 shoulda-matchers (2.8.0)
272 activesupport (>= 3.0.0) 274 activesupport (>= 3.0.0)
273 - simplecov (0.9.2) 275 + simplecov (0.10.0)
274 docile (~> 1.1.0) 276 docile (~> 1.1.0)
275 - multi_json (~> 1.0)  
276 - simplecov-html (~> 0.9.0)  
277 - simplecov-html (0.9.0)  
278 - spring (1.3.3) 277 + json (~> 1.8)
  278 + simplecov-html (~> 0.10.0)
  279 + simplecov-html (0.10.0)
  280 + spring (1.3.6)
279 sprockets (2.12.3) 281 sprockets (2.12.3)
280 hike (~> 1.2) 282 hike (~> 1.2)
281 multi_json (~> 1.0) 283 multi_json (~> 1.0)
282 rack (~> 1.0) 284 rack (~> 1.0)
283 tilt (~> 1.1, != 1.3.0) 285 tilt (~> 1.1, != 1.3.0)
284 - sprockets-rails (2.2.4) 286 + sprockets-rails (2.3.0)
285 actionpack (>= 3.0) 287 actionpack (>= 3.0)
286 activesupport (>= 3.0) 288 activesupport (>= 3.0)
287 sprockets (>= 2.8, < 4.0) 289 sprockets (>= 2.8, < 4.0)
@@ -290,7 +292,7 @@ GEM @@ -290,7 +292,7 @@ GEM
290 colorize (>= 0.7.0) 292 colorize (>= 0.7.0)
291 net-scp (>= 1.1.2) 293 net-scp (>= 1.1.2)
292 net-ssh (>= 2.8.0) 294 net-ssh (>= 2.8.0)
293 - therubyracer (0.12.1) 295 + therubyracer (0.12.2)
294 libv8 (~> 3.16.14.0) 296 libv8 (~> 3.16.14.0)
295 ref 297 ref
296 thor (0.19.1) 298 thor (0.19.1)
@@ -305,7 +307,7 @@ GEM @@ -305,7 +307,7 @@ GEM
305 json (>= 1.8.0) 307 json (>= 1.8.0)
306 unf (0.1.4) 308 unf (0.1.4)
307 unf_ext 309 unf_ext
308 - unf_ext (0.0.6) 310 + unf_ext (0.0.7.1)
309 warden (1.2.3) 311 warden (1.2.3)
310 rack (>= 1.0) 312 rack (>= 1.0)
311 web-console (2.0.0) 313 web-console (2.0.0)
@@ -314,7 +316,7 @@ GEM @@ -314,7 +316,7 @@ GEM
314 railties (~> 4.0) 316 railties (~> 4.0)
315 sprockets-rails (>= 2.0, < 4.0) 317 sprockets-rails (>= 2.0, < 4.0)
316 webrobots (0.1.1) 318 webrobots (0.1.1)
317 - websocket-driver (0.5.3) 319 + websocket-driver (0.5.4)
318 websocket-extensions (>= 0.1.0) 320 websocket-extensions (>= 0.1.0)
319 websocket-extensions (0.1.2) 321 websocket-extensions (0.1.2)
320 xpath (2.0.0) 322 xpath (2.0.0)
@@ -360,6 +362,7 @@ DEPENDENCIES @@ -360,6 +362,7 @@ DEPENDENCIES
360 shoulda-matchers (~> 2.8.0) 362 shoulda-matchers (~> 2.8.0)
361 simplecov 363 simplecov
362 spring 364 spring
  365 + sprockets (~> 2.12.3)
363 sqlite3 366 sqlite3
364 therubyracer 367 therubyracer
365 turbolinks 368 turbolinks