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
.ruby-version
  Diff comments   View file @2e3381f
1   -2.2.1
  1 +2.2.2
... ...
.travis.yml
  Diff comments   View file @2e3381f
1 1 language: ruby
2 2 rvm:
3   - - 2.2.1
  3 + - 2.2.2
4 4  
5 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 7 - pushd kalibro_install
8 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 9 - sudo apt-get remove libzmq3
... ...
Gemfile
  Diff comments   View file @2e3381f
... ... @@ -111,6 +111,8 @@ group :development, :test do
111 111  
112 112 # Localization assistance
113 113 gem 'i18n_generators'
  114 +
  115 + gem 'sprockets', '~>2.12.3' # spckets 3.0.3 breaks konacha
114 116 end
115 117  
116 118 # Acceptance tests
... ... @@ -123,6 +125,7 @@ group :cucumber do
123 125 gem 'poltergeist', '~> 1.6.0'
124 126 end
125 127  
  128 +
126 129 # Use ActiveModel has_secure_password
127 130 # gem 'bcrypt', '~> 3.1.7'
128 131  
... ...
Gemfile.lock
  Diff comments   View file @2e3381f
1 1 GIT
2 2 remote: https://github.com/seyhunak/twitter-bootstrap-rails.git
3   - revision: cd805c7217703e60ff82576525a3ba03a3c2bc35
  3 + revision: ba1e2bc2dad7f1e3c8b754f765dac7f4410fa06a
4 4 specs:
5 5 twitter-bootstrap-rails (3.2.1)
6 6 actionpack (>= 3.1)
... ... @@ -56,7 +56,7 @@ GEM
56 56 binding_of_caller (0.7.2)
57 57 debug_inspector (>= 0.0.1)
58 58 builder (3.2.2)
59   - byebug (4.0.3)
  59 + byebug (4.0.5)
60 60 columnize (= 0.9.0)
61 61 capistrano (3.4.0)
62 62 i18n
... ... @@ -65,7 +65,7 @@ GEM
65 65 capistrano-bundler (1.1.4)
66 66 capistrano (~> 3.1)
67 67 sshkit (~> 1.2)
68   - capistrano-rails (1.1.2)
  68 + capistrano-rails (1.1.3)
69 69 capistrano (~> 3.1)
70 70 capistrano-bundler (~> 1.1)
71 71 capistrano-rvm (0.1.2)
... ... @@ -77,7 +77,7 @@ GEM
77 77 rack (>= 1.0.0)
78 78 rack-test (>= 0.5.4)
79 79 xpath (~> 2.0)
80   - chart-js-rails (0.0.8)
  80 + chart-js-rails (0.0.9)
81 81 railties (> 3.1)
82 82 cliver (0.3.2)
83 83 codeclimate-test-reporter (0.4.7)
... ... @@ -86,11 +86,11 @@ GEM
86 86 coffee-rails (4.1.0)
87 87 coffee-script (>= 2.2.0)
88 88 railties (>= 4.0.0, < 5.0)
89   - coffee-script (2.3.0)
  89 + coffee-script (2.4.1)
90 90 coffee-script-source
91 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 94 colorpicker (0.0.5)
95 95 columnize (0.9.0)
96 96 commonjs (0.2.7)
... ... @@ -118,13 +118,13 @@ GEM
118 118 warden (~> 1.2.3)
119 119 diff-lcs (1.2.5)
120 120 docile (1.1.5)
121   - domain_name (0.5.23)
  121 + domain_name (0.5.24)
122 122 unf (>= 0.0.5, < 1.0.0)
123 123 erubis (2.7.0)
124 124 exception_notification (4.0.1)
125 125 actionmailer (>= 3.0.4)
126 126 activesupport (>= 3.0.4)
127   - execjs (2.4.0)
  127 + execjs (2.5.2)
128 128 factory_girl (4.5.0)
129 129 activesupport (>= 3.0.0)
130 130 factory_girl_rails (4.5.0)
... ... @@ -136,7 +136,7 @@ GEM
136 136 faraday (>= 0.7.4, < 0.10)
137 137 gherkin (2.12.2)
138 138 multi_json (~> 1.3)
139   - globalid (0.3.3)
  139 + globalid (0.3.5)
140 140 activesupport (>= 4.1.0)
141 141 google-analytics-rails (0.0.6)
142 142 hike (1.2.3)
... ... @@ -147,7 +147,7 @@ GEM
147 147 i18n_generators (1.2.1)
148 148 mechanize
149 149 rails (>= 3.0.0)
150   - jbuilder (2.2.12)
  150 + jbuilder (2.2.13)
151 151 activesupport (>= 3.0.0, < 5)
152 152 multi_json (~> 1.2)
153 153 jquery-rails (4.0.3)
... ... @@ -157,7 +157,7 @@ GEM
157 157 jquery-ui-rails (5.0.3)
158 158 railties (>= 3.2.16)
159 159 json (1.8.2)
160   - kalibro_client (0.1.0)
  160 + kalibro_client (0.1.1)
161 161 activesupport (>= 2.2.1)
162 162 faraday_middleware (~> 0.9.0)
163 163 konacha (3.3.0)
... ... @@ -168,11 +168,13 @@ GEM
168 168 sprockets
169 169 less (2.6.0)
170 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 173 less (~> 2.6.0)
  174 + sprockets (> 2, < 4)
  175 + tilt
174 176 libv8 (3.16.14.7)
175   - loofah (2.0.1)
  177 + loofah (2.0.2)
176 178 nokogiri (>= 1.5.9)
177 179 mail (2.6.3)
178 180 mime-types (>= 1.16, < 3)
... ... @@ -186,9 +188,9 @@ GEM
186 188 ntlm-http (~> 0.1, >= 0.1.1)
187 189 webrobots (>= 0.0.9, < 0.2)
188 190 metaclass (0.0.4)
189   - mime-types (2.4.3)
  191 + mime-types (2.5)
190 192 mini_portile (0.6.2)
191   - minitest (5.5.1)
  193 + minitest (5.6.1)
192 194 mocha (1.1.0)
193 195 metaclass (~> 0.0.1)
194 196 multi_json (1.11.0)
... ... @@ -209,7 +211,7 @@ GEM
209 211 cliver (~> 0.3.1)
210 212 multi_json (~> 1.0)
211 213 websocket-driver (>= 0.2.0)
212   - rack (1.6.0)
  214 + rack (1.6.1)
213 215 rack-test (0.6.3)
214 216 rack (>= 1.0)
215 217 rails (4.2.1)
... ... @@ -241,9 +243,9 @@ GEM
241 243 ref (1.0.5)
242 244 responders (2.1.0)
243 245 railties (>= 4.2.0, < 5)
244   - rspec-core (3.2.2)
  246 + rspec-core (3.2.3)
245 247 rspec-support (~> 3.2.0)
246   - rspec-expectations (3.2.0)
  248 + rspec-expectations (3.2.1)
247 249 diff-lcs (>= 1.2.0, < 2.0)
248 250 rspec-support (~> 3.2.0)
249 251 rspec-mocks (3.2.1)
... ... @@ -259,7 +261,7 @@ GEM
259 261 rspec-support (~> 3.2.0)
260 262 rspec-support (3.2.2)
261 263 sass (3.4.13)
262   - sass-rails (5.0.1)
  264 + sass-rails (5.0.3)
263 265 railties (>= 4.0.0, < 5.0)
264 266 sass (~> 3.1)
265 267 sprockets (>= 2.8, < 4.0)
... ... @@ -270,18 +272,18 @@ GEM
270 272 rdoc (~> 4.0)
271 273 shoulda-matchers (2.8.0)
272 274 activesupport (>= 3.0.0)
273   - simplecov (0.9.2)
  275 + simplecov (0.10.0)
274 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 281 sprockets (2.12.3)
280 282 hike (~> 1.2)
281 283 multi_json (~> 1.0)
282 284 rack (~> 1.0)
283 285 tilt (~> 1.1, != 1.3.0)
284   - sprockets-rails (2.2.4)
  286 + sprockets-rails (2.3.0)
285 287 actionpack (>= 3.0)
286 288 activesupport (>= 3.0)
287 289 sprockets (>= 2.8, < 4.0)
... ... @@ -290,7 +292,7 @@ GEM
290 292 colorize (>= 0.7.0)
291 293 net-scp (>= 1.1.2)
292 294 net-ssh (>= 2.8.0)
293   - therubyracer (0.12.1)
  295 + therubyracer (0.12.2)
294 296 libv8 (~> 3.16.14.0)
295 297 ref
296 298 thor (0.19.1)
... ... @@ -305,7 +307,7 @@ GEM
305 307 json (>= 1.8.0)
306 308 unf (0.1.4)
307 309 unf_ext
308   - unf_ext (0.0.6)
  310 + unf_ext (0.0.7.1)
309 311 warden (1.2.3)
310 312 rack (>= 1.0)
311 313 web-console (2.0.0)
... ... @@ -314,7 +316,7 @@ GEM
314 316 railties (~> 4.0)
315 317 sprockets-rails (>= 2.0, < 4.0)
316 318 webrobots (0.1.1)
317   - websocket-driver (0.5.3)
  319 + websocket-driver (0.5.4)
318 320 websocket-extensions (>= 0.1.0)
319 321 websocket-extensions (0.1.2)
320 322 xpath (2.0.0)
... ... @@ -360,6 +362,7 @@ DEPENDENCIES
360 362 shoulda-matchers (~> 2.8.0)
361 363 simplecov
362 364 spring
  365 + sprockets (~> 2.12.3)
363 366 sqlite3
364 367 therubyracer
365 368 turbolinks
... ...