summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* fix another N+1 query for label priorities34510-board-issues-sql-speedupmicael.bergeron2017-09-121-0/+11
| | | | added a QueryRecorder for IssuesController#index.json
* Merge branch 'gitaly-519-commit-stats' into 'master'Robert Speicher2017-09-122-1/+34
|\ | | | | | | | | | | | | Migrate Git::CommitStats to Gitaly Closes gitaly#519 See merge request !14077
| * Migrate Git::CommitStats to Gitalygitaly-519-commit-statsKim "BKC" Carlbäcker2017-09-112-1/+34
| |
* | Resolve "Error 500 in non-UTF8 branch names"Micael Bergeron2017-09-123-1/+25
| |
* | Merge branch 'detect-orphaned-repositories' into 'master'Douwe Maan2017-09-122-0/+129
|\ \ | | | | | | | | | | | | Detect orphaned repositories See merge request !14204
| * | Refactor on namespace and repository checks and added specsGabriel Mazetto2017-09-122-0/+129
| | |
* | | Merge branch 'housekeeping_settings' into 'master'Douwe Maan2017-09-122-5/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow to use same periods for housekeeping tasks Closes #34981 See merge request !13711
| * | | Allow to use same periods for housekeeping tasksAlex Lossent2017-09-112-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables skipping a lesser housekeeping task (incremental or full repack) by consistently scheduling a higher task (respectively full repack or gc) with the same period. Cf. #34981
* | | | Merge branch 'replace_project_issues_award_emoji.feature' into 'master'Rémy Coutable2017-09-121-0/+104
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Replace the 'project/issues/award_emoji.feature' spinach test with an rspec analog See merge request !14202
| * | | | Replace the 'project/issues/award_emoji.feature' spinach test with an rspec ↵Vitaliy @blackst0ne Klachkov2017-09-121-0/+104
| | | | | | | | | | | | | | | | | | | | analog
* | | | | Merge branch 'replace_project_builds_summary.feature' into 'master'Rémy Coutable2017-09-122-0/+69
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'project/builds/summary.feature' spinach test with an rspec analog See merge request !14177
| * | | | | Replace the 'project/builds/summary.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-122-0/+69
| |/ / / /
* | | | | Merge branch 'hide-read-registry-scope-when-registry-disabled' into 'master'Kamil Trzciński2017-09-125-11/+74
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Hide read_registry scope when registry is disabled on instance See merge request !13314
| * | | | Hide read_registry scope when registry is disabled on instanceRobin Bobbitt2017-08-215-11/+74
| | | | |
* | | | | Use WikiPages::CreateService in ↵Rémy Coutable2017-09-121-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec/features/projects/wiki/user_updates_wiki_page_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'replace_project_merge_requests_revert.feature' into 'master'Rémy Coutable2017-09-121-0/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog See merge request !14201
| * | | | | Replace the 'project/merge_requests/revert.feature' spinach test with an ↵Vitaliy @blackst0ne Klachkov2017-09-121-0/+59
| | |_|/ / | |/| | | | | | | | | | | | | rspec analog
* | | | | Merge branch 'replace_milestone.feature' into 'master'Rémy Coutable2017-09-121-0/+40
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Replace the 'project/milestone.feature' spinach test with an rspec analog See merge request !14171
| * | | | Replace the project/milestone.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-121-0/+40
| | | | |
* | | | | Merge branch '37608-reset-all-connections' into 'master'Robert Speicher2017-09-111-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Reset all connection schema cache after migration tests See merge request !14195
| * | | | Reset all connection schema cache after migration tests37608-reset-all-connectionsLin Jen-Shin2017-09-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We might also want to consider reduce the number of connections in the tests. However I just tried setting it to 1 and that doesn't seem enough for feature tests.
* | | | | Merge branch 'replace_project_merge_requests_accept.feature' into 'master'Rémy Coutable2017-09-111-0/+65
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog See merge request !14176
| * | | | Replace the 'project/merge_requests/accept.feature' spinach test with an ↵blackst0ne2017-09-111-0/+65
| |/ / / | | | | | | | | | | | | rspec analog
* | | | Merge branch 'replace_spinach_wiki.feature' into 'master'Rémy Coutable2017-09-115-174/+408
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Replace 'project/wiki.feature' spinach test with an rspec analog See merge request !13856
| * | | | Replace 'project/wiki.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-115-174/+408
| |/ / /
* | | | Merge branch 'replace_group_links.feature' into 'master'Rémy Coutable2017-09-111-0/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Replace 'project/group_links.feature' spinach test with an rspec analog See merge request !14169
| * | | | Replace project/group_links.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-101-0/+41
| |/ / /
* | | | Merge branch 'replace_emails.feature' into 'master'Rémy Coutable2017-09-111-0/+78
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Replace the 'profile/emails.feature' spinach test with an rspec analog See merge request !14172
| * | | | Replace the profile/emails.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-101-0/+78
| |/ / /
* | | | Merge branch 'replace_team_management.feature' into 'master'Rémy Coutable2017-09-111-0/+68
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Replace the 'project/team_management.feature' spinach test with an rspec analog See merge request !14173
| * | | Replace the project/team_management.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-101-0/+68
| |/ /
* | | Merge branch 'user-recent-push' into 'master'Douwe Maan2017-09-116-60/+225
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rework how recent push events are retrieved Closes #35990 See merge request !13995
| * | | Rework how recent push events are retrieveduser-recent-pushYorick Peterse2017-09-086-60/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever you push to a branch GitLab will show a button to create a merge request (should one not exist already). The underlying code to display this data was quite inefficient. For example, it involved multiple slow queries just to figure out what the most recent push event was. This commit changes the way this data is retrieved so it's much faster. This is achieved by caching the ID of the last push event on every push, which is then retrieved when loading certain pages. Database queries are only executed if necessary and the cached data is removed automatically once a merge request has been created, or 2 hours after being stored. A trade-off of this approach is that we _only_ track the last event. Previously if you were to push to branch A and B then create a merge request for branch B we'd still show the widget for branch A. As of this commit this is no longer the case, instead we will only show the widget for the branch you pushed to most recently. Once a merge request exists the widget is no longer displayed. Alternative solutions are either too complex and/or too slow, hence the decision was made to settle for this trade-off. Performance Impact ------------------ In the best case scenario (= a user didn't push anything for more than 2 hours) we perform a single Redis GET per page. Should there be cached data we will run a single (and lightweight) SQL query to get the event data from the database. If a merge request already exists we will run an additional DEL to remove the cache key. The difference in response timings can vary a bit per project. On GitLab.com the 99th percentile of time spent in User#recent_push hovers between 100 milliseconds and 1 second, while the mean hovers around 50 milliseconds. With the changes in this MR the expected time spent in User#recent_push is expected to be reduced down to just a few milliseconds. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/35990
* | | | Merge branch '37454-remove-confidential-cb-edit-issue' into 'master'Phil Hughes2017-09-111-25/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove confidential toggle checkbox while editing issue inline Closes #37454 See merge request !14142
| * | | | Remove confidential toggle checkbox and related code as no longer necessary37454-remove-confidential-cb-edit-issuekushalpandya2017-09-111-25/+0
| | |/ / | |/| |
* | | | Check for sidebar cookie instead of class when resizing windowAnnabel Dunstone Gray2017-09-114-4/+4
|/ / /
* | | Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-089-100/+11
| | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* | | Merge branch 'backport-issues-controller-changes' into 'master'Sean McGivern2017-09-081-0/+22
|\ \ \ | | | | | | | | | | | | | | | | Move issues index variable setting to a method See merge request !14048
| * \ \ Merge branch 'master' into backport-issues-controller-changesbackport-issues-controller-changesBryce Johnson2017-09-0757-197/+1423
| |\ \ \
| * | | | Backport getAllParams and other nav changes from service desk.Bryce Johnson2017-09-071-0/+22
| | | | |
* | | | | Merge branch ↵Rémy Coutable2017-09-081-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_tree' into 'master' Fix a "Wrong number of arguments" error in TreeHelper#flatten_tree Closes #37569 See merge request !14119
| * | | | | Fix a "Wrong number of arguments" error in TreeHelper#flatten_tree37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_treeRémy Coutable2017-09-071-0/+20
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'support-additional-colors' into 'master'Tim Zallmann2017-09-084-24/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supports additional colors and labels for the prometheus monitoring dashboard Closes #34629 See merge request !14065
| * | | | | Changed how the backend response is handled for when instead of seriesJose Ivan Vargas2017-09-073-4/+4
| | | | | |
| * | | | | Added minor details to specsJose Ivan Vargas2017-09-071-4/+4
| | | | | |
| * | | | | small fixes to code and specsJose Ivan Vargas2017-09-072-4/+11
| | | | | |
| * | | | | Added specs for the additional color supportJose Ivan Vargas2017-09-073-7/+5
| | | | | |
| * | | | | Renamed some componentsJose Ivan Vargas2017-09-072-12/+14
| | | | | |
* | | | | | Merge branch 'rs-issue-36104' into 'security-9-5'Douwe Maan2017-09-072-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [9.5] Disallow the `name` attribute on all user-provided markup See merge request gitlab/gitlabhq!2166
* | | | | | Merge branch 'rs-issue-36098' into 'security-9-5'Robert Speicher2017-09-071-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [9.5] Limit `style` attribute on `th` and `td` elements to specific properties See merge request gitlab/gitlabhq!2155