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 /lib | |
| parent | cdc4cd09e74bebf52250581dcbd99cfd8848aaeb (diff) | |
| download | gitlab-ce-6876c7afa8ccb5e21f2792362bec7567b5c3734d.tar.gz | |
Fix grammar (setup to set-up) in code comments, spec, views, etc.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/settings.rb | 2 | ||||
| -rw-r--r-- | lib/system_check/incoming_email/imap_authentication_check.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/gemojione.rake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index 897010217dc..c80d9890706 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -102,7 +102,7 @@ module API end optional :repository_checks_enabled, type: Boolean, desc: "GitLab will periodically run 'git fsck' in all project and wiki repositories to look for silent disk corruption issues." optional :repository_storages, type: Array[String], desc: 'Storage paths for new projects' - optional :require_two_factor_authentication, type: Boolean, desc: 'Require all users to setup Two-factor authentication' + optional :require_two_factor_authentication, type: Boolean, desc: 'Require all users to set up Two-factor authentication' given require_two_factor_authentication: ->(val) { val } do requires :two_factor_grace_period, type: Integer, desc: 'Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication' end diff --git a/lib/system_check/incoming_email/imap_authentication_check.rb b/lib/system_check/incoming_email/imap_authentication_check.rb index e55bea86d3f..3550c5796b0 100644 --- a/lib/system_check/incoming_email/imap_authentication_check.rb +++ b/lib/system_check/incoming_email/imap_authentication_check.rb @@ -7,7 +7,7 @@ module SystemCheck if config try_connect_imap else - @error = "#{mail_room_config_path} does not have mailboxes setup" + @error = "#{mail_room_config_path} does not have mailboxes set up" false end end diff --git a/lib/tasks/gemojione.rake b/lib/tasks/gemojione.rake index c6942d22926..560a52053d8 100644 --- a/lib/tasks/gemojione.rake +++ b/lib/tasks/gemojione.rake @@ -86,7 +86,7 @@ namespace :gemojione do SPRITESHEET_WIDTH = 860 SPRITESHEET_HEIGHT = 840 - # Setup a map to rename image files + # Set up a map to rename image files emoji_unicode_string_to_name_map = {} Gitlab::Emoji.emojis.each do |name, emoji_hash| # Ignore aliases |