From fac3c91728457a4ee57dcf789aac27462e295e43 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Mon, 31 Jul 2017 14:00:52 -0500 Subject: [PATCH 01/94] Add specific code review guidelines --- doc/development/code_review.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/development/code_review.md b/doc/development/code_review.md index e3f37616757..23313446d34 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -9,8 +9,16 @@ There are a few rules to get your merge request accepted: **approved by a [backend maintainer][projects]**. 1. If your merge request includes only frontend changes [^1], it must be **approved by a [frontend maintainer][projects]**. + 1. If your merge request includes UX changes [^1], it must + be **approved by a [UX team member][team]**. + 1. If your merge request includes adding a new JavaScript library [^1], it must be + **approved by a [frontend lead][team]**. 1. If your merge request includes frontend and backend changes [^1], it must be **approved by a [frontend and a backend maintainer][projects]**. + 1. If your merge request includes UX and frontend changes [^1], it must + be **approved by a [UX team member and a frontend maintainer][team]**. + 1. If your merge request includes UX, frontend and backend changes [^1], it must + be **approved by a [UX team member, a frontend and a backend maintainer][team]**. 1. To lower the amount of merge requests maintainers need to review, you can ask or assign any [reviewers][projects] for a first review. 1. If you need some guidance (e.g. it's your first merge request), feel free From c4e7875d2909588e55c21a7cf19e31f60bce200f Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Mon, 31 Jul 2017 15:19:51 -0500 Subject: [PATCH 02/94] Add note about UX paradigm --- doc/development/code_review.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/development/code_review.md b/doc/development/code_review.md index 23313446d34..9fc6759b58a 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -13,6 +13,8 @@ There are a few rules to get your merge request accepted: be **approved by a [UX team member][team]**. 1. If your merge request includes adding a new JavaScript library [^1], it must be **approved by a [frontend lead][team]**. + 1. If your merge request includes adding a new UI/UX paradigm [^1], it must be + **approved by a [UX lead][team]**. 1. If your merge request includes frontend and backend changes [^1], it must be **approved by a [frontend and a backend maintainer][projects]**. 1. If your merge request includes UX and frontend changes [^1], it must From a8c40687748cb5952e4c1bddc8b2c68a43567b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Zaj=C4=85czkowski?= Date: Mon, 4 Sep 2017 17:04:51 +0000 Subject: [PATCH 03/94] Replace "/" with "-" in cache key As a cache zip file with "/" upload seems to fail with 500 Internal Server Error. --- doc/ci/yaml/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index cacfd2ed254..4e925346ff5 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -276,7 +276,7 @@ To enable per-job and per-branch caching: ```yaml cache: - key: "$CI_JOB_NAME/$CI_COMMIT_REF_NAME" + key: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" untracked: true ``` @@ -284,7 +284,7 @@ To enable per-branch and per-stage caching: ```yaml cache: - key: "$CI_JOB_STAGE/$CI_COMMIT_REF_NAME" + key: "$CI_JOB_STAGE-$CI_COMMIT_REF_NAME" untracked: true ``` @@ -293,7 +293,7 @@ If you use **Windows Batch** to run your shell scripts you need to replace ```yaml cache: - key: "%CI_JOB_STAGE%/%CI_COMMIT_REF_NAME%" + key: "%CI_JOB_STAGE%-%CI_COMMIT_REF_NAME%" untracked: true ``` @@ -302,7 +302,7 @@ If you use **Windows PowerShell** to run your shell scripts you need to replace ```yaml cache: - key: "$env:CI_JOB_STAGE/$env:CI_COMMIT_REF_NAME" + key: "$env:CI_JOB_STAGE-$env:CI_COMMIT_REF_NAME" untracked: true ``` From 066ce8976c49b7b445e0207bd4f309cde33f909a Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Wed, 13 Sep 2017 11:08:12 -0500 Subject: [PATCH 04/94] Update line-resolve-all checkmark to be green when all discussions resolved Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37465 Related MRs - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13821 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14042 --- app/assets/stylesheets/pages/notes.scss | 3 ++- app/views/projects/merge_requests/show.html.haml | 5 ++++- .../37465-fix-line-resolve-all-green-checkmark-icon.yml | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index e437bad4912..052c005a2e8 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -778,6 +778,7 @@ ul.notes { background-color: transparent; border: none; outline: 0; + color: $gray-darkest; transition: color $general-hover-transition-duration $general-hover-transition-curve; &.is-disabled { @@ -801,7 +802,7 @@ ul.notes { } svg { - fill: $gray-darkest; + fill: currentColor; height: 16px; width: 16px; } diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index c2d16f7e731..d3742f3e4be 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -62,7 +62,10 @@ ":class" => "{ 'has-next-btn': !loggedOut && resolvedDiscussionCount !== discussionCount }" } %span.line-resolve-btn.is-disabled{ type: "button", ":class" => "{ 'is-active': resolvedDiscussionCount === discussionCount }" } - = render "shared/icons/icon_status_success.svg" + %template{ 'v-if' => 'resolvedDiscussionCount === discussionCount' } + = render 'shared/icons/icon_status_success_solid.svg' + %template{ 'v-else' => '' } + = render 'shared/icons/icon_resolve_discussion.svg' %span.line-resolve-text {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved = render "discussions/new_issue_for_all_discussions", merge_request: @merge_request diff --git a/changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml b/changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml new file mode 100644 index 00000000000..24b1d201409 --- /dev/null +++ b/changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml @@ -0,0 +1,6 @@ +--- +title: Update x/x discussions resolved checkmark icon to be green when all discussions + resolved +merge_request: +author: +type: fixed From 42d2dfad8f8c4c82d40ad5a300ebb8d0ab9d6a7a Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 12 Sep 2017 21:08:58 -0500 Subject: [PATCH 05/94] Fix MR ready to merge buttons/controls at mobile breakpoint Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37259 --- .../components/states/mr_widget_ready_to_merge.js | 6 +++--- app/assets/stylesheets/framework/media_object.scss | 4 ++++ app/assets/stylesheets/pages/merge_requests.scss | 4 ++++ changelogs/unreleased/37259-some-mr-ready-mobile-fixes.yml | 5 +++++ 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/37259-some-mr-ready-mobile-fixes.yml diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js index 65187754009..1fb7150d20e 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js @@ -202,8 +202,8 @@ export default {
-
- +
+