summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Merge branch '23662-issue-move-user-reference-exception' into 'master' Douwe Maan2016-10-251-1/+1
| |\ \ \
| | * | | Fix `User#to_reference`23662-issue-move-user-reference-exceptionTimothy Andrew2016-10-251-1/+1
| | | |/ | | |/|
| * | | Remove redundant class_name and foreign_key overridesDavid Wagner2016-10-2414-30/+30
| |/ /
| * | Merge branch 'yesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-s...Dmitriy Zaporozhets2016-10-241-1/+1
| |\ \
| | * | Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twit...Dmitriy Zaporozhets2016-10-241-1/+1
| * | | Merge branch '21513-fix-branch-protection-api' into 'master' Douwe Maan2016-10-241-0/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Implement review comments from @DouweM.Timothy Andrew2016-10-241-2/+2
| | * | Fix branch protection API.Timothy Andrew2016-10-241-0/+5
| * | | Merge branch 'remove-callback' into 'master' Rémy Coutable2016-10-241-4/+2
| |\ \ \ | | |_|/ | |/| |
| | * | refactor(email): use setter method instead AR callbacksSemyon Pupkov2016-10-231-4/+2
| | |/
| * | Remove duplicate code in repository cache clearingsh-flush-cache-after-importStan Hu2016-10-231-8/+1
| * | Expire and build repository cache after project importStan Hu2016-10-231-4/+14
| |/
| * Merge branch 'adam-fix-group-web-url' into 'master' Sean McGivern2016-10-211-1/+1
| |\
| | * Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".Adam Niedzielski2016-10-211-1/+1
| * | Merge branch '14192-issues-closed-by-merge-requests-using-metrics-data' into ...Yorick Peterse2016-10-211-1/+7
| |\ \ | | |/ | |/|
| | * Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests m...14192-issues-closed-by-merge-requests-using-metrics-dataPaco Guzman2016-10-201-1/+7
| * | Merge branch 'fix/validate-board-limit' into 'master' Douwe Maan2016-10-201-0/+7
| |\ \
| | * | [ci skip] Add a comment explaining validate_board_limit callbackfix/validate-board-limitDouglas Barbosa Alexandre2016-10-201-0/+7
| * | | Merge branch 'zj-use-iid-deployment-refs' into 'master' Kamil Trzciński2016-10-202-4/+4
| |\ \ \ | | |/ / | |/| |
| | * | Only create refs for new deploymentszj-use-iid-deployment-refsZ.J. van de Weg2016-10-201-1/+1
View Lorry Controller Status