summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-119-11/+100
* Merge branch 'replace_spinach_wiki.feature' into 'master'Rémy Coutable2017-09-115-174/+408
|\
| * 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 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 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 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 retrieveduser-recent-pushYorick Peterse2017-09-086-60/+225
* | | Merge branch '37454-remove-confidential-cb-edit-issue' into 'master'Phil Hughes2017-09-111-25/+0
|\ \ \
| * | | 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 '35012-navigation-add-option-to-change-navigation-color-...revert-f2421b2bRubén Dávila2017-09-089-100/+11
* | Merge branch 'backport-issues-controller-changes' into 'master'Sean McGivern2017-09-081-0/+22
|\ \
| * \ 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 '37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_tree...Rémy Coutable2017-09-081-0/+20
|\ \ \ \
| * | | | 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
| |/ / /
* | | | Merge branch 'support-additional-colors' into 'master'Tim Zallmann2017-09-084-24/+31
|\ \ \ \
| * | | | 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
* | | | | Merge branch 'rs-issue-36098' into 'security-9-5'Robert Speicher2017-09-071-3/+17
* | | | | Merge branch '29943-environment-folder' into 'security-9-5'Kamil Trzciński2017-09-073-94/+138
* | | | | Merge branch 'fix-escape-commit-block' into 'security-9-5'Douwe Maan2017-09-071-0/+22
* | | | | Merge branch 'fix-comment-reflection' into 'security-9-5'Jacob Schatz2017-09-071-0/+14
* | | | | Merge branch 'dm-go-get-xss' into 'security-9-3'Robert Speicher2017-09-071-1/+17
| |_|_|/ |/| | |
* | | | Merge branch '30473-allow-creation-of-subgroups-with-gitlab_default_can_creat...Douwe Maan2017-09-074-7/+188
|\ \ \ \
| * | | | Make Members with Owner and Master roles always able to create subgroups30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-falseRuben Davila2017-09-074-7/+188
| | |_|/ | |/| |
* | | | Merge branch '35558-only-one-garbage-collection-should-be-running-per-project...Douwe Maan2017-09-073-20/+114
|\ \ \ \ | |/ / / |/| | |
| * | | Adds exclusive lease to Git garbage collect worker.35558-only-one-garbage-collection-should-be-running-per-project-at-onceTiago Botelho2017-09-073-20/+114
* | | | Merge branch 'improve-share-locking-feature-for-subgroups' into 'master'Douwe Maan2017-09-079-84/+705
|\ \ \ \
| * | | | Refer to “Share with group lock” consistentlyimprove-share-locking-feature-for-subgroupsMichael Kozono2017-09-066-61/+61
| * | | | Link or not link depending on permissionsMichael Kozono2017-09-061-3/+13
| * | | | Fix ability when Share lock is offMichael Kozono2017-09-061-44/+60
| * | | | Link to ancestor settings pageMichael Kozono2017-09-061-3/+3
| * | | | Refactor based on code reviewMichael Kozono2017-09-061-3/+3
| * | | | Fix “Share lock” help textMichael Kozono2017-09-062-29/+88
| * | | | Fix “Share lock” policy for deeply nested groupsMichael Kozono2017-09-061-8/+34
| * | | | Specify nested_groups specsMichael Kozono2017-09-065-5/+5
| * | | | Enforce share_with_group_lock rulesMichael Kozono2017-09-062-0/+82
| * | | | Enable share_with_group_lock on subgroupMichael Kozono2017-09-062-0/+174
| * | | | Vary share lock setting UIMichael Kozono2017-09-061-0/+140
| * | | | 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