summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Changes snowplow to use cookies for sessionsJeremy Jackson2019-08-283-50/+129
| | | | | This also restructures how and where the configuration for Snowplow lives.
* Merge branch 'todos/include-issue-mr-titles' into 'master'Stan Hu2019-08-284-35/+35
|\ | | | | | | | | | | | | Add Issue and Merge Request titles to Todo items Closes #63488 See merge request gitlab-org/gitlab-ce!30435
| * Add Issue and Merge Request titles to Todo itemsArun Kumar Mohan2019-08-274-35/+35
| | | | | | | | | | | | Only displays the todo body if the todo has a note. This is to avoid redundant Issue or Merge Request titles displayed both in the Todo title and body.
* | Rename dev, org, com helperDoug Stull2019-08-281-0/+27
| |
* | CE-specific changes for designs `user_notes_count`Luke Duncalfe2019-08-275-53/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes call `#after_note_created` and `#after_note_destroyed` on their noteable in callbacks, so the noteable can perform tasks particular to them, like cache expiry. This is in preparation of the EE-specific class `DesignManagement::Design` clearing its `user_notes_count` cache when its note are created or destroyed. Refactoring Rspec behaviour testing of a counter caching service into a shared example. https://gitlab.com/gitlab-org/gitlab-ee/issues/13353
* | Fix a nil error in Gitlab::Danger::TeammateRémy Coutable2019-08-271-0/+8
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Move gke_cluster_dropdowns to create_cluster dirEnrique Alcantara2019-08-278-14/+14
| | | | | | | | | | | | | | | | | | | | | | This commit creates a create_cluster directory to collect all Vue applications related to creating kubernetes applications using gitlab. It also moves the gke_cluster_dropdowns collection of apps to the create_cluster directory. gke_cluster_dropdowns contains dropdown components used to select configuration options to create a Kubernetes cluster in Google Cloud.
* | Merge branch ↵Lin Jen-Shin2019-08-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '65312-use-group-labels-instead-of-legacy-team-labels-for-danger-picking-test-reviewers' into 'master' Detect the new stage labels in `Gitlab::Danger::Teammate` Closes #65312 See merge request gitlab-org/gitlab-ce!32261
| * | Detect the new stage labels in Gitlab::Danger::Teammate65312-use-group-labels-instead-of-legacy-team-labels-for-danger-picking-test-reviewersRémy Coutable2019-08-271-1/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch ↵Jan Provaznik2019-08-273-16/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '66641-broken-master-real-http-connections-are-disabled-unregistered-request' into 'master' Use `stub_full_request` to fix spec failure Closes #66641 See merge request gitlab-org/gitlab-ce!32259
| * | | Use `stub_full_request` to fix spec failure66641-broken-master-real-http-connections-are-disabled-unregistered-requestHeinrich Lee Yu2019-08-273-16/+24
| |/ / | | | | | | | | | Also change test URL sequest to .test TLD
* | | Merge branch '13806-fix' into 'master'Lin Jen-Shin2019-08-271-0/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Add nil check for Gitlab.config.prometheus Closes #13806 See merge request gitlab-org/gitlab-ce!32201
| * | Add nil check for Gitlab.config.prometheus13806-fixrpereira22019-08-261-0/+11
| | |
* | | Merge branch '57657-promote-label-to-group-label-via-api-endpoint' into 'master'Sean McGivern2019-08-271-0/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Promote Label to Group Label via API endpoint Closes #57657 See merge request gitlab-org/gitlab-ce!25218
| * | | Incorporate review feedbackRobert Schilling2019-08-261-9/+9
| | | |
| * | | Make tests passRobert Schilling2019-08-261-10/+12
| | | |
| * | | Move promote to put and add more specsRobert Schilling2019-08-261-5/+29
| | | |
| * | | Add docs and first specsRobert Schilling2019-08-261-0/+23
| | | |
* | | | Merge branch 'sh-project-feature-nplus-one' into 'master'Jan Provaznik2019-08-271-0/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove N+1 SQL query loading project feature in dashboard Closes #66482 See merge request gitlab-org/gitlab-ce!32169
| * | | | Remove N+1 SQL query loading project feature in dashboardsh-project-feature-nplus-oneStan Hu2019-08-231-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects that have a pipeline may need to check whether the user has permission to read the build (`can?(current_user, :read_build, project)`), which requires checking the `project_features` table. This would cause an N+1 SQL query for each project. This change also has a beneficial side effect that may avoid a race condition. When a user deletes a project, the project is queued for deletion and the user is redirected back to the dashboard page. However, the following may happen: 1. The dashboard page may load this deleted project in the list of 20 projects. 2. The view will load the project pipeline status from the cache and attempt to show each project. 3. When the view encounters the deleted project, it calls `can?(current_user, :read_build, project)` to determine whether to display the pipeline status. 4. Sidekiq deletes the project from the database. 5. However, since the deleted project is still loaded in memory, it will attempt to call `project.project_feature.access_level`. 6. Since `project_feature` was not eager loaded, a lazy `SELECT` call is made to the database. 7. This `SELECT` call returns nothing, and the user sees a 500 error. By eager loading `project_feature`, we can ensure that we have a consistent view and avoid records from being deleted later. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66482
* | | | | Merge branch '63502-encrypt-deploy-token' into 'master'Stan Hu2019-08-272-1/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Store deploy tokens encrypted" Closes #63502 See merge request gitlab-org/gitlab-ce!30679
| * | | | | Updated call to find deploy tokenEtienne Baqué2019-08-261-1/+2
| | | | | |
| * | | | | Added EncryptDeployTokensTokens spec fileEtienne Baqué2019-08-261-0/+47
| | | | | |
* | | | | | Update docs and comments about saml with allow_bypass_two_factordodocat2019-08-272-4/+30
|/ / / / / | | | | | | | | | | | | | | | allow_bypass_two_factor configration dose not work with saml provider
* | | | | Merge branch 'sh-fix-piwik-template' into 'master'Ash McKenzie2019-08-271-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Piwik not working Closes #66627 See merge request gitlab-org/gitlab-ce!32234
| * | | | | Fix Piwik not workingsh-fix-piwik-templateStan Hu2019-08-261-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to indentation, the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31402 broke the templating of Piwik script header. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66627
* | | | | | Merge branch 'sh-guard-against-orphaned-project-feature' into 'master'Michael Kozono2019-08-261-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guard against deleted project feature entry Closes #66482 See merge request gitlab-org/gitlab-ce!32187
| * | | | | | Guard against deleted project feature entryStan Hu2019-08-261-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/issues/66482, we see that a project's `project_feature` association may be lazily loaded and hence return `nil` if the entry is deleted if the `Project` is already loaded in memory. To ensure we don't fail hard when this happens, assume all features are disabled. We can fix this issue by eager loading the `project_feature` in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32169, but we shouldn't have to depend on that. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66482
* | | | | | | Revert "Merge branch 'user-tracking-settings' into 'master'"Jeremy Jackson2019-08-263-129/+50
| |/ / / / / |/| | | | | | | | | | | | | | | | | This reverts merge request !31826
* | | | | | Using before_save method instead of setterAishwarya Subramanian2019-08-261-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | Removed unused method for name setter method
* | | | | | Changes snowplow to use cookies for sessionsJeremy Jackson2019-08-263-50/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also restructures how and where the configuration for Snowplow lives.
* | | | | | Merge branch 'sh-fix-nplusone-issues' into 'master'Mayra Cabrera2019-08-261-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix N+1 Gitaly calls in /api/v4/projects/:id/issues See merge request gitlab-org/gitlab-ce!32171
| * | | | | | Fix N+1 Gitaly calls in /api/v4/projects/:id/issuessh-fix-nplusone-issuesStan Hu2019-08-231-0/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31938. In GitLab 9.0, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9661 removed the `subscribed` flag from the API when the user requested a list of issues or merge requests since calculating this value triggers extensive Markdown processing. In GitLab 12.0 via a4fbf39e, we accidentally reintroduced this performance regression by changing `IssueBasic` to `Issue` in `entities.rb`. This showed up as a Gitaly N+1 issue since the Markdown processing would attempt to extract a commit if it detected a regex that matched a commit. We restore the prior behavior by once again removing the `subscribed` flag for the bulk list of issues and merge requests and add a test to ensure they aren't reintroduced. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/66202
* | | | | | Replace echo function with a resolverBrett Walker2019-08-264-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `GraphQL::Function` has been deprecated in favor of resolvers.
* | | | | | Change default visibility level for FogBugz imported projects to PrivateGeorge Koltsov2019-08-261-0/+29
| | | | | |
* | | | | | Add usage pings for merge request creatingIgor2019-08-263-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Code Review Usage Ping for Create SMAU
* | | | | | Merge branch 'zj-remove-object-pools-feature-flag' into 'master'Nick Thomas2019-08-261-22/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the object pools feature flag See merge request gitlab-org/gitlab-ce!32204
| * | | | | | Remove the object pools feature flagZeger-Jan van de Weg2019-08-261-22/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag defaulted to true, so there's no change unless users turned it off. Given there's a lack of issues regarding object pools, this should be OK.
* | | | | | | Utilize RuboCop's Include/Exclude configPeter Leitzen2019-08-263-46/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop checking the file location programmatically.
* | | | | | | Merge branch ↵Nick Thomas2019-08-261-0/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '66443-unrecoverable-configuration-loop-in-external-auth-control' into 'master' Resolve "Unrecoverable configuration loop in external auth control" Closes #66443 See merge request gitlab-org/gitlab-ce!32102
| * | | | | | Add more tests to cover all cases66443-unrecoverable-configuration-loop-in-external-auth-controlRobert Schilling2019-08-221-0/+12
| | | | | | |
| * | | | | | Add test, reduce complexityRobert Schilling2019-08-221-0/+6
| | | | | | |
* | | | | | | Add edit_note and spec for editing quick actionsPatrick Derichs2019-08-262-3/+91
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call QuickActionsService on Note update Add support for notes which just contain commands after editing Return http status gone (410) if note was deleted Temporary frontend addition so it is not failing when a note is deleted Move specs to shared examples Fix rubocop style issue Deleting note on frontend when status is 410 Use guard clause for note which got deleted Simplified condition for nil note This method should no longer be called with nil note Refactoring of execute method to reduce complexity Move errors update to delete_note method Note is now deleted visually when it only contains commands after update Add expectation Fix style issues Changing action to fix tests Add tests for removeNote and update deleteNote expectations
* | | | | | Merge branch 'db_load_balancing_service_discovery_srv' into 'master'Kamil Trzciński2019-08-261-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | DB Load Balancing: Support SRV lookups See merge request gitlab-org/gitlab-ce!32135
| * | | | | | CE port: allow SRV records in DB service discoverydb_load_balancing_service_discovery_srvTiger2019-08-231-0/+11
| | | | | | |
* | | | | | | Merge branch 'ee-10586-geo-object-storage-replication' into 'master'Ash McKenzie2019-08-261-0/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Backport expired job artifact trait See merge request gitlab-org/gitlab-ce!32179
| * | | | | | Backport expired job artifact traitee-10586-geo-object-storage-replicationGabriel Mazetto2019-08-241-0/+4
| | |_|_|/ / | |/| | | |
* | | | | | Add helper to exactly undo cleanup_concurrent_column_renameReuben Pereira2019-08-251-0/+106
|/ / / / / | | | | | | | | | | | | | | | - Also add helper to undo rename_column_concurrently.
* | | | | Merge branch ↵Tim Zallmann2019-08-242-7/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '66073-use-time-series-chart-instead-of-area-chart-in-panel_types' into 'master' Enable line charts in dashbaord panels and embedded charts Closes #66073 See merge request gitlab-org/gitlab-ce!31920
| * | | | | Replace the area with time series where usedMiguel Rincon2019-08-212-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace in panel_type.vue - Replace in embed.vue - Port changes to support embed in 2 cols in large screens - Update specs