From ba21b8f2c9428937edd14a687aea946db6a2b77c Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Wed, 9 Nov 2016 11:51:46 +0000 Subject: Moved todos icons to new folder --- app/views/dashboard/todos/index.html.haml | 4 +- app/views/shared/empty_states/_todos_all_done.svg | 1 - app/views/shared/empty_states/_todos_empty.svg | 110 --------------------- .../shared/empty_states/icons/_todos_all_done.svg | 1 + .../shared/empty_states/icons/_todos_empty.svg | 110 +++++++++++++++++++++ 5 files changed, 113 insertions(+), 113 deletions(-) delete mode 100644 app/views/shared/empty_states/_todos_all_done.svg delete mode 100644 app/views/shared/empty_states/_todos_empty.svg create mode 100644 app/views/shared/empty_states/icons/_todos_all_done.svg create mode 100644 app/views/shared/empty_states/icons/_todos_empty.svg (limited to 'app/views') diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml index 472d698486b..e9f757df7d6 100644 --- a/app/views/dashboard/todos/index.html.haml +++ b/app/views/dashboard/todos/index.html.haml @@ -81,7 +81,7 @@ = paginate @todos, theme: "gitlab" - elsif current_user.todos.any? .todos-all-done - = render "shared/empty_states/todos_all_done.svg" + = render "shared/empty_states/icons/todos_all_done.svg" - if todos_filter_empty? %h4.text-center = Gitlab.config.gitlab.no_todos_messages.sample @@ -98,7 +98,7 @@ - else .todos-empty .todos-empty-hero - = render "shared/empty_states/todos_empty.svg" + = render "shared/empty_states/icons/todos_empty.svg" .todos-empty-content %h4 Todos let you see what you should do next. diff --git a/app/views/shared/empty_states/_todos_all_done.svg b/app/views/shared/empty_states/_todos_all_done.svg deleted file mode 100644 index 94b5c2e0ea0..00000000000 --- a/app/views/shared/empty_states/_todos_all_done.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/views/shared/empty_states/_todos_empty.svg b/app/views/shared/empty_states/_todos_empty.svg deleted file mode 100644 index b1e661268fb..00000000000 --- a/app/views/shared/empty_states/_todos_empty.svg +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/views/shared/empty_states/icons/_todos_all_done.svg b/app/views/shared/empty_states/icons/_todos_all_done.svg new file mode 100644 index 00000000000..94b5c2e0ea0 --- /dev/null +++ b/app/views/shared/empty_states/icons/_todos_all_done.svg @@ -0,0 +1 @@ + diff --git a/app/views/shared/empty_states/icons/_todos_empty.svg b/app/views/shared/empty_states/icons/_todos_empty.svg new file mode 100644 index 00000000000..b1e661268fb --- /dev/null +++ b/app/views/shared/empty_states/icons/_todos_empty.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.1 From 863efcc60437ccec67be6bd68af9ff3678141b89 Mon Sep 17 00:00:00 2001 From: dimitrieh Date: Mon, 23 Jan 2017 00:44:07 +0100 Subject: Improve pipeline status icon linking in widgets --- app/views/projects/commit/_commit_box.html.haml | 3 ++- app/views/projects/merge_requests/widget/_heading.html.haml | 3 ++- app/views/projects/pipelines/_info.html.haml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'app/views') diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index 08eb0c57f66..2b1c4e28ce2 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -64,7 +64,8 @@ - if @commit.status .well-segment.pipeline-info %div{ class: "icon-container ci-status-icon-#{@commit.status}" } - = ci_icon_for_status(@commit.status) + = link_to pipelines_namespace_project_commit_path(@project.namespace, @project, @commit.id) do + = ci_icon_for_status(@commit.status) Pipeline = link_to "##{@commit.pipelines.last.id}", pipelines_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "monospace" for diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index c80dc33058d..cc939ab9441 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -2,7 +2,8 @@ .mr-widget-heading - %w[success success_with_warnings skipped canceled failed running pending].each do |status| .ci_widget{ class: "ci-#{status} ci-status-icon-#{status}", style: ("display:none" unless @pipeline.status == status) } - = ci_icon_for_status(status) + = link_to namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id) do + = ci_icon_for_status(status) %span Pipeline = link_to "##{@pipeline.id}", namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), class: 'pipeline' diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index ca76f13ef5e..6caa5f16dc6 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -23,8 +23,8 @@ .info-well - if @commit.status .well-segment.pipeline-info - %div{ class: "icon-container ci-status-icon-#{@commit.status}" } - = ci_icon_for_status(@commit.status) + .icon-container + = icon('clock-o') = pluralize @pipeline.statuses.count(:id), "build" - if @pipeline.ref from -- cgit v1.2.1 From f87774a662d6846b27247b45c30e45ca428d9d8c Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Fri, 20 Jan 2017 13:11:09 -0600 Subject: Speed up animation transition; add hover state to top right icons Remove subscribe text from button --- app/views/projects/issues/index.html.haml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app/views') diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index 18e8372ecab..ff15815d7a6 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -19,10 +19,8 @@ = render 'shared/issuable/nav', type: :issues .nav-controls - if current_user - = link_to url_for(params.merge(format: :atom, private_token: current_user.private_token)), class: 'btn append-right-10' do + = link_to url_for(params.merge(format: :atom, private_token: current_user.private_token)), class: 'btn append-right-10', title: 'Subscribe' do = icon('rss') - %span.icon-label - Subscribe - if can? current_user, :create_issue, @project = link_to new_namespace_project_issue_path(@project.namespace, @project, -- cgit v1.2.1 From 8bcc911b9bc9fcb2179860c5a98d8a1ad3ec34b0 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Tue, 24 Jan 2017 17:54:30 +0000 Subject: Added error message and test --- app/views/projects/mattermosts/_no_teams.html.haml | 3 +++ app/views/projects/mattermosts/new.html.haml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/mattermosts/_no_teams.html.haml b/app/views/projects/mattermosts/_no_teams.html.haml index 605c7f61dee..1bb3642431e 100644 --- a/app/views/projects/mattermosts/_no_teams.html.haml +++ b/app/views/projects/mattermosts/_no_teams.html.haml @@ -1,3 +1,6 @@ += content_for :flash_message do + .alert.alert-danger= @teams if @teams.is_a?(String) + %p You aren’t a member of any team on the Mattermost instance at %strong= Gitlab.config.mattermost.host diff --git a/app/views/projects/mattermosts/new.html.haml b/app/views/projects/mattermosts/new.html.haml index 96b1d2aee61..82f596da0fe 100644 --- a/app/views/projects/mattermosts/new.html.haml +++ b/app/views/projects/mattermosts/new.html.haml @@ -2,7 +2,7 @@ .inline.pull-right = custom_icon('mattermost_logo', size: 48) %h3 Install Mattermost Command - - if @teams.empty? + - if @teams.is_a?(String) || @teams.empty? = render 'no_teams' - else = render 'team_selection' -- cgit v1.2.1 From 066155704dd46b348688366eae176fdcee641f3c Mon Sep 17 00:00:00 2001 From: dimitrieh Date: Wed, 25 Jan 2017 00:13:28 +0100 Subject: added icons and fixed mini pipeline action dropdown icons --- app/views/ci/status/_dropdown_graph_badge.html.haml | 2 +- app/views/ci/status/_graph_badge.html.haml | 2 +- app/views/shared/icons/_icon_action_cancel_borderless.svg | 1 + app/views/shared/icons/_icon_action_play_borderless.svg | 1 + app/views/shared/icons/_icon_action_retry_borderless.svg | 1 + app/views/shared/icons/_icon_action_stop_borderless.svg | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 app/views/shared/icons/_icon_action_cancel_borderless.svg create mode 100644 app/views/shared/icons/_icon_action_play_borderless.svg create mode 100644 app/views/shared/icons/_icon_action_retry_borderless.svg create mode 100644 app/views/shared/icons/_icon_action_stop_borderless.svg (limited to 'app/views') diff --git a/app/views/ci/status/_dropdown_graph_badge.html.haml b/app/views/ci/status/_dropdown_graph_badge.html.haml index 8dea3479f82..8ed23ac4919 100644 --- a/app/views/ci/status/_dropdown_graph_badge.html.haml +++ b/app/views/ci/status/_dropdown_graph_badge.html.haml @@ -16,4 +16,4 @@ - if status.has_action? = link_to status.action_path, class: 'ci-action-icon-wrapper js-ci-action-icon', method: status.action_method, data: { toggle: 'tooltip', title: status.action_title } do - = icon(status.action_icon, class: status.action_class) + = custom_icon(status.action_icon) diff --git a/app/views/ci/status/_graph_badge.html.haml b/app/views/ci/status/_graph_badge.html.haml index dd2f649de9a..edfb02d21f3 100644 --- a/app/views/ci/status/_graph_badge.html.haml +++ b/app/views/ci/status/_graph_badge.html.haml @@ -17,4 +17,4 @@ - if status.has_action? = link_to status.action_path, class: 'ci-action-icon-container has-tooltip', method: status.action_method, data: { toggle: 'tooltip', title: status.action_title } do %i.ci-action-icon-wrapper - = icon(status.action_icon, class: status.action_class) + = custom_icon(status.action_icon) diff --git a/app/views/shared/icons/_icon_action_cancel_borderless.svg b/app/views/shared/icons/_icon_action_cancel_borderless.svg new file mode 100644 index 00000000000..a1f700eb0ff --- /dev/null +++ b/app/views/shared/icons/_icon_action_cancel_borderless.svg @@ -0,0 +1 @@ + diff --git a/app/views/shared/icons/_icon_action_play_borderless.svg b/app/views/shared/icons/_icon_action_play_borderless.svg new file mode 100644 index 00000000000..6ac192cd7e9 --- /dev/null +++ b/app/views/shared/icons/_icon_action_play_borderless.svg @@ -0,0 +1 @@ + diff --git a/app/views/shared/icons/_icon_action_retry_borderless.svg b/app/views/shared/icons/_icon_action_retry_borderless.svg new file mode 100644 index 00000000000..0fa0243f3c0 --- /dev/null +++ b/app/views/shared/icons/_icon_action_retry_borderless.svg @@ -0,0 +1 @@ + diff --git a/app/views/shared/icons/_icon_action_stop_borderless.svg b/app/views/shared/icons/_icon_action_stop_borderless.svg new file mode 100644 index 00000000000..1c8e2fe4156 --- /dev/null +++ b/app/views/shared/icons/_icon_action_stop_borderless.svg @@ -0,0 +1 @@ + -- cgit v1.2.1 From 4983fbaaf457cf434bca83ecbc178723d90a3dd2 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Wed, 25 Jan 2017 09:40:41 +0000 Subject: Remove unneeded 'borderless' from icons name --- app/views/shared/icons/_icon_action_cancel.svg | 1 + app/views/shared/icons/_icon_action_cancel_borderless.svg | 1 - app/views/shared/icons/_icon_action_play.svg | 1 + app/views/shared/icons/_icon_action_play_borderless.svg | 1 - app/views/shared/icons/_icon_action_retry.svg | 1 + app/views/shared/icons/_icon_action_retry_borderless.svg | 1 - app/views/shared/icons/_icon_action_stop.svg | 1 + app/views/shared/icons/_icon_action_stop_borderless.svg | 1 - 8 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 app/views/shared/icons/_icon_action_cancel.svg delete mode 100644 app/views/shared/icons/_icon_action_cancel_borderless.svg create mode 100644 app/views/shared/icons/_icon_action_play.svg delete mode 100644 app/views/shared/icons/_icon_action_play_borderless.svg create mode 100644 app/views/shared/icons/_icon_action_retry.svg delete mode 100644 app/views/shared/icons/_icon_action_retry_borderless.svg create mode 100644 app/views/shared/icons/_icon_action_stop.svg delete mode 100644 app/views/shared/icons/_icon_action_stop_borderless.svg (limited to 'app/views') diff --git a/app/views/shared/icons/_icon_action_cancel.svg b/app/views/shared/icons/_icon_action_cancel.svg new file mode 100644 index 00000000000..a1f700eb0ff --- /dev/null +++ b/app/views/shared/icons/_icon_action_cancel.svg @@ -0,0 +1 @@ + diff --git a/app/views/shared/icons/_icon_action_cancel_borderless.svg b/app/views/shared/icons/_icon_action_cancel_borderless.svg deleted file mode 100644 index a1f700eb0ff..00000000000 --- a/app/views/shared/icons/_icon_action_cancel_borderless.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/views/shared/icons/_icon_action_play.svg b/app/views/shared/icons/_icon_action_play.svg new file mode 100644 index 00000000000..6ac192cd7e9 --- /dev/null +++ b/app/views/shared/icons/_icon_action_play.svg @@ -0,0 +1 @@ + diff --git a/app/views/shared/icons/_icon_action_play_borderless.svg b/app/views/shared/icons/_icon_action_play_borderless.svg deleted file mode 100644 index 6ac192cd7e9..00000000000 --- a/app/views/shared/icons/_icon_action_play_borderless.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/views/shared/icons/_icon_action_retry.svg b/app/views/shared/icons/_icon_action_retry.svg new file mode 100644 index 00000000000..0fa0243f3c0 --- /dev/null +++ b/app/views/shared/icons/_icon_action_retry.svg @@ -0,0 +1 @@ + diff --git a/app/views/shared/icons/_icon_action_retry_borderless.svg b/app/views/shared/icons/_icon_action_retry_borderless.svg deleted file mode 100644 index 0fa0243f3c0..00000000000 --- a/app/views/shared/icons/_icon_action_retry_borderless.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/views/shared/icons/_icon_action_stop.svg b/app/views/shared/icons/_icon_action_stop.svg new file mode 100644 index 00000000000..1c8e2fe4156 --- /dev/null +++ b/app/views/shared/icons/_icon_action_stop.svg @@ -0,0 +1 @@ + diff --git a/app/views/shared/icons/_icon_action_stop_borderless.svg b/app/views/shared/icons/_icon_action_stop_borderless.svg deleted file mode 100644 index 1c8e2fe4156..00000000000 --- a/app/views/shared/icons/_icon_action_stop_borderless.svg +++ /dev/null @@ -1 +0,0 @@ - -- cgit v1.2.1 From 819ae974d7cf8db98d6400c5ac85ebbd68c36f67 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Wed, 25 Jan 2017 11:04:16 +0000 Subject: Fix broken tests Fix linter error --- app/views/ci/status/_graph_badge.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views') diff --git a/app/views/ci/status/_graph_badge.html.haml b/app/views/ci/status/_graph_badge.html.haml index edfb02d21f3..a44adc6205a 100644 --- a/app/views/ci/status/_graph_badge.html.haml +++ b/app/views/ci/status/_graph_badge.html.haml @@ -2,7 +2,7 @@ - subject = local_assigns.fetch(:subject) - status = subject.detailed_status(current_user) -- klass = "ci-status-icon ci-status-icon-#{status.group}" +- klass = "ci-status-icon ci-status-icon-#{status.group} js-ci-status-icon-#{status.group}" - tooltip = "#{subject.name} - #{status.label}" - if status.has_details? @@ -16,5 +16,5 @@ - if status.has_action? = link_to status.action_path, class: 'ci-action-icon-container has-tooltip', method: status.action_method, data: { toggle: 'tooltip', title: status.action_title } do - %i.ci-action-icon-wrapper + %i.ci-action-icon-wrapper{ class: "js-#{status.action_icon}" } = custom_icon(status.action_icon) -- cgit v1.2.1 From ca40ef955a792a99a3248cbf55d63a9507d3bb20 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Thu, 26 Jan 2017 08:14:18 -0600 Subject: Add tooltip to subscribe btn --- app/views/projects/issues/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index ff15815d7a6..5fbed8b9ab8 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -19,7 +19,7 @@ = render 'shared/issuable/nav', type: :issues .nav-controls - if current_user - = link_to url_for(params.merge(format: :atom, private_token: current_user.private_token)), class: 'btn append-right-10', title: 'Subscribe' do + = link_to url_for(params.merge(format: :atom, private_token: current_user.private_token)), class: 'btn append-right-10 has-tooltip', title: 'Subscribe' do = icon('rss') - if can? current_user, :create_issue, @project = link_to new_namespace_project_issue_path(@project.namespace, -- cgit v1.2.1 From 10178af1fd30e97dd65d11bba1e640aa7dc5bbbd Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Thu, 26 Jan 2017 20:38:21 +0000 Subject: Fixes after review --- app/views/ci/status/_graph_badge.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/ci/status/_graph_badge.html.haml b/app/views/ci/status/_graph_badge.html.haml index a44adc6205a..0530d21a7e2 100644 --- a/app/views/ci/status/_graph_badge.html.haml +++ b/app/views/ci/status/_graph_badge.html.haml @@ -16,5 +16,5 @@ - if status.has_action? = link_to status.action_path, class: 'ci-action-icon-container has-tooltip', method: status.action_method, data: { toggle: 'tooltip', title: status.action_title } do - %i.ci-action-icon-wrapper{ class: "js-#{status.action_icon}" } + %i.ci-action-icon-wrapper{ class: "js-#{status.action_icon.dasherize}" } = custom_icon(status.action_icon) -- cgit v1.2.1 From 4f4d12442f3be382d4562cfb4683969d6eb8f7b2 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Wed, 25 Jan 2017 09:13:52 -0600 Subject: Revert 3f17f29a --- app/views/shared/issuable/_search_bar.html.haml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'app/views') diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index e9644ca0f12..55360dadbc4 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -47,10 +47,6 @@ %li.filter-dropdown-item{ 'data-value' => 'none' } %button.btn.btn-link No Assignee - - if current_user - %li.filter-dropdown-item{ 'data-value' => current_user.to_reference } - %button.btn.btn-link - Assigned to me %li.divider %ul.filter-dropdown{ 'data-dynamic' => true, 'data-dropdown' => true } %li.filter-dropdown-item -- cgit v1.2.1 From 1ad6b3696bdeedcc27af4db4f592b39942e19f7d Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Fri, 27 Jan 2017 13:32:21 +0100 Subject: Expose serialized pipelines for commit pipelines --- app/views/projects/commit/pipelines.html.haml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'app/views') diff --git a/app/views/projects/commit/pipelines.html.haml b/app/views/projects/commit/pipelines.html.haml index 00e7cdd1729..89968cf4e0d 100644 --- a/app/views/projects/commit/pipelines.html.haml +++ b/app/views/projects/commit/pipelines.html.haml @@ -1,6 +1,5 @@ -- page_title "Pipelines", "#{@commit.title} (#{@commit.short_id})", "Commits" +- page_title 'Pipelines', "#{@commit.title} (#{@commit.short_id})", 'Commits' -= render "commit_box" - -= render "ci_menu" -= render "pipelines_list", pipelines: @commit.pipelines.order(id: :desc) += render 'commit_box' += render 'ci_menu' += render 'pipelines_list', pipelines: @pipelines -- cgit v1.2.1 From a0872833351bba7fb9f2f78101a6ba87f83c21b2 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Tue, 24 Jan 2017 11:25:27 +0000 Subject: Use new partial to render a badge without a link in the builds details. Preventing from having a link to itself. Adds MR ID to CHANGELOG entry --- app/views/admin/runners/show.html.haml | 2 +- app/views/ci/status/_badge.html.haml | 12 +++--------- app/views/ci/status/_badge_link.html.haml | 11 +++++++++++ app/views/projects/ci/builds/_build.html.haml | 2 +- app/views/projects/ci/pipelines/_pipeline.html.haml | 2 +- .../generic_commit_statuses/_generic_commit_status.html.haml | 2 +- app/views/projects/pipelines/_info.html.haml | 2 +- 7 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 app/views/ci/status/_badge_link.html.haml (limited to 'app/views') diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml index 39e103e3062..28e1f2aba36 100644 --- a/app/views/admin/runners/show.html.haml +++ b/app/views/admin/runners/show.html.haml @@ -91,7 +91,7 @@ %strong ##{build.id} %td.status - = render 'ci/status/badge', status: build.detailed_status(current_user) + = render 'ci/status/badge_link', status: build.detailed_status(current_user) %td.status - if project diff --git a/app/views/ci/status/_badge.html.haml b/app/views/ci/status/_badge.html.haml index 601fb7f0f3f..a4f05fefc53 100644 --- a/app/views/ci/status/_badge.html.haml +++ b/app/views/ci/status/_badge.html.haml @@ -1,11 +1,5 @@ - status = local_assigns.fetch(:status) -- css_classes = "ci-status ci-#{status.group}" -- if status.has_details? - = link_to status.details_path, class: css_classes do - = custom_icon(status.icon) - = status.text -- else - %span{ class: css_classes } - = custom_icon(status.icon) - = status.text +%span{ class: "ci-status ci-#{status.group}" } + = custom_icon(status.icon) + = status.text diff --git a/app/views/ci/status/_badge_link.html.haml b/app/views/ci/status/_badge_link.html.haml new file mode 100644 index 00000000000..601fb7f0f3f --- /dev/null +++ b/app/views/ci/status/_badge_link.html.haml @@ -0,0 +1,11 @@ +- status = local_assigns.fetch(:status) +- css_classes = "ci-status ci-#{status.group}" + +- if status.has_details? + = link_to status.details_path, class: css_classes do + = custom_icon(status.icon) + = status.text +- else + %span{ class: css_classes } + = custom_icon(status.icon) + = status.text diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index c1e496455d1..fdf675f5f52 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -9,7 +9,7 @@ %tr.build.commit{ class: ('retried' if retried) } %td.status - = render "ci/status/badge", status: build.detailed_status(current_user) + = render "ci/status/badge_link", status: build.detailed_status(current_user) %td.branch-commit - if can?(current_user, :read_build, build) diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index 818a70f38f1..1d11d1aa931 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -4,7 +4,7 @@ %tr.commit %td.commit-link - = render 'ci/status/badge', status: pipeline.detailed_status(current_user) + = render 'ci/status/badge_link', status: pipeline.detailed_status(current_user) %td = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml index 07fb80750d6..55a9899280f 100644 --- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml +++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml @@ -8,7 +8,7 @@ %tr.generic_commit_status{ class: ('retried' if retried) } %td.status - = render 'ci/status/badge', status: generic_commit_status.detailed_status(current_user) + = render 'ci/status/badge_link', status: generic_commit_status.detailed_status(current_user) %td.generic_commit_status-link - if can?(current_user, :read_commit_status, generic_commit_status) && generic_commit_status.target_url diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index ca76f13ef5e..3bd822ead76 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -1,6 +1,6 @@ .page-content-header .header-main-content - = render 'ci/status/badge', status: @pipeline.detailed_status(current_user) + = render 'ci/status/badge_link', status: @pipeline.detailed_status(current_user) %strong Pipeline ##{@commit.pipelines.last.id} triggered #{time_ago_with_tooltip(@commit.authored_date)} by = author_avatar(@commit, size: 24) -- cgit v1.2.1 From 4472779b7f93e07558f5afa1b1f6b23564de3ccd Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Wed, 25 Jan 2017 11:30:08 +0000 Subject: Adds tests to build view Fix CHANGELOG entry --- app/views/projects/builds/_header.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/builds/_header.html.haml b/app/views/projects/builds/_header.html.haml index b15be0d861d..91eeee1800e 100644 --- a/app/views/projects/builds/_header.html.haml +++ b/app/views/projects/builds/_header.html.haml @@ -2,7 +2,7 @@ .header-content = render 'ci/status/badge', status: @build.detailed_status(current_user) Build - %strong ##{@build.id} + %strong.js-build-id ##{@build.id} in pipeline = link_to pipeline_path(@build.pipeline) do %strong ##{@build.pipeline.id} -- cgit v1.2.1 From 4ab83117fb5496be8c850925c78f32823593d5b2 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Thu, 26 Jan 2017 20:03:45 +0000 Subject: Changes after review --- app/views/ci/status/_badge_link.html.haml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app/views') diff --git a/app/views/ci/status/_badge_link.html.haml b/app/views/ci/status/_badge_link.html.haml index 601fb7f0f3f..27011fe7478 100644 --- a/app/views/ci/status/_badge_link.html.haml +++ b/app/views/ci/status/_badge_link.html.haml @@ -6,6 +6,4 @@ = custom_icon(status.icon) = status.text - else - %span{ class: css_classes } - = custom_icon(status.icon) - = status.text + = render "ci/status/badge", status: status -- cgit v1.2.1 From 6679a9062ad9f3ee9092655a5129feba1bcdd9d7 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Fri, 27 Jan 2017 14:20:57 +0000 Subject: Use badge partial as single source of truth instead of having 2 partials doing the same Update changelog description Changes after review --- app/views/admin/runners/show.html.haml | 2 +- app/views/ci/status/_badge.html.haml | 13 ++++++++++--- app/views/ci/status/_badge_link.html.haml | 9 --------- app/views/projects/builds/_header.html.haml | 2 +- app/views/projects/ci/builds/_build.html.haml | 2 +- app/views/projects/ci/pipelines/_pipeline.html.haml | 2 +- .../_generic_commit_status.html.haml | 2 +- app/views/projects/pipelines/_info.html.haml | 2 +- 8 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 app/views/ci/status/_badge_link.html.haml (limited to 'app/views') diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml index 28e1f2aba36..39e103e3062 100644 --- a/app/views/admin/runners/show.html.haml +++ b/app/views/admin/runners/show.html.haml @@ -91,7 +91,7 @@ %strong ##{build.id} %td.status - = render 'ci/status/badge_link', status: build.detailed_status(current_user) + = render 'ci/status/badge', status: build.detailed_status(current_user) %td.status - if project diff --git a/app/views/ci/status/_badge.html.haml b/app/views/ci/status/_badge.html.haml index a4f05fefc53..c00c7f7407e 100644 --- a/app/views/ci/status/_badge.html.haml +++ b/app/views/ci/status/_badge.html.haml @@ -1,5 +1,12 @@ - status = local_assigns.fetch(:status) +- link = local_assigns.fetch(:link, true) +- css_classes = "ci-status ci-#{status.group}" -%span{ class: "ci-status ci-#{status.group}" } - = custom_icon(status.icon) - = status.text +- if link && status.has_details? + = link_to status.details_path, class: css_classes do + = custom_icon(status.icon) + = status.text +- else + %span{ class: css_classes } + = custom_icon(status.icon) + = status.text diff --git a/app/views/ci/status/_badge_link.html.haml b/app/views/ci/status/_badge_link.html.haml deleted file mode 100644 index 27011fe7478..00000000000 --- a/app/views/ci/status/_badge_link.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -- status = local_assigns.fetch(:status) -- css_classes = "ci-status ci-#{status.group}" - -- if status.has_details? - = link_to status.details_path, class: css_classes do - = custom_icon(status.icon) - = status.text -- else - = render "ci/status/badge", status: status diff --git a/app/views/projects/builds/_header.html.haml b/app/views/projects/builds/_header.html.haml index 91eeee1800e..736b485bf06 100644 --- a/app/views/projects/builds/_header.html.haml +++ b/app/views/projects/builds/_header.html.haml @@ -1,6 +1,6 @@ .content-block.build-header .header-content - = render 'ci/status/badge', status: @build.detailed_status(current_user) + = render 'ci/status/badge', status: @build.detailed_status(current_user), link: false Build %strong.js-build-id ##{@build.id} in pipeline diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index fdf675f5f52..c1e496455d1 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -9,7 +9,7 @@ %tr.build.commit{ class: ('retried' if retried) } %td.status - = render "ci/status/badge_link", status: build.detailed_status(current_user) + = render "ci/status/badge", status: build.detailed_status(current_user) %td.branch-commit - if can?(current_user, :read_build, build) diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index 1d11d1aa931..818a70f38f1 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -4,7 +4,7 @@ %tr.commit %td.commit-link - = render 'ci/status/badge_link', status: pipeline.detailed_status(current_user) + = render 'ci/status/badge', status: pipeline.detailed_status(current_user) %td = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml index 55a9899280f..07fb80750d6 100644 --- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml +++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml @@ -8,7 +8,7 @@ %tr.generic_commit_status{ class: ('retried' if retried) } %td.status - = render 'ci/status/badge_link', status: generic_commit_status.detailed_status(current_user) + = render 'ci/status/badge', status: generic_commit_status.detailed_status(current_user) %td.generic_commit_status-link - if can?(current_user, :read_commit_status, generic_commit_status) && generic_commit_status.target_url diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 3bd822ead76..ca76f13ef5e 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -1,6 +1,6 @@ .page-content-header .header-main-content - = render 'ci/status/badge_link', status: @pipeline.detailed_status(current_user) + = render 'ci/status/badge', status: @pipeline.detailed_status(current_user) %strong Pipeline ##{@commit.pipelines.last.id} triggered #{time_ago_with_tooltip(@commit.authored_date)} by = author_avatar(@commit, size: 24) -- cgit v1.2.1 From d7c0955b88f8947e2da41bbce76544dbda76cc0e Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Fri, 27 Jan 2017 15:41:19 +0000 Subject: Fixed merge request tabs extra margin Fixed extra margin when the merge request tabs are affixed This was caused by some weird padding that was on the container & then not correctly removed. The fix involved removing the container from inside the tabs holder div & then adding the widths through CSS depending on if fixed & whether the parent is limited width or not. In reality out container classes need to be fixed as it is getting pretty un-managable at the moment this should of been an easy fix, but in reality turned into something much harder. Closes #26853 --- app/views/projects/merge_requests/_show.html.haml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/views') diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index eade0c2a668..9585a9a3ad4 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -52,7 +52,7 @@ = render 'award_emoji/awards_block', awardable: @merge_request, inline: true .merge-request-tabs-holder{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') } - %div{ class: container_class } + .merge-request-tabs-container %ul.merge-request-tabs.nav-links.no-top.no-bottom %li.notes-tab = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: 'div#notes', action: 'notes', toggle: 'tab' } do @@ -115,4 +115,3 @@ }); var mrRefreshWidgetUrl = "#{mr_widget_refresh_url(@merge_request)}"; - -- cgit v1.2.1 From 49831b537404e4dfeb0a1bf6972a06c164f22e74 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Wed, 25 Jan 2017 16:04:02 -0600 Subject: Fix project name label's for reference in project settings --- app/views/projects/edit.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 114865935d6..84787155168 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -9,7 +9,7 @@ %fieldset.append-bottom-0 .row .form-group.col-md-9 - = f.label :name, class: 'label-light' do + = f.label :name, class: 'label-light', for: 'project_name_edit' do Project name = f.text_field :name, class: "form-control", id: "project_name_edit" -- cgit v1.2.1 From f68eceadcbf511d6dd2869e298850634562b6c07 Mon Sep 17 00:00:00 2001 From: Jose Ivan Vargas Date: Fri, 27 Jan 2017 09:52:09 -0600 Subject: Fixed cancel button in the services form not redirecting back to the integrations settings view --- app/views/projects/services/_form.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index fc338dcf887..f1a80f1d5e1 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -17,4 +17,4 @@ - disabled_title = @service.disabled_title = link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service), class: "btn #{disabled_class}", title: disabled_title - = link_to "Cancel", namespace_project_services_path(@project.namespace, @project), class: "btn btn-cancel" + = link_to "Cancel", namespace_project_settings_integrations_path(@project.namespace, @project), class: "btn btn-cancel" -- cgit v1.2.1 From 4e2b9d703f3b3d3f64a25ff9ae33eb56210c1715 Mon Sep 17 00:00:00 2001 From: Berna Castro Date: Thu, 15 Dec 2016 13:07:35 +0100 Subject: Don't group projects on dashboard#issues --- app/views/shared/_issues.html.haml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'app/views') diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml index 26b349e8a62..f4401300ceb 100644 --- a/app/views/shared/_issues.html.haml +++ b/app/views/shared/_issues.html.haml @@ -1,16 +1,10 @@ - if @issues.to_a.any? - - @issues.group_by(&:project).each do |group| - .panel.panel-default.panel-small - - project = group[0] - .panel-heading - = link_to project.name_with_namespace, namespace_project_issues_path(project.namespace, project) - - if can?(current_user, :create_issue, project) - .pull-right - = link_to 'New issue', new_namespace_project_issue_path(project.namespace, project) + .panel.panel-default.panel-small + %ul.content-list.issues-list + - @issues.each do |issue| + - project = issue.project - %ul.content-list.issues-list - - group[1].each do |issue| - = render 'projects/issues/issue', issue: issue + = render 'projects/issues/issue', issue: issue = paginate @issues, theme: "gitlab" - else = render 'shared/empty_states/issues' -- cgit v1.2.1 From c85c681505b3d52f8ffa6729ebbbf2846e73cf30 Mon Sep 17 00:00:00 2001 From: Berna Castro Date: Thu, 15 Dec 2016 13:09:07 +0100 Subject: Add the group path to the issue ID if applicable --- app/views/projects/issues/_issue.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index bd46af339cf..8bb3fe6ba26 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -34,7 +34,7 @@ = note_count .issue-info - #{issue.to_reference} · + #{issue.to_reference(@project, @group)} · opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')} by #{link_to_member(@project, issue.author, avatar: false)} - if issue.milestone -- cgit v1.2.1 From 1c749880e51b641e0e3385c58a3aa289fd1bbbb6 Mon Sep 17 00:00:00 2001 From: Berna Castro Date: Thu, 15 Dec 2016 13:29:05 +0100 Subject: Refactor code when rendering a collection of issues --- app/views/shared/_issues.html.haml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'app/views') diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml index f4401300ceb..69e6ee8ec40 100644 --- a/app/views/shared/_issues.html.haml +++ b/app/views/shared/_issues.html.haml @@ -1,10 +1,7 @@ - if @issues.to_a.any? .panel.panel-default.panel-small %ul.content-list.issues-list - - @issues.each do |issue| - - project = issue.project - - = render 'projects/issues/issue', issue: issue + = render partial: 'projects/issues/issue', collection: @issues = paginate @issues, theme: "gitlab" - else = render 'shared/empty_states/issues' -- cgit v1.2.1 From ac66268443b05029cbc45cc358f62b764f1ff165 Mon Sep 17 00:00:00 2001 From: Berna Castro Date: Thu, 15 Dec 2016 15:51:50 +0100 Subject: Refactor Project#to_reference and make full_path a keyword argument Refactor overall code and fix failing specs Fix Project#to_reference Fix wrong spaces and update changelog Refactor #to_reference for Project & Issue Fix and improves Project#to_reference --- app/views/projects/issues/_issue.html.haml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 8bb3fe6ba26..6cfbab92f0f 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -34,7 +34,13 @@ = note_count .issue-info - #{issue.to_reference(@project, @group)} · + - if controller_name == "dashboard" + #{issue.to_reference(full_path: true)} + - else + #{issue.to_reference(@group || @project)} + + · + opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')} by #{link_to_member(@project, issue.author, avatar: false)} - if issue.milestone -- cgit v1.2.1 From aeb9db6753cfdd56f82d80c0e2c01f63d65b705d Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Tue, 10 Jan 2017 21:52:25 -0200 Subject: Present group and dashboard MR list without grouping by project --- app/views/projects/issues/_issue.html.haml | 7 +------ app/views/projects/merge_requests/_merge_request.html.haml | 3 ++- app/views/shared/_merge_requests.html.haml | 14 +++----------- 3 files changed, 6 insertions(+), 18 deletions(-) (limited to 'app/views') diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 6cfbab92f0f..6173d9e21f6 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -34,13 +34,8 @@ = note_count .issue-info - - if controller_name == "dashboard" - #{issue.to_reference(full_path: true)} - - else - #{issue.to_reference(@group || @project)} - + = @show_full_reference ? issue.to_reference(full: true) : issue.to_reference(@group || @project) · - opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')} by #{link_to_member(@project, issue.author, avatar: false)} - if issue.milestone diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index e3b0aa7e644..a1e6d09612c 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -46,7 +46,8 @@ = note_count .merge-request-info - #{merge_request.to_reference} · + = @show_full_reference ? merge_request.to_reference(full: true) : merge_request.to_reference(@group || @project) + · opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')} by #{link_to_member(@project, merge_request.author, avatar: false)} - if merge_request.target_project.default_branch != merge_request.target_branch diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml index 2f3605b4d27..773f71802c0 100644 --- a/app/views/shared/_merge_requests.html.haml +++ b/app/views/shared/_merge_requests.html.haml @@ -1,16 +1,8 @@ - if @merge_requests.to_a.any? - - @merge_requests.group_by(&:target_project).each do |group| - .panel.panel-default.panel-small - - project = group[0] - .panel-heading - = link_to project.name_with_namespace, namespace_project_merge_requests_path(project.namespace, project) - - if can?(current_user, :create_merge_request, project) - .pull-right - = link_to 'New merge request', new_namespace_project_merge_request_path(project.namespace, project) + .panel.panel-default.panel-small + %ul.content-list.mr-list + = render partial: 'projects/merge_requests/merge_request', collection: @merge_requests - %ul.content-list.mr-list - - group[1].each do |merge_request| - = render 'projects/merge_requests/merge_request', merge_request: merge_request = paginate @merge_requests, theme: "gitlab" - else -- cgit v1.2.1 From 441501e4bf57e663d8259695845d75b5b6d50684 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Tue, 10 Jan 2017 21:53:51 -0200 Subject: Present TODO's list without grouping by project --- app/views/dashboard/todos/index.html.haml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'app/views') diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml index f4efcfb27b2..0b471f142d0 100644 --- a/app/views/dashboard/todos/index.html.haml +++ b/app/views/dashboard/todos/index.html.haml @@ -70,15 +70,11 @@ .prepend-top-default - if @todos.any? .js-todos-options{ data: {per_page: @todos.limit_value, current_page: @todos.current_page, total_pages: @todos.total_pages} } - - @todos.group_by(&:project).each do |group| .panel.panel-default.panel-small - - project = group[0] - .panel-heading - = link_to project.name_with_namespace, namespace_project_path(project.namespace, project) - %ul.content-list.todos-list - = render group[1] + = render @todos = paginate @todos, theme: "gitlab" + - elsif current_user.todos.any? .todos-all-done = render "shared/empty_states/todos_all_done.svg" -- cgit v1.2.1 From 78b0106878fa1b2e2062e2c4ebb0a63375825879 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Thu, 12 Jan 2017 10:28:37 -0200 Subject: Move issuable reference display to a helper method --- app/views/projects/issues/_issue.html.haml | 3 +-- app/views/projects/merge_requests/_merge_request.html.haml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'app/views') diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 6173d9e21f6..f3be343daae 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -34,8 +34,7 @@ = note_count .issue-info - = @show_full_reference ? issue.to_reference(full: true) : issue.to_reference(@group || @project) - · + #{issuable_reference(issue)} · opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')} by #{link_to_member(@project, issue.author, avatar: false)} - if issue.milestone diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index a1e6d09612c..513f0818169 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -46,8 +46,7 @@ = note_count .merge-request-info - = @show_full_reference ? merge_request.to_reference(full: true) : merge_request.to_reference(@group || @project) - · + #{issuable_reference(merge_request)} · opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')} by #{link_to_member(@project, merge_request.author, avatar: false)} - if merge_request.target_project.default_branch != merge_request.target_branch -- cgit v1.2.1 From ed3cf83a634525996c76190ce06dd6298017484b Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Thu, 26 Jan 2017 10:16:26 -0200 Subject: Remove bold weight from TODOs action name font --- app/views/dashboard/todos/_todo.html.haml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml index 9d7bcdb9d16..605bfd0cf8d 100644 --- a/app/views/dashboard/todos/_todo.html.haml +++ b/app/views/dashboard/todos/_todo.html.haml @@ -11,8 +11,11 @@ = link_to_author(todo) - else (removed) - %span.todo-label + + %span.action-name = todo_action_name(todo) + + %span.todo-label - if todo.target = todo_target_link(todo) - else -- cgit v1.2.1 From 6a5a5d0ec0ad08fafc007a88d2cd558f3c7add1b Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Thu, 26 Jan 2017 11:10:04 -0200 Subject: Remove border from issues, todos and MR pages --- app/views/dashboard/todos/index.html.haml | 2 +- app/views/shared/_issues.html.haml | 2 +- app/views/shared/_merge_requests.html.haml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/views') diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml index 0b471f142d0..32b4350b8e0 100644 --- a/app/views/dashboard/todos/index.html.haml +++ b/app/views/dashboard/todos/index.html.haml @@ -70,7 +70,7 @@ .prepend-top-default - if @todos.any? .js-todos-options{ data: {per_page: @todos.limit_value, current_page: @todos.current_page, total_pages: @todos.total_pages} } - .panel.panel-default.panel-small + .panel.panel-default.panel-small.panel-without-border %ul.content-list.todos-list = render @todos = paginate @todos, theme: "gitlab" diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml index 69e6ee8ec40..3a49227961f 100644 --- a/app/views/shared/_issues.html.haml +++ b/app/views/shared/_issues.html.haml @@ -1,5 +1,5 @@ - if @issues.to_a.any? - .panel.panel-default.panel-small + .panel.panel-default.panel-small.panel-without-border %ul.content-list.issues-list = render partial: 'projects/issues/issue', collection: @issues = paginate @issues, theme: "gitlab" diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml index 773f71802c0..b7982b7fe9b 100644 --- a/app/views/shared/_merge_requests.html.haml +++ b/app/views/shared/_merge_requests.html.haml @@ -1,5 +1,5 @@ - if @merge_requests.to_a.any? - .panel.panel-default.panel-small + .panel.panel-default.panel-small.panel-without-border %ul.content-list.mr-list = render partial: 'projects/merge_requests/merge_request', collection: @merge_requests -- cgit v1.2.1 From 27a794914e9a9a9f979b89d26d0297f677e2946a Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Thu, 26 Jan 2017 11:22:16 -0200 Subject: Remove unnecessary extra margin on issues, mr and todo pages --- app/views/dashboard/issues.html.haml | 4 +- app/views/dashboard/merge_requests.html.haml | 4 +- app/views/dashboard/todos/index.html.haml | 73 ++++++++++++++-------------- app/views/groups/issues.html.haml | 3 +- app/views/groups/merge_requests.html.haml | 3 +- 5 files changed, 40 insertions(+), 47 deletions(-) (limited to 'app/views') diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 3caaf827ff5..653052f7c54 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -15,6 +15,4 @@ = render 'shared/new_project_item_select', path: 'issues/new', label: "New Issue" = render 'shared/issuable/filter', type: :issues - -.prepend-top-default - = render 'shared/issues' += render 'shared/issues' diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index fb016599fef..e64c78c4cb8 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -7,6 +7,4 @@ = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New Merge Request" = render 'shared/issuable/filter', type: :merge_requests - -.prepend-top-default - = render 'shared/merge_requests' += render 'shared/merge_requests' diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml index 32b4350b8e0..6f7141de12c 100644 --- a/app/views/dashboard/todos/index.html.haml +++ b/app/views/dashboard/todos/index.html.haml @@ -67,41 +67,40 @@ = sort_title_oldest_created -.prepend-top-default - - if @todos.any? - .js-todos-options{ data: {per_page: @todos.limit_value, current_page: @todos.current_page, total_pages: @todos.total_pages} } - .panel.panel-default.panel-small.panel-without-border - %ul.content-list.todos-list - = render @todos - = paginate @todos, theme: "gitlab" +- if @todos.any? + .js-todos-options{ data: {per_page: @todos.limit_value, current_page: @todos.current_page, total_pages: @todos.total_pages} } + .panel.panel-default.panel-small.panel-without-border + %ul.content-list.todos-list + = render @todos + = paginate @todos, theme: "gitlab" - - elsif current_user.todos.any? - .todos-all-done - = render "shared/empty_states/todos_all_done.svg" - - if todos_filter_empty? - %h4.text-center - = Gitlab.config.gitlab.no_todos_messages.sample - %p.text-center - Are you looking for things to do? Take a look at - = succeed "," do - = link_to "the opened issues", issues_dashboard_path - contribute to - = link_to "merge requests", merge_requests_dashboard_path - or mention someone in a comment to assign a new todo automatically. - - else - %h4.text-center - There are no todos to show. - - else - .todos-empty - .todos-empty-hero - = render "shared/empty_states/todos_empty.svg" - .todos-empty-content - %h4 - Todos let you see what you should do next. - %p - When an issue or merge request is assigned to you, or when you - %strong - @mention - in a comment, this will trigger a new item in your todo list, automatically. - %p - You will always know what to work on next. +- elsif current_user.todos.any? + .todos-all-done + = render "shared/empty_states/todos_all_done.svg" + - if todos_filter_empty? + %h4.text-center + = Gitlab.config.gitlab.no_todos_messages.sample + %p.text-center + Are you looking for things to do? Take a look at + = succeed "," do + = link_to "the opened issues", issues_dashboard_path + contribute to + = link_to "merge requests", merge_requests_dashboard_path + or mention someone in a comment to assign a new todo automatically. + - else + %h4.text-center + There are no todos to show. +- else + .todos-empty + .todos-empty-hero + = render "shared/empty_states/todos_empty.svg" + .todos-empty-content + %h4 + Todos let you see what you should do next. + %p + When an issue or merge request is assigned to you, or when you + %strong + @mention + in a comment, this will trigger a new item in your todo list, automatically. + %p + You will always know what to work on next. diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index 6ad03a60b3a..83edb719692 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -23,7 +23,6 @@ - if current_user To see all issues you should visit #{link_to 'dashboard', issues_dashboard_path} page. - .prepend-top-default - = render 'shared/issues' + = render 'shared/issues' - else = render 'shared/empty_states/issues', project_select_button: true diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index af73554086b..6ad76d23df5 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -15,5 +15,4 @@ - if current_user To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page. -.prepend-top-default - = render 'shared/merge_requests' += render 'shared/merge_requests' -- cgit v1.2.1 From 80a7c369083246fe689959906cab493a518ff980 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Thu, 26 Jan 2017 16:08:35 -0200 Subject: Do not rely on style class for changing DOM state on "Mark all as done" --- app/views/dashboard/todos/index.html.haml | 73 ++++++++++++++++--------------- 1 file changed, 37 insertions(+), 36 deletions(-) (limited to 'app/views') diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml index 6f7141de12c..153d0885063 100644 --- a/app/views/dashboard/todos/index.html.haml +++ b/app/views/dashboard/todos/index.html.haml @@ -67,40 +67,41 @@ = sort_title_oldest_created -- if @todos.any? - .js-todos-options{ data: {per_page: @todos.limit_value, current_page: @todos.current_page, total_pages: @todos.total_pages} } - .panel.panel-default.panel-small.panel-without-border - %ul.content-list.todos-list - = render @todos - = paginate @todos, theme: "gitlab" +.js-todos-all + - if @todos.any? + .js-todos-options{ data: {per_page: @todos.limit_value, current_page: @todos.current_page, total_pages: @todos.total_pages} } + .panel.panel-default.panel-small.panel-without-border + %ul.content-list.todos-list + = render @todos + = paginate @todos, theme: "gitlab" -- elsif current_user.todos.any? - .todos-all-done - = render "shared/empty_states/todos_all_done.svg" - - if todos_filter_empty? - %h4.text-center - = Gitlab.config.gitlab.no_todos_messages.sample - %p.text-center - Are you looking for things to do? Take a look at - = succeed "," do - = link_to "the opened issues", issues_dashboard_path - contribute to - = link_to "merge requests", merge_requests_dashboard_path - or mention someone in a comment to assign a new todo automatically. - - else - %h4.text-center - There are no todos to show. -- else - .todos-empty - .todos-empty-hero - = render "shared/empty_states/todos_empty.svg" - .todos-empty-content - %h4 - Todos let you see what you should do next. - %p - When an issue or merge request is assigned to you, or when you - %strong - @mention - in a comment, this will trigger a new item in your todo list, automatically. - %p - You will always know what to work on next. + - elsif current_user.todos.any? + .todos-all-done + = render "shared/empty_states/todos_all_done.svg" + - if todos_filter_empty? + %h4.text-center + = Gitlab.config.gitlab.no_todos_messages.sample + %p.text-center + Are you looking for things to do? Take a look at + = succeed "," do + = link_to "the opened issues", issues_dashboard_path + contribute to + = link_to "merge requests", merge_requests_dashboard_path + or mention someone in a comment to assign a new todo automatically. + - else + %h4.text-center + There are no todos to show. + - else + .todos-empty + .todos-empty-hero + = render "shared/empty_states/todos_empty.svg" + .todos-empty-content + %h4 + Todos let you see what you should do next. + %p + When an issue or merge request is assigned to you, or when you + %strong + @mention + in a comment, this will trigger a new item in your todo list, automatically. + %p + You will always know what to work on next. -- cgit v1.2.1 From b3de65bcc5627915511182a9ac9857b1fef14853 Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Thu, 26 Jan 2017 09:16:07 +0100 Subject: Update #list_teams to propagate errors --- app/views/projects/mattermosts/_no_teams.html.haml | 5 +++-- app/views/projects/mattermosts/new.html.haml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'app/views') diff --git a/app/views/projects/mattermosts/_no_teams.html.haml b/app/views/projects/mattermosts/_no_teams.html.haml index 1bb3642431e..aac74a25b75 100644 --- a/app/views/projects/mattermosts/_no_teams.html.haml +++ b/app/views/projects/mattermosts/_no_teams.html.haml @@ -1,5 +1,6 @@ -= content_for :flash_message do - .alert.alert-danger= @teams if @teams.is_a?(String) +- if @teams_error_message + = content_for :flash_message do + .alert.alert-danger= @teams_error_message %p You aren’t a member of any team on the Mattermost instance at diff --git a/app/views/projects/mattermosts/new.html.haml b/app/views/projects/mattermosts/new.html.haml index 82f596da0fe..96b1d2aee61 100644 --- a/app/views/projects/mattermosts/new.html.haml +++ b/app/views/projects/mattermosts/new.html.haml @@ -2,7 +2,7 @@ .inline.pull-right = custom_icon('mattermost_logo', size: 48) %h3 Install Mattermost Command - - if @teams.is_a?(String) || @teams.empty? + - if @teams.empty? = render 'no_teams' - else = render 'team_selection' -- cgit v1.2.1 From 500e1a56e0a2225a61ec4bea40a474e7e3e3d1cc Mon Sep 17 00:00:00 2001 From: Nur Rony Date: Mon, 30 Jan 2017 16:58:30 +0600 Subject: unifies mr diff file button style --- app/views/projects/diffs/_file.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index c37a33bbcd5..fc478ccc995 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -5,7 +5,7 @@ - unless diff_file.submodule? .file-actions.hidden-xs - if blob_text_viewable?(blob) - = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip btn-file-option', title: "Toggle comments for this file", disabled: @diff_notes_disabled do + = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip', title: "Toggle comments for this file", disabled: @diff_notes_disabled do = icon('comment') \ - if editable_diff?(diff_file) -- cgit v1.2.1 From e589c7e84854bd181d5059200e80f0b5c0b0e5f8 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Tue, 24 Jan 2017 12:06:09 +0100 Subject: Ignore encrypted attributes in Import/Export * Regenerates tokens for all models that have them * Remove variables, since they are basically just storing encrypted data * Bumped version up to 0.1.6 * Updated related docs --- app/views/projects/edit.html.haml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/views') diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 84787155168..ec944d4ffb7 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -183,6 +183,8 @@ %li Build traces and artifacts %li LFS objects %li Container registry images + %li CI variables + %li Any encrypted tokens %hr - if can? current_user, :archive_project, @project .row.prepend-top-default -- cgit v1.2.1 From ff4a6323d163c987a73523a7f16440d1baffb939 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Wed, 11 Jan 2017 11:54:04 +0000 Subject: Corrected docs href's --- app/views/shared/_import_form.html.haml | 2 +- app/views/shared/_outdated_browser.html.haml | 3 +-- app/views/shared/notifications/_custom_notifications.html.haml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'app/views') diff --git a/app/views/shared/_import_form.html.haml b/app/views/shared/_import_form.html.haml index 65a3a6bddab..74dc1958222 100644 --- a/app/views/shared/_import_form.html.haml +++ b/app/views/shared/_import_form.html.haml @@ -13,4 +13,4 @@ %li The import will time out after 15 minutes. For repositories that take longer, use a clone/push combination. %li - To migrate an SVN repository, check out #{link_to "this document", "http://doc.gitlab.com/ce/workflow/importing/migrating_from_svn.html"}. + To migrate an SVN repository, check out #{link_to "this document", help_page_path('workflow/importing/migrating_from_svn')}. diff --git a/app/views/shared/_outdated_browser.html.haml b/app/views/shared/_outdated_browser.html.haml index 0eba1fe075f..c06d1ffa59b 100644 --- a/app/views/shared/_outdated_browser.html.haml +++ b/app/views/shared/_outdated_browser.html.haml @@ -1,8 +1,7 @@ - if outdated_browser? - - link = "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/requirements.md#supported-web-browsers" .browser-alert GitLab may not work properly because you are using an outdated web browser. %br Please install a - = link_to 'supported web browser', link + = link_to 'supported web browser', help_page_url('install/requirements', anchor: 'supported-web-browsers') for a better experience. diff --git a/app/views/shared/notifications/_custom_notifications.html.haml b/app/views/shared/notifications/_custom_notifications.html.haml index b5c0a7fd6d4..a736bfd91e2 100644 --- a/app/views/shared/notifications/_custom_notifications.html.haml +++ b/app/views/shared/notifications/_custom_notifications.html.haml @@ -18,7 +18,7 @@ %p Custom notification levels are the same as participating levels. With custom notification levels you will also receive notifications for select events. To find out more, check out = succeed "." do - %a{ href: "http://docs.gitlab.com/ce/workflow/notifications.html", target: "_blank" } notification emails + %a{ href: help_page_path('workflow/notifications'), target: "_blank" } notification emails .col-lg-8 - NotificationSetting::EMAIL_EVENTS.each_with_index do |event, index| - field_id = "#{notifications_menu_identifier("modal", notification_setting)}_notification_setting[#{event}]" -- cgit v1.2.1 From bfbdc62a3f9d99cad85940526fa17031baface28 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sat, 12 Nov 2016 23:51:47 +0000 Subject: Added labels empty state and priority label empty state Fixed delete labels not working Review changes --- app/views/projects/labels/destroy.js.haml | 2 - app/views/projects/labels/index.html.haml | 58 +++++++++++----------- app/views/shared/_label.html.haml | 4 +- app/views/shared/empty_states/_labels.html.haml | 11 ++++ .../shared/empty_states/_priority_labels.html.haml | 3 ++ app/views/shared/empty_states/icons/_labels.svg | 1 + .../shared/empty_states/icons/_priority_labels.svg | 1 + 7 files changed, 46 insertions(+), 34 deletions(-) delete mode 100644 app/views/projects/labels/destroy.js.haml create mode 100644 app/views/shared/empty_states/_labels.html.haml create mode 100644 app/views/shared/empty_states/_priority_labels.html.haml create mode 100644 app/views/shared/empty_states/icons/_labels.svg create mode 100644 app/views/shared/empty_states/icons/_priority_labels.svg (limited to 'app/views') diff --git a/app/views/projects/labels/destroy.js.haml b/app/views/projects/labels/destroy.js.haml deleted file mode 100644 index 8d09e2bda11..00000000000 --- a/app/views/projects/labels/destroy.js.haml +++ /dev/null @@ -1,2 +0,0 @@ -- if @labels.empty? - $('.labels').load(document.URL + ' .nothing-here-block').hide().fadeIn(1000) diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml index 05a8475dcd6..29f861c09c6 100644 --- a/app/views/projects/labels/index.html.haml +++ b/app/views/projects/labels/index.html.haml @@ -3,37 +3,35 @@ - hide_class = '' = render "projects/issues/head" -%div{ class: container_class } - .top-area.adjust - .nav-text - Labels can be applied to issues and merge requests. Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging. +- if @labels.exists? || @prioritized_labels.exists? + %div{ class: container_class } + .top-area.adjust + .nav-text + Labels can be applied to issues and merge requests. Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging. - .nav-controls - - if can?(current_user, :admin_label, @project) - = link_to new_namespace_project_label_path(@project.namespace, @project), class: "btn btn-new" do - New label - - .labels - - if can?(current_user, :admin_label, @project) - -# Only show it in the first page - - hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1') - .prioritized-labels{ class: ('hide' if hide) } - %h5 Prioritized Labels - %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_namespace_project_labels_path(@project.namespace, @project) } - %p.empty-message{ class: ('hidden' unless @prioritized_labels.empty?) } No prioritized labels yet - - if @prioritized_labels.present? - = render partial: 'shared/label', subject: @project, collection: @prioritized_labels, as: :label + .nav-controls + - if can?(current_user, :admin_label, @project) + = link_to new_namespace_project_label_path(@project.namespace, @project), class: "btn btn-new" do + New label - .other-labels + .labels - if can?(current_user, :admin_label, @project) - %h5{ class: ('hide' if hide) } Other Labels - %ul.content-list.manage-labels-list.js-other-labels - - if @labels.present? - = render partial: 'shared/label', subject: @project, collection: @labels, as: :label - = paginate @labels, theme: 'gitlab' - - if @labels.blank? - .nothing-here-block + -# Only show it in the first page + - hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1') + .prioritized-labels{ class: ('hide' if hide) } + %h5 Prioritized Labels + %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_namespace_project_labels_path(@project.namespace, @project) } + #js-priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty?}" } + = render 'shared/empty_states/priority_labels' + - if @prioritized_labels.present? + = render partial: 'shared/label', subject: @project, collection: @prioritized_labels, as: :label + + - if @labels.present? + .other-labels - if can?(current_user, :admin_label, @project) - Create a label or #{link_to 'generate a default set of labels', generate_namespace_project_labels_path(@project.namespace, @project), method: :post}. - - else - No labels created + %h5{ class: ('hide' if hide) } Other Labels + %ul.content-list.manage-labels-list.js-other-labels + = render partial: 'shared/label', subject: @project, collection: @labels, as: :label + = paginate @labels, theme: 'gitlab' +- else + = render 'shared/empty_states/labels' diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index f11f4471a9d..4bfdf94b913 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -36,7 +36,7 @@ %li = link_to 'Edit', edit_label_path(label) %li - = link_to 'Delete', destroy_label_path(label), title: 'Delete', method: :delete, remote: true, data: {confirm: 'Remove this label? Are you sure?'} + = link_to 'Delete', destroy_label_path(label), title: 'Delete', method: :delete, data: {confirm: 'Remove this label? Are you sure?'} .pull-right.hidden-xs.hidden-sm.hidden-md = link_to_label(label, subject: subject, type: :merge_request, css_class: 'btn btn-transparent btn-action') do @@ -70,7 +70,7 @@ = link_to edit_label_path(label), title: "Edit", class: 'btn btn-transparent btn-action', data: {toggle: "tooltip"} do %span.sr-only Edit = icon('pencil-square-o') - = link_to destroy_label_path(label), title: "Delete", class: 'btn btn-transparent btn-action remove-row', method: :delete, remote: true, data: {confirm: label_deletion_confirm_text(label), toggle: "tooltip"} do + = link_to destroy_label_path(label), title: "Delete", class: 'btn btn-transparent btn-action remove-row', method: :delete, data: {confirm: label_deletion_confirm_text(label), toggle: "tooltip"} do %span.sr-only Delete = icon('trash-o') diff --git a/app/views/shared/empty_states/_labels.html.haml b/app/views/shared/empty_states/_labels.html.haml new file mode 100644 index 00000000000..ba5c2dae09d --- /dev/null +++ b/app/views/shared/empty_states/_labels.html.haml @@ -0,0 +1,11 @@ +.row.empty-state.labels + .pull-right.col-xs-12.col-sm-6 + .svg-content + = render 'shared/empty_states/icons/labels.svg' + .col-xs-12.col-sm-6 + .text-content + %h4 Labels can be applied to issues and merge requests to categorize them. + %p You can also star label to make it a priority label. + - if can?(current_user, :admin_label, @project) + = link_to 'New label', new_namespace_project_label_path(@project.namespace, @project), class: 'btn btn-new', title: 'New label', id: 'new_label_link' + = link_to 'Generate a default set of labels', generate_namespace_project_labels_path(@project.namespace, @project), method: :post, class: 'btn btn-success btn-inverted', title: 'Generate a default set of labels', id: 'generate_labels_link' diff --git a/app/views/shared/empty_states/_priority_labels.html.haml b/app/views/shared/empty_states/_priority_labels.html.haml new file mode 100644 index 00000000000..bc268301a97 --- /dev/null +++ b/app/views/shared/empty_states/_priority_labels.html.haml @@ -0,0 +1,3 @@ +.text-center + = render 'shared/empty_states/icons/priority_labels.svg' + %p Star labels to start sorting by priority diff --git a/app/views/shared/empty_states/icons/_labels.svg b/app/views/shared/empty_states/icons/_labels.svg new file mode 100644 index 00000000000..dc041a4a78b --- /dev/null +++ b/app/views/shared/empty_states/icons/_labels.svg @@ -0,0 +1 @@ + diff --git a/app/views/shared/empty_states/icons/_priority_labels.svg b/app/views/shared/empty_states/icons/_priority_labels.svg new file mode 100644 index 00000000000..7282c2b215e --- /dev/null +++ b/app/views/shared/empty_states/icons/_priority_labels.svg @@ -0,0 +1 @@ + -- cgit v1.2.1 From 38a97197b7c1baf96a9960e70c60f4b7431082f7 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Mon, 30 Jan 2017 11:43:13 -0600 Subject: Fix disable storing of sensitive information when importing a new repo --- app/views/shared/_import_form.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/shared/_import_form.html.haml b/app/views/shared/_import_form.html.haml index 65a3a6bddab..300022d4ad6 100644 --- a/app/views/shared/_import_form.html.haml +++ b/app/views/shared/_import_form.html.haml @@ -2,7 +2,7 @@ = f.label :import_url, class: 'control-label' do %span Git repository URL .col-sm-10 - = f.text_field :import_url, class: 'form-control', placeholder: 'https://username:password@gitlab.company.com/group/project.git', disabled: true + = f.text_field :import_url, autocomplete: 'off', class: 'form-control', placeholder: 'https://username:password@gitlab.company.com/group/project.git', disabled: true .well.prepend-top-20 %ul -- cgit v1.2.1 From d8b8168623ae780b72723546524cce0aae979556 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Mon, 30 Jan 2017 12:18:52 -0600 Subject: Remove underline style for icon hover --- app/views/projects/merge_requests/widget/_heading.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index cc939ab9441..ecd626872a5 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -2,7 +2,7 @@ .mr-widget-heading - %w[success success_with_warnings skipped canceled failed running pending].each do |status| .ci_widget{ class: "ci-#{status} ci-status-icon-#{status}", style: ("display:none" unless @pipeline.status == status) } - = link_to namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id) do + = link_to namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), class: 'icon-link' do = ci_icon_for_status(status) %span Pipeline -- cgit v1.2.1 From b61b45a7596b3f20aa1a0d264e6ba3c7af844bac Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Mon, 30 Jan 2017 14:01:02 -0600 Subject: Link to pipeline page from commit widget --- app/views/projects/commit/_commit_box.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views') diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index 2b1c4e28ce2..56f2c1529fe 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -64,10 +64,10 @@ - if @commit.status .well-segment.pipeline-info %div{ class: "icon-container ci-status-icon-#{@commit.status}" } - = link_to pipelines_namespace_project_commit_path(@project.namespace, @project, @commit.id) do + = link_to namespace_project_pipeline_path(@project.namespace, @project, @commit.pipelines.last.id) do = ci_icon_for_status(@commit.status) Pipeline - = link_to "##{@commit.pipelines.last.id}", pipelines_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "monospace" + = link_to "##{@commit.pipelines.last.id}", namespace_project_pipeline_path(@project.namespace, @project, @commit.pipelines.last.id), class: "monospace" for = link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace" %span.ci-status-label -- cgit v1.2.1 From 84bcb04099a995292ca26d776f595c4d00959bd4 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Tue, 31 Jan 2017 00:10:10 -0200 Subject: Remove new branch button for confidential issues --- app/views/projects/issues/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 9fa00811af0..11636d7ebc7 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -75,7 +75,7 @@ // This element is filled in using JavaScript. .content-block.content-block-small - = render 'new_branch' + = render 'new_branch' unless @issue.confidential? = render 'award_emoji/awards_block', awardable: @issue, inline: true %section.issuable-discussion -- cgit v1.2.1 From ef20bb2edd932a8e144aded11c83046e77ea79d9 Mon Sep 17 00:00:00 2001 From: dimitrieh Date: Tue, 31 Jan 2017 12:09:37 +0100 Subject: Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles --- app/views/projects/environments/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index 6e0d9456900..51c31a09378 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -33,7 +33,7 @@ %th ID %th Commit %th Build - %th + %th Created %th.hidden-xs = render @deployments -- cgit v1.2.1 From 5d871dccbee115691ef109dfc857123503869a0e Mon Sep 17 00:00:00 2001 From: Ritave Date: Wed, 2 Nov 2016 12:58:59 +0100 Subject: Abillity to promote project labels to group labels Fixes #24021 --- app/views/shared/_label.html.haml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/views') diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index f11f4471a9d..0bee8ddbd90 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -66,6 +66,10 @@ %a.js-subscribe-button{ data: { url: toggle_subscription_group_label_path(label.group, label) } } Group level + - if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_group, label.project.group) + = link_to promote_namespace_project_label_path(label.project.namespace, label.project, label), title: "Promote to Group Label", class: 'btn btn-transparent btn-action', data: {confirm: "Promoting this label will make this label available to all projects inside this group. Existing project labels with the same name will be merged. Are you sure?", toggle: "tooltip"}, method: :post do + %span.sr-only Promote to Group + = icon('level-up') - if can?(current_user, :admin_label, label) = link_to edit_label_path(label), title: "Edit", class: 'btn btn-transparent btn-action', data: {toggle: "tooltip"} do %span.sr-only Edit -- cgit v1.2.1 From 4840c682414aa2e7d57fa6f792405a49709b7dd8 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Tue, 31 Jan 2017 10:40:24 +0000 Subject: Don't capitalize environment name in show page Upate test to match the new behavior --- app/views/projects/environments/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index 6e0d9456900..b23ca109746 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -5,7 +5,7 @@ %div{ class: container_class } .top-area.adjust .col-md-9 - %h3.page-title= @environment.name.capitalize + %h3.page-title= @environment.name .col-md-3 .nav-controls = render 'projects/environments/terminal_button', environment: @environment -- cgit v1.2.1 From 87346bfe6de362b832e27c75f3e9b1def2ef1f11 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Tue, 31 Jan 2017 10:04:29 -0600 Subject: Remove settings cog from within admin scroll tabs; keep links centered --- app/views/layouts/nav/_admin.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml index ac04f57e217..19a947af4ca 100644 --- a/app/views/layouts/nav/_admin.html.haml +++ b/app/views/layouts/nav/_admin.html.haml @@ -1,5 +1,5 @@ += render 'layouts/nav/admin_settings' .scrolling-tabs-container{ class: nav_control_class } - = render 'layouts/nav/admin_settings' .fade-left = icon('angle-left') .fade-right -- cgit v1.2.1 From 2916ea82d9e3bdb69e6eeb9544f494d7269214bd Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 28 Dec 2016 11:53:05 -0500 Subject: Update pipeline and commit URL and text on CI status change --- app/views/projects/merge_requests/widget/_heading.html.haml | 2 +- app/views/projects/merge_requests/widget/_show.html.haml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index 804a4a2473b..0e3af62ebc2 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -10,7 +10,7 @@ = ci_label_for_status(status) for = succeed "." do - = link_to @pipeline.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @pipeline.sha), class: "monospace" + = link_to @pipeline.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @pipeline.sha), class: "monospace js-commit-link" %span.ci-coverage - elsif @merge_request.has_ci? diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml index 38328501ffd..f07e6b3ad54 100644 --- a/app/views/projects/merge_requests/widget/_show.html.haml +++ b/app/views/projects/merge_requests/widget/_show.html.haml @@ -24,6 +24,10 @@ preparing: "{{status}} build", normal: "Build {{status}}" }, + ci_sha: "#{@merge_request.head_pipeline ? @merge_request.head_pipeline.short_sha : ''}", + ci_pipeline: #{@merge_request.head_pipeline.try(:id).to_json}, + commits_path: "#{project_commits_path(@project)}", + pipeline_path: "#{project_pipelines_path(@project)}", pipelines_path: "#{pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}" }; -- cgit v1.2.1 From f799585c41d801bc657f992adf3d4b201af927d2 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Wed, 1 Feb 2017 16:38:52 +0000 Subject: Keep snippet visibility on error When a snippet is submitted, but there's an error, we didn't keep the visibility level. As the default is private, this means that submitting a public snippet that failed would then fall back to being a private snippet. --- app/views/projects/snippets/edit.html.haml | 2 +- app/views/projects/snippets/new.html.haml | 2 +- app/views/shared/snippets/_form.html.haml | 3 +-- app/views/snippets/edit.html.haml | 2 +- app/views/snippets/new.html.haml | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) (limited to 'app/views') diff --git a/app/views/projects/snippets/edit.html.haml b/app/views/projects/snippets/edit.html.haml index 216f70f5605..fb39028529d 100644 --- a/app/views/projects/snippets/edit.html.haml +++ b/app/views/projects/snippets/edit.html.haml @@ -3,4 +3,4 @@ %h3.page-title Edit Snippet %hr -= render "shared/snippets/form", url: namespace_project_snippet_path(@project.namespace, @project, @snippet), visibility_level: @snippet.visibility_level += render "shared/snippets/form", url: namespace_project_snippet_path(@project.namespace, @project, @snippet) diff --git a/app/views/projects/snippets/new.html.haml b/app/views/projects/snippets/new.html.haml index 772a594269c..cfed3a79bc5 100644 --- a/app/views/projects/snippets/new.html.haml +++ b/app/views/projects/snippets/new.html.haml @@ -3,4 +3,4 @@ %h3.page-title New Snippet %hr -= render "shared/snippets/form", url: namespace_project_snippets_path(@project.namespace, @project, @snippet), visibility_level: default_snippet_visibility += render "shared/snippets/form", url: namespace_project_snippets_path(@project.namespace, @project, @snippet) diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml index 0c788032020..2d22782eb36 100644 --- a/app/views/shared/snippets/_form.html.haml +++ b/app/views/shared/snippets/_form.html.haml @@ -11,7 +11,7 @@ .col-sm-10 = f.text_field :title, class: 'form-control', required: true, autofocus: true - = render 'shared/visibility_level', f: f, visibility_level: visibility_level, can_change_visibility_level: true, form_model: @snippet + = render 'shared/visibility_level', f: f, visibility_level: @snippet.visibility_level, can_change_visibility_level: true, form_model: @snippet .file-editor .form-group @@ -34,4 +34,3 @@ = link_to "Cancel", namespace_project_snippets_path(@project.namespace, @project), class: "btn btn-cancel" - else = link_to "Cancel", snippets_path(@project), class: "btn btn-cancel" - diff --git a/app/views/snippets/edit.html.haml b/app/views/snippets/edit.html.haml index 82f44a9a5c3..915bf98eb3e 100644 --- a/app/views/snippets/edit.html.haml +++ b/app/views/snippets/edit.html.haml @@ -2,4 +2,4 @@ %h3.page-title Edit Snippet %hr -= render 'shared/snippets/form', url: snippet_path(@snippet), visibility_level: @snippet.visibility_level += render 'shared/snippets/form', url: snippet_path(@snippet) diff --git a/app/views/snippets/new.html.haml b/app/views/snippets/new.html.haml index 79e2392490d..ca8afb4bb6a 100644 --- a/app/views/snippets/new.html.haml +++ b/app/views/snippets/new.html.haml @@ -2,4 +2,4 @@ %h3.page-title New Snippet %hr -= render "shared/snippets/form", url: snippets_path(@snippet), visibility_level: default_snippet_visibility += render "shared/snippets/form", url: snippets_path(@snippet) -- cgit v1.2.1 From c63194ce6f952173649d7de4038aa96348e90565 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Wed, 1 Feb 2017 18:15:59 +0000 Subject: Check public snippets for spam Apply the same spam checks to public snippets (either personal snippets that are public, or public snippets on public projects) as to issues on public projects. --- app/views/projects/snippets/_actions.html.haml | 5 +++++ app/views/snippets/_actions.html.haml | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'app/views') diff --git a/app/views/projects/snippets/_actions.html.haml b/app/views/projects/snippets/_actions.html.haml index 068a6610350..e2a5107a883 100644 --- a/app/views/projects/snippets/_actions.html.haml +++ b/app/views/projects/snippets/_actions.html.haml @@ -8,6 +8,8 @@ - if can?(current_user, :create_project_snippet, @project) = link_to new_namespace_project_snippet_path(@project.namespace, @project), class: 'btn btn-grouped btn-inverted btn-create', title: "New snippet" do New snippet + - if @snippet.submittable_as_spam? && current_user.admin? + = link_to 'Submit as spam', mark_as_spam_namespace_project_snippet_path(@project.namespace, @project, @snippet), method: :post, class: 'btn btn-grouped btn-spam', title: 'Submit as spam' - if can?(current_user, :create_project_snippet, @project) || can?(current_user, :update_project_snippet, @snippet) .visible-xs-block.dropdown %button.btn.btn-default.btn-block.append-bottom-0.prepend-top-5{ data: { toggle: "dropdown" } } @@ -27,3 +29,6 @@ %li = link_to edit_namespace_project_snippet_path(@project.namespace, @project, @snippet) do Edit + - if @snippet.submittable_as_spam? && current_user.admin? + %li + = link_to 'Submit as spam', mark_as_spam_namespace_project_snippet_path(@project.namespace, @project, @snippet), method: :post diff --git a/app/views/snippets/_actions.html.haml b/app/views/snippets/_actions.html.haml index 95fc7198104..9a9a3ff9220 100644 --- a/app/views/snippets/_actions.html.haml +++ b/app/views/snippets/_actions.html.haml @@ -8,6 +8,8 @@ - if current_user = link_to new_snippet_path, class: "btn btn-grouped btn-inverted btn-create", title: "New snippet" do New snippet + - if @snippet.submittable_as_spam? && current_user.admin? + = link_to 'Submit as spam', mark_as_spam_snippet_path(@snippet), method: :post, class: 'btn btn-grouped btn-spam', title: 'Submit as spam' - if current_user .visible-xs-block.dropdown %button.btn.btn-default.btn-block.append-bottom-0.prepend-top-5{ data: { toggle: "dropdown" } } @@ -26,3 +28,6 @@ %li = link_to edit_snippet_path(@snippet) do Edit + - if @snippet.submittable_as_spam? && current_user.admin? + %li + = link_to 'Submit as spam', mark_as_spam_snippet_path(@snippet), method: :post -- cgit v1.2.1 From b329a4675ab3641e5b0526da40ed4f47d61b53d4 Mon Sep 17 00:00:00 2001 From: Nur Rony Date: Thu, 2 Feb 2017 18:22:32 +0600 Subject: removes old css class from everywhere --- app/views/projects/merge_requests/conflicts/_file_actions.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/merge_requests/conflicts/_file_actions.html.haml b/app/views/projects/merge_requests/conflicts/_file_actions.html.haml index 2595ce74ac0..0839880713f 100644 --- a/app/views/projects/merge_requests/conflicts/_file_actions.html.haml +++ b/app/views/projects/merge_requests/conflicts/_file_actions.html.haml @@ -8,5 +8,5 @@ '@click' => "onClickResolveModeButton(file, 'edit')", type: 'button' } Edit inline - %a.btn.view-file.btn-file-option{ ":href" => "file.blobPath" } + %a.btn.view-file{ ":href" => "file.blobPath" } View file @{{conflictsData.shortCommitSha}} -- cgit v1.2.1 From 161d74f1a6e58dae29ad6ee37b7d70cdb4999cc4 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 2 Feb 2017 09:31:09 +0000 Subject: Fixed group label in issuable sidebar Group label link was pointing to group#issues rather than the projects issues. This fixes that by sending the correct subject to the link_to_label helper method. Closes #27253 --- app/views/shared/issuable/_sidebar.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index ec9bcaf63dd..10fa7901874 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -130,7 +130,7 @@ .value.issuable-show-labels.hide-collapsed{ class: ("has-labels" if selected_labels.any?) } - if selected_labels.any? - selected_labels.each do |label| - = link_to_label(label, type: issuable.to_ability_name) + = link_to_label(label, subject: issuable.project, type: issuable.to_ability_name) - else %span.no-value None .selectbox.hide-collapsed -- cgit v1.2.1 From 48a053f334f289ab5283fed9c000594c16fbd27f Mon Sep 17 00:00:00 2001 From: Bryce Johnson Date: Wed, 1 Feb 2017 15:55:55 -0500 Subject: Only render hr when user can't archive project. --- app/views/projects/edit.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index ec944d4ffb7..4a0ce995165 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -185,8 +185,8 @@ %li Container registry images %li CI variables %li Any encrypted tokens - %hr - if can? current_user, :archive_project, @project + %hr .row.prepend-top-default .col-lg-3 %h4.warning-title.prepend-top-0 -- cgit v1.2.1