diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-17 19:05:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-17 19:05:49 +0300 |
commit | 43a25d93ebdabea52f99b05e15b06250cd8f07d7 (patch) | |
tree | dceebdc68925362117480a5d672bcff122fb625b /app/controllers/jira_connect | |
parent | 20c84b99005abd1c82101dfeff264ac50d2df211 (diff) |
Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42
Diffstat (limited to 'app/controllers/jira_connect')
4 files changed, 3 insertions, 29 deletions
diff --git a/app/controllers/jira_connect/branches_controller.rb b/app/controllers/jira_connect/branches_controller.rb index 12ea6560e3a..4c1b0d2b208 100644 --- a/app/controllers/jira_connect/branches_controller.rb +++ b/app/controllers/jira_connect/branches_controller.rb @@ -23,7 +23,8 @@ class JiraConnect::BranchesController < ApplicationController def new_branch_data { initial_branch_name: initial_branch_name, - success_state_svg_path: ActionController::Base.helpers.image_path('illustrations/merge_requests.svg') + success_state_svg_path: + ActionController::Base.helpers.image_path('illustrations/empty-state/empty-merge-requests-md.svg') } end end diff --git a/app/controllers/jira_connect/public_keys_controller.rb b/app/controllers/jira_connect/public_keys_controller.rb index 4505ab16926..8cb932c087f 100644 --- a/app/controllers/jira_connect/public_keys_controller.rb +++ b/app/controllers/jira_connect/public_keys_controller.rb @@ -22,8 +22,6 @@ module JiraConnect end def public_key_storage_enabled? - return true if Gitlab.config.jira_connect.enable_public_keys_storage - Gitlab::CurrentSettings.jira_connect_public_key_storage_enabled? end end diff --git a/app/controllers/jira_connect/subscriptions_controller.rb b/app/controllers/jira_connect/subscriptions_controller.rb index a206e7fbbd8..773ef2bddca 100644 --- a/app/controllers/jira_connect/subscriptions_controller.rb +++ b/app/controllers/jira_connect/subscriptions_controller.rb @@ -19,10 +19,6 @@ class JiraConnect::SubscriptionsController < JiraConnect::ApplicationController p.style_src(*style_src_values) end - before_action do - push_frontend_feature_flag(:jira_connect_oauth, @user) - end - before_action :allow_rendering_in_iframe, only: :index before_action :verify_qsh_claim!, only: :index before_action :allow_self_managed_content_security_policy, only: :index @@ -34,7 +30,7 @@ class JiraConnect::SubscriptionsController < JiraConnect::ApplicationController respond_to do |format| format.html format.json do - render json: JiraConnect::AppDataSerializer.new(@subscriptions, !!current_user).as_json + render json: JiraConnect::AppDataSerializer.new(@subscriptions).as_json end end end diff --git a/app/controllers/jira_connect/users_controller.rb b/app/controllers/jira_connect/users_controller.rb deleted file mode 100644 index a37c68de299..00000000000 --- a/app/controllers/jira_connect/users_controller.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -class JiraConnect::UsersController < ApplicationController - feature_category :integrations - - layout 'signup_onboarding' - - before_action :verify_return_to_url, only: [:show] - - def show - @jira_app_link = params.delete(:return_to) - end - - private - - def verify_return_to_url - return unless params[:return_to].present? - - params.delete(:return_to) unless Integrations::Jira.valid_jira_cloud_url?(params[:return_to]) - end -end |