summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add support for nested groups to admin routingdz-fix-admin-routesDmitriy Zaporozhets2016-12-1113-27/+48
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch '25324-change-housekeeping-btn-to-default' into 'master' Alfredo Sumaran2016-12-092-1/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Use default btn styling for Housekeeping button on projects settings page Changes the Housekeeping button styling on the project settings page from ```btn-save``` to ```btn-default``` **BEFORE:** ![Screen_Shot_2016-12-06_at_12_51_42_PM](/uploads/1b1c8a26eead025062e2c98d9d0f4286/Screen_Shot_2016-12-06_at_12_51_42_PM.png) **AFTER:** ![Screen_Shot_2016-12-06_at_12_51_57_PM](/uploads/9e7937af4a058fa1aa8b45653dbad3ee/Screen_Shot_2016-12-06_at_12_51_57_PM.png) Closes #25324 cc: @awhildy See merge request !7959
| * Use default btn styling for Housekeeping button on projects settings pageRyan Harris2016-12-062-1/+5
| |
* | Merge branch 'issue_24020' into 'master' Alfredo Sumaran2016-12-093-1/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix display hook error message ## What does this MR do? Fix hook error message display. ## Are there points in the code the reviewer needs to double check? Probably Hook will return the plain multi line text. It is better `pre` tag than `h4`. I thought of another good looking display, but I did not come up with it. :sweat: ## Why was this MR needed? When the hook returns an STDERR, "Merge in progress" button spinning forever. Due to javascript's error. ## Screenshots (if relevant) When update hook returns an error like ``` XXXXXXXX YYYYYYYY ZZZZZZZZ ``` ![screen_shot](/uploads/8dac77972a309dfcb72c741dffbd7270/screen_shot.png) ## What are the relevant issue numbers? Closes #24020 See merge request !7775
| * | fix display hook error messagebasyura2016-12-053-1/+17
| | |
* | | Merge branch 'remove-your_email-gsub-in-help-page' into 'master' Sean McGivern2016-12-092-11/+1
|\ \ \ | | | | | | | | | | | | | | | | Stop replacing `$your_email` with the user's email in the `/help` pages See merge request !8014
| * | | Stop replacing `$your_email` with the user's emailremove-your_email-gsub-in-help-pageRémy Coutable2016-12-092-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | The `$your_email` was removed from the SSH doc. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '23305-leave-project-and-leave-group-should-be-buttons' into ↵Jacob Schatz2016-12-0911-42/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove 'Leave Project' and 'Leave Group' from settings dropdowns ## What does this MR do? Removes `Leave Project` and `Leave Group` from the settings dropdown. Adds it to the `views/shared/members/access_request_buttons.html.haml`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-11-19_at_15.34.26](/uploads/5c66a025513b4780a9e881f0036381e4/Screen_Shot_2016-11-19_at_15.34.26.png) ![Screen_Shot_2016-11-19_at_15.35.29](/uploads/ed74a5dfe982cf65bb49c0c4fb307061/Screen_Shot_2016-11-19_at_15.35.29.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 #23305 See merge request !7600
| * | | | Removed leave buttons from settings dropdowns23305-leave-project-and-leave-group-should-be-buttonsLuke "Jared" Bennett2016-11-2611-42/+36
| | | | | | | | | | | | | | | | | | | | Updated specs
* | | | | Merge branch 'workhorse-1.1.1' into 'master' Rémy Coutable2016-12-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhose 1.1.1 Change CI API rate limiting behavior. Will make a separate MR for 8-14-stable because that version lacks the workhorse install rake task. See merge request !7990
| * | | | | Use gitlab-workhose 1.1.1Jacob Vosmaer2016-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Confines API rate limiting feature to builds/register.json CI requests only.
* | | | | | Merge branch 'update-button-font-weight' into 'master' Fatih Acet2016-12-092-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the font weight of button styles because of the change to system fonts ## What does this MR do? Updates the font weight of button styles because of the change to system fonts ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? Because of the change to system fonts the font weight for buttons needed to be toned down a bit. Seems only buttons styles were affected. ## Screenshots (if relevant) left = result ![image](/uploads/c75868dca76561cafd559fb721be0601/image.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? cc: @cperessini See merge request !8012
| * | | | | | Updates the font weight of button styles because of the change to system fontsupdate-button-font-weightDimitrie Hoekstra2016-12-092-1/+5
| | | | | | |
* | | | | | | Merge branch 'members-dropdowns' into 'master' Fatih Acet2016-12-0913-20/+131
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated members dropdowns ## What does this MR do? EE has different dropdowns to allow for group LDAP members to be overridden, this ports the dropdown changes over to reduce conflicts. ## Screenshots (if relevant) ![Screen_Shot_2016-12-07_at_15.28.20](/uploads/6cb6def34015b024dc878aa3b99be4a0/Screen_Shot_2016-12-07_at_15.28.20.png) See merge request !7974
| * | | | | | | Group links spec updatePhil Hughes2016-12-092-3/+8
| | | | | | | |
| * | | | | | | Updated JS based on reviewPhil Hughes2016-12-093-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed group links dropdown to match
| * | | | | | | Updated members dropdownsPhil Hughes2016-12-0710-15/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ports some code over from EE to reduce conflicts
* | | | | | | | Merge branch 'followup-7899' into 'master' Sean McGivern2016-12-091-6/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a single query in Projects::ProjectMembersController to fetch members See merge request !7997
| * | | | | | | | Use a single query in Projects::ProjectMembersController to fetch membersfollowup-7899Rémy Coutable2016-12-081-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'update/installation-from-source-guide-8-15' into 'master' Alejandro Rodríguez2016-12-092-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update "Installation from source" guide for 8.15.0 Following the steps from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1. See merge request !8015
| * | | | | | | | | [ci skip] Update "Installation from source" guide for 8.15.0update/installation-from-source-guide-8-15Douglas Barbosa Alexandre2016-12-092-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch '25374-svg-as-prop' into 'master' Fatih Acet2016-12-0915-106/+135
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Provide SVG as a prop instead of hiding and copy them in environments table" ## What does this MR do? - Provides SVG as a prop instead of manually manipulate the DOM to show it - Uniforms all props names in environments related components, 3 formats were being used and it was error prone - Adds tests for the new SVG props. ## Why was this MR needed? Technical debt. ## 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 - [x] 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? Closes #25374 See merge request !7992
| * | | | | | | | Changes after review25374-svg-as-propFilipa Lacerda2016-12-092-4/+4
| | | | | | | | |
| * | | | | | | | Fix broken testFilipa Lacerda2016-12-091-2/+2
| | | | | | | | |
| * | | | | | | | Adds CHANGELOG entryFilipa Lacerda2016-12-091-0/+4
| | | | | | | | |
| * | | | | | | | Adds testsFilipa Lacerda2016-12-096-25/+62
| | | | | | | | |
| * | | | | | | | Uniformize props name formatFilipa Lacerda2016-12-098-33/+34
| | | | | | | | |
| * | | | | | | | Replace commit icon svg logicFilipa Lacerda2016-12-092-20/+8
| | | | | | | | |
| * | | | | | | | Replace play icon svg logicFilipa Lacerda2016-12-094-29/+28
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/milestone-summary' into 'master' Sean McGivern2016-12-092-2/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Displays milestone remaining days only when it's present See merge request !7998
| * | | | | | | | | Add CHANGELOG entryfix/milestone-summaryDouglas Barbosa Alexandre2016-12-081-0/+4
| | | | | | | | | |
| * | | | | | | | | Displays milestone remaining days only when it's presentDouglas Barbosa Alexandre2016-12-081-2/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'do-not-refresh-main-when-fork-target-branch-updated' into ↵Sean McGivern2016-12-094-14/+32
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Do not reload diff for merge request made from fork when target branch in fork is updated Closes #25263 See merge request !7973
| * | | | | | | | | | Do not reload diff for merge request made from fork when target branch in ↵do-not-refresh-main-when-fork-target-branch-updatedAdam Niedzielski2016-12-094-14/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fork is updated The target branch of a merge request has to be a branch in the project for which the merge request is submitted. When a branch changes in a fork, it does not make sense to reload diffs of merge requests in the upstream project that use the same branch name as the target branch. Please note that it does make sense to reload diffs when the source branch changes.
* | | | | | | | | | | Merge branch 'api-remove-source-branch' into 'master' Rémy Coutable2016-12-094-26/+47
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Ability to remove source branch Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23577 See merge request !7804
| * | | | | | | | | | | API: Ability to remove source branchapi-remove-source-branchRobert Schilling2016-12-044-26/+47
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '25272_fix_comments_tab_disappearing' into 'master' Sean McGivern2016-12-094-1/+49
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comments tab disappearing Fixes #25272 See merge request !7913
| * | | | | | | | | | | | remove unnecessary issues event filter on comments tabRydkin Maxim2016-12-084-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix features_visibility_spec.rb remove strange part of spec fix conditions of comments tab disappearing and fix spec generate changelog rewrite spec for more coplex check step-by-step move conditional logic into helper and fix changelog fix indentation in helper
* | | | | | | | | | | | | Merge branch 'render-svg-in-diffs-and-notes' into 'master' Sean McGivern2016-12-092-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render SVG images in notes Closes #24937 See merge request !7747
| * | | | | | | | | | | | | Render SVG as images in notesAndre Guedes2016-12-082-1/+5
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'issue_25152_docs' into 'master' Achilleas Pipinellis2016-12-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update JIRA troubleshoot documentation closes #25152 See merge request !7977
| * | | | | | | | | | | | | Update JIRA troubleshoot documentationissue_25152_docsFelipe Artur2016-12-081-0/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '22152-improve-setup-ssh-documentation' into 'master' Achilleas Pipinellis2016-12-091-80/+117
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements to setting up SSH documentation ## What does this MR do? Improves the documentation article on setting up SSH. * Added introduction * Added additional explanations * Added sub headings * Moved sections around * Added section about generating an SSH key pair on Windows with PuttyGen (will be expanded further in future) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24708 See merge request !6571
| * | | | | | | | | | | | | | Refactor SSH keys docsAchilleas Pipinellis2016-12-091-65/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | Improvements to setting up sshSean Packham2016-12-091-61/+93
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'zj-update-chatops-docs' into 'master' Sean Packham2016-12-092-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs to reflect new defaults on omnibus ## What does this MR do? Updates docs, after gitlab-org/omnibus-gitlab!1154 the flow has changed. See merge request !8006
| * | | | | | | | | | | | | Update docs to reflect new defaults on omnibuszj-update-chatops-docsZ.J. van de Weg2016-12-092-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For mattermost chat commands, new defaults are set in the next release making configuring easier. This commit reflects that in the doc. [ci skip]
* | | | | | | | | | | | | | Add 8.12.10, 8.12.11, and 8.12.12 CHANGELOG.md itemsRémy Coutable2016-12-091-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | Merge branch 'fix-active-nav-badges' into 'master' Fatih Acet2016-12-091-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix active nav badges not inheriting the link color ## What does this MR do? Fix active navigation and tabs badges not inheriting the link color (in this case, black). ## Screenshots (if relevant) ![image](/uploads/ab4e8ea99531106f9ddc4297e10c327b/image.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) See merge request !7950
| * | | | | | | | | | | | | Fix active nav badges not inheriting the link color.fix-active-nav-badgesPedro Moreira da Silva2016-12-061-0/+4
| | | | | | | | | | | | | |