summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...revert-c676283bFatih Acet2016-10-054-23/+49
|\
| * Merge branch 'kradydal/gitlab-ce-20989-disable-all-for-non-project-members'Rémy Coutable2016-10-051-0/+9
| |\
| | * Imrove grammarKatarzyna Kobierska2016-10-031-1/+1
| | * Fix test, add author attribute to all testsKatarzyna Kobierska2016-10-031-0/+9
| * | Merge branch 'trending-caching' into 'master' Rémy Coutable2016-10-052-22/+39
| |\ \
| | * | Refactor TrendingProjectsFinder to support cachingYorick Peterse2016-10-051-22/+31
| | * | Exclude system notes from Project.trendingYorick Peterse2016-10-041-0/+8
| * | | Merge branch 'desplacturing' into 'master' Jacob Schatz2016-10-051-1/+1
| |\ \ \
| | * | | Fix test for SearchAutocomplete.Bryce Johnson2016-10-051-1/+1
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-0514-91/+378
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'test-improve-gitlab-identifier' into 'master' Rémy Coutable2016-10-053-1/+143
| |\ \ \ \
| | * | | | Refactor Gitlab::IdentifierYorick Peterse2016-10-053-1/+143
| | | |/ / | | |/| |
| * | | | Merge branch 'update-runner-information' into 'master' Rémy Coutable2016-10-051-16/+27
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add some tests for updating ci runner informationupdate-runner-informationGrzegorz Bizon2016-10-031-16/+27
| | | |/ | | |/|
| * | | Merge branch 'all-skipped-equals-success' into 'master' Rémy Coutable2016-10-054-59/+144
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into all-skipped-equals-successall-skipped-equals-successLin Jen-Shin2016-10-052-4/+16
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge remote-tracking branch 'upstream/master' into all-skipped-equals-successLin Jen-Shin2016-10-0425-99/+306
| | |\ \ \
| | * \ \ \ Merge branch 'master' into all-skipped-equals-successLin Jen-Shin2016-10-0348-287/+1102
| | |\ \ \ \
| | * | | | | Fix tests. Check 'success' first (default status)Lin Jen-Shin2016-10-031-23/+20
| | * | | | | Add test for CommitStatus.exclude_ignoredLin Jen-Shin2016-10-031-15/+40
| | * | | | | Rename ignored to failed_but_allowed, introduce exclude_ignoredLin Jen-Shin2016-10-031-2/+2
| | * | | | | Add a test for on_failure jobs in the middleLin Jen-Shin2016-10-011-1/+18
| | * | | | | Should use eq because we want ordersLin Jen-Shin2016-10-011-6/+3
| | * | | | | We consider skipped = success, fixes #22598Lin Jen-Shin2016-09-301-0/+49
| | * | | | | Less confusing nameLin Jen-Shin2016-09-301-19/+19
| * | | | | | Merge branch 'remove-reset-project-activity-lease' into 'master' Rémy Coutable2016-10-052-8/+4
| |\ \ \ \ \ \
| | * | | | | | Remove lease from Event#reset_project_activityremove-reset-project-activity-leaseYorick Peterse2016-10-042-8/+4
| | | |_|_|/ / | | |/| | | |
| * | | | | | Fix project deletion when feature visibility is set to privatesh-fix-project-deletion-private-visibilityStan Hu2016-10-041-1/+22
| * | | | | | Merge branch 'fix/22225' into 'master' Sean McGivern2016-10-041-2/+22
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Skip wiki creation when GitHub project has wiki enabledDouglas Barbosa Alexandre2016-10-041-2/+22
| * | | | | | Merge branch 'code-blocks-vue-pre' into 'master' Jacob Schatz2016-10-042-4/+16
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fixed banzai test failuresPhil Hughes2016-10-041-4/+4
| | * | | | | Adds v-pre to code blocks in commentsPhil Hughes2016-10-041-0/+12
| | |/ / / /
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-0413-58/+270
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'restrict-failed-2fa-attempts' into 'master' Rémy Coutable2016-10-041-0/+38
| |\ \ \ \ \
| | * | | | | Restrict failed login attempts for users with 2FASean McGivern2016-10-041-0/+38
| * | | | | | Merge branch 'zj-save-environment-deployment-refs' into 'master' Kamil Trzciński2016-10-041-0/+10
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | deployment refs in own folder, new method for creating refszj-save-environment-deployment-refsZ.J. van de Weg2016-10-041-0/+10
| * | | | | | Merge branch 'issue_22446' into 'master' Sean McGivern2016-10-042-0/+60
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into issue_22446Sean McGivern2016-10-041-0/+17
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Fix bug when trying to cache closed issues from external issue trackersissue_22446Felipe Artur2016-10-032-0/+60
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'cleanup-mentionable-methods-arguments' into 'master' Douwe Maan2016-10-043-9/+19
| |\ \ \ \ \ \
| | * | | | | | Simplify Mentionable concern instance methodsPaco Guzman2016-10-043-9/+19
| | |/ / / / /
| * | | | | | Merge branch 'rc-improve-members-destroy-service' into 'master' Robert Speicher2016-10-044-43/+94
| |\ \ \ \ \ \
| | * | | | | | Invert method's namingRémy Coutable2016-10-031-1/+1
| | * | | | | | Fix a few things after the initial improvment to Members::DestroyServiceRémy Coutable2016-10-033-4/+13
| | * | | | | | Improve Members::DestroyServiceRémy Coutable2016-10-032-42/+84
| * | | | | | | Merge branch 'append-issue-template' into 'master' Fatih Acet2016-10-041-5/+25
| |\ \ \ \ \ \ \
| | * | | | | | | Append issue template to existing descriptionJoseph Frazier2016-10-031-5/+25
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'todo-issue-due-date' into 'master' Robert Speicher2016-10-041-1/+7
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |