Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

update rails and devise

  • Loading branch information...
commit 1d320d242392b2293db4b5e786b09d3c18ec1afd 1 parent 11ff144
Vitaly Tatarintsev authored

Showing 2 changed files with 36 additions and 36 deletions. Show diff stats Hide diff stats

  1. +2 2 Gemfile
  2. +34 34 Gemfile.lock
4 Gemfile
... ... @@ -1,11 +1,11 @@
1 1 source 'http://rubygems.org'
2 2
3   -gem 'rails', '3.2.12'
  3 +gem 'rails', '3.2.13'
4 4
5 5 gem "json", "~> 1.7.7"
6 6
7 7 gem 'mysql2', "~> 0.3.11"
8   -gem 'devise', "~> 2.1.2"
  8 +gem 'devise', "~> 2.2.3"
9 9 gem "devise-encryptable", "~> 0.1.1"
10 10 gem 'haml', "~> 3.1.7"
11 11 gem 'has_scope', "~> 0.5.1"
68 Gemfile.lock
... ... @@ -1,12 +1,12 @@
1 1 GEM
2 2 remote: http://rubygems.org/
3 3 specs:
4   - actionmailer (3.2.12)
5   - actionpack (= 3.2.12)
6   - mail (~> 2.4.4)
7   - actionpack (3.2.12)
8   - activemodel (= 3.2.12)
9   - activesupport (= 3.2.12)
  4 + actionmailer (3.2.13)
  5 + actionpack (= 3.2.13)
  6 + mail (~> 2.5.3)
  7 + actionpack (3.2.13)
  8 + activemodel (= 3.2.13)
  9 + activesupport (= 3.2.13)
10 10 builder (~> 3.0.0)
11 11 erubis (~> 2.7.0)
12 12 journey (~> 1.0.4)
@@ -14,19 +14,19 @@ GEM
14 14 rack-cache (~> 1.2)
15 15 rack-test (~> 0.6.1)
16 16 sprockets (~> 2.2.1)
17   - activemodel (3.2.12)
18   - activesupport (= 3.2.12)
  17 + activemodel (3.2.13)
  18 + activesupport (= 3.2.13)
19 19 builder (~> 3.0.0)
20   - activerecord (3.2.12)
21   - activemodel (= 3.2.12)
22   - activesupport (= 3.2.12)
  20 + activerecord (3.2.13)
  21 + activemodel (= 3.2.13)
  22 + activesupport (= 3.2.13)
23 23 arel (~> 3.0.2)
24 24 tzinfo (~> 0.3.29)
25   - activeresource (3.2.12)
26   - activemodel (= 3.2.12)
27   - activesupport (= 3.2.12)
28   - activesupport (3.2.12)
29   - i18n (~> 0.6)
  25 + activeresource (3.2.13)
  26 + activemodel (= 3.2.13)
  27 + activesupport (= 3.2.13)
  28 + activesupport (3.2.13)
  29 + i18n (= 0.6.1)
30 30 multi_json (~> 1.0)
31 31 addressable (2.3.2)
32 32 anjlab-bootstrap-rails (2.2.1.2)
@@ -70,7 +70,7 @@ GEM
70 70 colored (1.2)
71 71 daemons (1.1.9)
72 72 database_cleaner (0.9.1)
73   - devise (2.1.2)
  73 + devise (2.2.3)
74 74 bcrypt-ruby (~> 3.0)
75 75 orm_adapter (~> 0.1)
76 76 railties (~> 3.1)
@@ -142,7 +142,7 @@ GEM
142 142 websocket
143 143 listen (0.5.3)
144 144 lumberjack (1.0.2)
145   - mail (2.4.4)
  145 + mail (2.5.3)
146 146 i18n (>= 0.4.0)
147 147 mime-types (~> 1.16)
148 148 treetop (~> 1.4.8)
@@ -150,7 +150,7 @@ GEM
150 150 actionpack
151 151 method_source (0.8.1)
152 152 mime-types (1.21)
153   - multi_json (1.5.1)
  153 + multi_json (1.7.1)
154 154 multipart-post (1.1.5)
155 155 mysql2 (0.3.11)
156 156 net-scp (1.0.4)
@@ -179,14 +179,14 @@ GEM
179 179 rack
180 180 rack-test (0.6.2)
181 181 rack (>= 1.0)
182   - rails (3.2.12)
183   - actionmailer (= 3.2.12)
184   - actionpack (= 3.2.12)
185   - activerecord (= 3.2.12)
186   - activeresource (= 3.2.12)
187   - activesupport (= 3.2.12)
  182 + rails (3.2.13)
  183 + actionmailer (= 3.2.13)
  184 + actionpack (= 3.2.13)
  185 + activerecord (= 3.2.13)
  186 + activeresource (= 3.2.13)
  187 + activesupport (= 3.2.13)
188 188 bundler (~> 1.0)
189   - railties (= 3.2.12)
  189 + railties (= 3.2.13)
190 190 rails_best_practices (1.12.0)
191 191 activesupport
192 192 awesome_print
@@ -195,9 +195,9 @@ GEM
195 195 erubis
196 196 i18n
197 197 progressbar
198   - railties (3.2.12)
199   - actionpack (= 3.2.12)
200   - activesupport (= 3.2.12)
  198 + railties (3.2.13)
  199 + actionpack (= 3.2.13)
  200 + activesupport (= 3.2.13)
201 201 rack-ssl (~> 1.3.2)
202 202 rake (>= 0.8.7)
203 203 rdoc (~> 3.4)
@@ -206,7 +206,7 @@ GEM
206 206 rb-fsevent (0.9.2)
207 207 rb-inotify (0.8.8)
208 208 ffi (>= 0.5.0)
209   - rdoc (3.12.1)
  209 + rdoc (3.12.2)
210 210 json (~> 1.4)
211 211 rspec (2.11.0)
212 212 rspec-core (~> 2.11.0)
@@ -263,7 +263,7 @@ GEM
263 263 eventmachine (>= 0.12.6)
264 264 rack (>= 1.0.0)
265 265 thor (0.17.0)
266   - tilt (1.3.3)
  266 + tilt (1.3.6)
267 267 tinder (1.9.1)
268 268 eventmachine (>= 0.12.0, < 2)
269 269 faraday (~> 0.8)
@@ -281,7 +281,7 @@ GEM
281 281 eventmachine (>= 0.12.8)
282 282 http_parser.rb (~> 0.5.1)
283 283 simple_oauth (~> 0.1.4)
284   - tzinfo (0.3.35)
  284 + tzinfo (0.3.37)
285 285 uglifier (1.3.0)
286 286 execjs (>= 0.3.0)
287 287 multi_json (~> 1.0, >= 1.0.2)
@@ -302,7 +302,7 @@ DEPENDENCIES
302 302 capybara (~> 1.1.2)
303 303 coffee-rails (~> 3.2.2)
304 304 database_cleaner
305   - devise (~> 2.1.2)
  305 + devise (~> 2.2.3)
306 306 devise-encryptable (~> 0.1.1)
307 307 email_spec
308 308 erb2haml
@@ -325,7 +325,7 @@ DEPENDENCIES
325 325 newrelic_rpm
326 326 pry-rails
327 327 psych (~> 1.3.4)
328   - rails (= 3.2.12)
  328 + rails (= 3.2.13)
329 329 rails_best_practices
330 330 rb-fsevent (>= 0.4.3)
331 331 rb-inotify (>= 0.8.6)

0 comments on commit 1d320d2

Please sign in to comment.
Something went wrong with that request. Please try again.