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