summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update schemacheck-checkbox-remove-source-branchZ.J. van de Weg2016-10-141-588/+588
|
* Merge branch 'master' into check-checkbox-remove-source-branchZ.J. van de Weg2016-10-142407-24280/+90088
|\
| * Merge branch '22456-option-to-choose-for-no-issue-template' into 'master' Fatih Acet2016-10-143-8/+42
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added 'No template' functionality to issuable templates ## What does this MR do? Adds dropdown new footer item `.no-template`, when clicked it clears the `currentTemplate`, updates the editor and resets the dropdown toggle text. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![2016-10-10_03.21.45](/uploads/86ae95410807c66ce7b8be63c7ec2c20/2016-10-10_03.21.45.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 - [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 #22456 See merge request !6765
| | * Added no-template functionality22456-option-to-choose-for-no-issue-templateLuke Bennett2016-10-133-8/+42
| | | | | | | | | | | | Added tests
| * | Merge branch 'grapify-boards-api' into 'master' Rémy Coutable2016-10-141-31/+45
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify boards API ## What does this MR do? Add the Grape-DSL to the boards API. ## What are the relevant issue numbers? Related to #22928 See merge request !6876
| | * | Grapify boards APIRobert Schilling2016-10-141-31/+45
| | | |
| * | | Merge branch 'issuable-title-dropdown-fix' into 'master' Rémy Coutable2016-10-143-5/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated issuable dropdown titles ## What does this MR do? The dropdowns in the issuable form still had the filter dropdown titles, this fixes that by giving them their own titles. Closes #23337 See merge request !6882
| | * | | Use local assigns to get the dropdown titleissuable-title-dropdown-fixPhil Hughes2016-10-141-1/+1
| | | | |
| | * | | Updated issuable dropdown titlesPhil Hughes2016-10-143-5/+7
| | | | | | | | | | | | | | | | | | | | Closes #23337
| * | | | Merge branch 'patch-6' into 'master' Achilleas Pipinellis2016-10-141-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix grafana_configuration.md move link See merge request !6871
| | * | | | fix grafana_configuration.md move linkBen Bodenmiller2016-10-131-1/+1
| | | | | |
| * | | | | Merge branch 'zj-show-deployed-time-ago' into 'master' Kamil Trzciński2016-10-1417-65/+282
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show deployed time ago Closes #21652 cc @ayufan See merge request !6676
| | * | | | | Add test, fix merge errorzj-show-deployed-time-agoZ.J. van de Weg2016-10-143-12/+33
| | | | | | |
| | * | | | | Added safety check for formatted valuesLuke Bennett2016-10-141-2/+2
| | | | | | |
| | * | | | | Minor style improvementZ.J. van de Weg2016-10-144-16/+28
| | | | | | |
| | * | | | | Fixed conflict and corrected teaspoon testLuke Bennett2016-10-141-2/+3
| | | | | | |
| | * | | | | Rename method in testZ.J. van de Weg2016-10-143-21/+31
| | | | | | |
| | * | | | | Moved ci_status environments logic to new action ci_envrionments_status and ↵Luke Bennett2016-10-146-62/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | set up frontend polling
| | * | | | | Refactor ci_status on MergeRequestControllerZ.J. van de Weg2016-10-145-45/+35
| | | | | | |
| | * | | | | Fix indenting error in HAMLZ.J. van de Weg2016-10-142-3/+3
| | | | | | |
| | * | | | | Show what time ago a MR was deployedZ.J. van de Weg2016-10-1414-53/+202
| | | | | | |
| * | | | | | Merge branch 'fix/reassign-secret-token-on-generate' into 'master' Douwe Maan2016-10-141-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reassign secret token when regenerating one ## What does this MR do? This is an attempt to fix intermittent errors in out test suite. ```text Failures: 1) Gitlab::Shell memoized secret_token creates and links the secret token file Failure/Error: expect(File.read(secret_file).chomp).to eq(secret_token) expected: "690f959e206ab91acc54e1c605c7ff90" got: "cccb4e8df9360600271e61114d4e6e68" (compared using ==) # ./spec/lib/gitlab/backend/shell_spec.rb:47:in `block (3 levels) in <top (required)>' ``` It appears that `spec/lib/gitlab/backend/shell_spec.rb` tries to change the file that stores secret token, but `Gitlab::Shell` memoizes `@secret_token` on class level, so when it was already created by other tests (`spec/requests/api/internal_spec.rb` in this case), memoized token is not reassigned even if it was generated again with `ensure_secret_token!`. See merge request !6844
| | * | | | | | Reassign secret token when regenerating onefix/reassign-secret-token-on-generateGrzegorz Bizon2016-10-131-2/+2
| | | | | | | |
| * | | | | | | Merge branch 'grapify-todos-api' into 'master' Rémy Coutable2016-10-141-26/+19
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify todos API ## What does this MR do? Add the Grape-DSL to the todos API. ## What are the relevant issue numbers? Related to #22928 See merge request !6875
| | * | | | | | | Grapify todos APIgrapify-todos-apiRobert Schilling2016-10-141-26/+19
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch '15463-extract-update-merge-requests' into 'master' Yorick Peterse2016-10-149-43/+68
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract project#update_merge_requests to its own worker from GitPushService See merge request !6767
| | * | | | | | | Extract project#update_merge_requests and SystemHooks to its own worker from ↵15463-extract-update-merge-requestsPaco Guzman2016-10-139-43/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitPushService
| * | | | | | | | Merge branch '23332-fix-missing-glossary-link' into 'master' Achilleas Pipinellis2016-10-141-4/+4
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fix missing Glossary link" ## What does this MR do? Fixes broken links in University. ## What are the relevant issue numbers? Closes #23332 See merge request !6880
| | * | | | | | | Fixed missing linksSean Packham2016-10-141-1/+1
| | | | | | | | |
| | * | | | | | | Fixed missing linksSean Packham2016-10-141-4/+4
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'grapify-system-hooks' into 'master' Rémy Coutable2016-10-141-31/+29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify system hooks API ## What does this MR do? Add the Grape-DSL to the system-hook API. ## What are the relevant issue numbers? Related to #22928 See merge request !6861
| | * | | | | | | Grapify system hooks APIgrapify-system-hooksRobert Schilling2016-10-131-31/+29
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'docs/clarify-new-ci-permissions-some-more' into 'master' Achilleas Pipinellis2016-10-141-18/+37
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more info on the new CI permissions model From discussion in issue https://gitlab.com/gitlab-org/gitlab-ce/issues/22484 See merge request !6843
| | * | | | | | | Add link to update docs for source installationsAchilleas Pipinellis2016-10-141-1/+2
| | | | | | | | |
| | * | | | | | | Add more info on the new CI permissions modeldocs/clarify-new-ci-permissions-some-moreAchilleas Pipinellis2016-10-131-18/+36
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Merge branch 'docs/refactor-merge-request-revisions' into 'master' Achilleas Pipinellis2016-10-144-10/+20
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Refactor merge requests revisions docs See merge request !6878
| | * | | | | | Refactor merge requests revisionsAchilleas Pipinellis2016-10-144-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - A system note now appears on every push - Replace dashes with underscores in images [ci skip]
| * | | | | | | Merge branch 'docs/add-review-apps-example' into 'master' Achilleas Pipinellis2016-10-142-0/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to review apps example from docs Put a link in the example project of the Review Apps in dynamic environments and to the list of CI examples. See merge request !6873
| | * | | | | | Link to review apps example from docsAchilleas Pipinellis2016-10-142-0/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Merge branch 'trigger-docs-yaml' into 'master' Achilleas Pipinellis2016-10-131-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not run before_script, artifacts, cache in trigger_docs job Fixes See merge request !6866
| | * | | | | | Do not run before_script, artifacts, cache in trigger_docs jobtrigger-docs-yamlAchilleas Pipinellis2016-10-131-0/+3
| | |/ / / / /
| * | | | | | Merge branch 'remove-unique-keyframes' into 'master' Annabel Dunstone Gray2016-10-133-42/+44
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace unique keyframes mixin with specific keyframe animation names ## What does this MR do? Replaces `unique-keyframes` mixin with `include-keyframes` mixin ## Are there points in the code the reviewer needs to double check? Shouldn't be :thumbsup_tone1: ## Why was this MR needed? Some users had GitLab hosted in a distributed environment that makes `unique-keyframes` a non-viable implementation. The randomized animation names from `unique-keyframes` was not being picked up by the different servers which resulted in 404 errors. ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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 you do - 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 #22629 See merge request !6603
| | * | | | | | Replace unique keyframes mixin with specific keyframe animation namesClement Ho2016-10-133-42/+44
| | | | | | | |
| * | | | | | | Merge branch 'ce-to-ee-merge-check-rake-task' into 'master' Robert Speicher2016-10-133-0/+118
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE to EE merge check rake task ## What does this MR do? This merge request adds a Rake task that checks whether the current branch can be merged cleanly to EE/master. If not, it checks if a `<ce_branch>-ee` branch exists in EE, tries to merge it to EE/master and then tries to merge `ce_branch` to EE/master. If the result of the check is that the current branch cannot be merged cleanly to EE/master, the job will fail, display troubleshooting steps, and a warning will be shown in the merge request. ## Are there points in the code the reviewer needs to double check? Probably the steps I used to do the various checks, and also the steps I suggest to create an EE-specific branch. ## Why was this MR needed? The goal is to catch as early as possible the possible conflicts a CE MR will cause when CE/master will be merged to EE/master. This way, the developer is warned that he/she should open a MR against EE before or as soon as the CE is merged. In the end, this should lower the work of the CE->EE merger. ## What are the relevant issue numbers? Part of gitlab-org/gitlab-ee#715, hopefully. See merge request !6746
| | * | | | | | Improve the branch existence and merge checksce-to-ee-merge-check-rake-taskRémy Coutable2016-10-133-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a safeguard for non-CI env. Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | | Draft a quick CE->EE merge check rake taskRémy Coutable2016-10-133-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Merge branch '22655-deployments-don-t-always-have-keep-around-refs' into ↵Rémy Coutable2016-10-132-1/+17
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Handle case where deployment ref no longer exists ## What does this MR do? In 8.9, we didn't create keep-around refs for deployments. So it's possible that someone created a deployment (say, for testing), and then deleted the branch and all other references to that commit. That commit could then get GCed, and trying to view MRs on 8.11+ will show a 500. See https://gitlab.com/gitlab-org/gitlab-ce/issues/22655#note_16575020 for more details. ## Why was this MR needed? If someone created a deployment on 8.9, then deleted all references to the commit for that deployment, we will throw an exception when checking if the deployment includes a commit. Closes #22655. See merge request !6855
| | * | | | | | | Handle case where deployment ref no longer exists22655-deployments-don-t-always-have-keep-around-refsSean McGivern2016-10-132-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep-around refs for deployments were only introduced in 8.10, so any deployment created in 8.9 could have a SHA pointing to a commit that no longer exists in the repository. We can't do anything useful with those deployments, so make `#includes_commit?` always return false for those.
| * | | | | | | | Merge branch 'api-order-mounts' into 'master' Rémy Coutable2016-10-131-4/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort API mounts ## What does this MR do? Sort the API mounts. ## Why was this MR needed? The API mounts are unsorted. See merge request !6831
| | * | | | | | | | Sort API mountsapi-order-mountsRobert Schilling2016-10-131-4/+4
| | | | | | | | | |