summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Extract EE specific files/lines for Discussion spec/servicesce-issue_6628Felipe Artur2019-04-031-23/+26
| | | | This is part of moving GitLab to single codebase
* Merge branch '58644-remove-reply_to_individual_notes-feature-flag' into 'master'Nick Thomas2019-04-034-138/+34
|\ | | | | | | | | | | | | Remove reply_to_individual_notes feature flag Closes #58644 See merge request gitlab-org/gitlab-ce!26889
| * Remove reply_to_individual_notes feature flag58644-remove-reply_to_individual_notes-feature-flagHeinrich Lee Yu2019-04-034-138/+34
| | | | | | | | Also removes specs related to the flag
* | Merge branch 'feature/webide_escaping' of gitlab.com:hiddentiger/gitlab-ce ↵Kieran Andrews2019-04-032-8/+22
| | | | | | | | into feature/webide_escaping
* | Merge branch '52560-fix-duplicate-tag-system-hooks' into 'master'Rémy Coutable2019-04-031-0/+14
|\ \ | | | | | | | | | | | | | | | | | | Only execute system hooks once when pushing tags Closes #52560 See merge request gitlab-org/gitlab-ce!26888
| * | Only execute system hooks once when pushing tagsNick Thomas2019-04-031-0/+14
| |/
* | Merge branch '59756-shared-example-already-defined' into 'master'Sean McGivern2019-04-031-85/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove already defined shared example Closes #59756 See merge request gitlab-org/gitlab-ce!26867
| * | Remove already defined shared example59756-shared-example-already-definedAlexandru Croitor2019-04-021-85/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the time traking shared example as it was actually moved under time_tracking_quick_action_shared_examples.rb filename to a different path as part of spec refactorign for quick action https://gitlab.com/gitlab-org/gitlab-ce/issues/50199 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26095
* | | Add port section to CI Image objectFrancisco Javier López2019-04-0313-15/+703
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to implement https://gitlab.com/gitlab-org/gitlab-ee/issues/10179 we need several modifications on the CI config file. We are adding a new ports section in the default Image object. Each of these ports will accept: number, protocol and name. By default this new configuration will be only enabled in the Web IDE config file.
* | | Merge branch '55268-exclude-system-notes-from-commits-in-mr' into 'master'Rémy Coutable2019-04-031-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Do not show system notes on commits in the MR page Closes #55268 See merge request gitlab-org/gitlab-ce!26396
| * | | Do not show system notes on commits in the MR page55268-exclude-system-notes-from-commits-in-mrHeinrich Lee Yu2019-04-021-0/+8
| | | |
* | | | Merge branch '47234-composable-auto-devops' into 'master'Dmitriy Zaporozhets2019-04-031-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Composable Auto DevOps" Closes #47234 See merge request gitlab-org/gitlab-ce!26520
| * | | | Split Security Auto DevOps jobs into templatesTiger2019-04-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Container Scanning, Dependency Scanning, License Management and SAST parts of Auto DevOps now use the preexisting templates. Auto DevOps and the DAST job template will now use a shared job template instead of maintaining two copies of the job. This also allows Auto DevOps to use custom authentication with DAST.
* | | | | Merge branch ↵Sean McGivern2019-04-031-0/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53459-quick-action-adds-multiple-labels-to-issue-if-middle-words-overlap-with-existing-label' into 'master' Resolve "Quick Action Adds Multiple Labels to Issue If Middle Words Overlap with Existing Label" Closes #53459 See merge request gitlab-org/gitlab-ce!26602
| * | | | | 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.
* | | | | | Extend timezone dropdownEzekiel Kigbo2019-04-031-0/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds optional paramters to the constructor to allow reuse of the timezone dropdown on other pages
* | | | | | Merge branch 'fix-broken-master-release-permission-ce' into 'master'Rémy Coutable2019-04-031-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport: Fix Release permission spec See merge request gitlab-org/gitlab-ce!26897
| * | | | | | Fix Release permission specShinya Maeda2019-04-031-2/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | We recently changed the permission model to disallow guests to read Releases. The spec should be updated as well according to the expectation.
* | | | | | Merge branch 'fixed-duplicated-large-text-on-diffs' into 'master'Filipa Lacerda2019-04-031-5/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes duplicate diff too large error messages Closes #59802 See merge request gitlab-org/gitlab-ce!26857
| * | | | | Fixes duplicate diff too large error messagesPhil Hughes2019-04-021-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59802
* | | | | | Remove non-functional add issue button on welcome listDonald Cook2019-04-021-0/+14
| | | | | |
* | | | | | Revert "Merge branch 'jprovazn-graphql-prometheus' into 'master'"Jan Provaznik2019-04-021-35/+0
| |/ / / / |/| | | | | | | | | | | | | | This reverts merge request !26569
* | | | | 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
| | | | | | | | | | | | |