diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 18:08:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 18:08:51 +0300 |
commit | 163a7046ac76eb4109184e82ce0af911633e6626 (patch) | |
tree | 9f22bb438db435d518e8f5520b309c6319ae0bd8 /app | |
parent | 0637ba1e6e9024f35b2cbf561d9002ec17350bb3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
4 files changed, 13 insertions, 3 deletions
diff --git a/app/controllers/users/terms_controller.rb b/app/controllers/users/terms_controller.rb index 3c16d934b4d..231e449f733 100644 --- a/app/controllers/users/terms_controller.rb +++ b/app/controllers/users/terms_controller.rb @@ -4,7 +4,7 @@ module Users class TermsController < ApplicationController include InternalRedirect - skip_before_action :authenticate_user! + skip_before_action :authenticate_user!, only: [:index] skip_before_action :enforce_terms! skip_before_action :check_password_expiration skip_before_action :check_two_factor_requirement diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index 9875e0b9b88..028cd1ecce0 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -229,7 +229,15 @@ class JiraService < IssueTrackerService jira_issue_transition_id.scan(Gitlab::Regex.jira_transition_id_regex).each do |transition_id| issue.transitions.build.save!(transition: { id: transition_id }) rescue => error - log_error("Issue transition failed", error: error.message, client_url: client_url) + log_error( + "Issue transition failed", + error: { + exception_class: error.class.name, + exception_message: error.message, + exception_backtrace: Gitlab::BacktraceCleaner.clean_backtrace(error.backtrace) + }, + client_url: client_url + ) return false end end @@ -354,7 +362,7 @@ class JiraService < IssueTrackerService error: { exception_class: error.class.name, exception_message: error.message, - exception_backtrace: error.backtrace.join("\n") + exception_backtrace: Gitlab::BacktraceCleaner.clean_backtrace(error.backtrace) } ) nil diff --git a/app/views/groups/registry/repositories/index.html.haml b/app/views/groups/registry/repositories/index.html.haml index b82910df5d5..d3c3e5c1436 100644 --- a/app/views/groups/registry/repositories/index.html.haml +++ b/app/views/groups/registry/repositories/index.html.haml @@ -1,4 +1,5 @@ - page_title _("Container Registry") +- @content_class = "limit-container-width" unless fluid_layout %section .row.registry-placeholder.prepend-bottom-10 diff --git a/app/views/projects/registry/repositories/index.html.haml b/app/views/projects/registry/repositories/index.html.haml index 6ff7c27b1bc..3f90334d452 100644 --- a/app/views/projects/registry/repositories/index.html.haml +++ b/app/views/projects/registry/repositories/index.html.haml @@ -1,4 +1,5 @@ - page_title _("Container Registry") +- @content_class = "limit-container-width" unless fluid_layout %section .row.registry-placeholder.prepend-bottom-10 |