diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-06 21:07:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-06 21:07:54 +0000 |
commit | 99ddca0d88f1e4e49d61b1aa9d41b5785528d1dc (patch) | |
tree | 556577b458832ebbc43b299e5bf436adf8b1c606 /lib | |
parent | e1867c38fc5a4b931b4b2256d4909182e94f1051 (diff) | |
download | gitlab-ce-99ddca0d88f1e4e49d61b1aa9d41b5785528d1dc.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/services.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/experimentation.rb | 2 | ||||
-rw-r--r-- | lib/tasks/gitlab/import_export/import.rake | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb index aa5354e20c3..03c51f65172 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -115,7 +115,7 @@ module API end get ":id/services/:service_slug" do service = user_project.find_or_initialize_service(params[:service_slug].underscore) - present service, with: Entities::ProjectService, include_passwords: current_user.admin? + present service, with: Entities::ProjectService end end diff --git a/lib/gitlab/experimentation.rb b/lib/gitlab/experimentation.rb index f798841b6d0..4fbf15d521a 100644 --- a/lib/gitlab/experimentation.rb +++ b/lib/gitlab/experimentation.rb @@ -14,7 +14,7 @@ module Gitlab signup_flow: { feature_toggle: :experimental_separate_sign_up_flow, environment: ::Gitlab.dev_env_or_com?, - enabled_ratio: 0.5, + enabled_ratio: 1, tracking_category: 'Growth::Acquisition::Experiment::SignUpFlow' } }.freeze diff --git a/lib/tasks/gitlab/import_export/import.rake b/lib/tasks/gitlab/import_export/import.rake index f999a05875d..42b36873519 100644 --- a/lib/tasks/gitlab/import_export/import.rake +++ b/lib/tasks/gitlab/import_export/import.rake @@ -9,12 +9,13 @@ # @example # bundle exec rake "gitlab:import_export:import[root, root, imported_project, /path/to/file.tar.gz]" # -require 'sidekiq/testing' - namespace :gitlab do namespace :import_export do desc 'EXPERIMENTAL | Import large project archives' task :import, [:username, :namespace_path, :project_path, :archive_path] => :gitlab_environment do |_t, args| + # Load it here to avoid polluting Rake tasks with Sidekiq test warnings + require 'sidekiq/testing' + warn_user_is_not_gitlab if ENV['IMPORT_DEBUG'].present? |