diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-30 14:53:21 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-30 14:53:21 +0000 |
| commit | d0d551b07289142593b421fb0e08f4684d9120ba (patch) | |
| tree | f61a304be2e58b1fc72c0762140784386c0dc831 | |
| parent | a8c97187f07cc4feeec9347967a12680cf5aec37 (diff) | |
| parent | 4f68a45c8b7ca421fb4bf87c9d88bbd6ca3408e1 (diff) | |
| download | gitlab-ce-d0d551b07289142593b421fb0e08f4684d9120ba.tar.gz | |
Merge branch 'dz-awesome-print-version-unlock' into 'master'
Remove version lock on awesome_print dependency
See merge request gitlab-org/gitlab-ce!19232
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -320,7 +320,7 @@ group :development, :test do gem 'pry-byebug', '~> 3.4.1', platform: :mri gem 'pry-rails', '~> 0.3.4' - gem 'awesome_print', '~> 1.8.0', require: false + gem 'awesome_print', require: false gem 'fuubar', '~> 2.2.0' gem 'database_cleaner', '~> 1.5.0' diff --git a/Gemfile.lock b/Gemfile.lock index 471deae7e25..fe20570ae89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -977,7 +977,7 @@ DEPENDENCIES asciidoctor-plantuml (= 0.0.8) asset_sync (~> 2.4) attr_encrypted (~> 3.1.0) - awesome_print (~> 1.8.0) + awesome_print babosa (~> 1.0.2) base32 (~> 0.3.0) batch-loader (~> 1.2.1) |