Download as
Browse Code »

Commit fe2e7385abba945fe9d8a8fa1abebb4b23812610

Authored by Diego Camarinha
2 parents e23e7416 497274b5
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Merge pull request #145 from mezuro/update_gems 

Update gems and Ruby
Showing 4 changed files with 59 additions and 61 deletions   Show diff stats
1 -ruby-2.1.2 1 +ruby-2.1.3
1 language: ruby 1 language: ruby
2 rvm: 2 rvm:
3 - - 2.1.2 3 + - 2.1.3
4 4
5 before_script: 5 before_script:
6 - "cp config/database.yml.sample config/database.yml" 6 - "cp config/database.yml.sample config/database.yml"
1 source 'https://rubygems.org' 1 source 'https://rubygems.org'
2 2
3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' 3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4 -gem 'rails', '4.1.5' 4 +gem 'rails', '4.1.6'
5 5
6 # Use sqlite3 as the database for Active Record 6 # Use sqlite3 as the database for Active Record
7 gem 'sqlite3' 7 gem 'sqlite3'
@@ -13,7 +13,7 @@ gem 'sass-rails', '~> 4.0.1' @@ -13,7 +13,7 @@ gem 'sass-rails', '~> 4.0.1'
13 gem 'uglifier', '>= 1.3.0' 13 gem 'uglifier', '>= 1.3.0'
14 14
15 # Use CoffeeScript for .js.coffee assets and views 15 # Use CoffeeScript for .js.coffee assets and views
16 -gem 'coffee-rails', '~> 4.0.0' 16 +gem 'coffee-rails', '~> 4.1.0'
17 17
18 # See https://github.com/sstephenson/execjs#readme for more supported runtimes 18 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
19 gem 'therubyracer', :platforms => :ruby 19 gem 'therubyracer', :platforms => :ruby
@@ -25,10 +25,10 @@ gem 'jquery-rails' @@ -25,10 +25,10 @@ gem 'jquery-rails'
25 gem 'turbolinks' 25 gem 'turbolinks'
26 26
27 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder 27 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
28 -gem 'jbuilder', '~> 2.1.2' 28 +gem 'jbuilder', '~> 2.2.2'
29 29
30 # For user authentication and everything else 30 # For user authentication and everything else
31 -gem 'devise', '~> 3.3.0' 31 +gem 'devise', '~> 3.4.0'
32 32
33 # Kalibro integration 33 # Kalibro integration
34 gem 'kalibro_gatekeeper_client', '~> 1.0.0' 34 gem 'kalibro_gatekeeper_client', '~> 1.0.0'
@@ -11,27 +11,27 @@ GIT @@ -11,27 +11,27 @@ GIT
11 GEM 11 GEM
12 remote: https://rubygems.org/ 12 remote: https://rubygems.org/
13 specs: 13 specs:
14 - actionmailer (4.1.5)  
15 - actionpack (= 4.1.5)  
16 - actionview (= 4.1.5)  
17 - mail (~> 2.5.4)  
18 - actionpack (4.1.5)  
19 - actionview (= 4.1.5)  
20 - activesupport (= 4.1.5) 14 + actionmailer (4.1.6)
  15 + actionpack (= 4.1.6)
  16 + actionview (= 4.1.6)
  17 + mail (~> 2.5, >= 2.5.4)
  18 + actionpack (4.1.6)
  19 + actionview (= 4.1.6)
  20 + activesupport (= 4.1.6)
21 rack (~> 1.5.2) 21 rack (~> 1.5.2)
22 rack-test (~> 0.6.2) 22 rack-test (~> 0.6.2)
23 - actionview (4.1.5)  
24 - activesupport (= 4.1.5) 23 + actionview (4.1.6)
  24 + activesupport (= 4.1.6)
25 builder (~> 3.1) 25 builder (~> 3.1)
26 erubis (~> 2.7.0) 26 erubis (~> 2.7.0)
27 - activemodel (4.1.5)  
28 - activesupport (= 4.1.5) 27 + activemodel (4.1.6)
  28 + activesupport (= 4.1.6)
29 builder (~> 3.1) 29 builder (~> 3.1)
30 - activerecord (4.1.5)  
31 - activemodel (= 4.1.5)  
32 - activesupport (= 4.1.5) 30 + activerecord (4.1.6)
  31 + activemodel (= 4.1.6)
  32 + activesupport (= 4.1.6)
33 arel (~> 5.0.0) 33 arel (~> 5.0.0)
34 - activesupport (4.1.5) 34 + activesupport (4.1.6)
35 i18n (~> 0.6, >= 0.6.9) 35 i18n (~> 0.6, >= 0.6.9)
36 json (~> 1.7, >= 1.7.7) 36 json (~> 1.7, >= 1.7.7)
37 minitest (~> 5.1) 37 minitest (~> 5.1)
@@ -56,10 +56,10 @@ GEM @@ -56,10 +56,10 @@ GEM
56 capistrano-rails (1.1.2) 56 capistrano-rails (1.1.2)
57 capistrano (~> 3.1) 57 capistrano (~> 3.1)
58 capistrano-bundler (~> 1.1) 58 capistrano-bundler (~> 1.1)
59 - capistrano-rvm (0.1.1) 59 + capistrano-rvm (0.1.2)
60 capistrano (~> 3.0) 60 capistrano (~> 3.0)
61 sshkit (~> 1.2) 61 sshkit (~> 1.2)
62 - capybara (2.4.3) 62 + capybara (2.4.4)
63 mime-types (>= 1.16) 63 mime-types (>= 1.16)
64 nokogiri (>= 1.3.3) 64 nokogiri (>= 1.3.3)
65 rack (>= 1.0.0) 65 rack (>= 1.0.0)
@@ -69,7 +69,7 @@ GEM @@ -69,7 +69,7 @@ GEM
69 railties (> 3.1) 69 railties (> 3.1)
70 cliver (0.3.2) 70 cliver (0.3.2)
71 coderay (1.1.0) 71 coderay (1.1.0)
72 - coffee-rails (4.0.1) 72 + coffee-rails (4.1.0)
73 coffee-script (>= 2.2.0) 73 coffee-script (>= 2.2.0)
74 railties (>= 4.0.0, < 5.0) 74 railties (>= 4.0.0, < 5.0)
75 coffee-script (2.3.0) 75 coffee-script (2.3.0)
@@ -90,19 +90,20 @@ GEM @@ -90,19 +90,20 @@ GEM
90 gherkin (~> 2.12) 90 gherkin (~> 2.12)
91 multi_json (>= 1.7.5, < 2.0) 91 multi_json (>= 1.7.5, < 2.0)
92 multi_test (>= 0.1.1) 92 multi_test (>= 0.1.1)
93 - cucumber-rails (1.4.1) 93 + cucumber-rails (1.4.2)
94 capybara (>= 1.1.2, < 3) 94 capybara (>= 1.1.2, < 3)
95 cucumber (>= 1.3.8, < 2) 95 cucumber (>= 1.3.8, < 2)
96 - mime-types (~> 1.16) 96 + mime-types (>= 1.16, < 3)
97 nokogiri (~> 1.5) 97 nokogiri (~> 1.5)
98 rails (>= 3, < 5) 98 rails (>= 3, < 5)
99 dalli (2.7.2) 99 dalli (2.7.2)
100 database_cleaner (1.3.0) 100 database_cleaner (1.3.0)
101 debug_inspector (0.0.2) 101 debug_inspector (0.0.2)
102 - devise (3.3.0) 102 + devise (3.4.0)
103 bcrypt (~> 3.0) 103 bcrypt (~> 3.0)
104 orm_adapter (~> 0.1) 104 orm_adapter (~> 0.1)
105 railties (>= 3.2.6, < 5) 105 railties (>= 3.2.6, < 5)
  106 + responders
106 thread_safe (~> 0.1) 107 thread_safe (~> 0.1)
107 warden (~> 1.2.3) 108 warden (~> 1.2.3)
108 diff-lcs (1.2.5) 109 diff-lcs (1.2.5)
@@ -111,7 +112,7 @@ GEM @@ -111,7 +112,7 @@ GEM
111 exception_notification (4.0.1) 112 exception_notification (4.0.1)
112 actionmailer (>= 3.0.4) 113 actionmailer (>= 3.0.4)
113 activesupport (>= 3.0.4) 114 activesupport (>= 3.0.4)
114 - execjs (2.2.1) 115 + execjs (2.2.2)
115 factory_girl (4.4.0) 116 factory_girl (4.4.0)
116 activesupport (>= 3.0.0) 117 activesupport (>= 3.0.0)
117 factory_girl_rails (4.4.1) 118 factory_girl_rails (4.4.1)
@@ -126,30 +127,29 @@ GEM @@ -126,30 +127,29 @@ GEM
126 google-analytics-rails (0.0.6) 127 google-analytics-rails (0.0.6)
127 hike (1.2.3) 128 hike (1.2.3)
128 i18n (0.6.11) 129 i18n (0.6.11)
129 - jbuilder (2.1.3) 130 + jbuilder (2.2.2)
130 activesupport (>= 3.0.0, < 5) 131 activesupport (>= 3.0.0, < 5)
131 multi_json (~> 1.2) 132 multi_json (~> 1.2)
132 jquery-rails (3.1.2) 133 jquery-rails (3.1.2)
133 railties (>= 3.0, < 5.0) 134 railties (>= 3.0, < 5.0)
134 thor (>= 0.14, < 2.0) 135 thor (>= 0.14, < 2.0)
135 - jquery-ui-rails (5.0.0) 136 + jquery-ui-rails (5.0.1)
136 railties (>= 3.2.16) 137 railties (>= 3.2.16)
137 json (1.8.1) 138 json (1.8.1)
138 kalibro_gatekeeper_client (1.0.0) 139 kalibro_gatekeeper_client (1.0.0)
139 activesupport (>= 2.2.1) 140 activesupport (>= 2.2.1)
140 faraday_middleware (~> 0.9.0) 141 faraday_middleware (~> 0.9.0)
141 - konacha (3.2.4) 142 + konacha (3.2.5)
142 actionpack (>= 3.1, < 5) 143 actionpack (>= 3.1, < 5)
143 capybara 144 capybara
144 colorize 145 colorize
145 railties (>= 3.1, < 5) 146 railties (>= 3.1, < 5)
146 sprockets 147 sprockets
147 libv8 (3.16.14.7) 148 libv8 (3.16.14.7)
148 - mail (2.5.4)  
149 - mime-types (~> 1.16)  
150 - treetop (~> 1.4.8) 149 + mail (2.6.1)
  150 + mime-types (>= 1.16, < 3)
151 metaclass (0.0.4) 151 metaclass (0.0.4)
152 - mime-types (1.25.1) 152 + mime-types (2.4.1)
153 mini_portile (0.6.0) 153 mini_portile (0.6.0)
154 minitest (5.4.2) 154 minitest (5.4.2)
155 mocha (1.1.0) 155 mocha (1.1.0)
@@ -160,7 +160,7 @@ GEM @@ -160,7 +160,7 @@ GEM
160 net-scp (1.2.1) 160 net-scp (1.2.1)
161 net-ssh (>= 2.6.5) 161 net-ssh (>= 2.6.5)
162 net-ssh (2.9.1) 162 net-ssh (2.9.1)
163 - netrc (0.7.7) 163 + netrc (0.7.8)
164 nokogiri (1.6.3.1) 164 nokogiri (1.6.3.1)
165 mini_portile (= 0.6.0) 165 mini_portile (= 0.6.0)
166 orm_adapter (0.5.0) 166 orm_adapter (0.5.0)
@@ -170,38 +170,39 @@ GEM @@ -170,38 +170,39 @@ GEM
170 cliver (~> 0.3.1) 170 cliver (~> 0.3.1)
171 multi_json (~> 1.0) 171 multi_json (~> 1.0)
172 websocket-driver (>= 0.2.0) 172 websocket-driver (>= 0.2.0)
173 - polyglot (0.3.5)  
174 rack (1.5.2) 173 rack (1.5.2)
175 rack-test (0.6.2) 174 rack-test (0.6.2)
176 rack (>= 1.0) 175 rack (>= 1.0)
177 - rails (4.1.5)  
178 - actionmailer (= 4.1.5)  
179 - actionpack (= 4.1.5)  
180 - actionview (= 4.1.5)  
181 - activemodel (= 4.1.5)  
182 - activerecord (= 4.1.5)  
183 - activesupport (= 4.1.5) 176 + rails (4.1.6)
  177 + actionmailer (= 4.1.6)
  178 + actionpack (= 4.1.6)
  179 + actionview (= 4.1.6)
  180 + activemodel (= 4.1.6)
  181 + activerecord (= 4.1.6)
  182 + activesupport (= 4.1.6)
184 bundler (>= 1.3.0, < 2.0) 183 bundler (>= 1.3.0, < 2.0)
185 - railties (= 4.1.5) 184 + railties (= 4.1.6)
186 sprockets-rails (~> 2.0) 185 sprockets-rails (~> 2.0)
187 - railties (4.1.5)  
188 - actionpack (= 4.1.5)  
189 - activesupport (= 4.1.5) 186 + railties (4.1.6)
  187 + actionpack (= 4.1.6)
  188 + activesupport (= 4.1.6)
190 rake (>= 0.8.7) 189 rake (>= 0.8.7)
191 thor (>= 0.18.1, < 2.0) 190 thor (>= 0.18.1, < 2.0)
192 rake (10.3.2) 191 rake (10.3.2)
193 rdoc (4.1.2) 192 rdoc (4.1.2)
194 json (~> 1.4) 193 json (~> 1.4)
195 ref (1.0.5) 194 ref (1.0.5)
  195 + responders (1.1.1)
  196 + railties (>= 3.2, < 4.2)
196 rest-client (1.7.2) 197 rest-client (1.7.2)
197 mime-types (>= 1.16, < 3.0) 198 mime-types (>= 1.16, < 3.0)
198 netrc (~> 0.7) 199 netrc (~> 0.7)
199 - rspec-core (3.1.5) 200 + rspec-core (3.1.7)
200 rspec-support (~> 3.1.0) 201 rspec-support (~> 3.1.0)
201 rspec-expectations (3.1.2) 202 rspec-expectations (3.1.2)
202 diff-lcs (>= 1.2.0, < 2.0) 203 diff-lcs (>= 1.2.0, < 2.0)
203 rspec-support (~> 3.1.0) 204 rspec-support (~> 3.1.0)
204 - rspec-mocks (3.1.2) 205 + rspec-mocks (3.1.3)
205 rspec-support (~> 3.1.0) 206 rspec-support (~> 3.1.0)
206 rspec-rails (3.1.0) 207 rspec-rails (3.1.0)
207 actionpack (>= 3.0) 208 actionpack (>= 3.0)
@@ -211,7 +212,7 @@ GEM @@ -211,7 +212,7 @@ GEM
211 rspec-expectations (~> 3.1.0) 212 rspec-expectations (~> 3.1.0)
212 rspec-mocks (~> 3.1.0) 213 rspec-mocks (~> 3.1.0)
213 rspec-support (~> 3.1.0) 214 rspec-support (~> 3.1.0)
214 - rspec-support (3.1.1) 215 + rspec-support (3.1.2)
215 sass (3.2.19) 216 sass (3.2.19)
216 sass-rails (4.0.3) 217 sass-rails (4.0.3)
217 railties (>= 4.0.0, < 5.0) 218 railties (>= 4.0.0, < 5.0)
@@ -234,10 +235,10 @@ GEM @@ -234,10 +235,10 @@ GEM
234 multi_json (~> 1.0) 235 multi_json (~> 1.0)
235 rack (~> 1.0) 236 rack (~> 1.0)
236 tilt (~> 1.1, != 1.3.0) 237 tilt (~> 1.1, != 1.3.0)
237 - sprockets-rails (2.1.4) 238 + sprockets-rails (2.2.0)
238 actionpack (>= 3.0) 239 actionpack (>= 3.0)
239 activesupport (>= 3.0) 240 activesupport (>= 3.0)
240 - sprockets (~> 2.8) 241 + sprockets (>= 2.8, < 4.0)
241 sqlite3 (1.3.9) 242 sqlite3 (1.3.9)
242 sshkit (1.5.1) 243 sshkit (1.5.1)
243 colorize 244 colorize
@@ -252,9 +253,6 @@ GEM @@ -252,9 +253,6 @@ GEM
252 thread_safe (0.3.4) 253 thread_safe (0.3.4)
253 tilt (1.4.1) 254 tilt (1.4.1)
254 tins (1.3.3) 255 tins (1.3.3)
255 - treetop (1.4.15)  
256 - polyglot  
257 - polyglot (>= 0.3.1)  
258 turbolinks (2.4.0) 256 turbolinks (2.4.0)
259 coffee-rails 257 coffee-rails
260 tzinfo (1.2.2) 258 tzinfo (1.2.2)
@@ -264,7 +262,7 @@ GEM @@ -264,7 +262,7 @@ GEM
264 json (>= 1.8.0) 262 json (>= 1.8.0)
265 warden (1.2.3) 263 warden (1.2.3)
266 rack (>= 1.0) 264 rack (>= 1.0)
267 - websocket-driver (0.3.4) 265 + websocket-driver (0.3.5)
268 xpath (2.0.0) 266 xpath (2.0.0)
269 nokogiri (~> 1.3) 267 nokogiri (~> 1.3)
270 268
@@ -279,17 +277,17 @@ DEPENDENCIES @@ -279,17 +277,17 @@ DEPENDENCIES
279 capistrano-rails 277 capistrano-rails
280 capistrano-rvm (~> 0.1.0) 278 capistrano-rvm (~> 0.1.0)
281 chart-js-rails (~> 0.0.6) 279 chart-js-rails (~> 0.0.6)
282 - coffee-rails (~> 4.0.0) 280 + coffee-rails (~> 4.1.0)
283 colorpicker (~> 0.0.5) 281 colorpicker (~> 0.0.5)
284 coveralls 282 coveralls
285 cucumber-rails (~> 1.4.0) 283 cucumber-rails (~> 1.4.0)
286 dalli (~> 2.7.0) 284 dalli (~> 2.7.0)
287 database_cleaner 285 database_cleaner
288 - devise (~> 3.3.0) 286 + devise (~> 3.4.0)
289 exception_notification (~> 4.0.1) 287 exception_notification (~> 4.0.1)
290 factory_girl_rails (~> 4.4.1) 288 factory_girl_rails (~> 4.4.1)
291 google-analytics-rails (~> 0.0.6) 289 google-analytics-rails (~> 0.0.6)
292 - jbuilder (~> 2.1.2) 290 + jbuilder (~> 2.2.2)
293 jquery-rails 291 jquery-rails
294 jquery-ui-rails (~> 5.0.0) 292 jquery-ui-rails (~> 5.0.0)
295 kalibro_gatekeeper_client (~> 1.0.0) 293 kalibro_gatekeeper_client (~> 1.0.0)
@@ -297,7 +295,7 @@ DEPENDENCIES @@ -297,7 +295,7 @@ DEPENDENCIES
297 mocha 295 mocha
298 pg (~> 0.17.0) 296 pg (~> 0.17.0)
299 poltergeist (~> 1.5.0) 297 poltergeist (~> 1.5.0)
300 - rails (= 4.1.5) 298 + rails (= 4.1.6)
301 rspec-rails (~> 3.1.0) 299 rspec-rails (~> 3.1.0)
302 sass-rails (~> 4.0.1) 300 sass-rails (~> 4.0.1)
303 sdoc 301 sdoc