From b9287208523e1a5c05939fe0db038df51a9082fc Mon Sep 17 00:00:00 2001 From: Jarka Kadlecova Date: Wed, 30 Aug 2017 16:57:50 +0200 Subject: Support discussion locking in the backend --- app/helpers/notes_helper.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/helpers') diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index ce028195e51..c219aa3d6a9 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -130,8 +130,12 @@ module NotesHelper end def can_create_note? + issuable = @issue || @merge_request + if @snippet.is_a?(PersonalSnippet) can?(current_user, :comment_personal_snippet, @snippet) + elsif issuable + can?(current_user, :create_note, issuable) else can?(current_user, :create_note, @project) end -- cgit v1.2.1 From cca510028ab9253c3768e06b9ad6c4c5e3905c5d Mon Sep 17 00:00:00 2001 From: Jarka Kadlecova Date: Tue, 26 Sep 2017 08:56:04 +0200 Subject: add discussion lock icon to the system_note_helper --- app/helpers/system_note_helper.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/helpers') diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb index d7eaf6ce24d..cb2c5561aa6 100644 --- a/app/helpers/system_note_helper.rb +++ b/app/helpers/system_note_helper.rb @@ -19,7 +19,9 @@ module SystemNoteHelper 'discussion' => 'comment', 'moved' => 'arrow-right', 'outdated' => 'pencil', - 'duplicate' => 'issue-duplicate' + 'duplicate' => 'issue-duplicate', + 'locked' => 'locked', + 'unlocked' => 'unlocked' }.freeze def system_note_icon_name(note) -- cgit v1.2.1 From 613a6cc8b5b3d94314cac8af4a5d9aeef6ff1e6f Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Wed, 27 Sep 2017 13:35:42 +0100 Subject: Fix locked and unlocked icons --- app/helpers/system_note_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb index cb2c5561aa6..00fe67d6ffb 100644 --- a/app/helpers/system_note_helper.rb +++ b/app/helpers/system_note_helper.rb @@ -20,8 +20,8 @@ module SystemNoteHelper 'moved' => 'arrow-right', 'outdated' => 'pencil', 'duplicate' => 'issue-duplicate', - 'locked' => 'locked', - 'unlocked' => 'unlocked' + 'locked' => 'lock', + 'unlocked' => 'lock-open' }.freeze def system_note_icon_name(note) -- cgit v1.2.1 From 25a1ef69333280201bf745192e178f5a8e3f9165 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 3 Oct 2017 23:22:35 +0200 Subject: Introduce policy check for clusters navigation option --- app/helpers/projects_helper.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/helpers') diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 4c0cce54527..20e050195ea 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -293,6 +293,7 @@ module ProjectsHelper snippets: :read_project_snippet, settings: :admin_project, builds: :read_build, + clusters: :read_cluster, labels: :read_label, issues: :read_issue, project_members: :read_project_member, -- cgit v1.2.1 From 79c80de99d511d084cff072bd90192ffe8ba4cda Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Fri, 22 Sep 2017 15:49:56 +0200 Subject: Making private project avatars use local paths + Some Group Icons --- app/helpers/application_helper.rb | 7 ++++++- app/helpers/groups_helper.rb | 9 +++++++-- app/helpers/lazy_image_tag_helper.rb | 6 +++++- 3 files changed, 18 insertions(+), 4 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8d02d5de5c3..cfdb95e2498 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -41,7 +41,12 @@ module ApplicationHelper end if project.avatar_url - image_tag project.avatar_url, options + if project.private? + options[:use_original_source] = true + image_tag project.avatar_url(use_asset_path: false), options + else + image_tag project.avatar_url, options + end else # generated icon project_identicon(project, options) end diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 82bceddf1f0..091d98a2c94 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -12,7 +12,7 @@ module GroupsHelper group = Group.find_by_full_path(group) end - group.try(:avatar_url) || ActionController::Base.helpers.image_path('no_group_avatar.png') + group.try(:avatar_url, use_asset_path: false) || ActionController::Base.helpers.image_path('no_group_avatar.png') end def group_title(group, name = nil, url = nil) @@ -89,7 +89,12 @@ module GroupsHelper link_to(group_path(group), class: "group-path #{'breadcrumb-item-text' unless for_dropdown} js-breadcrumb-item-text #{'hidable' if hidable}") do output = if (group.try(:avatar_url) || show_avatar) && !Rails.env.test? - image_tag(group_icon(group), class: "avatar-tile", width: 15, height: 15) + if group.private? + puts "GROUP IS PRIVATE : " + group_icon(group) + image_tag(group_icon(group), class: "avatar-tile", width: 15, height: 15, use_original_source: true) + else + image_tag(group_icon(group), class: "avatar-tile", width: 15, height: 15) + end else "" end diff --git a/app/helpers/lazy_image_tag_helper.rb b/app/helpers/lazy_image_tag_helper.rb index 2c5619ac41b..aea1fcc7e91 100644 --- a/app/helpers/lazy_image_tag_helper.rb +++ b/app/helpers/lazy_image_tag_helper.rb @@ -9,7 +9,11 @@ module LazyImageTagHelper unless options.delete(:lazy) == false options[:data] ||= {} - options[:data][:src] = path_to_image(source) + unless options.delete(:use_original_source) == true + options[:data][:src] = path_to_image(source) + else + options[:data][:src] = source + end options[:class] ||= "" options[:class] << " lazy" -- cgit v1.2.1 From 892b02e890be539a95e6b52feb14f5d188513700 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Mon, 2 Oct 2017 13:35:01 +0200 Subject: Created group_icon and group_icon_url Tests for these new helper methods --- app/helpers/groups_helper.rb | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 091d98a2c94..60ac4c63e62 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -1,4 +1,8 @@ +require 'uri' + module GroupsHelper + include Gitlab::CurrentSettings + def can_change_group_visibility_level?(group) can?(current_user, :change_visibility_level, group) end @@ -7,12 +11,28 @@ module GroupsHelper can?(current_user, :change_share_with_group_lock, group) end - def group_icon(group) + # = project_icon(@project, alt: @project.name, class: 'avatar s40 avatar-tile') + # = image_tag group_icon(@group), alt: '', class: 'avatar group-avatar s160' + def group_icon(group, options = {}) + img_path = group_icon_url(group, options) + image_tag img_path, options + end + + def group_icon_url(group, options = {}) if group.is_a?(String) group = Group.find_by_full_path(group) end - group.try(:avatar_url, use_asset_path: false) || ActionController::Base.helpers.image_path('no_group_avatar.png') + if group.avatar_url + if group.private? + options[:use_original_source] = true + group.avatar_url(use_asset_path: false) + else + group.avatar_url + end + else # No Avatar Icon + ActionController::Base.helpers.image_path('no_group_avatar.png') + end end def group_title(group, name = nil, url = nil) @@ -90,10 +110,9 @@ module GroupsHelper output = if (group.try(:avatar_url) || show_avatar) && !Rails.env.test? if group.private? - puts "GROUP IS PRIVATE : " + group_icon(group) - image_tag(group_icon(group), class: "avatar-tile", width: 15, height: 15, use_original_source: true) + group_icon(group, class: "avatar-tile", width: 15, height: 15, use_original_source: true) else - image_tag(group_icon(group), class: "avatar-tile", width: 15, height: 15) + group_icon(group, class: "avatar-tile", width: 15, height: 15) end else "" -- cgit v1.2.1 From 1b752968757873434404a2bf82ea360ce829ec87 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Mon, 2 Oct 2017 15:44:58 +0200 Subject: Fixed Linting errors + tests --- app/helpers/lazy_image_tag_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers') diff --git a/app/helpers/lazy_image_tag_helper.rb b/app/helpers/lazy_image_tag_helper.rb index aea1fcc7e91..60df16b3373 100644 --- a/app/helpers/lazy_image_tag_helper.rb +++ b/app/helpers/lazy_image_tag_helper.rb @@ -9,7 +9,7 @@ module LazyImageTagHelper unless options.delete(:lazy) == false options[:data] ||= {} - unless options.delete(:use_original_source) == true + unless options.delete(:use_original_source) options[:data][:src] = path_to_image(source) else options[:data][:src] = source -- cgit v1.2.1 From 6168e33e9e2f327f078e07b71c466dcc9fa9813a Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Tue, 3 Oct 2017 12:21:02 +0200 Subject: Fixed Test --- app/helpers/lazy_image_tag_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/lazy_image_tag_helper.rb b/app/helpers/lazy_image_tag_helper.rb index 60df16b3373..4def806f1c0 100644 --- a/app/helpers/lazy_image_tag_helper.rb +++ b/app/helpers/lazy_image_tag_helper.rb @@ -9,10 +9,10 @@ module LazyImageTagHelper unless options.delete(:lazy) == false options[:data] ||= {} - unless options.delete(:use_original_source) - options[:data][:src] = path_to_image(source) - else + if options.delete(:use_original_source) options[:data][:src] = source + else + options[:data][:src] = path_to_image(source) end options[:class] ||= "" options[:class] << " lazy" -- cgit v1.2.1 From 27577e8e2b7bf18c0dbc402e5efad4905c5a154c Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Wed, 4 Oct 2017 13:58:32 +0200 Subject: Fixed Tests --- app/helpers/lazy_image_tag_helper.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/lazy_image_tag_helper.rb b/app/helpers/lazy_image_tag_helper.rb index 4def806f1c0..2b5e9a9ef57 100644 --- a/app/helpers/lazy_image_tag_helper.rb +++ b/app/helpers/lazy_image_tag_helper.rb @@ -9,11 +9,12 @@ module LazyImageTagHelper unless options.delete(:lazy) == false options[:data] ||= {} - if options.delete(:use_original_source) - options[:data][:src] = source - else - options[:data][:src] = path_to_image(source) - end + options[:data][:src] = if options.delete(:use_original_source) + source + else + path_to_image(source) + end + options[:class] ||= "" options[:class] << " lazy" -- cgit v1.2.1 From d2620faff92f235d5659ccdac0825cf18c7e2389 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Thu, 5 Oct 2017 16:29:45 +0200 Subject: Updates based on MR comments --- app/helpers/application_helper.rb | 15 +++++++++------ app/helpers/lazy_image_tag_helper.rb | 12 +++++++----- 2 files changed, 16 insertions(+), 11 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cfdb95e2498..264f21a1466 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -41,12 +41,15 @@ module ApplicationHelper end if project.avatar_url - if project.private? - options[:use_original_source] = true - image_tag project.avatar_url(use_asset_path: false), options - else - image_tag project.avatar_url, options - end + #if project.private? + # options[:use_original_source] = true + # image_tag project.avatar_url(use_asset_path: false), options + #else + # image_tag project.avatar_url, options + #end + + image_tag project.avatar_url(use_asset_path: project.public?), options + else # generated icon project_identicon(project, options) end diff --git a/app/helpers/lazy_image_tag_helper.rb b/app/helpers/lazy_image_tag_helper.rb index 2b5e9a9ef57..c150c2927a9 100644 --- a/app/helpers/lazy_image_tag_helper.rb +++ b/app/helpers/lazy_image_tag_helper.rb @@ -9,11 +9,13 @@ module LazyImageTagHelper unless options.delete(:lazy) == false options[:data] ||= {} - options[:data][:src] = if options.delete(:use_original_source) - source - else - path_to_image(source) - end + #options[:data][:src] = if options.delete(:use_original_source) + # source + # else + # path_to_image(source) + # end + + options[:data][:src] = path_to_image(source) options[:class] ||= "" options[:class] << " lazy" -- cgit v1.2.1 From c786c8dcb334fbacf5b6e4fbf2da1910f94d80c4 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Thu, 5 Oct 2017 17:49:11 +0200 Subject: Another Change for cleanup --- app/helpers/lazy_image_tag_helper.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/lazy_image_tag_helper.rb b/app/helpers/lazy_image_tag_helper.rb index c150c2927a9..603b9438e35 100644 --- a/app/helpers/lazy_image_tag_helper.rb +++ b/app/helpers/lazy_image_tag_helper.rb @@ -9,12 +9,6 @@ module LazyImageTagHelper unless options.delete(:lazy) == false options[:data] ||= {} - #options[:data][:src] = if options.delete(:use_original_source) - # source - # else - # path_to_image(source) - # end - options[:data][:src] = path_to_image(source) options[:class] ||= "" -- cgit v1.2.1 From 3d152cd2058a928ec26efe90240b66e5e62ed677 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Thu, 5 Oct 2017 23:17:52 +0200 Subject: Fixed Linting Error --- app/helpers/application_helper.rb | 8 -------- 1 file changed, 8 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 264f21a1466..466e1170181 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -41,15 +41,7 @@ module ApplicationHelper end if project.avatar_url - #if project.private? - # options[:use_original_source] = true - # image_tag project.avatar_url(use_asset_path: false), options - #else - # image_tag project.avatar_url, options - #end - image_tag project.avatar_url(use_asset_path: project.public?), options - else # generated icon project_identicon(project, options) end -- cgit v1.2.1 From 9f228449a53e1cc5661aba2645a49ecbbf4d5794 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Fri, 6 Oct 2017 08:14:52 +0200 Subject: Removed 2 uncommented lines --- app/helpers/groups_helper.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 60ac4c63e62..b366e627e01 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -11,8 +11,6 @@ module GroupsHelper can?(current_user, :change_share_with_group_lock, group) end - # = project_icon(@project, alt: @project.name, class: 'avatar s40 avatar-tile') - # = image_tag group_icon(@group), alt: '', class: 'avatar group-avatar s160' def group_icon(group, options = {}) img_path = group_icon_url(group, options) image_tag img_path, options -- cgit v1.2.1 From ee2c13d78d2289c87218068c0231f1386d7da2eb Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 26 Sep 2017 13:42:04 +0200 Subject: Add 1000+ counters (instead of inifnite) to jobs controller --- app/helpers/numbers_helper.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 app/helpers/numbers_helper.rb (limited to 'app/helpers') diff --git a/app/helpers/numbers_helper.rb b/app/helpers/numbers_helper.rb new file mode 100644 index 00000000000..45bd3606076 --- /dev/null +++ b/app/helpers/numbers_helper.rb @@ -0,0 +1,11 @@ +module NumbersHelper + def limited_counter_with_delimiter(resource, **options) + limit = options.fetch(:limit, 1000).to_i + count = resource.limit(limit + 1).count(:all) + if count > limit + number_with_delimiter(count - 1, options) + '+' + else + number_with_delimiter(count, options) + end + end +end -- cgit v1.2.1 From 70716a1292ca5910908ba37a9d113c8b5a221bb7 Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Wed, 20 Sep 2017 17:41:11 +0200 Subject: Allow creating merge requests across forks of a project --- app/helpers/merge_requests_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/helpers') diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index c31023f2d9a..5b2c58d193d 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -73,7 +73,8 @@ module MergeRequestsHelper end def target_projects(project) - [project, project.default_merge_request_target].uniq + MergeRequestTargetProjectFinder.new(current_user: current_user, source_project: project) + .execute end def merge_request_button_visibility(merge_request, closed) -- cgit v1.2.1 From 5f41cddf80b5bcf7b409e200b21cd26761ad9afd Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Mon, 9 Oct 2017 10:45:23 +0200 Subject: Based on MR simplified the logic --- app/helpers/application_helper.rb | 2 +- app/helpers/groups_helper.rb | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 466e1170181..8d02d5de5c3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -41,7 +41,7 @@ module ApplicationHelper end if project.avatar_url - image_tag project.avatar_url(use_asset_path: project.public?), options + image_tag project.avatar_url, options else # generated icon project_identicon(project, options) end diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index b366e627e01..655b9d02c1e 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -1,7 +1,4 @@ -require 'uri' - module GroupsHelper - include Gitlab::CurrentSettings def can_change_group_visibility_level?(group) can?(current_user, :change_visibility_level, group) @@ -22,12 +19,7 @@ module GroupsHelper end if group.avatar_url - if group.private? - options[:use_original_source] = true - group.avatar_url(use_asset_path: false) - else - group.avatar_url - end + group.avatar_url else # No Avatar Icon ActionController::Base.helpers.image_path('no_group_avatar.png') end @@ -107,11 +99,7 @@ module GroupsHelper link_to(group_path(group), class: "group-path #{'breadcrumb-item-text' unless for_dropdown} js-breadcrumb-item-text #{'hidable' if hidable}") do output = if (group.try(:avatar_url) || show_avatar) && !Rails.env.test? - if group.private? - group_icon(group, class: "avatar-tile", width: 15, height: 15, use_original_source: true) - else - group_icon(group, class: "avatar-tile", width: 15, height: 15) - end + group_icon(group, class: "avatar-tile", width: 15, height: 15) else "" end -- cgit v1.2.1 From 59c6ddcdefb813487d552499ebcb5504b5fde548 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Mon, 9 Oct 2017 17:05:51 +0200 Subject: Fix for Lint Error + Upload Test --- app/helpers/groups_helper.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'app/helpers') diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 655b9d02c1e..f5ef9c53a7a 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -1,5 +1,4 @@ module GroupsHelper - def can_change_group_visibility_level?(group) can?(current_user, :change_visibility_level, group) end -- cgit v1.2.1 From 75c6953fc76422b138335680b227e7303d20c136 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Tue, 10 Oct 2017 10:59:07 +0200 Subject: Changed Group Icon URL Back to try option --- app/helpers/groups_helper.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index f5ef9c53a7a..676c1d1988b 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -17,11 +17,7 @@ module GroupsHelper group = Group.find_by_full_path(group) end - if group.avatar_url - group.avatar_url - else # No Avatar Icon - ActionController::Base.helpers.image_path('no_group_avatar.png') - end + group.try(:avatar_url) || ActionController::Base.helpers.image_path('no_group_avatar.png') end def group_title(group, name = nil, url = nil) -- cgit v1.2.1 From 47d19c2de1df14bb3ab00d051be8e4f19f4ed7c4 Mon Sep 17 00:00:00 2001 From: Andrew Newdigate Date: Tue, 10 Oct 2017 14:56:04 +0000 Subject: Stop using `branch_names.include?` and use `branch_exists?` --- app/helpers/compare_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/compare_helper.rb b/app/helpers/compare_helper.rb index 2c28dd81c87..8bf96c0905f 100644 --- a/app/helpers/compare_helper.rb +++ b/app/helpers/compare_helper.rb @@ -4,8 +4,8 @@ module CompareHelper to.present? && from != to && can?(current_user, :create_merge_request, project) && - project.repository.branch_names.include?(from) && - project.repository.branch_names.include?(to) + project.repository.branch_exists?(from) && + project.repository.branch_exists?(to) end def create_mr_path(from = params[:from], to = params[:to], project = @project) -- cgit v1.2.1