summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-fix-issue-54189-11-5' into 'security-11-5'Steve Azzopardi2018-11-182-1/+30
| | | | | [11.5] Prevent templated services from being imported See merge request gitlab/gitlabhq!2635
* Merge branch 'security-11-5-2717-xss-username-autocomplete' into 'security-11-5'Steve Azzopardi2018-11-181-6/+23
| | | | | [11.5] Escape user fullname while rendering autocomplete template to prevent XSS See merge request gitlab/gitlabhq!2606
* Merge branch ↵Steve Azzopardi2018-11-161-3/+11
| | | | | | | | | '54011-all-files-named-index-have-their-content-rendered-as-if-they-were-text-files' into 'master' Resolve "All files named `index.*` have their content rendered as if they were text files" Closes #54011 See merge request gitlab-org/gitlab-ce!23063
* Merge branch '53491-fix-again' into 'master'11-5-stable-prepare-rc10Sean McGivern2018-11-151-2/+2
| | | | | | | | | | | Don't care about order when getting awarded issues Closes #53491 See merge request gitlab-org/gitlab-ce!23101 (cherry picked from commit f3c44f640a0644590485d61d36ad222b343ec139) 8ae9b248 Don't care about order when getting awarded issues
* Merge branch 'ignore-environment-validation-failure' into 'master'Kamil Trzciński2018-11-152-0/+69
| | | | | | | | | | | Ignore environment validation failure See merge request gitlab-org/gitlab-ce!23100 (cherry picked from commit 0f25d2b33fbee7161f0ecf26a6d853533808beec) ea695ab7 Ignore environment validation failure a2a2a8f0 Add changelog 00842f95 User persisted?
* Merge branch 'mr-expand-all-collapsed-files' into 'master'Filipa Lacerda2018-11-151-0/+22
| | | | | | | | | | | Fix collapsed files not fully fully expanding Closes #53866 See merge request gitlab-org/gitlab-ce!23019 (cherry picked from commit 63b4b4b2688fa4f068772026536b2250bce39070) 8e265bc3 Fix collapsed files not fully fully expanding
* Merge branch 'fix-deployment-metrics-in-mr-widget' into 'master'Kamil Trzciński2018-11-151-0/+36
| | | | | | | | | | | | | | | Avoid returning deployment metrics url to MR widget when the deployment is not successful Closes #53870 See merge request gitlab-org/gitlab-ce!23010 (cherry picked from commit 7674a8f477c90c1c8c9a969e7d80ea1ec9e72cd9) e270fcc8 Fix deployment metrics in MR widget 15431054 Add spec for deployment metrics 2d6570f0 Do not remove the existing permission check 09e693c6 Add changelog d8c24ac1 Remove unrelated changes
* Merge branch '53636-fix-rendering-of-any-user-filter' into 'master'11-5-stable-prepare-rc9Clement Ho2018-11-141-13/+44
| | | | | | | Disable updating appearance of filter tokens for special values Closes #53636 See merge request gitlab-org/gitlab-ce!22865
* Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-148-31/+913
| | | | | | | Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
* Merge branch 'dm-commit-email-select-options' into 'master'Stan Hu2018-11-141-2/+7
| | | | | | | Fix bug causing not all emails to show up in commit email selectbox Closes #54045 See merge request gitlab-org/gitlab-ce!23079
* Merge branch 'rs-revert-api' into 'master'Nick Thomas2018-11-131-0/+112
| | | | | | | Add revert to commits API Closes gitlab-org/release/framework#48 See merge request gitlab-org/gitlab-ce!22919
* Merge branch 'enable-image-comments-for-renamed-files' into 'master'Filipa Lacerda2018-11-131-0/+20
| | | | | Fixed image commenting on moved files See merge request gitlab-org/gitlab-ce!23023
* Merge branch '53879-kube-token-nil' into 'master'Kamil Trzciński2018-11-134-3/+57
| | | | | | | Fix deployment jobs using nil token Closes #53879 See merge request gitlab-org/gitlab-ce!23009
* Merge branch 'fix-tags-for-envs' into 'master'11-5-stable-prepare-rc6Stan Hu2018-11-121-2/+11
| | | | | | | Fix tags for environments Closes gitlab-ee#8397 See merge request gitlab-org/gitlab-ce!22993
* Merge branch 'sh-fix-refresh-service-deleted-branch' into 'master'Douwe Maan2018-11-121-0/+4
| | | | | | | Fix MergeRequestService erroring out on deleted branch Closes #53853 See merge request gitlab-org/gitlab-ce!22989
* Merge branch 'fix-error-handling-bugs-in-kubernetes-integration' into 'master'Dmitriy Zaporozhets2018-11-121-0/+14
| | | | | | | | | | | Fix error handling bugs in kubernetes integration See merge request gitlab-org/gitlab-ce!22922 (cherry picked from commit f69f7a6702f68a14cb29b2686b030f36711cef7f) b9916610 Remove special handling for 404 response from K8s f852b235 Fix error handling in cluster_platform_configure_worker 269b0e10 Add changelog for fixing k8s integration error handling
* Merge branch 'always-proxy-reports' into 'master'Grzegorz Bizon2018-11-122-14/+48
| | | | | | | | | backport: Always proxy reports downloads See merge request gitlab-org/gitlab-ce!22889 (cherry picked from commit ef58a64039c517be7df08eef1b3a7af7ad5eab16) 5da2f42d backport: Always proxy reports downloads
* Merge branch 'revert_issue_board_entity' into 'master'Stan Hu2018-11-095-51/+5
| | | | | Revert "Extract code into IssueBoardEntity" See merge request gitlab-org/gitlab-ce!22928
* Merge branch 'limit-parallel-to-100' into 'master'Grzegorz Bizon2018-11-091-0/+10
| | | | | | | Limit parallel to 50 Closes #53711 See merge request gitlab-org/gitlab-ce!22907
* Merge branch 'osw-revert-comment-in-any-diff-line' into 'master'Sean McGivern2018-11-088-891/+31
| | | | | Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'" See merge request gitlab-org/gitlab-ce!22891
* Discussions redesignFatih Acet2018-11-083-5/+103
|
* backport changes from gitlab-ee!7903Simon Knox2018-11-081-3/+12
|
* Merge branch 'fix-stuck-import-jobs-query-performance-issue' into 'master'Douwe Maan2018-11-071-11/+11
|\ | | | | | | | | StuckImportJobsWorker query performance optimization See merge request gitlab-org/gitlab-ce!22879
| * StuckImportJobsWorker query performance optimizationTiago Botelho2018-11-071-11/+11
| | | | | | | | | | | | Improves the performance of fetching the enqueued projects for StuckImportJobsWorker, preventing a statement timeout.
* | Merge branch 'prevent-override-of-attr_encrypted' into 'master'Stan Hu2018-11-071-5/+17
|\ \ | | | | | | | | | | | | | | | | | | Prevent attr_encrypted models from being overriden Closes gitlab-ee#8234 See merge request gitlab-org/gitlab-ce!22764
| * | Prevent attr_encrypted models from being overridenStan Hu2018-11-071-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing spec in spec/controllers/admin/hooks_controller_spec.rb attr_encrypted expects models to have their attribute methods defined, or it will override them with standard Ruby accessors. Migration specs that rolled back the state of the database after columns were migrated to encrypted values were interfering with these definitions. To ensure that the SystemHook specs pass, we need to call `SystemHook.define_attribute_methods` to ensure that attr_encrypted sees the right methods that reflect the latest state of the database. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8234
* | | Merge branch 'sh-paginate-bitbucket-server-imports' into 'master'Douglas Barbosa Alexandre2018-11-074-5/+57
|\ \ \ | | | | | | | | | | | | | | | | Paginate Bitbucket Server importer projects See merge request gitlab-org/gitlab-ce!22825
| * | | Paginate Bitbucket Server importer projectsStan Hu2018-11-074-5/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent delays in loading the page and reduce memory usage, limit the number of projects shown at 25 per page. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/50021
* | | | Merge branch 'jira-ping-differentiate-cloud' into 'master'Sean McGivern2018-11-072-1/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage ping - Differentiate Jira Server and Cloud Closes #51043 See merge request gitlab-org/gitlab-ce!22791
| * | | | Usage ping - Differentiate Jira Server and Cloudjira-ping-differentiate-cloudMario de la Ossa2018-11-072-1/+17
| | | | |
* | | | | Merge branch 'bvl-patches-via-mail' into 'master'Douwe Maan2018-11-0716-0/+801
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to add patches to merge requests created via email Closes #40830 See merge request gitlab-org/gitlab-ce!22723
| * | | | | Allow limiting quick actions to executeBob Van Landuyt2018-11-072-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes we don't want to trigger any quick actions that cause side effects. For example when building a record to validate. This allows listing the quick actions that need to be performed.
| * | | | | Apply patches when creating MR via emailBob Van Landuyt2018-11-0714-0/+773
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to add patches as attachments to merge request created via email. When an email to create a merge request is sent, all the attachments ending in `.patch` will be applied to the branch specified in the subject of the email. If the branch did not exist, it will be created from the HEAD of the repository. When the patches could not be applied, the error message will be replied to the user. The patches can have a maximum combined size of 2MB for now.
* | | | | | Resolve "Issue board card design"Constance Okoghenun2018-11-0717-64/+204
| | | | | |
* | | | | | Merge branch 'revert-45b61a9e' into 'master'Nick Thomas2018-11-0718-40/+38
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'" See merge request gitlab-org/gitlab-ce!22875
| * | | | | Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into ↵Douwe Maan2018-11-0718-40/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !22526
* | | | | | Merge branch 'fj-41213-api-update-submodule-commit' into 'master'Sean McGivern2018-11-073-1/+313
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add endpoint to update a git submodule reference Closes #41213 See merge request gitlab-org/gitlab-ce!20949
| * | | | | | Add submodule update API endpointFrancisco Javier López2018-11-073-1/+313
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new endpoint allow users to update a submodule's reference. The MR involves adding a new operation RPC operation in gitaly-proto (see gitlab-org/gitaly-proto!233) and change Gitaly to use this new version (see gitlab-org/gitaly!936). See gitlab-org/gitlab-ce!20949
* | | | | | | Merge branch 'max_retries_when' into 'master'Grzegorz Bizon2018-11-076-56/+369
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to configure when to retry builds Closes gitlab-runner#3515 See merge request gitlab-org/gitlab-ce!21758
| * | | | | | | fix merge conflictMarkus Doits2018-11-071-356/+0
| | | | | | | |
| * | | | | | | change forgotten constant in spec to match codeMarkus Doits2018-11-071-1/+1
| | | | | | | |
| * | | | | | | handle old retry format in build (possibly saved in database)Markus Doits2018-11-071-0/+16
| | | | | | | |
| * | | | | | | fix failing specs due to latest changesMarkus Doits2018-11-072-4/+4
| | | | | | | |
| * | | | | | | refactoring after latest feedbackMarkus Doits2018-11-072-99/+120
| | | | | | | |
| * | | | | | | fix wrong retry error messagesMarkus Doits2018-11-071-2/+2
| | | | | | | |
| * | | | | | | refactor validations to a Entry::Retry classMarkus Doits2018-11-072-1/+364
| | | | | | | |
| * | | | | | | add a test that checks that retry when values in documentation are validMarkus Doits2018-11-071-1/+27
| | | | | | | |
| * | | | | | | refactor for hopefully lower cognitive complexityMarkus Doits2018-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before: - Method `validate_retry` has a Cognitive Complexity of 7 (exceeds 5 allowed). Consider refactoring. - Method `validate_retry_max` has a Cognitive Complexity of 9 (exceeds 5 allowed). Consider refactoring. - Method `validate_retry_when` has a Cognitive Complexity of 14 (exceeds 5 allowed). Consider refactoring.
| * | | | | | | fix allowed keys validator to use correct attribute as error base?Markus Doits2018-11-071-1/+1
| | | | | | | |
| * | | | | | | add specs for create pipeline service and new retry when featureMarkus Doits2018-11-071-7/+25
| | | | | | | |