Skip to content

Commit e73f280

Browse files
author
Tim Morgan
committed
Rails 4.2.5.2
1 parent ed34b76 commit e73f280

2 files changed

Lines changed: 42 additions & 42 deletions

File tree

Gemfile.d/framework.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
gem 'rails', '4.2.5.1'
15+
gem 'rails', '4.2.5.2'
1616
gem 'responders'
1717
gem 'psych' # fix TypeError: superclass mismatch for class Mark
1818

Gemfile.lock

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,36 @@ GIT
1414
GEM
1515
remote: https://rubygems.org/
1616
specs:
17-
actionmailer (4.2.5.1)
18-
actionpack (= 4.2.5.1)
19-
actionview (= 4.2.5.1)
20-
activejob (= 4.2.5.1)
17+
actionmailer (4.2.5.2)
18+
actionpack (= 4.2.5.2)
19+
actionview (= 4.2.5.2)
20+
activejob (= 4.2.5.2)
2121
mail (~> 2.5, >= 2.5.4)
2222
rails-dom-testing (~> 1.0, >= 1.0.5)
23-
actionpack (4.2.5.1)
24-
actionview (= 4.2.5.1)
25-
activesupport (= 4.2.5.1)
23+
actionpack (4.2.5.2)
24+
actionview (= 4.2.5.2)
25+
activesupport (= 4.2.5.2)
2626
rack (~> 1.6)
2727
rack-test (~> 0.6.2)
2828
rails-dom-testing (~> 1.0, >= 1.0.5)
2929
rails-html-sanitizer (~> 1.0, >= 1.0.2)
30-
actionview (4.2.5.1)
31-
activesupport (= 4.2.5.1)
30+
actionview (4.2.5.2)
31+
activesupport (= 4.2.5.2)
3232
builder (~> 3.1)
3333
erubis (~> 2.7.0)
3434
rails-dom-testing (~> 1.0, >= 1.0.5)
3535
rails-html-sanitizer (~> 1.0, >= 1.0.2)
36-
activejob (4.2.5.1)
37-
activesupport (= 4.2.5.1)
36+
activejob (4.2.5.2)
37+
activesupport (= 4.2.5.2)
3838
globalid (>= 0.3.0)
39-
activemodel (4.2.5.1)
40-
activesupport (= 4.2.5.1)
39+
activemodel (4.2.5.2)
40+
activesupport (= 4.2.5.2)
4141
builder (~> 3.1)
42-
activerecord (4.2.5.1)
43-
activemodel (= 4.2.5.1)
44-
activesupport (= 4.2.5.1)
42+
activerecord (4.2.5.2)
43+
activemodel (= 4.2.5.2)
44+
activesupport (= 4.2.5.2)
4545
arel (~> 6.0)
46-
activesupport (4.2.5.1)
46+
activesupport (4.2.5.2)
4747
i18n (~> 0.7)
4848
json (~> 1.7, >= 1.7.7)
4949
minitest (~> 5.1)
@@ -64,7 +64,7 @@ GEM
6464
commonjs (0.2.7)
6565
composite_primary_keys (8.1.2)
6666
activerecord (~> 4.2.0)
67-
concurrent-ruby (1.0.0)
67+
concurrent-ruby (1.0.1)
6868
configoro (1.4.0)
6969
activesupport
7070
diff-lcs (1.2.5)
@@ -74,14 +74,14 @@ GEM
7474
execjs (2.6.0)
7575
factory_girl (4.5.0)
7676
activesupport (>= 3.0.0)
77-
factory_girl_rails (4.5.0)
77+
factory_girl_rails (4.6.0)
7878
factory_girl (~> 4.5.0)
7979
railties (>= 3.0.0)
8080
fakeweb (1.3.0)
8181
find_or_create_on_scopes (1.4.1)
8282
activerecord (>= 3.1)
83-
font-awesome-rails (4.5.0.0)
84-
railties (>= 3.2, < 5.0)
83+
font-awesome-rails (4.5.0.1)
84+
railties (>= 3.2, < 5.1)
8585
globalid (0.3.6)
8686
activesupport (>= 4.1.0)
8787
has_metadata_column (1.1.5)
@@ -114,29 +114,29 @@ GEM
114114
nokogiri (>= 1.5.9)
115115
mail (2.6.3)
116116
mime-types (>= 1.16, < 3)
117-
mime-types (2.99)
117+
mime-types (2.99.1)
118118
mini_portile2 (2.0.0)
119119
minitest (5.8.4)
120120
nokogiri (1.6.7.2)
121121
mini_portile2 (~> 2.0.0.rc2)
122122
pg (0.18.4)
123-
plist (3.1.0)
123+
plist (3.2.0)
124124
polyglot (0.3.5)
125125
psych (2.0.17)
126126
rack (1.6.4)
127127
rack-cors (0.4.0)
128128
rack-test (0.6.3)
129129
rack (>= 1.0)
130-
rails (4.2.5.1)
131-
actionmailer (= 4.2.5.1)
132-
actionpack (= 4.2.5.1)
133-
actionview (= 4.2.5.1)
134-
activejob (= 4.2.5.1)
135-
activemodel (= 4.2.5.1)
136-
activerecord (= 4.2.5.1)
137-
activesupport (= 4.2.5.1)
130+
rails (4.2.5.2)
131+
actionmailer (= 4.2.5.2)
132+
actionpack (= 4.2.5.2)
133+
actionview (= 4.2.5.2)
134+
activejob (= 4.2.5.2)
135+
activemodel (= 4.2.5.2)
136+
activerecord (= 4.2.5.2)
137+
activesupport (= 4.2.5.2)
138138
bundler (>= 1.3.0, < 2.0)
139-
railties (= 4.2.5.1)
139+
railties (= 4.2.5.2)
140140
sprockets-rails
141141
rails-deprecated_sanitizer (1.0.3)
142142
activesupport (>= 4.2.0.alpha)
@@ -148,25 +148,25 @@ GEM
148148
loofah (~> 2.0)
149149
rails-observers (0.1.2)
150150
activemodel (~> 4.0)
151-
railties (4.2.5.1)
152-
actionpack (= 4.2.5.1)
153-
activesupport (= 4.2.5.1)
151+
railties (4.2.5.2)
152+
actionpack (= 4.2.5.2)
153+
activesupport (= 4.2.5.2)
154154
rake (>= 0.8.7)
155155
thor (>= 0.18.1, < 2.0)
156156
rake (10.5.0)
157157
redcarpet (3.3.4)
158158
ref (2.0.0)
159159
responders (2.1.1)
160160
railties (>= 4.2.0, < 5.1)
161-
rspec-core (3.4.2)
161+
rspec-core (3.4.3)
162162
rspec-support (~> 3.4.0)
163163
rspec-expectations (3.4.0)
164164
diff-lcs (>= 1.2.0, < 2.0)
165165
rspec-support (~> 3.4.0)
166166
rspec-mocks (3.4.1)
167167
diff-lcs (>= 1.2.0, < 2.0)
168168
rspec-support (~> 3.4.0)
169-
rspec-rails (3.4.1)
169+
rspec-rails (3.4.2)
170170
actionpack (>= 3.0, < 4.3)
171171
activesupport (>= 3.0, < 4.3)
172172
railties (>= 3.0, < 4.3)
@@ -193,7 +193,7 @@ GEM
193193
sprockets (3.5.2)
194194
concurrent-ruby (~> 1.0)
195195
rack (> 1, < 3)
196-
sprockets-rails (3.0.0)
196+
sprockets-rails (3.0.3)
197197
actionpack (>= 4.0)
198198
activesupport (>= 4.0)
199199
sprockets (>= 3.0.0)
@@ -219,15 +219,15 @@ GEM
219219
json
220220
squash_uploader (1.0.1)
221221
json
222-
stringex (2.5.2)
222+
stringex (2.6.0)
223223
therubyracer (0.12.2)
224224
libv8 (~> 3.16.14.0)
225225
ref
226226
thor (0.19.1)
227227
thread_safe (0.3.5)
228228
tilt (2.0.2)
229229
timeliness (0.3.8)
230-
treetop (1.6.3)
230+
treetop (1.6.5)
231231
polyglot (~> 0.3)
232232
tzinfo (1.2.2)
233233
thread_safe (~> 0.1)
@@ -267,7 +267,7 @@ DEPENDENCIES
267267
pg
268268
psych
269269
rack-cors
270-
rails (= 4.2.5.1)
270+
rails (= 4.2.5.2)
271271
rails-observers
272272
redcarpet
273273
responders

0 commit comments

Comments
 (0)