Skip to content

Commit b3b7155

Browse files
committed
Rails 4.0.3
1 parent fa70276 commit b3b7155

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding: utf-8
22
source 'http://ruby.taobao.org'
33

4-
gem "rails", "4.0.2"
4+
gem "rails", "4.0.3"
55
gem 'turbolinks', '~> 1.2.0'
66
gem 'jquery-turbolinks', '2.0.0'
77
gem 'actionpack-action_caching', '1.0.0'
@@ -71,7 +71,7 @@ gem 'faye-rails','1.0.0'
7171
gem "social-share-button", '0.1.4'
7272

7373
# 表单
74-
gem 'simple_form', "3.0.0.rc"
74+
gem 'simple_form', "3.0.1"
7575

7676
# API
7777
gem 'grape', github: 'intridea/grape', branch: 'frontier'

Gemfile.lock

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,27 @@ GIT
4343
GEM
4444
remote: http://ruby.taobao.org/
4545
specs:
46-
actionmailer (4.0.2)
47-
actionpack (= 4.0.2)
46+
actionmailer (4.0.3)
47+
actionpack (= 4.0.3)
4848
mail (~> 2.5.4)
49-
actionpack (4.0.2)
50-
activesupport (= 4.0.2)
49+
actionpack (4.0.3)
50+
activesupport (= 4.0.3)
5151
builder (~> 3.1.0)
5252
erubis (~> 2.7.0)
5353
rack (~> 1.5.2)
5454
rack-test (~> 0.6.2)
5555
actionpack-action_caching (1.0.0)
5656
actionpack (>= 4.0.0.beta, < 5.0)
57-
activemodel (4.0.2)
58-
activesupport (= 4.0.2)
57+
activemodel (4.0.3)
58+
activesupport (= 4.0.3)
5959
builder (~> 3.1.0)
60-
activerecord (4.0.2)
61-
activemodel (= 4.0.2)
60+
activerecord (4.0.3)
61+
activemodel (= 4.0.3)
6262
activerecord-deprecated_finders (~> 1.0.2)
63-
activesupport (= 4.0.2)
63+
activesupport (= 4.0.3)
6464
arel (~> 4.0.0)
6565
activerecord-deprecated_finders (1.0.3)
66-
activesupport (4.0.2)
66+
activesupport (4.0.3)
6767
i18n (~> 0.6, >= 0.6.4)
6868
minitest (~> 4.2)
6969
multi_json (~> 1.3)
@@ -80,7 +80,7 @@ GEM
8080
redcarpet
8181
remotipart (~> 1.0)
8282
sass-rails
83-
arel (4.0.1)
83+
arel (4.0.2)
8484
atomic (1.1.14)
8585
auto-space (0.0.2)
8686
bcrypt-ruby (3.1.1)
@@ -227,7 +227,7 @@ GEM
227227
rails (>= 3.2.0)
228228
railties (>= 3.2.0)
229229
moped (1.5.0)
230-
multi_json (1.8.2)
230+
multi_json (1.8.4)
231231
multi_xml (0.4.1)
232232
multipart-post (1.2.0)
233233
net-scp (1.0.4)
@@ -256,7 +256,7 @@ GEM
256256
omniauth (~> 1.0)
257257
origin (1.1.0)
258258
orm_adapter (0.4.0)
259-
polyglot (0.3.3)
259+
polyglot (0.3.4)
260260
postmark (0.9.15)
261261
json
262262
rake
@@ -274,24 +274,24 @@ GEM
274274
rack (>= 1.0.0)
275275
rack-test (0.6.2)
276276
rack (>= 1.0)
277-
rails (4.0.2)
278-
actionmailer (= 4.0.2)
279-
actionpack (= 4.0.2)
280-
activerecord (= 4.0.2)
281-
activesupport (= 4.0.2)
277+
rails (4.0.3)
278+
actionmailer (= 4.0.3)
279+
actionpack (= 4.0.3)
280+
activerecord (= 4.0.3)
281+
activesupport (= 4.0.3)
282282
bundler (>= 1.3.0, < 2.0)
283-
railties (= 4.0.2)
283+
railties (= 4.0.3)
284284
sprockets-rails (~> 2.0.0)
285285
rails-i18n (0.1.8)
286286
i18n (~> 0.5)
287287
rails_autolink (1.1.0)
288288
rails (> 3.1)
289-
railties (4.0.2)
290-
actionpack (= 4.0.2)
291-
activesupport (= 4.0.2)
289+
railties (4.0.3)
290+
actionpack (= 4.0.3)
291+
activesupport (= 4.0.3)
292292
rake (>= 0.8.7)
293293
thor (>= 0.18.1, < 2.0)
294-
rake (10.1.0)
294+
rake (10.1.1)
295295
redcarpet (3.0.0)
296296
redis (3.0.2)
297297
redis-namespace (1.2.1)
@@ -343,9 +343,9 @@ GEM
343343
multi_json (~> 1)
344344
redis (~> 3)
345345
redis-namespace
346-
simple_form (3.0.0.rc)
347-
actionpack (>= 4.0.0.rc1, < 4.1)
348-
activemodel (>= 4.0.0.rc1, < 4.1)
346+
simple_form (3.0.1)
347+
actionpack (>= 4.0.0, < 4.1)
348+
activemodel (>= 4.0.0, < 4.1)
349349
social-share-button (0.1.4)
350350
sprite-factory (1.4.1)
351351
sprockets (2.10.1)
@@ -433,7 +433,7 @@ DEPENDENCIES
433433
puma (= 2.6.0)
434434
quiet_assets (~> 1.0.2)
435435
rack-cors
436-
rails (= 4.0.2)
436+
rails (= 4.0.3)
437437
rails-i18n (= 0.1.8)
438438
rails_autolink (>= 1.1.0)
439439
redcarpet (~> 3.0.0)
@@ -446,7 +446,7 @@ DEPENDENCIES
446446
sass-rails (~> 4.0.0)
447447
settingslogic (~> 2.0.9)
448448
sidekiq (= 2.5.3)
449-
simple_form (= 3.0.0.rc)
449+
simple_form (= 3.0.1)
450450
social-share-button (= 0.1.4)
451451
sprite-factory (= 1.4.1)
452452
thin (= 1.5.0)

0 commit comments

Comments
 (0)