diff options
author | Stan Hu <stanhu@gmail.com> | 2019-04-29 17:14:47 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-04-29 17:14:47 +0000 |
commit | 3610d23d2da0ca10ae6a099f614d4bf2daafe958 (patch) | |
tree | 24bcc328d1f69474e8e8fd87f824ec8e66e4a8e8 | |
parent | f84992f13cf168e3c347755b103b7c1ea258d686 (diff) | |
parent | 042370ad55ff86c04ba6a9e02196a1d80265b642 (diff) | |
download | gitlab-ce-3610d23d2da0ca10ae6a099f614d4bf2daafe958.tar.gz |
Merge branch 'pl-upgrade-letter_opener_web' into 'master'
Upgrade letter_opener_web to support Rails 5.1
See merge request gitlab-org/gitlab-ce!27829
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 6 | ||||
-rw-r--r-- | changelogs/unreleased/pl-upgrade-letter_opener_web.yml | 5 |
3 files changed, 9 insertions, 4 deletions
@@ -309,7 +309,7 @@ group :development do gem 'foreman', '~> 0.84.0' gem 'brakeman', '~> 4.2', require: false - gem 'letter_opener_web', '~> 1.3.0' + gem 'letter_opener_web', '~> 1.3.4' gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false # Better errors handler diff --git a/Gemfile.lock b/Gemfile.lock index ceece1da8d7..c08f0c24ba6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -444,9 +444,9 @@ GEM rest-client (~> 2.0) launchy (2.4.3) addressable (~> 2.3) - letter_opener (1.4.1) + letter_opener (1.7.0) launchy (~> 2.2) - letter_opener_web (1.3.0) + letter_opener_web (1.3.4) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) @@ -1093,7 +1093,7 @@ DEPENDENCIES kaminari (~> 1.0) knapsack (~> 1.17) kubeclient (~> 4.2.2) - letter_opener_web (~> 1.3.0) + letter_opener_web (~> 1.3.4) license_finder (~> 5.4) licensee (~> 8.9) lograge (~> 0.5) diff --git a/changelogs/unreleased/pl-upgrade-letter_opener_web.yml b/changelogs/unreleased/pl-upgrade-letter_opener_web.yml new file mode 100644 index 00000000000..9891344215a --- /dev/null +++ b/changelogs/unreleased/pl-upgrade-letter_opener_web.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade letter_opener_web to support Rails 5.1 +merge_request: 27829 +author: +type: fixed |