summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adds changelog27778-a11y-sidebarFilipa Lacerda2017-03-011-0/+5
|
* Fix linter errorsFilipa Lacerda2017-03-012-2/+2
|
* Improve a11y in sidebarFilipa Lacerda2017-02-284-20/+20
|
* Merge branch '26348-group-members-rearrange' into 'master' Dmitriy Zaporozhets2017-02-284-8/+7
|\ | | | | | | | | | | | | Move `Group -> Members` to top-level, fix missing sub-nav for Subgroups Closes #28678 See merge request !9589
| * Move `Group -> Members` to top-level, fix missing sub-nav for SubgroupsKushal Pandya2017-02-284-8/+7
| |
* | Merge branch '27934-left-align-logo' into 'master' Dmitriy Zaporozhets2017-02-283-24/+17
|\ \ | | | | | | | | | | | | | | | | | | Left align logo; increase max width of title Closes #27934 See merge request !9588
| * | Left align logo; increase max width of title27934-left-align-logoAnnabel Dunstone Gray2017-02-283-24/+17
| |/
* | Merge branch '28661-ci-tables-buttons' into 'master' Annabel Dunstone Gray2017-02-287-113/+97
|\ \ | | | | | | | | | | | | | | | | | | Fix CI tables action buttons are hidden is smaller screens Closes #28661 See merge request !9578
| * | Remove hidden-xs classes from last columns in environments and pipelines table.28661-ci-tables-buttonsFilipa Lacerda2017-02-287-113/+97
| | | | | | | | | | | | | | | Transform pipelines table css to match structure of pipelines table Make environments table overflow
* | | Merge branch 'patch-14' into 'master' Filipa Lacerda2017-02-281-0/+5
|\ \ \ | | | | | | | | | | | | | | | | Document use of AirBnb js styleguide and eslint. See merge request !9558
| * | | Add newline to end of frontend.md.patch-14Bryce Johnson2017-02-281-1/+1
| | | |
| * | | Document use of AirBnb js styleguide and eslint.Bryce Johnson2017-02-281-0/+5
| | | |
* | | | Merge branch 'issue-tags-layout' into 'master' Annabel Dunstone Gray2017-02-282-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix 'New Tag' layout on Tags page See merge request !9176
| * | | | Fix 'New Tag' layout on Tags pageRobert Marcano2017-02-132-1/+5
| | | | |
* | | | | Merge branch '6073_project_api' into 'master' Sean McGivern2017-02-286-10/+70
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | API project create: Make name or path required Closes #6073 See merge request !9416
| * | | | API project create: Make name or path requiredJarka Kadlecova2017-02-276-10/+70
| | | | |
* | | | | Update CHANGELOG.md for 8.17.126790-no-label-color-todosJames Lopez2017-02-2812-44/+15
| | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'dm-dont-share-projects-with-group-ancestors' into 'master' Dmitriy Zaporozhets2017-02-282-3/+25
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Don't allow a project to be shared with an ancestor of the group it is in Closes #28788 See merge request !9566
| * | | | Don't allow a project to be shared with an ancestor of the group it is inDouwe Maan2017-02-282-3/+25
| | | | |
* | | | | Merge branch '27354-navigation-new-button' into 'master' Dmitriy Zaporozhets2017-02-283-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put back the new project button Closes #27354 See merge request !9426
| * | | | | Put back the new project button27354-navigation-new-buttonAnnabel Dunstone Gray2017-02-223-0/+9
| | | | | |
* | | | | | Merge branch 'dm-nested-group-shared-projects' into 'master' Dmitriy Zaporozhets2017-02-284-5/+91
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix access to projects shared with a nested group Closes #28787 See merge request !9565
| * | | | | | Fix access to projects shared with a nested groupdm-nested-group-shared-projectsDouwe Maan2017-02-284-5/+91
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'dz-rubocop-skip-builds' into 'master' Dmitriy Zaporozhets2017-02-281-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore builds dir when run rubocop check See merge request !9580
| * | | | | | Ignore builds dir when run rubocop checkdz-rubocop-skip-buildsDmitriy Zaporozhets2017-02-281-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch ↵Rémy Coutable2017-02-281-11/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28769-raise-custom-exception-in-all-methods-of-mergeservice-that-want-to-inform-the-user' into 'master' Use exceptions for MergeService error handling Closes #28769 See merge request !9576
| * | | | | | Use exceptions for MergeService error handling28769-raise-custom-exception-in-all-methods-of-mergeservice-that-want-to-inform-the-userSean McGivern2017-02-281-11/+9
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | If any method called by `MergeService#execute` raises a `MergeError`, that error's message will be logged, the model will be updated, and the merge will fail.
* | | | | | Merge branch 'api-empty-return' into 'master' Sean McGivern2017-02-28100-477/+1611
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return 204 on all DELETE endpoints Closes #20429 See merge request !9397
| * | | | | New runner API returns 204api-empty-returnRobert Schilling2017-02-282-2/+5
| | | | | |
| * | | | | Backport new behavior to CI APIRobert Schilling2017-02-282-0/+3
| | | | | |
| * | | | | Backport API to V3Robert Schilling2017-02-2836-28/+1485
| | | | | |
| * | | | | Update documentationRobert Schilling2017-02-2816-306/+5
| | | | | |
| * | | | | Return 204 for delete endpointsRobert Schilling2017-02-2846-142/+114
| | | | | |
* | | | | | Merge branch 'ee-compat-code-review' into 'master' Rémy Coutable2017-02-281-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Clarify when to create EE compatibility MR in code review process See merge request !9575
| * | | | | Clarify when to create EE compatibility MR in code review processAdam Niedzielski2017-02-281-0/+6
|/ / / / /
* | | | | Merge branch 'only-create-unmergeable-todo-once' into 'master' Kamil Trzciński2017-02-285-11/+34
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Only create unmergeable todos once Closes #28555 See merge request !9513
| * | | | Only create unmergeable todos onceonly-create-unmergeable-todo-onceSean McGivern2017-02-245-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we created an unmergeable todo when a merge request: 1. Had merge when pipeline succeeds set. 2. Became unmergeable. However, when merge when pipeline succeeds fails due to unmergeability, the flag isn't actually removed. And a merge request can become unmergeable multiple times, as every time the target branch is updated we need to re-check the mergeable status. This means that if the todo was marked done, and the MR was checked again, a new todo would be created for the same event. Instead of checking this, we should create the todo from the service responsible for merging when the pipeline succeeds. That way the todo is guaranteed to only be created when we care about it.
* | | | | Merge branch 'fix-migration-downtime' into 'master' Rubén Dávila Santos2017-02-281-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix migration without DOWNTIME clause specified See merge request !9571
| * | | | | Fix migration without DOWNTIME clause specifiedRuben Davila2017-02-281-0/+2
|/ / / / /
* | | | | Merge branch 'fix-rubocop' into 'master' cherry-picking-regressions-8.17.0Robert Speicher2017-02-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make RuboCop happy See merge request !9554
| * | | | | Make RuboCop happyfix-rubocopSean McGivern2017-02-271-1/+1
| | | | | |
* | | | | | Merge branch '25920-create-issue-from-failing-build' into 'master' Clement Ho2017-02-274-3/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add button to create issue for failing build Closes #25920 See merge request !9391
| * | | | | | Fix CSS classesAlex Sanford2017-02-274-3/+59
|/ / / / / /
* | | | | | Merge branch '20890-comment-image-inline' into 'master' 28711-cherry-picking-ui-regressions-8-17-0Robert Speicher2017-02-273-14/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inline comment images by removing wrapper #20890 Closes #20890 See merge request !5804
| * | | | | | Fix false positive caused by non-interpolated string useJared Deckard2016-08-131-2/+2
| | | | | | |
| * | | | | | Fix inline comment images by removing wrapper #20890Jared Deckard2016-08-133-12/+5
| | | | | | |
* | | | | | | Merge branch 'fix-webpack-dev-server-proxy' into 'master' Douwe Maan2017-02-271-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken dev environment in master See merge request !9557
| * | | | | | | fix missing @ symbolMike Greiling2017-02-271-1/+1
| | | | | | | |
* | | | | | | | Merge branch '28723-consistent-handling-indexof' into 'master' Clement Ho2017-02-277-9/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep consistent in handling indexOf results Closes #28723 See merge request !9531
| * | | | | | | | Keep consistent in handling indexOf resultsTakuya Noguchi2017-02-257-9/+13
| | | | | | | | |