summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'track-pipeline-user' into 'master' Rémy Coutable2016-07-182-0/+5
|\
| * Track a user who created a pipelineKamil Trzcinski2016-07-152-0/+5
* | Merge branch 'fix-stage-status-show-for-pipelines' into 'master' Rémy Coutable2016-07-181-5/+19
|\ \
| * | Fix stage status shown for pipelinesfix-stage-status-show-for-pipelinesKamil Trzcinski2016-07-151-5/+19
| |/
* | Allow a project import URL to be blank to prevent false positivesStan Hu2016-07-171-2/+2
* | Update testslegacy-diff-notes-are-dumbDouwe Maan2016-07-151-4/+4
|/
* Merge branch 'fix/persistent-import-data' into 'master' Fatih Acet2016-07-141-2/+20
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/persistent-...James Lopez2016-07-1317-78/+79
| |\
| * | fixes a few issues to do with import_url not being saved correctly for import...James Lopez2016-07-121-2/+20
* | | Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-5/+4
| |/ |/|
* | Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-131-4/+5
* | Avoid `describe`-ing symbols in specsrs-describe-symbolsRobert Speicher2016-07-1217-74/+74
|/
* Optimize system note visibility checking by hiding notes thatStan Hu2016-07-111-0/+14
* Support renames in diff_for_path actionsSean McGivern2016-07-111-3/+3
* Collapse large diffs by defaultSean McGivern2016-07-082-0/+72
* Merge branch 'feature/option-set-new-users-external' into 'master' Rémy Coutable2016-07-081-0/+21
|\
| * Added setting to set new users by default as externalDravere2016-07-071-0/+21
* | Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-072-2/+187
|\ \
| * | Have `Project#open_branches` return branches that are matched by a wildcard p...18627-wildcard-branch-protectionTimothy Andrew2016-07-071-2/+2
| * | Support wildcard matches for protected branches at the model level.Timothy Andrew2016-07-052-2/+187
* | | Merge branch 'new-diff-notes' into 'master' Douwe Maan2016-07-076-27/+259
|\ \ \
| * | | Make `DiffNote#update_position` privateDouwe Maan2016-07-071-39/+44
| * | | Update test with new factory nameDouwe Maan2016-07-071-2/+2
| * | | Add tests for MergeRequest#reload_diffDouwe Maan2016-07-061-0/+40
| * | | Add tests for DiffNoteDouwe Maan2016-07-061-0/+186
| * | | Add DiffNote modelDouwe Maan2016-07-061-8/+8
| * | | Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-063-17/+18
| | |/ | |/|
* | | Exclude projects pending delete from notificationsSean McGivern2016-07-071-0/+17
|/ /
* | Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into 'm...Douwe Maan2016-07-061-1/+31
|\ \
| * | Use a more future-proof check for Note/LegacyDiffNote19092-fix-event-for-legacydiffnote-not-considered-noteRémy Coutable2016-07-061-4/+4
| * | Fix diff comments not showing up in activity feedRémy Coutable2016-07-041-1/+31
* | | Merge branch 'gh-labels' into 'master' Robert Speicher2016-07-061-7/+6
|\ \ \
| * | | Allow '?', or '&' for label titlesDouglas Barbosa Alexandre2016-07-051-7/+6
| | |/ | |/|
* | | Merge branch 'fix/import-url-validator' into 'master' Robert Speicher2016-07-061-0/+12
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-304-6/+119
| |\ \
| * \ \ fix merge conflictsJames Lopez2016-06-284-1/+96
| |\ \ \
| * | | | another fix and fixed specJames Lopez2016-06-221-1/+8
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-229-120/+323
| |\ \ \ \
| * \ \ \ \ Merge branches 'fix/import-url-validator' and 'master' of gitlab.com:gitlab-o...James Lopez2016-06-207-33/+115
| |\ \ \ \ \
| * | | | | | fixing URL validation for import_url on projectsJames Lopez2016-06-171-0/+5
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-07-041-0/+37
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge branch 'master' into dev-masterTomasz Maczukin2016-07-0217-49/+159
| |\ \ \ \ \ \
| * | | | | | | Ensure logged-out users can't see private refsSean McGivern2016-06-301-0/+37
* | | | | | | | Better message for git hooks and file locksValery Sizov2016-07-041-9/+9
* | | | | | | | Merge branch '13524-keep-around-commits' into 'master' Douwe Maan2016-07-043-2/+14
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Don't garbage collect commits that have related DB records like commentsDouwe Maan2016-07-043-2/+14
* | | | | | | | Merge branch 'explicit-requesters-scope' into 'master' Douwe Maan2016-07-014-20/+63
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-014-20/+63
* | | | | | | | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-0112-17/+0
|/ / / / / / /
* | | | | | | Merge branch 'fix/build-retry-button-in-view' into 'master' Robert Speicher2016-06-301-0/+18
|\ \ \ \ \ \ \
View Lorry Controller Status