diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-05-30 10:12:34 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-05-30 10:12:34 +0300 |
| commit | e869387ca27f9a9ac34f6398876714199fc3100e (patch) | |
| tree | 8380a9c46b5d2be28be6f6fa0acaf881104fb7bf | |
| parent | 5b1416aa74c4fa80e0c324fd2907166af5ca479b (diff) | |
| parent | 2a0debdf265d33d603e851b9b6de83ae99e5d80a (diff) | |
Merge branch '46844-update-awesome_print-to-1-8-0' into 'master'
Update awesome_print to 1.8.0
Closes #46844
See merge request gitlab-org/gitlab-ce!19163
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/46844-update-awesome_print-to-1-8-0.yml | 5 |
3 files changed, 8 insertions, 3 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.2.0', require: false + gem 'awesome_print', '~> 1.8.0', require: false gem 'fuubar', '~> 2.2.0' gem 'database_cleaner', '~> 1.5.0' diff --git a/Gemfile.lock b/Gemfile.lock index 915e1c530fb..cfd74334c86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,7 @@ GEM attr_encrypted (3.1.0) encryptor (~> 3.0.0) attr_required (1.0.0) - awesome_print (1.2.0) + awesome_print (1.8.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) @@ -977,7 +977,7 @@ DEPENDENCIES asciidoctor-plantuml (= 0.0.8) asset_sync (~> 2.4) attr_encrypted (~> 3.1.0) - awesome_print (~> 1.2.0) + awesome_print (~> 1.8.0) babosa (~> 1.0.2) base32 (~> 0.3.0) batch-loader (~> 1.2.1) diff --git a/changelogs/unreleased/46844-update-awesome_print-to-1-8-0.yml b/changelogs/unreleased/46844-update-awesome_print-to-1-8-0.yml new file mode 100644 index 00000000000..e6dc9a6187b --- /dev/null +++ b/changelogs/unreleased/46844-update-awesome_print-to-1-8-0.yml @@ -0,0 +1,5 @@ +--- +title: Update awesome_print to 1.8.0 +merge_request: 19163 +author: Takuya Noguchi +type: other |