Skip to content

Commit fd30489

Browse files
Updated the Rails And Mongoid Version
1 parent 774a8c6 commit fd30489

File tree

2 files changed

+36
-41
lines changed

2 files changed

+36
-41
lines changed

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22

33
ruby '2.1.2'
44
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
5-
gem 'rails', '4.1.1'
5+
gem 'rails', '4.1.2'
66
# Use SCSS for stylesheets
77
gem 'sass-rails', '~> 4.0.3'
88

@@ -57,7 +57,7 @@ gem 'sidekiq'
5757
gem 'devise'
5858

5959
# Use mongoid to utilise mongodb
60-
gem 'mongoid', github: 'mongoid/mongoid'
60+
gem 'mongoid'
6161

6262
# Use devise_invitable to give authentication to only invited users
6363
gem 'devise_invitable'

Gemfile.lock

+34-39
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,35 @@
1-
GIT
2-
remote: git://github.com/mongoid/mongoid.git
3-
revision: 50b633c8baf2fa467e8c36b18a013a2cd50e0454
4-
specs:
5-
mongoid (4.0.0)
6-
activemodel (~> 4.0)
7-
moped (~> 2.0.0)
8-
origin (~> 2.1)
9-
tzinfo (>= 0.3.37)
10-
111
GEM
122
remote: https://rubygems.org/
133
specs:
14-
actionmailer (4.1.1)
15-
actionpack (= 4.1.1)
16-
actionview (= 4.1.1)
4+
actionmailer (4.1.2)
5+
actionpack (= 4.1.2)
6+
actionview (= 4.1.2)
177
mail (~> 2.5.4)
18-
actionpack (4.1.1)
19-
actionview (= 4.1.1)
20-
activesupport (= 4.1.1)
8+
actionpack (4.1.2)
9+
actionview (= 4.1.2)
10+
activesupport (= 4.1.2)
2111
rack (~> 1.5.2)
2212
rack-test (~> 0.6.2)
23-
actionview (4.1.1)
24-
activesupport (= 4.1.1)
13+
actionview (4.1.2)
14+
activesupport (= 4.1.2)
2515
builder (~> 3.1)
2616
erubis (~> 2.7.0)
27-
activemodel (4.1.1)
28-
activesupport (= 4.1.1)
17+
activemodel (4.1.2)
18+
activesupport (= 4.1.2)
2919
builder (~> 3.1)
30-
activerecord (4.1.1)
31-
activemodel (= 4.1.1)
32-
activesupport (= 4.1.1)
20+
activerecord (4.1.2)
21+
activemodel (= 4.1.2)
22+
activesupport (= 4.1.2)
3323
arel (~> 5.0.0)
34-
activesupport (4.1.1)
24+
activesupport (4.1.2)
3525
i18n (~> 0.6, >= 0.6.9)
3626
json (~> 1.7, >= 1.7.7)
3727
minitest (~> 5.1)
3828
thread_safe (~> 0.1)
3929
tzinfo (~> 1.1)
4030
arel (5.0.1.20140414130214)
4131
bcrypt (3.1.7)
42-
bootstrap-sass (3.1.1.1)
32+
bootstrap-sass (3.2.0.0)
4333
sass (~> 3.2)
4434
bson (2.3.0)
4535
builder (3.2.2)
@@ -66,7 +56,7 @@ GEM
6656
diff-lcs (1.2.5)
6757
docile (1.1.5)
6858
erubis (2.7.0)
69-
execjs (2.2.0)
59+
execjs (2.2.1)
7060
factory_girl (4.4.0)
7161
activesupport (>= 3.0.0)
7262
factory_girl_rails (4.4.1)
@@ -109,6 +99,11 @@ GEM
10999
mime-types (1.25.1)
110100
mini_portile (0.6.0)
111101
minitest (5.3.5)
102+
mongoid (4.0.0)
103+
activemodel (~> 4.0)
104+
moped (~> 2.0.0)
105+
origin (~> 2.1)
106+
tzinfo (>= 0.3.37)
112107
moped (2.0.0)
113108
bson (~> 2.2)
114109
connection_pool (~> 2.0)
@@ -132,19 +127,19 @@ GEM
132127
rack (1.5.2)
133128
rack-test (0.6.2)
134129
rack (>= 1.0)
135-
rails (4.1.1)
136-
actionmailer (= 4.1.1)
137-
actionpack (= 4.1.1)
138-
actionview (= 4.1.1)
139-
activemodel (= 4.1.1)
140-
activerecord (= 4.1.1)
141-
activesupport (= 4.1.1)
130+
rails (4.1.2)
131+
actionmailer (= 4.1.2)
132+
actionpack (= 4.1.2)
133+
actionview (= 4.1.2)
134+
activemodel (= 4.1.2)
135+
activerecord (= 4.1.2)
136+
activesupport (= 4.1.2)
142137
bundler (>= 1.3.0, < 2.0)
143-
railties (= 4.1.1)
138+
railties (= 4.1.2)
144139
sprockets-rails (~> 2.0)
145-
railties (4.1.1)
146-
actionpack (= 4.1.1)
147-
activesupport (= 4.1.1)
140+
railties (4.1.2)
141+
actionpack (= 4.1.2)
142+
activesupport (= 4.1.2)
148143
rake (>= 0.8.7)
149144
thor (>= 0.18.1, < 2.0)
150145
rake (10.3.2)
@@ -243,8 +238,8 @@ DEPENDENCIES
243238
jbuilder (~> 2.0)
244239
jquery-rails
245240
linkedin
246-
mongoid!
247-
rails (= 4.1.1)
241+
mongoid
242+
rails (= 4.1.2)
248243
rspec-rails
249244
sass-rails (~> 4.0.3)
250245
sdoc (~> 0.4.0)

0 commit comments

Comments
 (0)