Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update install doc to reflect start of yarn dependencyupdate-yarn-docs | Mike Greiling | 2017-02-28 | 1 | -4/+3 |
| | |||||
* | Merge branch '6073_project_api' into 'master' | Sean McGivern | 2017-02-28 | 6 | -10/+70 |
|\ | | | | | | | | | | | | | API project create: Make name or path required Closes #6073 See merge request !9416 | ||||
| * | API project create: Make name or path required | Jarka Kadlecova | 2017-02-27 | 6 | -10/+70 |
| | | |||||
* | | Update CHANGELOG.md for 8.17.126790-no-label-color-todos | James Lopez | 2017-02-28 | 12 | -44/+15 |
| | | | | | | [ci skip] | ||||
* | | Merge branch 'dm-dont-share-projects-with-group-ancestors' into 'master' | Dmitriy Zaporozhets | 2017-02-28 | 2 | -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 in | Douwe Maan | 2017-02-28 | 2 | -3/+25 |
| | | | |||||
* | | | Merge branch '27354-navigation-new-button' into 'master' | Dmitriy Zaporozhets | 2017-02-28 | 3 | -0/+9 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Put back the new project button Closes #27354 See merge request !9426 | ||||
| * | | | Put back the new project button27354-navigation-new-button | Annabel Dunstone Gray | 2017-02-22 | 3 | -0/+9 |
| | | | | |||||
* | | | | Merge branch 'dm-nested-group-shared-projects' into 'master' | Dmitriy Zaporozhets | 2017-02-28 | 4 | -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-projects | Douwe Maan | 2017-02-28 | 4 | -5/+91 |
| | |/ / | |/| | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch 'dz-rubocop-skip-builds' into 'master' | Dmitriy Zaporozhets | 2017-02-28 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Ignore builds dir when run rubocop check See merge request !9580 | ||||
| * | | | | Ignore builds dir when run rubocop checkdz-rubocop-skip-builds | Dmitriy Zaporozhets | 2017-02-28 | 1 | -0/+1 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch ↵ | Rémy Coutable | 2017-02-28 | 1 | -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-user | Sean McGivern | 2017-02-28 | 1 | -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 McGivern | 2017-02-28 | 100 | -477/+1611 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Return 204 on all DELETE endpoints Closes #20429 See merge request !9397 | ||||
| * | | | | New runner API returns 204api-empty-return | Robert Schilling | 2017-02-28 | 2 | -2/+5 |
| | | | | | |||||
| * | | | | Backport new behavior to CI API | Robert Schilling | 2017-02-28 | 2 | -0/+3 |
| | | | | | |||||
| * | | | | Backport API to V3 | Robert Schilling | 2017-02-28 | 36 | -28/+1485 |
| | | | | | |||||
| * | | | | Update documentation | Robert Schilling | 2017-02-28 | 16 | -306/+5 |
| | | | | | |||||
| * | | | | Return 204 for delete endpoints | Robert Schilling | 2017-02-28 | 46 | -142/+114 |
| | | | | | |||||
* | | | | | Merge branch 'ee-compat-code-review' into 'master' | Rémy Coutable | 2017-02-28 | 1 | -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 process | Adam Niedzielski | 2017-02-28 | 1 | -0/+6 |
|/ / / / | |||||
* | | | | Merge branch 'only-create-unmergeable-todo-once' into 'master' | Kamil Trzciński | 2017-02-28 | 5 | -11/+34 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Only create unmergeable todos once Closes #28555 See merge request !9513 | ||||
| * | | | Only create unmergeable todos onceonly-create-unmergeable-todo-once | Sean McGivern | 2017-02-24 | 5 | -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 Santos | 2017-02-28 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix migration without DOWNTIME clause specified See merge request !9571 | ||||
| * | | | | Fix migration without DOWNTIME clause specified | Ruben Davila | 2017-02-28 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Merge branch 'fix-rubocop' into 'master' cherry-picking-regressions-8.17.0 | Robert Speicher | 2017-02-27 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Make RuboCop happy See merge request !9554 | ||||
| * | | | | Make RuboCop happyfix-rubocop | Sean McGivern | 2017-02-27 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch '25920-create-issue-from-failing-build' into 'master' | Clement Ho | 2017-02-27 | 4 | -3/+59 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add button to create issue for failing build Closes #25920 See merge request !9391 | ||||
| * | | | | | Fix CSS classes | Alex Sanford | 2017-02-27 | 4 | -3/+59 |
|/ / / / / | |||||
* | | | | | Merge branch '20890-comment-image-inline' into 'master' 28711-cherry-picking-ui-regressions-8-17-0 | Robert Speicher | 2017-02-27 | 3 | -14/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inline comment images by removing wrapper #20890 Closes #20890 See merge request !5804 | ||||
| * | | | | | Fix false positive caused by non-interpolated string use | Jared Deckard | 2016-08-13 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Fix inline comment images by removing wrapper #20890 | Jared Deckard | 2016-08-13 | 3 | -12/+5 |
| | | | | | | |||||
* | | | | | | Merge branch 'fix-webpack-dev-server-proxy' into 'master' | Douwe Maan | 2017-02-27 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken dev environment in master See merge request !9557 | ||||
| * | | | | | | fix missing @ symbol | Mike Greiling | 2017-02-27 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch '28723-consistent-handling-indexof' into 'master' | Clement Ho | 2017-02-27 | 7 | -9/+13 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep consistent in handling indexOf results Closes #28723 See merge request !9531 | ||||
| * | | | | | | | Keep consistent in handling indexOf results | Takuya Noguchi | 2017-02-25 | 7 | -9/+13 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'dz-nested-groups-fixtures' into 'master' | Douwe Maan | 2017-02-27 | 1 | -0/+69 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add development fixtures for nested groups See merge request !9553 | ||||
| * | | | | | | | | Add development fixtures for nested groupsdz-nested-groups-fixtures | Dmitriy Zaporozhets | 2017-02-27 | 1 | -0/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | | | Merge branch '28212-avoid-dos-on-build-trace' into 'master' | Clement Ho | 2017-02-27 | 2 | -13/+24 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace setInterval with setTimeout to prevent highly frequent requests Closes #28212 See merge request !9271 | ||||
| * | | | | | | | | | Replace setInterval with setTimeout to prevent highly frequent requests | Takuya Noguchi | 2017-02-25 | 2 | -13/+24 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Update CHANGELOG.md for 8.16.7 | James Lopez | 2017-02-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | | Merge branch '27840-improve-search-bar-experience' into 'master' | Annabel Dunstone Gray | 2017-02-27 | 4 | -3/+55 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #27840 - Improve the search bar experience on mobile Closes #27840 See merge request !9280 | ||||
| * | | | | | | | | | Fix #27840 - Improve the search bar experience on mobile | Pratik Borsadiya | 2017-02-24 | 4 | -3/+55 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Update CHANGELOG.md for 8.16.7 | James Lopez | 2017-02-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | James Lopez | 2017-02-27 | 3 | -31/+64 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'remove-jquery-ui-draggable' into 'master' | Jacob Schatz | 2017-02-27 | 2 | -25/+58 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed jQuery UI draggable See merge request !8582 | ||||
| | * | | | | | | | | | | Removed jQuery UI draggableremove-jquery-ui-draggable | Phil Hughes | 2017-02-27 | 2 | -25/+58 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'fix-webpack-dev-server-proxy' into 'master' | Douwe Maan | 2017-02-27 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix webpack dev server when behind proxy See merge request !9543 | ||||
| | * | | | | | | | | | | ensure webpack dev server proxy connects regardless of request headersfix-webpack-dev-server-proxy | Mike Greiling | 2017-02-27 | 1 | -6/+6 |
| | | | | | | | | | | | |