diff options
| author | Marcel Amirault <ravlen@gmail.com> | 2018-09-17 09:17:33 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-09-17 09:17:33 +0000 |
| commit | 6876c7afa8ccb5e21f2792362bec7567b5c3734d (patch) | |
| tree | 00e3c3d155a54a2665ee571e5eba0e1b0cd8a80d /config | |
| parent | cdc4cd09e74bebf52250581dcbd99cfd8848aaeb (diff) | |
| download | gitlab-ce-6876c7afa8ccb5e21f2792362bec7567b5c3734d.tar.gz | |
Fix grammar (setup to set-up) in code comments, spec, views, etc.
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/initializers/devise.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index fdaf6a6472d..67337f4b82f 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -760,8 +760,8 @@ test: host: localhost port: 80 - # When you run tests we clone and setup gitlab-shell - # In order to setup it correctly you need to specify + # When you run tests we clone and set up gitlab-shell + # In order to set it up correctly you need to specify # your system username you use to run GitLab # user: YOUR_USERNAME pages: diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index c41b2db722c..179e00cdbd0 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -71,7 +71,7 @@ Devise.setup do |config| # a value less than 10 in other environments. config.stretches = Rails.env.test? ? 1 : 10 - # Setup a pepper to generate the encrypted password. + # Set up a pepper to generate the encrypted password. # config.pepper = "2ef62d549c4ff98a5d3e0ba211e72cff592060247e3bbbb9f499af1222f876f53d39b39b823132affb32858168c79c1d7741d26499901b63c6030a42129924ef" # ==> Configuration for :confirmable |