summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'improve/invite-accept-page' into 'master' Douwe Maan2016-11-302-3/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alert user when logged in user email is not the same as the invitation ## What does this MR do? Add a note to the invitation page when the logged in user email is not the same as the invitation. ## Why was this MR needed? Help users to not accept invitations logged in with a wrong account. ## Screenshots (if relevant) ![1](/uploads/78ac6d3db67c9ed60cf74a20ad240d0b/1.png) ## Relevant issues Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24955 See merge request !7803
| * | | | | | | | | Add a CHANGELOG entryimprove/invite-accept-pageDouglas Barbosa Alexandre2016-11-291-0/+4
| | | | | | | | | |
| * | | | | | | | | Alert user when logged in user email is not the same as the invitationDouglas Barbosa Alexandre2016-11-291-3/+10
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ee-1137-follow-up-protected-branch-users-and-groups' into ↵Douwe Maan2016-11-304-16/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE-specific changes for gitlab-org/gitlab-ee#1137 ## What does this MR do? - gitlab-org/gitlab-ee#1137 is a `technical debt` issue to clean up the EE protected branch access levels (for users and groups) implementation. - Some of this cleanup bleeds over to code shared by CE and EE, which is why this MR is required. - An EE-specific MR has also been created: gitlab-org/gitlab-ee!927 See merge request !7821
| * | | | | | | | | | CE-specific changes gitlab-org/gitlab-ee#1137ee-1137-follow-up-protected-branch-users-and-groupsTimothy Andrew2016-11-294-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Extract all common {push,merge} access level model code into the `ProtectedBranchAccess` module - Use the HTTP verb to define controller specs
* | | | | | | | | | | Merge branch '24999-fix-project-avatar-alignment' into 'master' Annabel Dunstone Gray2016-11-302-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the width of project avatars in order to adjust alignment within their container element ## What does this MR do? Adjusts the width of project avatars in order to fix their alignment within the container elements. ## Are there points in the code the reviewer needs to double check? To make sure there are no unintentional styles changes on unrelated elements. ## Why was this MR needed? To fix the issue seen below. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-11-26_at_3.55.58_PM](/uploads/c0012ee7bb5f9e83af41190f71f030fa/Screen_Shot_2016-11-26_at_3.55.58_PM.png) After: ![Screen_Shot_2016-11-26_at_3.56.17_PM](/uploads/c1236216382e6baa094570c17565e8cf/Screen_Shot_2016-11-26_at_3.56.17_PM.png) Affected pages: ![Screen_Shot_2016-11-26_at_4.12.38_PM](/uploads/8db6d86a5998843e7b7a755fb4000add/Screen_Shot_2016-11-26_at_4.12.38_PM.png) ## What are the relevant issue numbers? Closes #24999 See merge request !7772
| * | | | | | | | | | | Fix the width of project avatars in order to adjust alignment within their ↵Ryan Harris2016-11-262-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | container element
* | | | | | | | | | | | Merge branch '25002-sentence-case-dashboard-tabs' into 'master' Annabel Dunstone Gray2016-11-303-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes project dashboard tabs to sentence casing Changes the nav tab titles on the project dashboard page (```https://gitlab.com/dashboard/projects```) from title casing to sentence casing. Before: ![Screen_Shot_2016-11-26_at_11.17.23_PM](/uploads/a31c951cf83f7670acee778db9337be5/Screen_Shot_2016-11-26_at_11.17.23_PM.png) After: ![Screen_Shot_2016-11-26_at_11.17.39_PM](/uploads/a0cb5f6b6771e6f5149750ea1e7beb02/Screen_Shot_2016-11-26_at_11.17.39_PM.png) Closes #25002 See merge request !7774
| * | | | | | | | | | | Edit /spec/features/profiles/preferences_spec.rb to match changes in 084d90acRyan Harris2016-11-291-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Changes project dashboard tabs to sentence casingRyan Harris2016-11-262-3/+7
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'add-sub-nav-active-color' into 'master' Annabel Dunstone Gray2016-11-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add blue back to sub nav active ## What does this MR do? Adds blue color back active sub nav tab ## Screenshots (if relevant) ![Screen_Shot_2016-11-29_at_10.00.55_AM](/uploads/b968fce60d8e25e7f0769f6fb045291c/Screen_Shot_2016-11-29_at_10.00.55_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/24149 See merge request !7829
| * | | | | | | | | | | Add blue back to sub nav activetauriedavis2016-11-291-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '25011-hoverstates-for-collapsed-issue-merge-request-sidebar' ↵Fatih Acet2016-11-292-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Adds hoverstates for collapsed Issue/Merge Request sidebar This MR is part 1/2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/25011 ## What does this MR do? Adds hoverstates for collapsed Issue/Merge Request sidebar ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? We needed hover states on the issue/merge request sidebar ## Screenshots (if relevant) ![2016-11-27_23.39.28](/uploads/adb83f5fa291cc8f89f1a7d7e2577546/2016-11-27_23.39.28.gif)![2016-11-27_23.39.13](/uploads/7018e4272da26cb06efb7c6fe4eae413/2016-11-27_23.39.13.gif) ![2016-11-29_16.05.11](/uploads/fcf9a674aa24cf0e7349a7e439b024fe/2016-11-29_16.05.11.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25011 See merge request !7777
| * | | | | | | | | | | | Adds hoverstates for collapsed Issue/Merge Request sidebar25011-hoverstates-for-collapsed-issue-merge-request-sidebarDimitrie Hoekstra2016-11-292-5/+15
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch ↵24834-timeago-not-working-properly-on-dynamically-loading-diff-discussionsAlfredo Sumaran2016-11-292-11/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24135-new-project-should-be-below-new-group-on-the-welcome-screen' into 'master' New project should be below new group on the welcome screen ## What does this MR do? Places the group `.blank-slate` above the project's. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-11-26_at_13.52.33](/uploads/a6e28dc54ebfc42f0cff5b46558f4ff0/Screen_Shot_2016-11-26_at_13.52.33.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24135 See merge request !7770
| * | | | | | | | | | | | Moved groups above projects24135-new-project-should-be-below-new-group-on-the-welcome-screenLuke "Jared" Bennett2016-11-292-11/+16
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'remove-jsx-react-eslint-plugins' into 'master' Fatih Acet2016-11-2912-36/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove JSX/React eslint plugins. ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7470
| * | | | | | | | | | | | Remove JSX/React eslint plugins.remove-jsx-react-eslint-pluginsLuke "Jared" Bennett2016-11-2912-36/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change airbnb eslint config package to `eslint-config-airbnb-base` and update plugins. Change `airbnb` to `airbnb-base` for .eslintrc `extends` value. Added changelog entry Made sure all plugins and envs are set Corrected new failing specs
* | | | | | | | | | | | | Merge branch 'feature/expose-timestimes-in-build-entity' into 'master' Grzegorz Bizon2016-11-292-9/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose timestamps in build entity ## What does this MR do? This MR exposes timestamps for build entity that is being used by serializers in `app/serializers`. ## Does this MR meet the acceptance criteria? - Tests - [x] Added for this feature/bug - [ ] All builds are passing ## What are the relevant issue numbers? See https://gitlab.com/gitlab-org/gitlab-ce/issues/24844#note_19145053 See merge request !7818
| * | | | | | | | | | | | | Expose timestamp in build entity used by serializerfeature/expose-timestimes-in-build-entityGrzegorz Bizon2016-11-292-9/+19
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '25055-pipelines-info-missing-from-mr-widget' into 'master' Annabel Dunstone Gray2016-11-292-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipelines info being hidden in merge request widget ## What does this MR do? Reintroduces CSS classes that are necessary for `MergeRequestWidget` to show correct divs. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - ~~[ ] Added for this feature/bug~~ - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25055 See merge request !7808
| * | | | | | | | | | | | Fix pipelines info being hidden in merge request widget25055-pipelines-info-missing-from-mr-widgetAdam Niedzielski2016-11-292-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do need these "ci-#{status}" classes because we use them in MergeRequestWidget to show correct divs.
* | | | | | | | | | | | | Merge branch 'removing_unnecessary_indexes' into 'master' Yorick Peterse2016-11-293-9/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary database indices See merge request !7789
| * | | | | | | | | | | | Remove unnecessary database indexesValery Sizov2016-11-293-9/+37
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'readme-link-fix' into 'master' Rémy Coutable2016-11-292-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken README.md UX guide link. See merge request !7805
| * | | | | | | | | | | Fix broken README.md UX guide link.Dan Dedrick2016-11-282-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace broken link to UX guide with new working link in the README.md file.
* | | | | | | | | | | | Merge branch 'fix/blob-controller-spec' into 'master' Sean McGivern2016-11-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix blob controller spec failure See merge request !7814
| * | | | | | | | | | | | fix blob controller spec failure - updated not to use file-path-fix/blob-controller-specJames Lopez2016-11-292-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix blob controller spec failureJames Lopez2016-11-291-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'docs/fix-bitbucket-integration-typos' into 'master' Achilleas Pipinellis2016-11-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in Bitbucket integration docs [ci skip] See merge request !7823
| * | | | | | | | | | | | | Fixing typo & Clarifying Key nameLee Matos2016-11-291-2/+2
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '24880-configurable-plaintext-emails' into 'master' Sean McGivern2016-11-298-2/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add setting to enable/disable HTML emails Closes #24880 See merge request !7749
| * | | | | | | | | | | | | Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emailsRuben Davila2016-11-288-2/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new global setting will allow admins to specify if HTML emails should be sent or not, this is basically useful when system administrators want to save some disk space by avoiding emails in HTML format and using only the Plain Text version.
* | | | | | | | | | | | | | Merge branch 'zj-issue-search-slash-command' into 'master' Kamil Trzciński2016-11-297-9/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add issue search slash command See merge request !7752
| * | | | | | | | | | | | | | Add issue search slash commandzj-issue-search-slash-commandZ.J. van de Weg2016-11-257-9/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of many requested in: gitlab-org/gitlab-ce#24768
* | | | | | | | | | | | | | | Merge branch '24150-consistent-dropdown-styles' into 'master' Annabel Dunstone Gray2016-11-2916-60/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Homogenize sort and filter dropdown toggles ## What does this MR do? Homogenizes the style of *filter* and *sort* dropdown toggles (aka buttons) related to: - *issues* (index, new & edit views) - *issue boards* (index); - *merge requests* (index, new, edit); - *projects* (index and "explore"); - *projects admin* (index); - *groups* (show and "explore"); - *groups admin* (index); - *users admin* (index); - *todos* (index); - *branches* (index); - *commits* (index); - *cycle analytics*; - *network*; - *forks*; - *tags* (index); - *global search* Some other dropdowns are incidently concerned: - project admin (show); - assigne/due date/milestone/label dropdowns on the issue and board sidebars; - stage dropdown on the build sidebar; - merge request and comparison dropdowns for choosing forks and branches; - ref switcher (e.g. in the blob (show) view or in the graphs view); Dropdown toggles concerned by #24150 but not covered in this MR: - Dropdowns for selection MR versions to be compared (in the "Changes" tab of an MR); - Dropdowns that bring up a list of actions: - "Settings" dropdowns (such as the one found on the upper-right corner of all project pages); - The download/action/notifications buttons on the main project page; - Dropdowns located inside of list items (on list of pipelines, users and groups, for instance); - The "Options" button on the commit (show) view; - The "+" button on the tree explorer (for creating files, branches, tags, ...) ### TODO - [ ] Update ui.html if needed ## Are there points in the code the reviewer needs to double check? Am I changing any other dropdown toggle than listed above? ## Why was this MR needed? For #24150 ## Screenshots (if relevant) ### Issue Index **Before:** ![issue-index-before](/uploads/1aa358b0b9e79fd3a7467b57cd2b03ec/issue-index-before.png) **After:** ![issue-index-after](/uploads/7a4159e8927d456ed3f4390072174e49/issue-index-after.png) ### Issue New **Before:** ![issue-new-before](/uploads/fcfb9c39d2ff8f00827f52d60db5c114/issue-new-before.png) **After:** ![issue-new-after](/uploads/a0b151d257d8f3e8f98a2873427362ee/issue-new-after.png) ### Merge Request Branch Selector **Before:** ![merge-request-new-before](/uploads/8dd7b6e8ea38af7aced743386bfb83ca/merge-request-new-before.png) **After:** ![merge-request-new-after](/uploads/38ad8f5a315344b3bab7e936a84acf7e/merge-request-new-after.png) ### Global Search ![global-search-after](/uploads/f2912b7d91fd286028cb9481d2d53a82/global-search-after.png) ### Cycle Analytics ![cycle-analytics-after](/uploads/248d5ca360bb510aa0f0bfa8a1a00aae/cycle-analytics-after.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~API support added~~ - Tests - ~~Added for this feature/bug~~ - [ ] All builds are passing - ~~Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)~~ - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #24150 See merge request !7583
| * | | | | | | | | | | | | | dropdowns.scss: Fix style issues after reviewDavid Wagner2016-11-281-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Wagner <david@marvid.fr>
| * | | | | | | | | | | | | | Update some more sort/filter dropdownsDavid Wagner2016-11-288-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apart from Issues and Merge Requests pages, there are other sort/filter dropdowns that needed updating. Signed-off-by: David Wagner <david@marvid.fr>
| * | | | | | | | | | | | | | Update the ChangelogDavid Wagner2016-11-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: David Wagner <david@marvid.fr>
| * | | | | | | | | | | | | | Make open and hovered dropdown toggles look the sameDavid Wagner2016-11-281-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The chevron now has the same darker shade when the dropdown is opened it had when hovered on. Signed-off-by: David Wagner <david@marvid.fr>
| * | | | | | | | | | | | | | Homogenize dropdowns on Issue pageDavid Wagner2016-11-287-43/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sort and filter dropdowns look the same and tweak their icon and colors according to #24150. Signed-off-by: David Wagner <david@marvid.fr>
* | | | | | | | | | | | | | | Merge branch 'hide-project-variables' into 'master' Fatih Acet2016-11-296-2/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide project variables values by default Add a button to reveal/hide the values to help prevent accidental disclosure of sensitive information from wandering on a page. ![hide-vars](/uploads/5b5eeef9b4650776b529b780998bbb1b/hide-vars.gif) Closes #21358 See merge request !7731
| * | | | | | | | | | | | | | | Enable ESLint and fix minor code style stuff in project_variables.js.es6.hide-project-variablesFatih Acet2016-11-291-21/+20
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add spec for hiding variables and remove the need for ES6 SymbolStan Hu2016-11-242-3/+28
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Hide project variables values by defaultStan Hu2016-11-245-2/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a button to reveal/hide the values to help prevent accidental disclosure of sensitive information from wandering on a page. Closes #21358
* | | | | | | | | | | | | | | | Merge branch 'refactor-issuable-description-and-metadata' into 'master' Robert Speicher2016-11-294-74/+138
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor issuable description and metadata form sections Continuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/23864. Brother of gitlab-org/gitlab-ee!916. See merge request !7758
| * | | | | | | | | | | | | | | | Refactor issuable description and metadata form sectionsrefactor-issuable-description-and-metadataRémy Coutable2016-11-254-74/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | Merge branch 'hoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emails' ↵Douwe Maan2016-11-2916-35/+154
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add diff hunks to notification emails Add diff hunks to notification emails. Continued from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5855 - thanks @hoopes! This also fixes an issue where the + / - prefixes were missing from diffs in emails. Screenshots (from my browser) of the HTML emails, along with text screenshots :stuck_out_tongue: ![image](/uploads/cb31400becf5149d40c8bb98a655aa93/image.png) ``` New comment for Merge Request !1 on app/views/admin/builds/index.html.haml: http://localhost:3000/gitlab-org/gitlab-ce/merge_requests/1#note_1023 > Finished This is a comment at the top of a match section. ``` ![image](/uploads/704dd3845797530697a27f5c1953c053/image.png) ``` New comment for Merge Request !1 on app/views/admin/builds/index.html.haml: http://localhost:3000/gitlab-org/gitlab-ce/merge_requests/1#note_1022 > Finished > %span.badge.js-running-count= @all_builds.finished.count(:id) > > - %li{class: ('active' if @scope == 'all')} > - = link_to admin_builds_path(scope: :all) do > - All > - %span.badge.js-totalbuilds-count= @all_builds.count(:id) > - > .gray-content-block > #{(@scope || 'running').capitalize} builds > This is a comment at the bottom of a match section. ``` ![image](/uploads/4063f3d9738aea8ebf3c0e690d0eddee/image.png) ``` New comment for Merge Request !1 on app/views/admin/builds/index.html.haml: http://localhost:3000/gitlab-org/gitlab-ce/merge_requests/1#note_1024 > = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post > > %ul.center-top-menu > - %li{class: ('active' if @scope.nil?)} > + %li{class: ('active' if @scope == 'all')} > = link_to admin_builds_path do > + All This is a comment with some deleted and added lines above it. ``` Closes #21027, closes #24340. See merge request !7660
| * | | | | | | | | | | | | | | | | Use assigned variables betterhoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emailsSean McGivern2016-11-283-6/+4
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix spec styleSean McGivern2016-11-282-10/+5
| | | | | | | | | | | | | | | | | |