projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
396f2e2
)
Update to rails 4.2.9
author
Tom Hughes
<tom@compton.nu>
Tue, 27 Jun 2017 07:18:16 +0000
(08:18 +0100)
committer
Tom Hughes
<tom@compton.nu>
Tue, 27 Jun 2017 07:18:16 +0000
(08:18 +0100)
Gemfile
patch
|
blob
|
history
Gemfile.lock
patch
|
blob
|
history
diff --git
a/Gemfile
b/Gemfile
index 278167d6611943d97360516ec4eaa78dea31fb58..03572296372fb1b62789dd8499ca067fb559d91c 100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-1,7
+1,7
@@
source "https://rubygems.org"
# Require rails
source "https://rubygems.org"
# Require rails
-gem "rails", "4.2.
8
"
+gem "rails", "4.2.
9
"
# Require things which have moved to gems in ruby 1.9
gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
# Require things which have moved to gems in ruby 1.9
gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
diff --git
a/Gemfile.lock
b/Gemfile.lock
index cbb332aa0b8ea71e06aaddbf03dee8facb6add70..6cc81978339a71e8ea57d8fce7c5961fa86ed6f4 100644
(file)
--- a/
Gemfile.lock
+++ b/
Gemfile.lock
@@
-2,38
+2,38
@@
GEM
remote: https://rubygems.org/
specs:
SystemTimer (1.2.3)
remote: https://rubygems.org/
specs:
SystemTimer (1.2.3)
- actionmailer (4.2.
8
)
- actionpack (= 4.2.
8
)
- actionview (= 4.2.
8
)
- activejob (= 4.2.
8
)
+ actionmailer (4.2.
9
)
+ actionpack (= 4.2.
9
)
+ actionview (= 4.2.
9
)
+ activejob (= 4.2.
9
)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.
8
)
- actionview (= 4.2.
8
)
- activesupport (= 4.2.
8
)
+ actionpack (4.2.
9
)
+ actionview (= 4.2.
9
)
+ activesupport (= 4.2.
9
)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-page_caching (1.1.0)
actionpack (>= 4.0.0, < 6)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-page_caching (1.1.0)
actionpack (>= 4.0.0, < 6)
- actionview (4.2.
8
)
- activesupport (= 4.2.
8
)
+ actionview (4.2.
9
)
+ activesupport (= 4.2.
9
)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (4.2.
8
)
- activesupport (= 4.2.
8
)
+ activejob (4.2.
9
)
+ activesupport (= 4.2.
9
)
globalid (>= 0.3.0)
globalid (>= 0.3.0)
- activemodel (4.2.
8
)
- activesupport (= 4.2.
8
)
+ activemodel (4.2.
9
)
+ activesupport (= 4.2.
9
)
builder (~> 3.1)
builder (~> 3.1)
- activerecord (4.2.
8
)
- activemodel (= 4.2.
8
)
- activesupport (= 4.2.
8
)
+ activerecord (4.2.
9
)
+ activemodel (= 4.2.
9
)
+ activesupport (= 4.2.
9
)
arel (~> 6.0)
arel (~> 6.0)
- activesupport (4.2.
8
)
+ activesupport (4.2.
9
)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
@@
-231,16
+231,16
@@
GEM
rack-test (0.6.3)
rack (>= 1.0)
rack-uri_sanitizer (0.0.2)
rack-test (0.6.3)
rack (>= 1.0)
rack-uri_sanitizer (0.0.2)
- rails (4.2.
8
)
- actionmailer (= 4.2.
8
)
- actionpack (= 4.2.
8
)
- actionview (= 4.2.
8
)
- activejob (= 4.2.
8
)
- activemodel (= 4.2.
8
)
- activerecord (= 4.2.
8
)
- activesupport (= 4.2.
8
)
+ rails (4.2.
9
)
+ actionmailer (= 4.2.
9
)
+ actionpack (= 4.2.
9
)
+ actionview (= 4.2.
9
)
+ activejob (= 4.2.
9
)
+ activemodel (= 4.2.
9
)
+ activerecord (= 4.2.
9
)
+ activesupport (= 4.2.
9
)
bundler (>= 1.3.0, < 2.0)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.
8
)
+ railties (= 4.2.
9
)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@@
-253,9
+253,9
@@
GEM
rails-i18n (4.0.9)
i18n (~> 0.7)
railties (~> 4.0)
rails-i18n (4.0.9)
i18n (~> 0.7)
railties (~> 4.0)
- railties (4.2.
8
)
- actionpack (= 4.2.
8
)
- activesupport (= 4.2.
8
)
+ railties (4.2.
9
)
+ actionpack (= 4.2.
9
)
+ activesupport (= 4.2.
9
)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
@@
-287,7
+287,7
@@
GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
- secure_headers (3.6.
4
)
+ secure_headers (3.6.
5
)
useragent
simplecov (0.14.1)
docile (~> 1.1.0)
useragent
simplecov (0.14.1)
docile (~> 1.1.0)
@@
-309,7
+309,7
@@
GEM
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.7)
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.7)
- timecop (0.
8.1
)
+ timecop (0.
9.0
)
tins (1.14.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
tins (1.14.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
@@
-376,7
+376,7
@@
DEPENDENCIES
r2
rack-cors
rack-uri_sanitizer
r2
rack-cors
rack-uri_sanitizer
- rails (= 4.2.
8
)
+ rails (= 4.2.
9
)
rails-i18n (~> 4.0.0)
redcarpet
rinku (>= 1.2.2)
rails-i18n (~> 4.0.0)
redcarpet
rinku (>= 1.2.2)