diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-14 12:22:59 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-14 12:22:59 +0000 |
| commit | 8467a796a79e091278999d804c12a8c7e82be3bc (patch) | |
| tree | b21e9a9596f9d9693b0b597e82545c2723df1378 | |
| parent | fdb0761b3a2cfd4a93422148b31a6d39d070820a (diff) | |
| parent | 9ccd6bc81ef70da1a85bd2674ad9bc8527bf289b (diff) | |
| download | gitlab-ce-8467a796a79e091278999d804c12a8c7e82be3bc.tar.gz | |
Merge branch '44160-update-foreman-to-0.84.0' into 'master'
Update foreman to 0.84.0
Closes #44160
See merge request gitlab-org/gitlab-ce!17690
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/44160-update-foreman-to-0-84-0.yml | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -300,7 +300,7 @@ group :metrics do end group :development do - gem 'foreman', '~> 0.78.0' + gem 'foreman', '~> 0.84.0' gem 'brakeman', '~> 3.6.0', require: false gem 'letter_opener_web', '~> 1.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index b85c7085d07..86b4e5301d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -265,7 +265,7 @@ GEM nokogiri (>= 1.5.11, < 2.0.0) font-awesome-rails (4.7.0.1) railties (>= 3.2, < 5.1) - foreman (0.78.0) + foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) fuubar (2.2.0) @@ -1055,7 +1055,7 @@ DEPENDENCIES fog-openstack (~> 0.1) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) - foreman (~> 0.78.0) + foreman (~> 0.84.0) fuubar (~> 2.2.0) gemnasium-gitlab-service (~> 0.2) gemojione (~> 3.3) diff --git a/changelogs/unreleased/44160-update-foreman-to-0-84-0.yml b/changelogs/unreleased/44160-update-foreman-to-0-84-0.yml new file mode 100644 index 00000000000..990d188eb78 --- /dev/null +++ b/changelogs/unreleased/44160-update-foreman-to-0-84-0.yml @@ -0,0 +1,5 @@ +--- +title: Update foreman from 0.78.0 to 0.84.0 +merge_request: 17690 +author: Takuya Noguchi +type: other |