summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow sorting groups in APIsort-api-groupsSean McGivern2016-11-174-3/+51
| | | | | | Allow `order_by` and `sort` parameters to `/api/v3/groups.json`. At present, only ordering by name and path is supported, and the default sort is name ascending (alphabetical order).
* Merge branch 'docs/refactor-environments' into 'master' Achilleas Pipinellis2016-11-1716-56/+491
|\ | | | | | | | | | | | | | | | | | | | | | | | | Refactor environments documentation ## What does this MR do? Refactor environments docs. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/23484 See merge request !7107
| * Add stop environment permissions and remove deleteAchilleas Pipinellis2016-11-171-1/+1
| | | | | | | | [ci skip]
| * Add note about auto-stopping of environmentsAchilleas Pipinellis2016-11-172-5/+19
| |
| * Finish "Stopping envs" and "Grouping similar envs" sectionsAchilleas Pipinellis2016-11-172-27/+56
| | | | | | | | [ci skip]
| * Finish dynamic environments and URLs sectionsdocs/refactor-environmentsAchilleas Pipinellis2016-11-175-4/+156
| | | | | | | | [ci skip]
| * Move name rules under environment:name in yaml readmeAchilleas Pipinellis2016-11-171-16/+17
| |
| * Finish most of environmentsAchilleas Pipinellis2016-11-176-52/+132
| | | | | | | | [ci skip]
| * Change deployments view imageAchilleas Pipinellis2016-11-161-0/+0
| | | | | | | | [ci skip]
| * Add section on defining environmentsAchilleas Pipinellis2016-11-162-52/+114
| | | | | | | | [ci skip]
| * Move paragraph to overviewAchilleas Pipinellis2016-11-161-6/+7
| |
| * Begin writing Overview sectionAchilleas Pipinellis2016-11-162-89/+30
| |
| * WIP refactor environmentsAchilleas Pipinellis2016-11-165-35/+190
| |
* | Update CHANGELOG.md for 8.13.6Rémy Coutable2016-11-179-33/+11
| | | | | | [ci skip]
* | Merge branch 'feature/environment-teardown-when-branch-deleted' into 'master' Kamil Trzciński2016-11-1715-34/+431
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop environment when branch is deleted ## What does this MR do? This MR adds a environment teardown service, that is called when user deletes a branch. This most often happens when merge requests is merged. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Closes #23218 See merge request !7355
| * | Remove unnecessary check from environments servicefeature/environment-teardown-when-branch-deletedGrzegorz Bizon2016-11-161-5/+0
| | |
| * | Add comment related to workaround used in specsGrzegorz Bizon2016-11-161-0/+3
| | |
| * | Add Changelog entry for auto-close environmentsGrzegorz Bizon2016-11-161-0/+4
| | |
| * | Remove redundant call to after branch delete serviceGrzegorz Bizon2016-11-163-22/+16
| | |
| * | Add specs for environments recently updated on branchGrzegorz Bizon2016-11-163-1/+64
| | |
| * | Refactor methods for environments in project modelGrzegorz Bizon2016-11-163-7/+15
| | |
| * | Improve readability in project model for environmentsGrzegorz Bizon2016-11-161-2/+2
| | |
| * | Select recently updated environments for auto-closeGrzegorz Bizon2016-11-152-2/+6
| | |
| * | Add test example for after branch delete serviceGrzegorz Bizon2016-11-151-0/+15
| | |
| * | Test call to after branch delete hooks in serviceGrzegorz Bizon2016-11-151-0/+12
| | |
| * | Extend tests for delete branch serviceGrzegorz Bizon2016-11-151-2/+15
| | |
| * | Add minimial test coverage for delete branch serviceGrzegorz Bizon2016-11-151-0/+28
| | |
| * | Add feature tests for environments auto-closeGrzegorz Bizon2016-11-152-4/+39
| | |
| * | Make it possible to fabricate environment on branchGrzegorz Bizon2016-11-142-6/+20
| | |
| * | Improve name of service that stops CI environmentsGrzegorz Bizon2016-11-143-3/+3
| | |
| * | Check permissions before stopping CI environmentsGrzegorz Bizon2016-11-142-23/+50
| | |
| * | Add service that runs after branch removed hooksGrzegorz Bizon2016-11-113-6/+45
| | |
| * | Do not call environments service in repository modelGrzegorz Bizon2016-11-114-27/+5
| | |
| * | Stop environments for branch after branch removalGrzegorz Bizon2016-11-096-9/+29
| | |
| * | Make commit an optional arg for environments searchGrzegorz Bizon2016-11-094-31/+42
| | |
| * | Extend tests for service that stops environmentGrzegorz Bizon2016-11-091-1/+49
| | |
| * | Fix environment feature specs after changes in factoryGrzegorz Bizon2016-11-091-1/+3
| | |
| * | Add environment factory review app traitGrzegorz Bizon2016-11-094-22/+38
| | |
| * | Add environment teardown serviceGrzegorz Bizon2016-11-083-0/+68
| | |
* | | Merge branch 'patch-9' into 'master' Dmitriy Zaporozhets2016-11-171-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CONTRIBUTING.md - Adding info about issues within a milestone ## What does this MR do? Adds copy regarding issues within the current milestone to the contribution guide. ## 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) cc @dzaporozhets @awhildy See merge request !7516
| * | | Update CONTRIBUTING.md - Adding info about issues within a milestoneTaurie Davis2016-11-161-1/+4
| | | |
* | | | Merge branch 'revert-0a3cafb2' into 'master' Douwe Maan2016-11-174-21/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master'" There were some issues with the initial implementation: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6796#note_18557076 This reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6796 See merge request !7521
| * | | | Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' ↵revert-0a3cafb2Douwe Maan2016-11-174-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | | into 'master'" This reverts merge request !6796
* | | | | Merge branch 'docs/markdown' into 'master' Achilleas Pipinellis2016-11-171-103/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove ToC and fix headings in Markdown docs See merge request !7523
| * | | | | Remove ToC and fix headings in Markdown docsdocs/markdownAchilleas Pipinellis2016-11-171-103/+53
| | |_|_|/ | |/| | | | | | | | | | | | | [ci skip]
* | | | | Merge branch '24010-Add-named-anchors-for-diffs-in-the-commit-page' into ↵Sean McGivern2016-11-179-25/+37
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Adds hash anchors to diff_files to make possible linking exact file in commit Closes #24010 See merge request !7298
| * | | | Unify anchor link format for MR diff files !7298Yar2016-11-157-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path. Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage. Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format. Inspired by #24010 and !7298
| * | | | Fix double event and xhr request call on MR page !7298Yar2016-11-152-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | On page merge_requests/n/diffs and merge_requests/n/commits 'shown.bs.tab' event triggers twice when tab is loading which lead to extra ajax request for data each time. This commit prevent this event from triggering twice when tab is loading.
* | | | | Merge branch '24107-slack-comment-link' into 'master' Rémy Coutable2016-11-173-14/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the slack notification comment link. ## What does this MR do? Changes the link in Slack notifications for comments. ## What are the relevant issue numbers? Closes #24107 See merge request !7498
| * | | | | Change the slack notification comment link.Herbert Kagumba2016-11-163-14/+18
| | | | | |
View Lorry Controller Status