summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2018-03-12 23:54:40 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2018-03-13 00:01:07 +0900
commit9ccd6bc81ef70da1a85bd2674ad9bc8527bf289b (patch)
treec0ebf890bc6d60465359a50fbd071fa50271418e
parentcd7b75ddf63fcf0510dea9c3eefc602127540b9b (diff)
downloadgitlab-ce-9ccd6bc81ef70da1a85bd2674ad9bc8527bf289b.tar.gz
Update foreman from 0.78.0 to 0.84.0
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--changelogs/unreleased/44160-update-foreman-to-0-84-0.yml5
3 files changed, 8 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 2793463fd81..66112e23a68 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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 fa99ec3febe..a0a4c0071c9 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