Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace the 'project/merge_requests/accept.feature' spinach test with an rspe... | blackst0ne | 2017-09-11 | 1 | -0/+65 |
* | Merge branch '37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_tree... | Rémy Coutable | 2017-09-08 | 1 | -0/+20 |
|\ | |||||
| * | Fix a "Wrong number of arguments" error in TreeHelper#flatten_tree37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_tree | Rémy Coutable | 2017-09-07 | 1 | -0/+20 |
* | | Merge branch 'rs-issue-36104' into 'security-9-5' | Douwe Maan | 2017-09-07 | 1 | -2/+0 |
* | | Merge branch '29943-environment-folder' into 'security-9-5' | Kamil Trzciński | 2017-09-07 | 1 | -94/+112 |
* | | Merge branch 'improve-share-locking-feature-for-subgroups' into 'master' | Douwe Maan | 2017-09-07 | 4 | -84/+260 |
|\ \ | |||||
| * | | Refer to “Share with group lock” consistentlyimprove-share-locking-feature-for-subgroups | Michael Kozono | 2017-09-06 | 2 | -17/+17 |
| * | | Specify nested_groups specs | Michael Kozono | 2017-09-06 | 2 | -2/+2 |
| * | | Enable share_with_group_lock on subgroup | Michael Kozono | 2017-09-06 | 1 | -0/+62 |
| * | | Add post-nested group Share lock integration tests | Michael Kozono | 2017-09-06 | 1 | -34/+86 |
| * | | Add pre-nested group share lock tests | Michael Kozono | 2017-09-06 | 1 | -40/+102 |
| * | | Refactor and rename specs | Michael Kozono | 2017-09-06 | 2 | -12/+12 |
* | | | Resolve "Make project and features visibility settings less confusing" | Mike Greiling | 2017-09-07 | 4 | -41/+58 |
* | | | Merge branch 'zj-auto-devops-table' into 'master' | Kamil Trzciński | 2017-09-07 | 1 | -0/+10 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops... | Kamil Trzcinski | 2017-09-07 | 5 | -22/+8 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-table | Zeger-Jan van de Weg | 2017-09-07 | 6 | -10/+11 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into zj/gitlab-ce-zj... | Kamil Trzcinski | 2017-09-06 | 5 | -16/+12 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'master' into zj-auto-devops-table | Zeger-Jan van de Weg | 2017-09-06 | 14 | -208/+348 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into zj-auto-devops-table | Zeger-Jan van de Weg | 2017-09-04 | 40 | -757/+405 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix tests | Zeger-Jan van de Weg | 2017-09-04 | 1 | -0/+10 |
* | | | | | | | Merge branch '23079-remove-default-scope-in-sortable' into 'master' | Douwe Maan | 2017-09-07 | 1 | -4/+3 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Removes default scope from sortable23079-remove-default-scope-in-sortable | Tiago Botelho | 2017-09-07 | 1 | -4/+3 |
* | | | | | | | Merge branch 'events-migration-cleanup' into 'master' | Sean McGivern | 2017-09-07 | 2 | -18/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Finish migration to the new events setupevents-migration-cleanup | Yorick Peterse | 2017-09-06 | 2 | -18/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'fly-out-top-level-item' into 'master' | Filipa Lacerda | 2017-09-07 | 3 | -4/+4 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Add top level items to fly-out navigation | Phil Hughes | 2017-09-06 | 3 | -4/+4 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'breadcrumbs-extra-btns-remove' into 'master' | Filipa Lacerda | 2017-09-07 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | spec fixes | Phil Hughes | 2017-09-06 | 2 | -2/+2 |
* | | | | | | | Merge branch 'rs-update-capybara' into 'master' | Rémy Coutable | 2017-09-07 | 4 | -8/+9 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Fix failures introduced by Capybara upgraders-update-capybara | Robert Speicher | 2017-09-05 | 4 | -8/+9 |
* | | | | | | | Merge branch '35161_first_time_contributor_badge' into 'master' | Sean McGivern | 2017-09-06 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix the failing spec35161_first_time_contributor_badge | micael.bergeron | 2017-09-06 | 1 | -2/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'tc-test-admin-log-links' into 'master' | Dmitriy Zaporozhets | 2017-09-06 | 1 | -3/+5 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Put loggers in before_action for easier overriding in EEtc-test-admin-log-links | Toon Claes | 2017-09-06 | 1 | -3/+5 |
* | | | | | | | Merge branch 'breadcrumbs-improvements' into 'master' | Filipa Lacerda | 2017-09-06 | 3 | -11/+5 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch 'master' into breadcrumbs-improvements | Phil Hughes | 2017-09-06 | 3 | -25/+11 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' into breadcrumbs-improvements | Phil Hughes | 2017-09-05 | 4 | -103/+191 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' into breadcrumbs-improvements | Phil Hughes | 2017-09-05 | 1 | -11/+29 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | test fixes | Phil Hughes | 2017-09-05 | 2 | -45/+1 |
| * | | | | | | | Merge branch 'master' into breadcrumbs-improvements | Phil Hughes | 2017-09-05 | 1 | -6/+8 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | rspec test fixes | Phil Hughes | 2017-09-04 | 2 | -9/+4 |
* | | | | | | | | | Resolve outdated diff discussions on push | Sean McGivern | 2017-09-06 | 1 | -51/+49 |
* | | | | | | | | | change collapse to resolve and comments to discussions | Ashley Dumaine | 2017-09-06 | 1 | -5/+9 |
* | | | | | | | | | add unit tests for new collapse_outdated_diff_comments toggle | Ashley Dumaine | 2017-09-06 | 1 | -0/+76 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'master' into '36860-migrate-issues-author'36860-migrate-issues-author | Douwe Maan | 2017-09-05 | 9 | -174/+239 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'fuzzy-issue-search' into 'master' | Sean McGivern | 2017-09-05 | 2 | -11/+11 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix broken feature specs | Hiroyuki Sato | 2017-08-31 | 2 | -11/+11 |
| * | | | | | | | | | Remove spec as no longer necessary | kushalpandya | 2017-09-05 | 1 | -43/+0 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'feature/gpg-verification-status' into 'master' | Douwe Maan | 2017-09-05 | 3 | -103/+181 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | update signature badges to reflect new states | Alexis Reigel | 2017-09-05 | 1 | -29/+104 |