diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-26 20:49:21 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-26 20:49:21 +0000 |
| commit | 76d9f556c7d02e5fef4f1a4feae00b2a30139800 (patch) | |
| tree | f70ff14bec6e33b3e716f20d2d6fcd51b0495df6 | |
| parent | 68b84d8154a92876fb2c308b2ca16eb78f2b3933 (diff) | |
| parent | a0aff4508dedf0e23f2cb7a2e0f0fecc322932d9 (diff) | |
| download | gitlab-ce-76d9f556c7d02e5fef4f1a4feae00b2a30139800.tar.gz | |
Merge branch 'rails5-update-gemfile-lock' into 'master'
Rails5 update Gemfile.rails5.lock
See merge request gitlab-org/gitlab-ce!21388
| -rw-r--r-- | Gemfile.rails5.lock | 18 | ||||
| -rw-r--r-- | changelogs/unreleased/rails5-update-gemfile-lock.yml | 5 |
2 files changed, 13 insertions, 10 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index f9ec29cde90..63b450d3f62 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -126,7 +126,7 @@ GEM numerizer (~> 0.1.1) chunky_png (1.3.5) citrus (3.0.2) - coderay (1.1.1) + coderay (1.1.2) coercible (1.0.0) descendants_tracker (~> 0.0.1) commonmarker (0.17.8) @@ -495,7 +495,7 @@ GEM memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) - method_source (0.8.2) + method_source (0.9.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) @@ -638,12 +638,11 @@ GEM unparser procto (0.0.3) prometheus-client-mmap (0.9.4) - pry (0.10.4) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.4.3) + byebug (>= 9.0, < 9.1) pry (~> 0.10) pry-rails (0.3.5) pry (>= 0.9.10) @@ -751,7 +750,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.2.0) + rouge (3.2.1) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -817,7 +816,7 @@ GEM rubyzip (1.2.1) rufus-scheduler (3.4.0) et-orbi (~> 1.0) - rugged (0.27.2) + rugged (0.27.4) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -878,7 +877,6 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slack-notifier (1.5.1) - slop (3.6.0) spring (2.0.1) activesupport (>= 4.2) spring-commands-rspec (1.0.4) diff --git a/changelogs/unreleased/rails5-update-gemfile-lock.yml b/changelogs/unreleased/rails5-update-gemfile-lock.yml new file mode 100644 index 00000000000..3891b16e2b8 --- /dev/null +++ b/changelogs/unreleased/rails5-update-gemfile-lock.yml @@ -0,0 +1,5 @@ +--- +title: Rails5 update Gemfile.rails5.lock +merge_request: 21388 +author: Jasper Maes +type: other |