diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-27 13:23:40 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-27 13:23:40 +0000 |
| commit | 47d269c1aa43fc89e8fda65a7f83dbb062c9beea (patch) | |
| tree | 1a18182a71f065d07bd2c12b4f0406c6badcf6db /Gemfile.lock | |
| parent | c01ff1f54b55a60f7c7473d0d8a429d5cf9c1609 (diff) | |
| parent | 702380f1aed9d20cc48d24164e4910613ec18703 (diff) | |
| download | gitlab-ce-47d269c1aa43fc89e8fda65a7f83dbb062c9beea.tar.gz | |
Merge branch 'rs-letter_opener_web' into 'master'
Add letter_opener_web gem
Sent emails in the development environment will no longer automatically
be opened in the browser. If a sent email needs to be viewed, it can be
found at the `/rails/letter_opener` route.
See merge request !3893
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c3c52eebbfa..91d89b4875a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -448,8 +448,12 @@ GEM kgio (2.10.0) launchy (2.4.3) addressable (~> 2.3) - letter_opener (1.1.2) + letter_opener (1.4.1) launchy (~> 2.2) + letter_opener_web (1.3.0) + actionmailer (>= 3.2) + letter_opener (~> 1.0) + railties (>= 3.2) licensee (8.0.0) rugged (>= 0.24b) listen (3.0.5) @@ -954,7 +958,7 @@ DEPENDENCIES jquery-turbolinks (~> 2.1.0) jquery-ui-rails (~> 5.0.0) kaminari (~> 0.16.3) - letter_opener (~> 1.1.2) + letter_opener_web (~> 1.3.0) licensee (~> 8.0.0) loofah (~> 2.0.3) mail_room (~> 0.6.1) |