summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-12-31 09:30:23 +0000
committerConstance Okoghenun <constanceokoghenun@gmail.com>2018-12-31 14:46:16 +0100
commit384c0944544ceb6e397792d2ddc82b81162624fc (patch)
tree2a6ebe9b7f17881c6e333c20b7508c9ed728cbb1
parent0a5c3d1616bad94539f16a8f9d942777ff773647 (diff)
downloadgitlab-ce-54206-show-the-activity-filter-dropdown-in-discussion-tab-only-show-all-discussions-always-in-changes-tab.tar.gz
`--no-rdoc` and `--no-ri` have been deprecated since RubyGems 2.0: https://github.com/rubygems/rubygems/blob/v2.0.0/History.txt#L43 They were finally removed in a recent release: https://github.com/rubygems/rubygems/pull/2354
-rw-r--r--scripts/prepare_build.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index d85c53090a4..58b74f2f07d 100644
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -10,7 +10,7 @@ fi
# Only install knapsack after bundle install! Otherwise oddly some native
# gems could not be found under some circumstance. No idea why, hours wasted.
-retry gem install knapsack --no-ri --no-rdoc
+retry gem install knapsack --no-document
cp config/gitlab.yml.example config/gitlab.yml
sed -i 's/bin_path: \/usr\/bin\/git/bin_path: \/usr\/local\/bin\/git/' config/gitlab.yml