diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 09:09:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 09:09:13 +0300 |
commit | cebee31a0483ef7f2cade3d6dde0a53a68e86cc6 (patch) | |
tree | b818a3e84bde169e6b2a9c96d9b794b6b8708094 /app | |
parent | 7ec2694360b4d4bd9a4b00ef5166a77c854d9d4f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/ide/components/commit_sidebar/form.vue | 1 | ||||
-rw-r--r-- | app/controllers/registrations_controller.rb | 2 | ||||
-rw-r--r-- | app/models/repository.rb | 4 |
3 files changed, 1 insertions, 6 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/form.vue b/app/assets/javascripts/ide/components/commit_sidebar/form.vue index 9d5473a1201..491814bb408 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/form.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/form.vue @@ -102,7 +102,6 @@ export default { this.componentHeight = null; }, }, - activityBarViews, }; </script> diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 55f06df6bb0..30589694e3f 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -35,7 +35,7 @@ class RegistrationsController < Devise::RegistrationsController end # Do not show the signed_up notice message when the signup_flow experiment is enabled. - # Instead, show it after succesfully updating the role. + # Instead, show it after successfully updating the role. flash[:notice] = nil if experiment_enabled?(:signup_flow) rescue Gitlab::Access::AccessDeniedError redirect_to(new_user_session_path) diff --git a/app/models/repository.rb b/app/models/repository.rb index c6573e0bad2..9807aed07a9 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -1091,10 +1091,6 @@ class Repository end def rebase(user, merge_request, skip_ci: false) - if Feature.disabled?(:two_step_rebase, default_enabled: true) - return rebase_deprecated(user, merge_request) - end - push_options = [] push_options << Gitlab::PushOptions::CI_SKIP if skip_ci |