summaryrefslogtreecommitdiff
path: root/spec/features
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'user-recent-push' into 'master'Douwe Maan2017-09-111-1/+3
|\ | | | | | | | | | | | | Rework how recent push events are retrieved Closes #35990 See merge request !13995
| * Rework how recent push events are retrieveduser-recent-pushYorick Peterse2017-09-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Check for sidebar cookie instead of class when resizing windowAnnabel Dunstone Gray2017-09-114-4/+4
| |
* | 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 'rs-issue-36104' into 'security-9-5'Douwe Maan2017-09-071-2/+0
| | | | | | | | | | | | | | | [9.5] Disallow the `name` attribute on all user-provided markup See merge request gitlab/gitlabhq!2166
* | | Merge branch '29943-environment-folder' into 'security-9-5'Kamil Trzciński2017-09-071-94/+112
| |/ |/| | | | | | | Do not use `location.pathname` when accessing environments folders See merge request !2147
* | Merge branch 'improve-share-locking-feature-for-subgroups' into 'master'Douwe Maan2017-09-074-84/+260
|\ \ | | | | | | | | | | | | | | | | | | Improve "Share with group lock" feature for subgroups Closes #30550 See merge request !13944
| * | Refer to “Share with group lock” consistentlyimprove-share-locking-feature-for-subgroupsMichael Kozono2017-09-062-17/+17
| | |
| * | Specify nested_groups specsMichael Kozono2017-09-062-2/+2
| | |
| * | Enable share_with_group_lock on subgroupMichael Kozono2017-09-061-0/+62
| | | | | | | | | | | | …when needed
| * | Add post-nested group Share lock integration testsMichael Kozono2017-09-061-34/+86
| | |
| * | Add pre-nested group share lock testsMichael Kozono2017-09-061-40/+102
| | |
| * | Refactor and rename specsMichael Kozono2017-09-062-12/+12
| | |
* | | Resolve "Make project and features visibility settings less confusing"Mike Greiling2017-09-074-41/+58
| | |
* | | Merge branch 'zj-auto-devops-table' into 'master'Kamil Trzciński2017-09-071-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Implement the implied CI/CD config for AutoDevOps Closes #34777 See merge request !13923
| * \ \ Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-09-075-22/+8
| |\ \ \ | | | |/ | | |/| | | | | zj/gitlab-ce-zj-auto-devops-table
| * | | Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-tableZeger-Jan van de Weg2017-09-076-10/+11
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2017-09-065-16/+12
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0614-208/+348
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0440-757/+405
| |\ \ \ \ \
| * | | | | | Fix testsZeger-Jan van de Weg2017-09-041-0/+10
| | | | | | |
* | | | | | | Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-071-4/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes default scope from sortable Closes #23079 See merge request !13558
| * | | | | | Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-071-4/+3
| | | | | | |
* | | | | | | Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-072-18/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finish migration to the new events setup Closes #37241 See merge request !13932
| * | | | | | | Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-062-18/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finishes the procedure for migrating events from the old format into the new format. Code no longer uses the old setup and the database tables used during the migration process are swapped, with the old table being dropped. While the database migration can be reversed this will 1) take a lot of time as data has to be coped around 2) won't restore data in the "events.data" column as we have no way of restoring this. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37241
* | | | | | | Merge branch 'fly-out-top-level-item' into 'master'Filipa Lacerda2017-09-073-4/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add top level items to fly-out navigation Closes #36294 See merge request !13981
| * | | | | | Add top level items to fly-out navigationPhil Hughes2017-09-063-4/+4
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This only appears when in the collapsed sidebar. If the sidebar is expanded, then these items are hidden & no fly-out navigation is displayed. Closes #36294
* | | | | | Merge branch 'breadcrumbs-extra-btns-remove' into 'master'Filipa Lacerda2017-09-072-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the action buttons out of the breadcrumbs Closes #36459 See merge request !14072
| * | | | | | spec fixesPhil Hughes2017-09-062-2/+2
| | | | | | |
* | | | | | | Merge branch 'rs-update-capybara' into 'master'Rémy Coutable2017-09-074-8/+9
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Update capybara 2.6.2 -> 2.15.1 See merge request !13976
| * | | | | | Fix failures introduced by Capybara upgraders-update-capybaraRobert Speicher2017-09-054-8/+9
| | | | | | |
* | | | | | | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-061-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First time contributor badge Closes #35161 See merge request !13902
| * | | | | | | fix the failing spec35161_first_time_contributor_badgemicael.bergeron2017-09-061-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'tc-test-admin-log-links' into 'master'Dmitriy Zaporozhets2017-09-061-3/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Put Admin loggers in before_action for easier overriding in EE See merge request !14081
| * | | | | | Put loggers in before_action for easier overriding in EEtc-test-admin-log-linksToon Claes2017-09-061-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it easier to override the set of loggers, by putting them in a separate method. Also modify spec so it tests for links, instead of checking for regular text.
* | | | | | | Merge branch 'breadcrumbs-improvements' into 'master'Filipa Lacerda2017-09-063-11/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements to breadcrumbs Closes #35269 and #36460 See merge request !13582
| * | | | | | Merge branch 'master' into breadcrumbs-improvementsPhil Hughes2017-09-063-25/+11
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'master' into breadcrumbs-improvementsPhil Hughes2017-09-054-103/+191
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'master' into breadcrumbs-improvementsPhil Hughes2017-09-051-11/+29
| |\ \ \ \ \ \
| * | | | | | | test fixesPhil Hughes2017-09-052-45/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed un-used file
| * | | | | | | Merge branch 'master' into breadcrumbs-improvementsPhil Hughes2017-09-051-6/+8
| |\ \ \ \ \ \ \
| * | | | | | | | rspec test fixesPhil Hughes2017-09-042-9/+4
| | | | | | | | |
* | | | | | | | | Resolve outdated diff discussions on pushSean McGivern2017-09-061-51/+49
| | | | | | | | |
* | | | | | | | | change collapse to resolve and comments to discussionsAshley Dumaine2017-09-061-5/+9
| | | | | | | | |
* | | | | | | | | add unit tests for new collapse_outdated_diff_comments toggleAshley Dumaine2017-09-061-0/+76
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch 'master' into '36860-migrate-issues-author'36860-migrate-issues-authorDouwe Maan2017-09-059-174/+239
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ \ \ \ \ \ \ Merge branch 'fuzzy-issue-search' into 'master'Sean McGivern2017-09-052-11/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fuzzy search issues / merge requests Closes #26835, #29994, and #20362 See merge request !13780
| | * | | | | | | | Fix broken feature specsHiroyuki Sato2017-08-312-11/+11
| | | | | | | | | |
| * | | | | | | | | Remove spec as no longer necessarykushalpandya2017-09-051-43/+0
| | |_|_|_|/ / / / | |/| | | | | | |