diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 00:08:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 00:08:01 +0300 |
commit | 4ba55564e1dd7fdbdb89065be8eefd01d8c2d607 (patch) | |
tree | 32e6eaec4cf44b40607e3fd8c4077050c3ce9771 /app/helpers | |
parent | 115c8ea7af7ef69ca3f09c333314546e9b5712f9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/award_emoji_helper.rb | 2 | ||||
-rw-r--r-- | app/helpers/blob_helper.rb | 2 | ||||
-rw-r--r-- | app/helpers/gitlab_routing_helper.rb | 68 | ||||
-rw-r--r-- | app/helpers/issuables_helper.rb | 29 | ||||
-rw-r--r-- | app/helpers/notes_helper.rb | 6 | ||||
-rw-r--r-- | app/helpers/snippets_helper.rb | 8 |
6 files changed, 61 insertions, 54 deletions
diff --git a/app/helpers/award_emoji_helper.rb b/app/helpers/award_emoji_helper.rb index 4bc5a7b090e..13df53a751b 100644 --- a/app/helpers/award_emoji_helper.rb +++ b/app/helpers/award_emoji_helper.rb @@ -7,7 +7,7 @@ module AwardEmojiHelper if awardable.is_a?(Note) # We render a list of notes very frequently and calling the specific method is a lot faster than the generic one (4.5x) if awardable.for_personal_snippet? - toggle_award_emoji_snippet_note_path(awardable.noteable, awardable) + gitlab_toggle_award_emoji_snippet_note_path(awardable.noteable, awardable) else toggle_award_emoji_project_note_path(@project, awardable.id) end diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 656e6039dbd..c9fb28d0299 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -141,7 +141,7 @@ module BlobHelper if @build && @entry raw_project_job_artifacts_url(@project, @build, path: @entry.path, **kwargs) elsif @snippet - raw_snippet_url(@snippet) + gitlab_raw_snippet_url(@snippet) elsif @blob project_raw_url(@project, @id, **kwargs) end diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb index 3810041b2af..78c41257404 100644 --- a/app/helpers/gitlab_routing_helper.rb +++ b/app/helpers/gitlab_routing_helper.rb @@ -194,88 +194,84 @@ module GitlabRoutingHelper take_ownership_project_pipeline_schedule_path(project, schedule, *args) end - def snippet_path(snippet, *args) - if snippet.type == "ProjectSnippet" - application_url_helpers.project_snippet_path(snippet.project, snippet, *args) + def gitlab_snippet_path(snippet, *args) + if snippet.is_a?(ProjectSnippet) + project_snippet_path(snippet.project, snippet, *args) else new_args = snippet_query_params(snippet, *args) - application_url_helpers.snippet_path(snippet, *new_args) + snippet_path(snippet, *new_args) end end - def snippet_url(snippet, *args) - if snippet.type == "ProjectSnippet" - application_url_helpers.project_snippet_url(snippet.project, snippet, *args) + def gitlab_snippet_url(snippet, *args) + if snippet.is_a?(ProjectSnippet) + project_snippet_url(snippet.project, snippet, *args) else new_args = snippet_query_params(snippet, *args) - application_url_helpers.snippet_url(snippet, *new_args) + snippet_url(snippet, *new_args) end end - def raw_snippet_path(snippet, *args) - if snippet.type == "ProjectSnippet" - application_url_helpers.raw_project_snippet_path(snippet.project, snippet, *args) + def gitlab_raw_snippet_path(snippet, *args) + if snippet.is_a?(ProjectSnippet) + raw_project_snippet_path(snippet.project, snippet, *args) else new_args = snippet_query_params(snippet, *args) - application_url_helpers.raw_snippet_path(snippet, *new_args) + raw_snippet_path(snippet, *new_args) end end - def raw_snippet_url(snippet, *args) - if snippet.type == "ProjectSnippet" - application_url_helpers.raw_project_snippet_url(snippet.project, snippet, *args) + def gitlab_raw_snippet_url(snippet, *args) + if snippet.is_a?(ProjectSnippet) + raw_project_snippet_url(snippet.project, snippet, *args) else new_args = snippet_query_params(snippet, *args) - application_url_helpers.raw_snippet_url(snippet, *new_args) + raw_snippet_url(snippet, *new_args) end end - def snippet_notes_path(snippet, *args) + def gitlab_snippet_notes_path(snippet, *args) new_args = snippet_query_params(snippet, *args) - application_url_helpers.snippet_notes_path(snippet, *new_args) + snippet_notes_path(snippet, *new_args) end - def snippet_notes_url(snippet, *args) + def gitlab_snippet_notes_url(snippet, *args) new_args = snippet_query_params(snippet, *args) - application_url_helpers.snippet_notes_url(snippet, *new_args) + snippet_notes_url(snippet, *new_args) end - def snippet_note_path(snippet, note, *args) + def gitlab_snippet_note_path(snippet, note, *args) new_args = snippet_query_params(snippet, *args) - application_url_helpers.snippet_note_path(snippet, note, *new_args) + snippet_note_path(snippet, note, *new_args) end - def snippet_note_url(snippet, note, *args) + def gitlab_snippet_note_url(snippet, note, *args) new_args = snippet_query_params(snippet, *args) - application_url_helpers.snippet_note_url(snippet, note, *new_args) + snippet_note_url(snippet, note, *new_args) end - def toggle_award_emoji_snippet_note_path(snippet, note, *args) + def gitlab_toggle_award_emoji_snippet_note_path(snippet, note, *args) new_args = snippet_query_params(snippet, *args) - application_url_helpers.toggle_award_emoji_snippet_note_path(snippet, note, *new_args) + toggle_award_emoji_snippet_note_path(snippet, note, *new_args) end - def toggle_award_emoji_snippet_note_url(snippet, note, *args) + def gitlab_toggle_award_emoji_snippet_note_url(snippet, note, *args) new_args = snippet_query_params(snippet, *args) - application_url_helpers.toggle_award_emoji_snippet_note_url(snippet, note, *new_args) + toggle_award_emoji_snippet_note_url(snippet, note, *new_args) end - def toggle_award_emoji_snippet_path(snippet, *args) + def gitlab_toggle_award_emoji_snippet_path(snippet, *args) new_args = snippet_query_params(snippet, *args) - application_url_helpers.toggle_award_emoji_snippet_path(snippet, *new_args) + toggle_award_emoji_snippet_path(snippet, *new_args) end - def toggle_award_emoji_snippet_url(snippet, *args) + def gitlab_toggle_award_emoji_snippet_url(snippet, *args) new_args = snippet_query_params(snippet, *args) - application_url_helpers.toggle_award_emoji_snippet_url(snippet, *new_args) + toggle_award_emoji_snippet_url(snippet, *new_args) end private - def application_url_helpers - Gitlab::Routing.url_helpers - end - def snippet_query_params(snippet, *args) opts = case args.last when Hash diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 18451bc5273..8c75a4a13e8 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -279,19 +279,30 @@ module IssuablesHelper initialDescriptionText: issuable.description, initialTaskStatus: issuable.task_status } + data.merge!(issue_only_initial_data(issuable)) + data.merge!(path_data(parent)) + data.merge!(updated_at_by(issuable)) - data[:hasClosingMergeRequest] = issuable.merge_requests_count(current_user) != 0 if issuable.is_a?(Issue) - data[:zoomMeetingUrl] = ZoomMeeting.canonical_meeting_url(issuable) if issuable.is_a?(Issue) + data + end - if parent.is_a?(Group) - data[:groupPath] = parent.path - else - data.merge!(projectPath: ref_project.path, projectNamespace: ref_project.namespace.full_path) - end + def issue_only_initial_data(issuable) + return {} unless issuable.is_a?(Issue) - data.merge!(updated_at_by(issuable)) + { + hasClosingMergeRequest: issuable.merge_requests_count(current_user) != 0, + zoomMeetingUrl: ZoomMeeting.canonical_meeting_url(issuable), + sentryIssueIdentifier: SentryIssue.find_by(issue: issuable)&.sentry_issue_identifier # rubocop:disable CodeReuse/ActiveRecord + } + end - data + def path_data(parent) + return { groupPath: parent.path } if parent.is_a?(Group) + + { + projectPath: ref_project.path, + projectNamespace: ref_project.namespace.full_path + } end def updated_at_by(issuable) diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index fbbdebaa623..acf9f8c5b5b 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -95,7 +95,7 @@ module NotesHelper def notes_url(params = {}) if @snippet.is_a?(PersonalSnippet) - snippet_notes_path(@snippet, params) + gitlab_snippet_notes_path(@snippet, params) else params.merge!(target_id: @noteable.id, target_type: @noteable.class.name.underscore) @@ -105,7 +105,7 @@ module NotesHelper def note_url(note, project = @project) if note.noteable.is_a?(PersonalSnippet) - snippet_note_path(note.noteable, note) + gitlab_snippet_note_path(note.noteable, note) else project_note_path(project, note) end @@ -126,7 +126,7 @@ module NotesHelper def new_form_url return unless @snippet.is_a?(PersonalSnippet) - snippet_notes_path(@snippet) + gitlab_snippet_notes_path(@snippet) end def can_create_note? diff --git a/app/helpers/snippets_helper.rb b/app/helpers/snippets_helper.rb index 7d7d8646c25..7b93d44190e 100644 --- a/app/helpers/snippets_helper.rb +++ b/app/helpers/snippets_helper.rb @@ -13,7 +13,7 @@ module SnippetsHelper def download_raw_snippet_button(snippet) link_to(icon('download'), - raw_snippet_path(snippet, inline: false), + gitlab_raw_snippet_path(snippet, inline: false), target: '_blank', rel: 'noopener noreferrer', class: "btn btn-sm has-tooltip", @@ -109,7 +109,7 @@ module SnippetsHelper end def snippet_embed_tag(snippet) - content_tag(:script, nil, src: snippet_url(snippet, format: :js)) + content_tag(:script, nil, src: gitlab_snippet_url(snippet, format: :js)) end def snippet_badge(snippet) @@ -134,7 +134,7 @@ module SnippetsHelper return if blob.empty? || blob.binary? || blob.stored_externally? link_to(external_snippet_icon('doc-code'), - raw_snippet_url(@snippet), + gitlab_raw_snippet_url(@snippet), class: 'btn', target: '_blank', rel: 'noopener noreferrer', @@ -143,7 +143,7 @@ module SnippetsHelper def embedded_snippet_download_button link_to(external_snippet_icon('download'), - raw_snippet_url(@snippet, inline: false), + gitlab_raw_snippet_url(@snippet, inline: false), class: 'btn', target: '_blank', title: 'Download', |