diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 17:02:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 17:02:45 +0300 |
commit | 80f61b4035607d7cd87de993b8f5e996bde3481f (patch) | |
tree | 06b12f51e97d87192e3dd0e05edf55143645b894 /lib/tasks | |
parent | 4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/tasks')
-rw-r--r-- | lib/tasks/downtime_check.rake | 4 | ||||
-rw-r--r-- | lib/tasks/gettext.rake | 2 | ||||
-rw-r--r-- | lib/tasks/gitlab/dev.rake | 2 | ||||
-rw-r--r-- | lib/tasks/gitlab/shell.rake | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/tasks/downtime_check.rake b/lib/tasks/downtime_check.rake index 557f4fef10b..ce97ed50fc7 100644 --- a/lib/tasks/downtime_check.rake +++ b/lib/tasks/downtime_check.rake @@ -1,9 +1,9 @@ desc 'Checks if migrations in a branch require downtime' task downtime_check: :environment do repo = if defined?(Gitlab::License) - 'gitlab-ee' + 'gitlab' else - 'gitlab-ce' + 'gitlab-foss' end `git fetch https://gitlab.com/gitlab-org/#{repo}.git --depth 1` diff --git a/lib/tasks/gettext.rake b/lib/tasks/gettext.rake index 91a52144dd2..dfc0047e753 100644 --- a/lib/tasks/gettext.rake +++ b/lib/tasks/gettext.rake @@ -13,7 +13,7 @@ namespace :gettext do end task :compile do - # See: https://gitlab.com/gitlab-org/gitlab-ce/issues/33014#note_31218998 + # See: https://gitlab.com/gitlab-org/gitlab-foss/issues/33014#note_31218998 FileUtils.touch(File.join(Rails.root, 'locale/gitlab.pot')) Rake::Task['gettext:po_to_json'].invoke diff --git a/lib/tasks/gitlab/dev.rake b/lib/tasks/gitlab/dev.rake index 77c28615856..17d3ac74375 100644 --- a/lib/tasks/gitlab/dev.rake +++ b/lib/tasks/gitlab/dev.rake @@ -18,7 +18,7 @@ namespace :gitlab do args end - if File.basename(Rails.root) == 'gitlab-ee' + if File.basename(Rails.root) == 'gitlab' puts "Skipping EE projects" exit 0 elsif Gitlab::EeCompatCheck.new(opts || {}).check diff --git a/lib/tasks/gitlab/shell.rake b/lib/tasks/gitlab/shell.rake index 487808a7baa..abd47f018f1 100644 --- a/lib/tasks/gitlab/shell.rake +++ b/lib/tasks/gitlab/shell.rake @@ -135,7 +135,7 @@ namespace :gitlab do then you may have been affected by the 9.3.0 bug in which the new setting was disabled by default. - https://gitlab.com/gitlab-org/gitlab-ee/issues/2738 + https://gitlab.com/gitlab-org/gitlab/issues/2738 It was reverted in 9.3.1 and fixed in 9.3.3, however, if Settings were saved while the setting was unchecked, then it is still disabled. |