diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 00:09:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 00:09:11 +0300 |
| commit | 696b36294520f8a311586f99e838b6a61b1b3f32 (patch) | |
| tree | aa043fc07393643a80453a579c590fe437d02ead /app | |
| parent | c57e10faab0abb213e7a18274fd5a98ba87a5c09 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/ide/components/ide_status_bar.vue | 2 | ||||
| -rw-r--r-- | app/controllers/oauth/applications_controller.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/ide/components/ide_status_bar.vue b/app/assets/javascripts/ide/components/ide_status_bar.vue index 4da417a37ce..7ce33fd2278 100644 --- a/app/assets/javascripts/ide/components/ide_status_bar.vue +++ b/app/assets/javascripts/ide/components/ide_status_bar.vue @@ -81,7 +81,7 @@ export default { <span v-if="latestPipeline && latestPipeline.details" class="ide-status-pipeline"> <button type="button" - class="p-0 border-0 h-50" + class="p-0 border-0 bg-transparent" @click="openRightPane($options.rightSidebarViews.pipelines)" > <ci-icon diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb index bbf0bdd3662..f0e6cebe0e4 100644 --- a/app/controllers/oauth/applications_controller.rb +++ b/app/controllers/oauth/applications_controller.rb @@ -8,8 +8,8 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController include Gitlab::Experimentation::ControllerConcern include InitializesCurrentUserMode - before_action :verify_user_oauth_applications_enabled, except: :index - before_action :authenticate_user! + prepend_before_action :verify_user_oauth_applications_enabled, except: :index + prepend_before_action :authenticate_user! before_action :add_gon_variables before_action :load_scopes, only: [:index, :create, :edit, :update] |