summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge status_for and status, feedback:Lin Jen-Shin2016-11-031-5/+1
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-0225-197/+246
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | It's not used as a public API right now, feedback:Lin Jen-Shin2016-10-281-5/+4
| * | | | | | | | | | | Still show status from pipelines, see:Lin Jen-Shin2016-10-271-7/+14
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-261-1/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-2516-35/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Pass `@ref` along so we know which pipeline to showLin Jen-Shin2016-10-241-0/+4
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/labels-api'Rémy Coutable2016-11-041-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Return conflict error in label API when title is taken by group labellabels-apiDouwe Maan2016-10-201-4/+0
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' Douwe Maan2016-11-041-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-041-0/+7
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Fix: Todos Filter Shows All Users22588-todos-filter-shows-all-usersValery Sizov2016-11-041-0/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Allow multiple repository storage shards to be enabled, and automatically rou...Nick Thomas2016-11-042-5/+36
* | | | | | | | | | | Ensure merge request's "remove branch" accessors return booleans24102-cannot-unselect-remove-source-branch-when-editing-merge-requestRémy Coutable2016-11-031-2/+2
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Use the server's base URL without relative URL part when creating links in JIRABrian Kintz2016-11-021-1/+1
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'Allow-admin-to-search-for-user-by-secondary-email-address' into...Sean McGivern2016-11-011-0/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow to search for user by secondary email address in the admin interfaceYar2016-11-011-0/+18
* | | | | | | | | | Fix project features default valuesFelipe Artur2016-11-012-1/+6
* | | | | | | | | | Use select instead of pluck on Project.group_idsDouglas Barbosa Alexandre2016-10-311-1/+1
* | | | | | | | | | Use label subject to calculate number of issues/mrs within the groupDouglas Barbosa Alexandre2016-10-313-15/+23
|/ / / / / / / / /
* | | | | | | | | Merge branch '22271-drone-tag-pipeline-build' into 'master' Douwe Maan2016-10-311-12/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-buildAlejandro Rodríguez2016-10-281-12/+12
* | | | | | | | | | Merge branch '23106-events-default-scope-results-in-a-slow-query' into 'master' Yorick Peterse2016-10-311-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Optimize Event queries by removing default order23106-events-default-scope-results-in-a-slow-queryAlejandro Rodríguez2016-10-271-1/+1
* | | | | | | | | | | Merge branch 'lfs_object_removal' into 'master' 23858-task-listsSean McGivern2016-10-311-0/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove unreferenced LFS objects from DB and fsFrank Groeneveld2016-10-281-0/+6
* | | | | | | | | | | | Merge branch 'dz-internal-api-fullpath' into 'master' Dmitriy Zaporozhets2016-10-281-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Refactor storage path extraction from full repo pathdz-internal-api-fullpathDmitriy Zaporozhets2016-10-281-0/+14
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '22392-add-x-of-y-tasks-completed-on-issuable' into 'master' Sean McGivern2016-10-284-4/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | add "x of y tasks completed" on issuableGuilherme Salazar2016-10-284-4/+15
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '23872-members-of-group-that-has-project-access-getting-404-on-a...Rémy Coutable2016-10-281-8/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix project member access for group linksSean McGivern2016-10-281-8/+2
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'adam-fix-labels-find-or-create' into 'master' Douwe Maan2016-10-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Pass user instance to Labels::FindOrCreateService or skip_authorization: trueadam-fix-labels-find-or-createAdam Niedzielski2016-10-281-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'use-optimistic-locking' into 'master' Stan Hu2016-10-282-12/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix optimistic lockingKamil Trzcinski2016-10-261-6/+6
| * | | | | | | | | | Add tests for optimistic lockingKamil Trzcinski2016-10-261-1/+1
| * | | | | | | | | | Use optimistic lockingKamil Trzcinski2016-10-261-6/+6
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '5905-duplicate-email-errors' into 'master' Rémy Coutable2016-10-281-1/+3
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 5905-duplicate-email-errorsSteve Halasz2016-10-2716-36/+40
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Only show one error message for an invalid emailSteve Halasz2016-10-271-1/+3
* | | | | | | | | | | Merge branch '23928-sortable-highest_label_priority-is-bugged' into 'master' Rémy Coutable2016-10-282-4/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix and improve `Sortable.highest_label_priority`23928-sortable-highest_label_priority-is-buggedAlejandro Rodríguez2016-10-272-4/+9
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'issue_1008_1' into 'master' Sean McGivern2016-10-286-136/+122
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Finish updates to use JIRA gemFelipe Artur2016-10-266-69/+64
| * | | | | | | | | | Refactor JIRA service to use gemDrew Blessing2016-10-261-105/+96
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Revert "Revert "Change "Group#web_url" to return "/groups/twitter" rather tha...dz-revert-revertDmitriy Zaporozhets2016-10-271-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'master' into issue-board-sidebarissue-board-sidebarPhil Hughes2016-10-2622-106/+127
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'show-commit-status-from-source-project' into 'master' Douwe Maan2016-10-251-3/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Also keep commits from source_project around, feedback:Lin Jen-Shin2016-10-251-3/+5
| | | |_|/ / / / / | | |/| | | | | |