summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix rubucop offensesbitbucket-oauth2Douglas Barbosa Alexandre2016-12-162-28/+27
|
* BB importer: Fix documantationValery Sizov2016-12-161-5/+3
|
* BB importer: Adressed more review commentsValery Sizov2016-12-162-15/+23
|
* Use new generic image for project importAchilleas Pipinellis2016-12-164-2/+2
|
* Merge branch 'bitbucket-oauth2' of gitlab.com:gitlab-org/gitlab-ce into ↵Achilleas Pipinellis2016-12-161-6/+4
|\ | | | | | | bitbucket-oauth2
| * Merge branch 'bitbucket-oauth2' of gitlab.com:gitlab-org/gitlab-ce into ↵Valery Sizov2016-12-160-0/+0
| |\ | | | | | | | | | bitbucket-oauth2
| * | BB importer: address review commentValery Sizov2016-12-162-7/+5
| | |
| * | BB importer: Milestone importerValery Sizov2016-12-163-0/+12
| | |
* | | Refactor Bitbucket import docsAchilleas Pipinellis2016-12-1612-25/+59
| |/ |/|
* | BB importer: Milestone importerValery Sizov2016-12-163-0/+12
|/
* BB importer: Added note about linking BB users and GitLab users[ci skip]Valery Sizov2016-12-161-1/+2
|
* BB importer: Fixed bug with putting expired token to a project.clone_urlValery Sizov2016-12-154-5/+8
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-1485-211/+1346
|\
| * Merge branch '24803-change-cursor-for-ca-stages' into 'master' Alfredo Sumaran2016-12-142-0/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cursor now changes to a pointer when mousing over stages on Cycle Analytics page When mousing over the different stage headers on the Cycle Analytics page, the mouse cursor will now change to a pointer, indicating these sections are clickable. Closes #24803 cc: @awhildy See merge request !7921
| | * Change cursor type only for inactive stage-nav-items on Cycle Analytics pageRyan Harris2016-12-091-1/+2
| | |
| | * Changed cursor for stage-nav-item instead of just stage-nameRyan Harris2016-12-051-2/+1
| | |
| | * Cursor now changes to a pointer when mousing over stages on Cycle Analytics pageRyan Harris2016-12-042-0/+6
| | |
| * | Merge branch '24927-custom-event-polyfill-test' into 'master' Alfredo Sumaran2016-12-142-0/+47
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tests for Custom Event polyfill ## What does this MR do? Adds tests for CustomEvent polyfill. ## 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 - [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 #24927 See merge request !7996
| | * | Fix broken test in chrome24927-custom-event-polyfill-testFilipa Lacerda2016-12-131-3/+3
| | | |
| | * | Fix broken testFilipa Lacerda2016-12-091-3/+3
| | | |
| | * | Adds tests for Custom Event polyfillFilipa Lacerda2016-12-082-0/+47
| | | | | | | | | | | | | | | | Update changelog with MR ID
| * | | Merge branch 'dz-remove-namespaces-path-uniq' into 'master' Dmitriy Zaporozhets2016-12-148-12/+118
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify namespace name and path validation ## What does this MR do? * Allow same namespace name with different parent_id * Allow same namespace path. Uniq validation should be handled by routes table ## Are there points in the code the reviewer needs to double check? migrations ## Why was this MR needed? So we can use same name in different nesting like: ``` gitlab-ce/foo gitlab-com/foo foo/gitlab-ce ``` ## Screenshots (if relevant) no ## 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 - [x] 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !8013
| | * \ \ Merge branch 'master' into 'dz-remove-namespaces-path-uniq'Dmitriy Zaporozhets2016-12-14217-893/+3737
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | Merge Request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8013 # Conflicts: # db/schema.rb
| * | | | Merge branch 'dz-fix-admin-routes' into 'master' Sean McGivern2016-12-1413-27/+48
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for nested groups to admin routing See merge request !8008
| | * | | | 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 'mattl-gitshell-fixes' into 'master' Rémy Coutable2016-12-141-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the docs to require GitLab Shell 4.0.3 See merge request !8050
| | * \ \ \ \ Merge branch 'cherry-pick-f55fc1ec' into 'mattl-gitshell-fixes' mattl-gitshell-fixesMatt Lee2016-12-121-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8.14 requires GitLab shell 4.0.3 ## 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 - [X] [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? See merge request !8049
| | | * | | | | 8.14 requires GitLab shell 4.0.3Matt Lee2016-12-121-1/+1
| | |/ / / / /
| * | | | | | Merge branch 'build-statuses' into 'master' Rémy Coutable2016-12-1458-170/+1125
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detailed build statuses ## What does this MR do? Implements detailed statuses for `Ci::Builds` and `CommitStatus`. It also adds a new icon for manual build. ## Screenshots ![manual_builds_icon](/uploads/22b5c594350856c85398ef705a635f8b/manual_builds_icon.png) ## What are the relevant issue numbers? See #24273, closes #22642 See merge request !7989
| | * | | | | | Improve build status specs contexts descriptionsGrzegorz Bizon2016-12-145-4/+6
| | | | | | | |
| | * | | | | | Add some missing tests for detailed status methodsbuild-statusesGrzegorz Bizon2016-12-143-2/+32
| | | | | | | |
| | * | | | | | Remove trailing blank line from Allowable moduleGrzegorz Bizon2016-12-141-1/+0
| | | | | | | |
| | * | | | | | Update manual build icon SVGGrzegorz Bizon2016-12-131-1/+1
| | | | | | | |
| | * | | | | | Make it possible to mix `Gitlab::Routing` inGrzegorz Bizon2016-12-133-1/+30
| | | | | | | |
| | * | | | | | Extract abilities checking module from ability modelGrzegorz Bizon2016-12-134-7/+36
| | | | | | | |
| | * | | | | | Extend tests for pipeline detailed status helpersGrzegorz Bizon2016-12-131-12/+18
| | | | | | | |
| | * | | | | | Add tests for common build detailed status helpersGrzegorz Bizon2016-12-131-0/+37
| | | | | | | |
| | * | | | | | Add missing tests for build `cancelable?` methodGrzegorz Bizon2016-12-131-0/+36
| | | | | | | |
| | * | | | | | Add tests for detailed build statuses factoryGrzegorz Bizon2016-12-131-0/+141
| | | | | | | |
| | * | | | | | Make it possible to retry build that was canceledGrzegorz Bizon2016-12-132-1/+9
| | | | | | | |
| | * | | | | | Make build retryable only if complete and executedGrzegorz Bizon2016-12-132-9/+32
| | | | | | | |
| | * | | | | | Improve readability in methods for detailed statusGrzegorz Bizon2016-12-134-4/+12
| | | | | | | |
| | * | | | | | Add tests for build cancelable/retryable statusesGrzegorz Bizon2016-12-132-0/+172
| | | | | | | |
| | * | | | | | Extend specs for build play/stop detailed statusesGrzegorz Bizon2016-12-132-7/+55
| | | | | | | |
| | * | | | | | Refine build stop/play extended status specsGrzegorz Bizon2016-12-133-35/+35
| | | | | | | |
| | * | | | | | Use manual build icon in play/stop build statusesGrzegorz Bizon2016-12-133-6/+12
| | | | | | | |
| | * | | | | | Adds manual action icon and case to show itFilipa Lacerda2016-12-132-0/+3
| | | | | | | |
| | * | | | | | Fix detailed status specs for pipeline stage modelGrzegorz Bizon2016-12-121-1/+3
| | | | | | | |
| | * | | | | | Fix detailed status badge for generic commit statusGrzegorz Bizon2016-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | Fix pipeline specs for detailed statusesGrzegorz Bizon2016-12-121-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
View Lorry Controller Status