Commit 89535572 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'patch-37' into 'master'

Fix #55740:  Use the '--no-document' option instead of the 'gem' tool's deprecated options

Closes #55740

See merge request gitlab-org/gitlab-ce!24049
parents 30a301b8 c7ac1b40
No related merge requests found
......@@ -120,6 +120,6 @@ Example response:
```json
{
"name": "Ruby",
"content": "# This file is a template, and might need editing before it works on your project.\n# Official language image. Look for the different tagged releases at:\n# https://hub.docker.com/r/library/ruby/tags/\nimage: \"ruby:2.3\"\n\n# Pick zero or more services to be used on all builds.\n# Only needed when using a docker container to run your tests in.\n# Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-service\nservices:\n - mysql:latest\n - redis:latest\n - postgres:latest\n\nvariables:\n POSTGRES_DB: database_name\n\n# Cache gems in between builds\ncache:\n paths:\n - vendor/ruby\n\n# This is a basic example for a gem or script which doesn't use\n# services such as redis or postgres\nbefore_script:\n - ruby -v # Print out ruby version for debugging\n # Uncomment next line if your rails app needs a JS runtime:\n # - apt-get update -q && apt-get install nodejs -yqq\n - gem install bundler --no-ri --no-rdoc # Bundler is not installed with the image\n - bundle install -j $(nproc) --path vendor # Install dependencies into ./vendor/ruby\n\n# Optional - Delete if not using `rubocop`\nrubocop:\n script:\n - rubocop\n\nrspec:\n script:\n - rspec spec\n\nrails:\n variables:\n DATABASE_URL: \"postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB\"\n script:\n - bundle exec rake db:migrate\n - bundle exec rake db:seed\n - bundle exec rake test\n"
"content": "# This file is a template, and might need editing before it works on your project.\n# Official language image. Look for the different tagged releases at:\n# https://hub.docker.com/r/library/ruby/tags/\nimage: \"ruby:2.3\"\n\n# Pick zero or more services to be used on all builds.\n# Only needed when using a docker container to run your tests in.\n# Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-service\nservices:\n - mysql:latest\n - redis:latest\n - postgres:latest\n\nvariables:\n POSTGRES_DB: database_name\n\n# Cache gems in between builds\ncache:\n paths:\n - vendor/ruby\n\n# This is a basic example for a gem or script which doesn't use\n# services such as redis or postgres\nbefore_script:\n - ruby -v # Print out ruby version for debugging\n # Uncomment next line if your rails app needs a JS runtime:\n # - apt-get update -q && apt-get install nodejs -yqq\n - gem install bundler --no-document # Bundler is not installed with the image\n - bundle install -j $(nproc) --path vendor # Install dependencies into ./vendor/ruby\n\n# Optional - Delete if not using `rubocop`\nrubocop:\n script:\n - rubocop\n\nrspec:\n script:\n - rspec spec\n\nrails:\n variables:\n DATABASE_URL: \"postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB\"\n script:\n - bundle exec rake db:migrate\n - bundle exec rake db:seed\n - bundle exec rake test\n"
}
```
......@@ -300,7 +300,7 @@ cache:
before_script:
- ruby -v # Print out ruby version for debugging
- gem install bundler --no-ri --no-rdoc # Bundler is not installed with the image
- gem install bundler --no-document # Bundler is not installed with the image
- bundle install -j $(nproc) --path vendor # Install dependencies into ./vendor/ruby
rspec:
......
......@@ -77,7 +77,7 @@ before_script:
- apt-get update -qq && apt-get install -y -qq sqlite3 libsqlite3-dev nodejs
- ruby -v
- which ruby
- gem install bundler --no-ri --no-rdoc
- gem install bundler --no-document
- bundle install --jobs $(nproc) "${FLAGS[@]}"
rspec:
......
......@@ -1660,7 +1660,7 @@ automatically fetched and evaluated along with the content of `.gitlab-ci.yml`:
before_script:
- apt-get update -qq && apt-get install -y -qq sqlite3 libsqlite3-dev nodejs
- gem install bundler --no-ri --no-rdoc
- gem install bundler --no-document
- bundle install --jobs $(nproc) "${FLAGS[@]}"
```
......
......@@ -142,7 +142,7 @@ Download Ruby and compile it:
Then install the Bundler Gem:
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
## 3. Go
......
......@@ -49,7 +49,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -49,7 +49,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -49,7 +49,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -51,7 +51,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -51,7 +51,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -51,7 +51,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -51,7 +51,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -52,7 +52,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -51,7 +51,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -51,7 +51,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -51,7 +51,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -51,7 +51,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -51,7 +51,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -51,7 +51,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -51,7 +51,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -47,7 +47,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 3. Get latest code
......
......@@ -67,7 +67,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
## 3. Get latest code
......
......@@ -47,7 +47,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 3. Get latest code
......
......@@ -47,7 +47,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Get latest code
......
......@@ -47,7 +47,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Get latest code
......
......@@ -47,7 +47,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Get latest code
......
......@@ -47,7 +47,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Get latest code
......
......@@ -50,7 +50,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Get latest code
......
......@@ -50,7 +50,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Get latest code
......
......@@ -50,7 +50,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -49,7 +49,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -49,7 +49,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -49,7 +49,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -49,7 +49,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -49,7 +49,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -49,7 +49,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -49,7 +49,7 @@ sudo make install
Install Bundler:
```bash
sudo gem install bundler --no-ri --no-rdoc
sudo gem install bundler --no-document
```
### 4. Update Node
......
......@@ -24,7 +24,7 @@ before_script:
- ruby -v # Print out ruby version for debugging
# Uncomment next line if your rails app needs a JS runtime:
# - apt-get update -q && apt-get install nodejs -yqq
- gem install bundler --no-ri --no-rdoc # Bundler is not installed with the image
- gem install bundler --no-document # Bundler is not installed with the image
- bundle install -j $(nproc) --path vendor # Install dependencies into ./vendor/ruby
# Optional - Delete if not using `rubocop`
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment