Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-06-24 19:51:24 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2019-06-24 19:51:24 +0300
commit7e701518da02827f18d373c104aa91829eb67877 (patch)
tree14dfd0c2058dcec5286ebb5fbdadf7974c2234ef
parent67fc63c71ee1bd5a2633d267f0cd51f4d1227f7a (diff)
parentc32bb5ea991029903cad4c7caa3e6b4f44c68736 (diff)
Merge branch 'live-with-bundled-bundler' into 'master'
Use the Bundler bundled with Ruby (2.6+) by default See merge request gitlab-com/gitlab-docs!479
-rw-r--r--README.md13
1 files changed, 2 insertions, 11 deletions
diff --git a/README.md b/README.md
index b836b708..f1bdfc84 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,6 @@ The [deployment process](#deployment-process) happens automatically every hour.
- [Projects we pull from](#projects-we-pull-from)
- [Requirements](#requirements)
- [Ruby](#ruby)
- - [Bundler](#bundler)
- [Install Nanoc's dependencies](#install-nanocs-dependencies)
- [Development under GDK](#development-under-gdk)
- [Development when contributing to GitLab documentation](#development-when-contributing-to-gitlab-documentation)
@@ -66,8 +65,7 @@ In order to be able to preview any changes you make to GitLab's documentation,
here's what you will need to have:
- A Unix/Linux or macOS environment
-- Ruby 2.6:+
-- Bundler
+- Ruby 2.6+
**Note:**
On Windows, the process described here would be different, but as most of
@@ -94,14 +92,7 @@ One way is to use RVM:
```
Check your Ruby version with `ruby --version`.
-
-### Bundler
-
-[Bundler](https://bundler.io/) is a Ruby dependency manager. Install it with:
-
-```
-gem install bundler
-```
+Also check the bundled Bundler version with `bundle --version`. You will see `Bundler version 1.17.3`.
## Install Nanoc's dependencies