summaryrefslogtreecommitdiff
path: root/spec/support
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ce-jej/saml-failure-messages' into 'master'Grzegorz Bizon2018-05-242-0/+15
|\ | | | | | | | | [CE] Backport helpers from GroupSAML failure messages See merge request gitlab-org/gitlab-ce!19064
| * Backport helpers from GroupSAML failure messagesce-jej/saml-failure-messagesJames Edwards-Jones2018-05-212-0/+15
| |
* | Merge branch 'ce-5928-geo-rake-task-to-force-housekeeping-on-next-sync' into ↵Nick Thomas2018-05-211-0/+4
|\ \ | |/ |/| | | | | | | | | 'master' Backport from EE: Adding Progressbar explicitly and spec extensions for it See merge request gitlab-org/gitlab-ce!18885
| * Adding progressbar explicitly and spec extensions for itce-5928-geo-rake-task-to-force-housekeeping-on-next-syncGabriel Mazetto2018-05-101-0/+4
| |
* | Merge branch 'feature/gb/add-regexp-variables-expression' into 'master'Kamil Trzciński2018-05-181-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Add support for variables expression regexp syntax Closes #43601 See merge request gitlab-org/gitlab-ce!18902
| * | Simplify untrusted regexp factory methodGrzegorz Bizon2018-05-181-0/+2
| | |
* | | Delete remote uploadsJan Provaznik2018-05-161-0/+23
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ObjectStore uploader requires presence of associated `uploads` record when deleting the upload file (through the carrierwave's after_commit hook) because we keep info whether file is LOCAL or REMOTE in `upload` object. For this reason we can not destroy uploads as "dependent: :destroy" hook because these would be deleted too soon. Instead we rely on carrierwave's hook to destroy `uploads` in after_commit hook. But in before_destroy hook we still have to delete not-mounted uploads (which don't use carrierwave's destroy hook). This has to be done in before_Destroy instead of after_commit because `FileUpload` requires existence of model's object on destroy action. This is not ideal state of things, in a next step we should investigate how to unify model dependencies so we can use same workflow for all uploads. Related to #45425
* | Merge branch ↵Kamil Trzciński2018-05-151-0/+57
|\ \ | | | | | | | | | | | | | | | | | | 'ce-5968-extract-ee-specific-files-lines-for-clusters-related-files' into 'master' Backport Cluster related EE code See merge request gitlab-org/gitlab-ce!18931
| * | Extract shared components from Clusters::CreateService specMatija Čupić2018-05-131-0/+57
| | |
* | | Fix gitaly-ruby bundle poisoning in CIJacob Vosmaer (out of office May 10-14)2018-05-141-1/+5
|/ /
* | Merge branch ↵Kamil Trzciński2018-05-111-3/+66
|\ \ | |/ |/| | | | | | | | | 'ce-5911-extract-ee-specific-files-lines-for-spec-models-clusters' into 'master' Backport EE specific cluster spec changes to CE See merge request gitlab-org/gitlab-ce!18866
| * Backport KubernetesHelper deployment related changesMatija Čupić2018-05-101-3/+66
| |
* | Merge branch '45442-updates-updated-at-to-issue-on-time-spent' into 'master'Douwe Maan2018-05-101-6/+22
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Update `updated_at` on an issue when label or time spent was added" Closes #45442 See merge request gitlab-org/gitlab-ce!18757
| * | Updates updated_at on issue when using /spend quick actionJacopo2018-05-091-6/+22
| | |
* | | Merge branch 'ce-jej/group-saml-skip-forgery-protection' into 'master'Douwe Maan2018-05-101-5/+12
|\ \ \ | |_|/ |/| | | | | | | | [CE] Backport with_forgery_protection spec helper See merge request gitlab-org/gitlab-ce!18833
| * | Backport with_forgery_protection spec helperJames Edwards-Jones2018-05-081-5/+12
| | |
* | | Merge branch 'fix_plural_handling_for_migration_to_ghost_user' into 'master'Robert Speicher2018-05-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Cleanly handle plural name for ghost user migration See merge request gitlab-org/gitlab-ce!18798
| * | | Cleanly handle plural name for ghost user migrationOlivier Gonzalez2018-05-071-1/+1
| | |/ | |/|
* | | Add changelog for pipeline build foreign keyGrzegorz Bizon2018-05-081-1/+0
| | |
* | | Add database foreign key between pipelines and buildsGrzegorz Bizon2018-05-081-0/+11
|/ /
* | Merge branch '5480-epic-notifications-ce' into 'master'Douwe Maan2018-05-073-0/+106
|\ \ | | | | | | | | | | | | Backport 5480-epic-notifications from EE See merge request gitlab-org/gitlab-ce!18724
| * | Backport 5480-epic-notifications from EEMario de la Ossa2018-05-073-0/+106
| | |
* | | Merge branch 'ccr/weight_1481' into 'master'Douwe Maan2018-05-071-0/+27
|\ \ \ | |/ / |/| | | | | | | | Backport of 1481-changing-weight-values-should-trigger-system-notes See merge request gitlab-org/gitlab-ce!18699
| * | Backport of 1481-changing-weight-values-should-trigger-system-notesChantal Rollison2018-05-031-0/+27
| | |
* | | Bump Gitaly to 0.98.0Zeger-Jan van de Weg2018-05-071-1/+1
| | | | | | | | | | | | | | | | | | Hooks were run for wikis, but given the internal API wasn't responding failures happended, as seen on: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18693
* | | Merge branch 'live-trace-v2-efficient-destroy-all' into 'master'Grzegorz Bizon2018-05-071-0/+38
|\ \ \ | | | | | | | | | | | | | | | | Live trace: Use efficient destroy all (for `dependent: :destory` problem) See merge request gitlab-org/gitlab-ce!18575
| * \ \ Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-05-071-0/+19
| |\ \ \
| * | | | Added shared exmaple for fast_destroy_all concernShinya Maeda2018-05-041-0/+38
| | | | |
* | | | | Fix spec: ci_trace_shared_examples.rb for positive offset by appendShinya Maeda2018-05-071-1/+1
| | | | |
* | | | | Enforce proper 416 support for runner trace patch endpointKamil Trzciński2018-05-071-0/+0
| |/ / / |/| | |
* | | | Merge branch 'master' into live-trace-v2Shinya Maeda2018-05-071-0/+19
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Enforces terms in the web applicationBob Van Landuyt2018-05-041-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enforces the terms in the web application. These cases are specced: - Logging in: When terms are enforced, and a user logs in that has not accepted the terms, they are presented with the screen. They get directed to their customized root path afterwards. - Signing up: After signing up, the first screen the user is presented with the screen to accept the terms. After they accept they are directed to the dashboard. - While a session is active: - For a GET: The user will be directed to the terms page first, after they accept the terms, they will be directed to the page they were going to - For any other request: They are directed to the terms, after they accept the terms, they are directed back to the page they came from to retry the request. Any information entered would be persisted in localstorage and available on the page.
* | | Test trace_spec on both conditions - ci_enable_live_trace is on/offShinya Maeda2018-05-041-0/+741
| | |
* | | Introduce Redis helpers. Rename BuildTraceChunkFlushToDbWorker to ↵Shinya Maeda2018-05-042-5/+18
| | | | | | | | | | | | Ci::BuildTraceChunkFlushWorker.
* | | Merge branch 'master' into live-trace-v2Shinya Maeda2018-05-031-2/+2
|\ \ \ | |/ /
| * | Load branches on new merge request page asynchronouslyWinnie Hellmann2018-05-021-2/+2
| | |
* | | Merge branch 'master' into live-trace-v2Shinya Maeda2018-05-024-1/+164
|\ \ \ | |/ /
| * | Merge branch 'dm-commit-trailer-without-gravatar' into 'master'Robert Speicher2018-05-011-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix commit trailer rendering when Gravatar is disabled Closes #45633 See merge request gitlab-org/gitlab-ce!18586
| | * | Fix commit trailer rendering when Gravatar is disabledDouwe Maan2018-04-251-1/+1
| | |/
| * | Merge branch 'helm-add-alpine-mirrors' into 'master'Kamil Trzciński2018-05-011-0/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add alpine mirrors while operating on k8s cluster Closes gitlab-ee#4922 See merge request gitlab-org/gitlab-ce!18651
| | * | Add alpine mirrors while operating on k8s clusterAlessio Caiazza2018-04-301-0/+19
| | | |
| * | | Merge request and commit discussions APIJan Provaznik2018-05-012-0/+144
| | | |
* | | | Merge branch 'master' into live-trace-v2Shinya Maeda2018-05-012-0/+115
|\ \ \ \ | |/ / /
| * | | Ensure member notifications are sent after the member actual creation/update ↵Rémy Coutable2018-04-262-0/+115
| |/ / | | | | | | | | | | | | | | | in the DB Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Refactoring ci_job_trace to ci_build_traceShinya Maeda2018-04-261-1/+1
| | |
* | | Merge branch 'master' into live-trace-v2Shinya Maeda2018-04-266-22/+76
|\ \ \ | |/ /
| * | Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan2018-04-252-3/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Legacy disk path refactor Closes gitaly#1111 See merge request gitlab-org/gitlab-ce!18364
| | * | Gitlab::Shell works on shard name, not pathZeger-Jan van de Weg2018-04-252-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct disk access is done through Gitaly now, so the legacy path was deprecated. This path was used in Gitlab::Shell however. This required the refactoring in this commit. Added is the removal of direct path access on the project model, as that lookup wasn't needed anymore is most cases. Closes https://gitlab.com/gitlab-org/gitaly/issues/1111
| * | | Fix an N+1 for MRs from forks on the MR index pageSean McGivern2018-04-241-17/+33
| | | |
| * | | Merge branch 'jej/refactor-omniauth-controller' into 'master'Douwe Maan2018-04-243-2/+39
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Refactor OmniauthCallbacksController to remove duplication Closes #26559 See merge request gitlab-org/gitlab-ce!16694