summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Grapify the projects snippet APIgrapify-project-snippet-apiRobert Schilling2016-11-212-92/+128
|
* Merge branch 'fix/do-not-add-todo-when-build-allowed-to-fail' into 'master' 24710-external-statuses-pipelineKamil Trzciński2016-11-215-9/+47
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not create TODO when build is allowed to fail ## What does this MR do? Do not create a TODO when build that failed is allowed to fail. ## 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) - Tests - [x] Added for this feature/bug - [ ] All builds are passing ## What are the relevant issue numbers? Closes #22280 See merge request !7618
| * Add documentation about todos and failed buildsGrzegorz Bizon2016-11-211-2/+4
| |
| * Add Changelog entry for failed builds todos fixGrzegorz Bizon2016-11-211-0/+4
| |
| * Do not create TODO when build is allowed to failGrzegorz Bizon2016-11-213-7/+39
| |
* | Merge branch 'ee-870-backport' into 'master' Sean McGivern2016-11-2113-17/+85
|\ \ | | | | | | | | | | | | Backport some changes done from Time Tracking feature in EE. See merge request !7604
| * | Backport some changes done from Time Tracking feature in EE.ee-870-backportRuben Davila2016-11-1813-17/+85
| | |
* | | Merge branch 'grapify-users-api' into 'master' Rémy Coutable2016-11-213-306/+320
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the users API Certain endpoints return different entities based on which user issues the request. Right now, I am not aware how to specify multiple entities as part of the description block of the endpoint. @rymai Do you know something about that. ## What are the relevant issue numbers? Related to #22928 See merge request !7147
| * | | Grapify the users APIgrapify-users-apiRobert Schilling2016-11-213-307/+321
| | | |
* | | | Merge branch 'make-prepare-build-sh-compat' into 'master' Rémy Coutable2016-11-211-4/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove bashism from scripts/prepare_build.sh Make `scripts/prepare_build.sh` an sh, rather than bash, script Write once, run everywhere. Even alpine. See merge request !7561
| * | | | Remove bashism from scripts/prepare_build.shNick Thomas2016-11-181-4/+5
| | | | |
* | | | | Merge branch 'dz-fix-group-name-dot' into 'master' Rémy Coutable2016-11-213-8/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add constraints to group id in routing To prevent 404 when visit page like https://gitlab.com/groups/group.with.dot/activity Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24622 See merge request !7614
| * | | | | Fix 404 on some group pages when name contains dotdz-fix-group-name-dotDmitriy Zaporozhets2016-11-213-8/+25
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'create-pipeline-endpoint' into 'master' Rémy Coutable2016-11-214-0/+117
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint for creating a pipeline Fixes #23468 See merge request !7209
| * | | | | Add api endpoint for creating a pipelineIdo Leibovich2016-11-184-0/+117
| | | | | | | | | | | | | | | | | | | | | | | | Add a new endpoint in the new API for creating a new pipeline, and return the details of that pipeline.
* | | | | | Merge branch 'issue_5541' into 'master' Sean McGivern2016-11-2111-32/+92
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to block JIRA events for commits and merge requests implements #5541 See merge request !7469
| * | | | | | Allow enabling and disabling commit and MR events for JIRAissue_5541Felipe Artur2016-11-1811-32/+92
| | | | | | |
* | | | | | | Merge branch 'remove-unnecessary-self-from-user-model' into 'master' Rémy Coutable2016-11-212-54/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary self from user model self keyword nod needed. Code is more clean and understandable. https://github.com/bbatsov/ruby-style-guide#no-self-unless-required See merge request !7551
| * | | | | | | Remove unnecessary self from user modelSemyon Pupkov2016-11-192-54/+57
| | | | | | | |
* | | | | | | | Merge branch 'use-build-in-broadcast-message-spec' into 'master' Rémy Coutable2016-11-211-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Use build instead create in BroadcastMessage model spec See merge request !7592
| * | | | | | | Use build instead create in BroadcastMessage model specSemyon Pupkov2016-11-191-1/+1
| | | | | | | |
* | | | | | | | Merge branch '24627-fix-bad-mr-error-message' into 'master' Rémy Coutable2016-11-213-2/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes regression causing an error message to appear when user first enters the Merge Request form. Closes #24627 See merge request !7599
| * | | | | | | | Fix regression in Merge request formAlex Sanford2016-11-193-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request !7163 caused an error message to appear on the Merge Request form when it was first loaded by the user. This commit fixes that regression bug.
* | | | | | | | | Merge branch 'super-secret-login-upgrade' into 'master' Fatih Acet2016-11-192-25/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert signin tab order fix. The history: > 1. @sytses created this: https://gitlab.com/gitlab-org/gitlab-ce/issues/23279 > 2. The fix was submitted here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867 > 3. I [made](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867#note_16993324) the same observation you did after it was merged 4. A long discussion about accessibility and UX followed, and we decided to revert all changes (https://gitlab.com/gitlab-org/gitlab-ce/issues/23698). ## Screenshots (if relevant) ![2016-11-17_20.55.22](/uploads/c81b0bbe0cd08747124531778af6273f/2016-11-17_20.55.22.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [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 https://gitlab.com/gitlab-org/gitlab-ce/issues/23698 See merge request !7538
| * | | | | | | | | Un-un-revert signin tab order fix.super-secret-login-upgradeBryce Johnson2016-11-182-25/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-db-schema' into 'master' Kamil Trzciński2016-11-191-3/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate sidekiq throttling parameters Improves `db/schema` after merging https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7015. cc @grzesiek @filipa See merge request !7603
| * | | | | | | | | | Remove duplicate sidekiq throttling parametersfix-db-schemaKamil Trzcinski2016-11-191-3/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fix-typo-in-gitlab-flow' into 'master' Achilleas Pipinellis2016-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo in gitlab_flow.md ('munch'->'much') See merge request !7595
| * | | | | | | | | | fix typo in gitlab_flow.md ('munch'->'much')kkkkkkkk2016-11-191-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-7' into 'master' Achilleas Pipinellis2016-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong link Not a big one, just fix a wrong link to internal page. See merge request !7597
| * | | | | | | | | | | Fix wrong linkebuildy2016-11-191-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '24673-broken-test-in-merge_request_widget_spec-js' into 'master' Jacob Schatz2016-11-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken merge request widget spec ## What does this MR do? Converts the invalid es6 syntax of the merge_request_widget_spec which is actually causing the spec not to run through teaspoon ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Get specs working again ## Screenshots (if relevant) None ## 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) ## What are the relevant issue numbers? Closes #24673 See merge request !7594
| * | | | | | | | | | | Fix spec24673-broken-test-in-merge_request_widget_spec-jsClement Ho2016-11-181-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '22539-display-folders' into 'master' Fatih Acet2016-11-1943-329/+2349
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Display "folders" for environments" ## What does this MR do? Adds the ability to show the grouped environments inside "folders". Adds several reusable vue components in order to accomplish the recursive tree data structure presented. For the individual components, Jasmine tests were added. For the ones that depend of an API response, rspec tests are used. ## Screenshots (if relevant) ![Screen_Shot_2016-11-16_at_02.00.13](/uploads/1278012c8639b999b53f080728d283e1/Screen_Shot_2016-11-16_at_02.00.13.png) ![Screen_Shot_2016-11-16_at_02.00.25](/uploads/a3d65416ddb553e1b8f0f4c8897a75dc/Screen_Shot_2016-11-16_at_02.00.25.png) ![Screen_Shot_2016-10-17_at_16.08.50](/uploads/af63efe1d2cbd5fc069408622ef4b607/Screen_Shot_2016-10-17_at_16.08.50.png) ![environments](/uploads/b5a1801766d82ab176fc60f96b6968cb/environments.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry 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 #22539 See merge request !7015
| * | | | | | | | | | | Fix test22539-display-foldersFilipa Lacerda2016-11-191-22/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Fix broken testFilipa Lacerda2016-11-192-7/+22
| | | | | | | | | | | |
| * | | | | | | | | | | Changes for stop url to pathFilipa Lacerda2016-11-192-23/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Try to fix testsKamil Trzcinski2016-11-181-4/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Expose stop_path for environment to not construct that in frontendKamil Trzcinski2016-11-183-2/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Bring back the `commit_url` as it's used by CycleAnalyticsKamil Trzcinski2016-11-182-0/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Fix broken testsFilipa Lacerda2016-11-182-11/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Do not trigger CI [ci skip]Kamil Trzcinski2016-11-180-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch '22539-display-folders' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-11-1820-359/+326
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22539-display-folders
| | * | | | | | | | | | | Fix css classFilipa Lacerda2016-11-182-2/+4
| | | | | | | | | | | | |
| | * | | | | | | | | | | Remove comment from htmlFilipa Lacerda2016-11-181-1/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Removes unnecessary commentsFilipa Lacerda2016-11-182-3/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Improvements after reviewFilipa Lacerda2016-11-181-9/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Remove unused CSSFilipa Lacerda2016-11-181-4/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Remove slotsFilipa Lacerda2016-11-182-20/+22
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fixes typoFilipa Lacerda2016-11-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes unneeded comparision