summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Fix quick actions add label name middle word overlaps53459-quick-action-adds-multiple-labels-to-issue-if-middle-words-overlap-with-existing-labelJacopo2019-04-021-0/+41
| | | | | | | | Fixes quick actions add label when adding a label which name middle word overlaps with another label name: for example adding "A B C" when also label "B" exists. With the fix only the label "A B C" is correctly added, previously also the label "B" was added due to the middle word overlaps.
* Merge branch 'ce-reduce-diff-in-spec-models' into 'master'Lin Jen-Shin2019-04-025-7/+42
|\ | | | | | | | | [CE] Reduce diff with EE in `spec/models` See merge request gitlab-org/gitlab-ce!26847
| * [CE] Reduce diff with EE in spec/models/project_wiki_spec.rbce-reduce-diff-in-spec-modelsRémy Coutable2019-04-021-1/+0
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * [CE] Reduce diff with EE in spec/models/project_team_spec.rbRémy Coutable2019-04-021-0/+24
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * [CE] Reduce diff with EE in spec/models/project_spec.rbRémy Coutable2019-04-021-0/+9
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * [CE] Reduce diff with EE in spec/models/environment_spec.rbRémy Coutable2019-04-021-1/+3
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * [CE] Reduce diff with EE in spec/models/concerns/prometheus_adapter_spec.rbRémy Coutable2019-04-021-5/+6
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch ↵Lin Jen-Shin2019-04-021-38/+0
|\ \ | | | | | | | | | | | | | | | | | | 'ce-6119-extract-ee-specific-files-lines-for-spec-services-groups' into 'master' Remove groups destroy race condition spec See merge request gitlab-org/gitlab-ce!26851
| * | Remove groups destroy race condition specce-6119-extract-ee-specific-files-lines-for-spec-services-groupsSean McGivern2019-04-021-38/+0
| | | | | | | | | | | | | | | | | | | | | This was removed in the below MR in EE only, as it was causing failures related to Geo. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3999
* | | Merge branch 'sh-cache-pipeline-find-commits' into 'master'Kamil Trzciński2019-04-021-0/+2
|\ \ \ | | | | | | | | | | | | | | | | Cache FindCommit results in pipelines view See merge request gitlab-org/gitlab-ce!26776
| * | | Cache FindCommit results in pipelines viewsh-cache-pipeline-find-commitsStan Hu2019-04-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For each pipeline, the controller will call `Pipeline#latest?` to determine if the pipeline's ref is the latest for that branch. Since it's likely that the same branches are being used in each pipeline, we can reduce Gitaly overhead by caching the results of the FindCommit call.
* | | | Stop calling UnlinkRepositoryFromObjectPool RPCJacob Vosmaer2019-04-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/59777. In earlier iterations of our implementation of Git object deduplication we thought we would be making extensive use of Git remotes in pool repositories in the future, and that we should manage these remotes carefully from the start. We now expect we only care about one remote, namely the source project. The other remotes are there only for forensic purposes. Before this MR we tried to also remove pool remotes when member projects got deleted, with the UnlinkRepositoryFromObjectPool RPC. This is fragile when there are race conditions (see https://gitlab.com/gitlab-org/gitaly/issues/1568#note_153955926). We have spent some time making this RPC less fragile in https://gitlab.com/gitlab-org/gitaly/merge_requests/1151 but looking at this problem again, I think we should just stop calling it.
* | | | Merge branch 'jarv/dev-to-gitlab-2019-04-02' into 'master'Robert Speicher2019-04-0221-56/+597
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jarv/dev to gitlab 2019 04 02 Closes #2810 See merge request gitlab-org/gitlab-ce!26846
| * \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵jarv/dev-to-gitlab-2019-04-02John Jarvis2019-04-0221-56/+597
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | jarv/dev-to-gitlab-2019-04-02
| | * | | Rake task for removing exif from uploadsJan Provaznik2019-04-021-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | Adds a rake task which can be used for removing EXIF data from existing uploads.
| | * | | Merge branch 'security-2819-xss-resolve-conflicts-branch-name' into 'master'GitLab Release Tools Bot2019-04-021-0/+15
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix XSS in resolve conflicts form See merge request gitlab/gitlabhq!2977
| | | * | | Fix XSS in resolve conflicts formPaul Slaughter2019-03-071-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue arose when the branch name contained Vue template JavaScript. The fix is to use `v-pre` which disables Vue compilation in a template.
| | * | | | Merge branch 'security-56224' into 'master'GitLab Release Tools Bot2019-04-021-1/+35
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix related branches visible in issues for guests See merge request gitlab/gitlabhq!2996
| | | * | | | Hide related branches when user does not have permissionMark Chao2019-03-211-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Guest user of a project should not see branches
| | * | | | | Merge branch 'security-id-potential-denial-languages' into 'master'GitLab Release Tools Bot2019-04-025-5/+72
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return cached languages if they've been detected before See merge request gitlab/gitlabhq!2998
| | | * | | | | Return cached languages if they've been detected beforeIgor Drozdov2019-03-205-5/+72
| | | | | | | |
| | * | | | | | Merge branch 'security-55503-fix-pdf-js-vulnerability' into 'master'GitLab Release Tools Bot2019-04-022-3/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix PDF.js vulnerability See merge request gitlab/gitlabhq!2999
| | | * | | | | | Fixed pdf testsNatalia Tepluhina2019-03-132-3/+3
| | | | | | | | |
| | * | | | | | | Merge branch 'security-use-untrusted-regexp' into 'master'GitLab Release Tools Bot2019-04-027-47/+121
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use UntrustedRegexp for CI refs matching See merge request gitlab/gitlabhq!3005
| | | * | | | | | | Make CI refs matching to to use UntrustedRegexpKamil Trzciński2019-03-157-47/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes ref validation to use always `UntrustedRegexp`. This also splits the existing RubySyntax into separate class.
| | * | | | | | | | Merge branch 'security-milestone-labels' into 'master'GitLab Release Tools Bot2019-04-021-0/+86
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Check label_ids parent when updating issue board See merge request gitlab/gitlabhq!3027
| | | * | | | | | | | Check if labels are available for target issuableJarka Košanová2019-03-281-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - labels have to be in the same project/group as an issuable
| | * | | | | | | | | Merge branch 'security-mass-assignment-on-project-update' into 'master'GitLab Release Tools Bot2019-04-021-0/+17
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disallow changing namespace of a project in update method See merge request gitlab/gitlabhq!3028
| | | * | | | | | | | | Refactor specs according to the code reviewMałgorzata Ksionek2019-03-261-1/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Add cr remarksMałgorzata Ksionek2019-03-251-1/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Disallow changing namespace of a project in update methodMałgorzata Ksionek2019-03-201-0/+17
| | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | Disallow guest users from accessing ReleasesShinya Maeda2019-03-262-2/+40
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | As they do not have a permission to read git tag
* | | | | | | | | | Merge branch 'expose-mr-pipeline-parameters-for-merge-widget-ce' into 'master'Kamil Trzciński2019-04-023-42/+14
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport: Expose merge request pipeline parameters for MR widget See merge request gitlab-org/gitlab-ce!26826
| * | | | | | | | | Backport EE changeexpose-mr-pipeline-parameters-for-merge-widget-ceShinya Maeda2019-04-023-42/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for merge request pipelines
* | | | | | | | | | Backport splitting approval changes from CEIgor2019-04-022-28/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author and committers approvals are split in EE This commit provides backports for those changes This reverts commit 886f00bcba23d67e2c86591c2eb5359ef457a2f9.
* | | | | | | | | | Monitor GraphQL with PrometheusJan Provaznik2019-04-021-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends graphql's platform tracing class to observe duration of graphql methods. In graphql 1.8.11 is added prometheus class but it's not very useful for us because it uses prometheus_exporter to export results.
* | | | | | | | | | Merge branch 'sh-fix-rugged-tree-entries' into 'master'Sean McGivern2019-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid excessive recursive calls with Rugged TreeEntries Closes #59759 See merge request gitlab-org/gitlab-ce!26813
| * | | | | | | | | Avoid excessive recursive calls with Rugged TreeEntriessh-fix-rugged-tree-entriesStan Hu2019-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Rugged implementation was recursively scanning the repository to create `flat_path` because the post-process step was being called from with a loop. For large repositories, this was significantly slowing things down. Break the call to `rugged_populate_flat_path` out of this loop to make this work efficiently. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59759
* | | | | | | | | | Merge branch 'issue_51789_part_1' into 'master'Sean McGivern2019-04-024-2/+115
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate issuable states to integer patch 1 of 2 Closes #51789 See merge request gitlab-org/gitlab-ce!25107
| * | | | | | | | | Address review commentsFelipe Artur2019-03-281-17/+10
| | | | | | | | | |
| * | | | | | | | | Merge masterFelipe Artur2019-03-27852-5981/+24587
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove auto vacuum logic, decrease batch size and intervalFelipe Artur2019-03-011-33/+2
| | | | | | | | | | |
| * | | | | | | | | | Address review commentsFelipe Artur2019-02-191-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into issue_51789_part_1Felipe Artur2019-02-19126-923/+3008
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add more specs and code improvementsFelipe Artur2019-02-191-16/+37
| | | | | | | | | | | |
| * | | | | | | | | | | Make migrations reschedulableFelipe Artur2019-02-181-0/+45
| | | | | | | | | | | |
| * | | | | | | | | | | Add Reschedulable moduleFelipe Artur2019-02-151-5/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Fix specsFelipe Artur2019-02-152-2/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Add specs for issuable states syncFelipe Artur2019-02-141-0/+30
| | | | | | | | | | | |
| * | | | | | | | | | | Split background migration for issues and merge requestsFelipe Artur2019-02-141-8/+8
| | | | | | | | | | | |
View Lorry Controller Status