Download as
Browse Code »

Commit 4c5bbcefe4122b06c9ff3c3eb20dbe4318fba52b

Authored by marcheing
2 parents 8ae6f645 4efe049b
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Merge pull request #241 from mezuro/gem_updates 

Gem updates
Showing 2 changed files with 62 additions and 63 deletions   Show diff stats
Gemfile
  Diff comments   View file @4c5bbce
1 1 source 'https://rubygems.org'
2 2  
3 3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4   -gem 'rails', '4.2.1'
  4 +gem 'rails', '4.2.2'
5 5  
6 6 # Use sqlite3 as the database for Active Record
7 7 gem 'sqlite3'
... ... @@ -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.2.2'
  28 +gem 'jbuilder', '~> 2.0'
29 29  
30 30 # For user authentication and everything else
31   -gem 'devise', '~> 3.4.0'
  31 +gem 'devise', '~> 3.5.1'
32 32  
33 33 # Kalibro integration
34 34 gem 'kalibro_client', '~> 0.3.0'
... ... @@ -58,7 +58,7 @@ gem 'sdoc', '~> 0.4.0', group: :doc
58 58 gem 'rails-html-sanitizer', '~> 1.0'
59 59  
60 60 # Sends a email whenever there is a unexpected exception
61   -gem 'exception_notification', '~> 4.0.1'
  61 +gem 'exception_notification', '~> 4.1.1'
62 62  
63 63 # Google Analytics
64 64 gem 'google-analytics-rails', '~> 0.0.6'
... ... @@ -91,7 +91,7 @@ group :development, :test do
91 91 gem 'spring'
92 92  
93 93 # Test framework
94   - gem 'rspec-rails', '~> 3.2.0'
  94 + gem 'rspec-rails', '~> 3.3.2'
95 95  
96 96 # Fixtures made easy
97 97 gem 'factory_girl_rails', '~> 4.5.0'
... ...
Gemfile.lock
  Diff comments   View file @4c5bbce
1 1 GIT
2 2 remote: https://github.com/seyhunak/twitter-bootstrap-rails.git
3   - revision: ba1e2bc2dad7f1e3c8b754f765dac7f4410fa06a
  3 + revision: 935f53bb55ef736260fa2ef04e29da2fc3fb2b3f
4 4 specs:
5 5 twitter-bootstrap-rails (3.2.1)
6 6 actionpack (>= 3.1)
7 7 execjs (>= 2.2.2, >= 2.2)
8 8 less-rails (>= 2.5.0)
9   - rails (>= 3.1)
10 9 railties (>= 3.1)
11 10  
12 11 GEM
13 12 remote: https://rubygems.org/
14 13 specs:
15   - actionmailer (4.2.1)
16   - actionpack (= 4.2.1)
17   - actionview (= 4.2.1)
18   - activejob (= 4.2.1)
  14 + actionmailer (4.2.2)
  15 + actionpack (= 4.2.2)
  16 + actionview (= 4.2.2)
  17 + activejob (= 4.2.2)
19 18 mail (~> 2.5, >= 2.5.4)
20 19 rails-dom-testing (~> 1.0, >= 1.0.5)
21   - actionpack (4.2.1)
22   - actionview (= 4.2.1)
23   - activesupport (= 4.2.1)
  20 + actionpack (4.2.2)
  21 + actionview (= 4.2.2)
  22 + activesupport (= 4.2.2)
24 23 rack (~> 1.6)
25 24 rack-test (~> 0.6.2)
26 25 rails-dom-testing (~> 1.0, >= 1.0.5)
27 26 rails-html-sanitizer (~> 1.0, >= 1.0.1)
28   - actionview (4.2.1)
29   - activesupport (= 4.2.1)
  27 + actionview (4.2.2)
  28 + activesupport (= 4.2.2)
30 29 builder (~> 3.1)
31 30 erubis (~> 2.7.0)
32 31 rails-dom-testing (~> 1.0, >= 1.0.5)
33 32 rails-html-sanitizer (~> 1.0, >= 1.0.1)
34   - activejob (4.2.1)
35   - activesupport (= 4.2.1)
  33 + activejob (4.2.2)
  34 + activesupport (= 4.2.2)
36 35 globalid (>= 0.3.0)
37   - activemodel (4.2.1)
38   - activesupport (= 4.2.1)
  36 + activemodel (4.2.2)
  37 + activesupport (= 4.2.2)
39 38 builder (~> 3.1)
40   - activerecord (4.2.1)
41   - activemodel (= 4.2.1)
42   - activesupport (= 4.2.1)
  39 + activerecord (4.2.2)
  40 + activemodel (= 4.2.2)
  41 + activesupport (= 4.2.2)
43 42 arel (~> 6.0)
44   - activesupport (4.2.1)
  43 + activesupport (4.2.2)
45 44 i18n (~> 0.7)
46 45 json (~> 1.7, >= 1.7.7)
47 46 minitest (~> 5.1)
... ... @@ -56,7 +55,7 @@ GEM
56 55 binding_of_caller (0.7.2)
57 56 debug_inspector (>= 0.0.1)
58 57 builder (3.2.2)
59   - byebug (4.0.5)
  58 + byebug (5.0.0)
60 59 columnize (= 0.9.0)
61 60 capistrano (3.4.0)
62 61 i18n
... ... @@ -94,7 +93,7 @@ GEM
94 93 colorpicker (0.0.5)
95 94 columnize (0.9.0)
96 95 commonjs (0.2.7)
97   - cucumber (1.3.19)
  96 + cucumber (1.3.20)
98 97 builder (>= 2.1.2)
99 98 diff-lcs (>= 1.1.3)
100 99 gherkin (~> 2.12)
... ... @@ -109,7 +108,7 @@ GEM
109 108 dalli (2.7.4)
110 109 database_cleaner (1.4.1)
111 110 debug_inspector (0.0.2)
112   - devise (3.4.1)
  111 + devise (3.5.1)
113 112 bcrypt (~> 3.0)
114 113 orm_adapter (~> 0.1)
115 114 railties (>= 3.2.6, < 5)
... ... @@ -121,7 +120,7 @@ GEM
121 120 domain_name (0.5.24)
122 121 unf (>= 0.0.5, < 1.0.0)
123 122 erubis (2.7.0)
124   - exception_notification (4.0.1)
  123 + exception_notification (4.1.1)
125 124 actionmailer (>= 3.0.4)
126 125 activesupport (>= 3.0.4)
127 126 execjs (2.5.2)
... ... @@ -146,14 +145,14 @@ GEM
146 145 i18n_generators (1.2.1)
147 146 mechanize
148 147 rails (>= 3.0.0)
149   - jbuilder (2.2.13)
  148 + jbuilder (2.3.0)
150 149 activesupport (>= 3.0.0, < 5)
151 150 multi_json (~> 1.2)
152   - jquery-rails (4.0.3)
  151 + jquery-rails (4.0.4)
153 152 rails-dom-testing (~> 1.0)
154 153 railties (>= 4.2.0)
155 154 thor (>= 0.14, < 2.0)
156   - jquery-ui-rails (5.0.3)
  155 + jquery-ui-rails (5.0.5)
157 156 railties (>= 3.2.16)
158 157 json (1.8.3)
159 158 kalibro_client (0.3.0)
... ... @@ -205,7 +204,7 @@ GEM
205 204 mini_portile (~> 0.6.0)
206 205 ntlm-http (0.1.1)
207 206 orm_adapter (0.5.0)
208   - pg (0.18.1)
  207 + pg (0.18.2)
209 208 poltergeist (1.6.0)
210 209 capybara (~> 2.1)
211 210 cliver (~> 0.3.1)
... ... @@ -214,16 +213,16 @@ GEM
214 213 rack (1.6.4)
215 214 rack-test (0.6.3)
216 215 rack (>= 1.0)
217   - rails (4.2.1)
218   - actionmailer (= 4.2.1)
219   - actionpack (= 4.2.1)
220   - actionview (= 4.2.1)
221   - activejob (= 4.2.1)
222   - activemodel (= 4.2.1)
223   - activerecord (= 4.2.1)
224   - activesupport (= 4.2.1)
  216 + rails (4.2.2)
  217 + actionmailer (= 4.2.2)
  218 + actionpack (= 4.2.2)
  219 + actionview (= 4.2.2)
  220 + activejob (= 4.2.2)
  221 + activemodel (= 4.2.2)
  222 + activerecord (= 4.2.2)
  223 + activesupport (= 4.2.2)
225 224 bundler (>= 1.3.0, < 2.0)
226   - railties (= 4.2.1)
  225 + railties (= 4.2.2)
227 226 sprockets-rails
228 227 rails-deprecated_sanitizer (1.0.3)
229 228 activesupport (>= 4.2.0.alpha)
... ... @@ -233,9 +232,9 @@ GEM
233 232 rails-deprecated_sanitizer (>= 1.0.1)
234 233 rails-html-sanitizer (1.0.2)
235 234 loofah (~> 2.0)
236   - railties (4.2.1)
237   - actionpack (= 4.2.1)
238   - activesupport (= 4.2.1)
  235 + railties (4.2.2)
  236 + actionpack (= 4.2.2)
  237 + activesupport (= 4.2.2)
239 238 rake (>= 0.8.7)
240 239 thor (>= 0.18.1, < 2.0)
241 240 rake (10.4.2)
... ... @@ -243,24 +242,24 @@ GEM
243 242 ref (1.0.5)
244 243 responders (2.1.0)
245 244 railties (>= 4.2.0, < 5)
246   - rspec-core (3.2.3)
247   - rspec-support (~> 3.2.0)
248   - rspec-expectations (3.2.1)
  245 + rspec-core (3.3.1)
  246 + rspec-support (~> 3.3.0)
  247 + rspec-expectations (3.3.0)
249 248 diff-lcs (>= 1.2.0, < 2.0)
250   - rspec-support (~> 3.2.0)
251   - rspec-mocks (3.2.1)
  249 + rspec-support (~> 3.3.0)
  250 + rspec-mocks (3.3.1)
252 251 diff-lcs (>= 1.2.0, < 2.0)
253   - rspec-support (~> 3.2.0)
254   - rspec-rails (3.2.1)
  252 + rspec-support (~> 3.3.0)
  253 + rspec-rails (3.3.2)
255 254 actionpack (>= 3.0, < 4.3)
256 255 activesupport (>= 3.0, < 4.3)
257 256 railties (>= 3.0, < 4.3)
258   - rspec-core (~> 3.2.0)
259   - rspec-expectations (~> 3.2.0)
260   - rspec-mocks (~> 3.2.0)
261   - rspec-support (~> 3.2.0)
262   - rspec-support (3.2.2)
263   - sass (3.4.13)
  257 + rspec-core (~> 3.3.0)
  258 + rspec-expectations (~> 3.3.0)
  259 + rspec-mocks (~> 3.3.0)
  260 + rspec-support (~> 3.3.0)
  261 + rspec-support (3.3.0)
  262 + sass (3.4.15)
264 263 sass-rails (5.0.3)
265 264 railties (>= 4.0.0, < 5.0)
266 265 sass (~> 3.1)
... ... @@ -282,7 +281,7 @@ GEM
282 281 spring (1.3.6)
283 282 sprockets (3.2.0)
284 283 rack (~> 1.0)
285   - sprockets-rails (2.3.0)
  284 + sprockets-rails (2.3.2)
286 285 actionpack (>= 3.0)
287 286 activesupport (>= 3.0)
288 287 sprockets (>= 2.8, < 4.0)
... ... @@ -339,13 +338,13 @@ DEPENDENCIES
339 338 cucumber-rails (~> 1.4.0)
340 339 dalli (~> 2.7.0)
341 340 database_cleaner (~> 1.4.1)
342   - devise (~> 3.4.0)
343   - exception_notification (~> 4.0.1)
  341 + devise (~> 3.5.1)
  342 + exception_notification (~> 4.1.1)
344 343 factory_girl_rails (~> 4.5.0)
345 344 google-analytics-rails (~> 0.0.6)
346 345 http_accept_language
347 346 i18n_generators
348   - jbuilder (~> 2.2.2)
  347 + jbuilder (~> 2.0)
349 348 jquery-rails
350 349 jquery-ui-rails (~> 5.0.0)
351 350 kalibro_client (~> 0.3.0)
... ... @@ -353,9 +352,9 @@ DEPENDENCIES
353 352 mocha
354 353 pg (~> 0.18.1)
355 354 poltergeist (~> 1.6.0)
356   - rails (= 4.2.1)
  355 + rails (= 4.2.2)
357 356 rails-html-sanitizer (~> 1.0)
358   - rspec-rails (~> 3.2.0)
  357 + rspec-rails (~> 3.3.2)
359 358 sass-rails (~> 5.0.0)
360 359 sdoc (~> 0.4.0)
361 360 shoulda-matchers (~> 2.8.0)
... ...