summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Add feature flag to enforce gitaly request limitsMark Lapierre2019-03-111-1/+37
| | | | | | | | We typically don't want to enforce request limits in production However, we have some production-like test environments, i.e., ones where `Rails.env.production?` returns `true`. We do want to be able to check if the limit is being exceeded while testing in those environments.
* Merge branch 'ab-roulette-multiple-roles' into 'master'Nick Thomas2019-03-111-0/+39
|\ | | | | | | | | Support multiple roulette roles per project See merge request gitlab-org/gitlab-ce!25818
| * Support multiple roulette roles per projectAndreas Brandl2019-03-111-0/+39
| |
* | Merge branch 'fix-diff-files-expand-all' into 'master'Filipa Lacerda2019-03-114-2/+65
|\ \ | | | | | | | | | | | | | | | | | | Fix expand all button not working Closes #51737 See merge request gitlab-org/gitlab-ce!25961
| * | Fix expand all button not workingPhil Hughes2019-03-114-2/+65
| |/ | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51737
* | Merge branch 'expose-group-id-on-home-panel' into 'master'Phil Hughes2019-03-111-0/+15
|\ \ | | | | | | | | | | | | | | | | | | expose group id on home panel Closes #58677 See merge request gitlab-org/gitlab-ce!25897
| * | expose group id on home panelPeter Marko2019-03-111-0/+15
| | |
* | | Merge branch 'bvl-add-gitlab-shell-discover-spec' into 'master'Douwe Maan2019-03-111-0/+8
|\ \ \ | |_|/ |/| | | | | | | | Add spec for `/api/internal/discover` without user See merge request gitlab-org/gitlab-ce!25936
| * | Add spec for `/api/internal/discover` without userBob Van Landuyt2019-03-111-0/+8
| |/ | | | | | | | | | | | | | | The behavior for GitLab shell calling `/discover` when a user is not found is currently untested. We are relying on this behaviour to make GitLab reply "Welcome to GitLab, Anonymous!".
* | Merge branch 'sh-rugged-commit-tree-entry' into 'master'Douwe Maan2019-03-111-1/+15
|\ \ | | | | | | | | | | | | Bring back Rugged implementation of commit_tree_entry See merge request gitlab-org/gitlab-ce!25896
| * | Add back Rugged support for retrieving a commit tree entryStan Hu2019-03-081-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings back some of the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20176/diffs. We discovered another N+1 that hits Gitaly `TreeEntry` via the `RelativeLinkFilter`: https://gitlab.com/gitlab-org/gitlab-ce/issues/58657. When a blob is loaded with many relative links, `TreeEntry` is called for each link to scan the URI type. There are multiple paths that hit Gitaly `TreeEntry`, and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25706 did not cover all cases. This commit covers another common use case. For users using Gitaly on top of NFS, accessing the Git data directly via Rugged may be faster than going through than Gitaly. This merge request introduces the feature flag `rugged_commit_tree_entry` to activate the Rugged method.
* | | Merge branch '10081-env-table' into 'master'Phil Hughes2019-03-111-0/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reduces EE differences for environments table Closes gitlab-ee#10081 See merge request gitlab-org/gitlab-ce!25916
| * | | Reduces EE differences for environments tableFilipa Lacerda2019-03-081-0/+14
| | | | | | | | | | | | | | | | | | | | Async loads EE components Creates a Mixin for EE properties
* | | | Merge branch 'winh-jest-synchronous-timeout' into 'master'Phil Hughes2019-03-112-16/+26
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Introduce setTestTimeout() for synchronous Jest tests Closes #58658 See merge request gitlab-org/gitlab-ce!25926
| * | | Add setTestTimeout for Jest testsWinnie Hellmann2019-03-082-16/+26
| |/ / | | | | | | | | | | | | Allows contributors to set the timeout for individual jest tests.
* | | Fix the last-ditch memory killer pgroup SIGKILLNick Thomas2019-03-091-1/+1
| | |
* | | Filter merge requests by target branchHiroyuki Sato2019-03-096-2/+101
| | |
* | | Merge branch 'fix/email_validator' into 'master'Stan Hu2019-03-091-0/+94
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Align EmailValidator to validate_email gem implementation. Closes #57352 See merge request gitlab-org/gitlab-ce!24971
| * | Align EmailValidator to validate_email gem implementation.Horatiu Eugen Vlad2019-03-051-0/+94
| | | | | | | | | | | | | | | | | | Renamed EmailValidator to DeviseEmailValidator to avoid 'email:' naming collision with ActiveModel::Validations::EmailValidator in 'validates' statement. Make use of the options attribute of the parent class ActiveModel::EachValidator. Add more options: regex.
* | | Disallow reopening of locked merge requestsJan Beckmann2019-03-082-3/+53
| | | | | | | | | | | | Fixes #56864
* | | Merge branch '58649-project-template-for-android' into 'master'Sean McGivern2019-03-081-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project template for Android" Closes #58649 See merge request gitlab-org/gitlab-ce!25870
| * | | Add Android templateJason Lenny2019-03-071-0/+1
| | |/ | |/|
* | | Merge branch 'ingress-hostnames' into 'master'Mike Greiling2019-03-0811-15/+86
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for ingress hostnames Closes #58244, #56158, and #46691 See merge request gitlab-org/gitlab-ce!25181
| * | | Add support for ingress hostnamesingress-hostnameswalkafwalka2019-03-0711-15/+86
| |/ /
* | | Provide EE backports for filtering by approver featureIgor2019-03-073-334/+385
| | | | | | | | | | | | | | | Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files
* | | Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'"Luke Duncalfe2019-03-081-1/+1
|/ / | | | | This reverts merge request !25708
* | Merge branch 'ce-10266-job-failed-173481892' into 'master'Luke Bennett2019-03-071-4/+6
|\ \ | | | | | | | | | | | | | | | | | | Fix for mismatch in EE on FIXTURE_PATHS to FIXTURE_PATH Closes gitlab-ee#10266 See merge request gitlab-org/gitlab-ce!25878
| * | Fix for mismatch in EE on FIXTURE_PATHS to FIXTURE_PATHRémy Coutable2019-03-071-4/+6
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '46464-improve-stop-pipeline-modal' into 'master'Kushal Pandya2019-03-071-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve stop pipeline modal" Closes #46464 See merge request gitlab-org/gitlab-ce!25059
| * | | Add fields displayed in modal to testmfluharty2019-03-071-1/+3
| | | |
| * | | Update corresponding testmfluharty2019-03-071-1/+1
| | | |
* | | | Resolve "Project template for iOS"Jason Lenny2019-03-071-0/+1
| | | |
* | | | Merge branch '56618-hashed-storage-skip-validation' into 'master'Stan Hu2019-03-074-0/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Hashed storage migration should not be attempted if project does not validate" Closes #56618 See merge request gitlab-org/gitlab-ce!25753
| * | | | Skip project validation when switching storage layoutsGabriel Mazetto2019-03-054-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a fix for the Hashed Storage migration and Rollback procedure to ignore any project-level validation error that can happen in a long-running instance. There are many situations where defaults and acceptable values changed but, because we didn't provide a migration to "valid" attributes, it can happen that project will not be `valid? => true`. Because the changes we are making are limited to setting a project as read_only or changing the storage_level, it's safe to bypass validation.
* | | | | Merge branch 'use-date-for-upcoming-milestone-comparison' into 'master'Andreas Brandl2019-03-071-0/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use date for upcoming milestone comparison Closes #58325 See merge request gitlab-org/gitlab-ce!25806
| * | | | | Add failing test for milestone with far-future dateSean McGivern2019-03-061-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When looking for upcoming milestones, we compare the milestone's due date to `NOW()`. However, the due date is a date and `NOW()` is a timestamp, and in Postgres, timestamps can't extend as far in the future as dates can. This test exposes the issue.
* | | | | | Adding additional usage metrics for Release to weekly pingDarby Frey2019-03-071-0/+2
| | | | | |
* | | | | | Resolve "Mask the existing variables"Matija Čupić2019-03-075-13/+13
| | | | | |
* | | | | | Remove translation dependency in CA specLuke Bennett2019-03-071-19/+0
| |_|_|/ / |/| | | |
* | | | | Merge branch 'sh-rugged-get-tree-entry' into 'master'Sean McGivern2019-03-071-1/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bring back Rugged implementation of TreeEntry See merge request gitlab-org/gitlab-ce!25706
| * | | | | Bring back Rugged implementation of TreeEntryStan Hu2019-03-071-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings back some of the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20099/diffs For users using Gitaly on top of NFS, accessing the Git data directly via Rugged is more performant than Gitaly. This merge request introduces the feature flag `rugged_tree_entry` to activate the Rugged method. Part of four Rugged changes identified in https://gitlab.com/gitlab-org/gitlab-ce/issues/57317.
* | | | | | Merge branch 'ce-extract-ee-specific-code-for-spec/support' into 'master'Dmitriy Zaporozhets2019-03-079-87/+138
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Extract EE specific code for spec/support See merge request gitlab-org/gitlab-ce!25569
| * | | | | | Reduce differences in spec/support/shared_contexts/services_shared_context.rbRémy Coutable2019-03-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Reduce differences in spec/support/webmock.rbRémy Coutable2019-03-071-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Reduce differences in spec/support/matchers/access_matchers.rbRémy Coutable2019-03-071-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Reduce differences in spec/support/helpers/kubernetes_helpers.rbRémy Coutable2019-03-071-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Reduce differences in spec/support/helpers/javascript_fixtures_helpers.rbRémy Coutable2019-03-072-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Reduce differences in spec/support/db_cleaner.rbRémy Coutable2019-03-072-45/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Reduce differences in spec/support/api/schema_matcher.rbRémy Coutable2019-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'sh-rugged-tree-entries' into 'master'Sean McGivern2019-03-071-5/+69
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Bring back Rugged implementation of GetTreeEntries See merge request gitlab-org/gitlab-ce!25674
View Lorry Controller Status