summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Use deployment IID when saving refsZ.J. van de Weg2016-10-202-3/+3
* | | Merge branch 'update-duration-at-the-end-of-pipeline' into 'master' Rémy Coutable2016-10-201-3/+0
|\ \ \
| * | | Update duration at the end of pipelineupdate-duration-at-the-end-of-pipelineKamil Trzcinski2016-10-201-3/+0
* | | | Merge branch 'render-hipchat-notification-descriptions' into 'master' Rémy Coutable2016-10-201-22/+36
|\ \ \ \
| * | | | Return truncation for notification descriptions, fix minor bugs with renderingAirat Shigapov2016-10-201-6/+11
| * | | | Use guard clause instead of if-else statementAirat Shigapov2016-10-201-13/+12
| * | | | Clean up Banzai HTML for HipChatDavid Eisner2016-10-201-0/+3
| * | | | Ensure absolute URLs for single lines from Banzai for HipChatDavid Eisner2016-10-201-3/+7
| * | | | Absolute URLs for Banzai HTML for HipChatDavid Eisner2016-10-201-11/+21
| * | | | Also render commit titles in HipChat notificationsDavid Eisner2016-10-201-4/+8
| * | | | Full Banzai rendering for HipChat notificationsDavid Eisner2016-10-201-11/+3
| * | | | Render hipchat notification descriptions as HTML instead of raw markdownAirat Shigapov2016-10-201-6/+3
* | | | | Merge branch '23341-fix-viewing-mr-from-deleted-project' into 'master' Douwe Maan2016-10-201-17/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename forked_source_project_missing? to source_project_missing?Nick Thomas2016-10-201-3/+3
| * | | | Fix the merge request view when source projects or branches are removedNick Thomas2016-10-201-9/+6
| * | | | Revert "Add #closed_without_source_project?"Nick Thomas2016-10-201-8/+2
| | |_|/ | |/| |
* | | | Merge branch 'issue_22944' into 'master' Sean McGivern2016-10-201-6/+1
|\ \ \ \
| * | | | Create project feature when project is createdissue_22944Felipe Artur2016-10-191-6/+1
| |/ / /
* | | | Merge branch 'refactoring_find_commits_method' into 'master' Sean McGivern2016-10-201-3/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Refactoring find_commits functionalityValery Sizov2016-10-201-3/+6
| | |/ | |/|
* | | Differentiate the expire from leave eventCallum Dryden2016-10-203-3/+18
| |/ |/|
* | Merge branch 'feature/group-level-labels' into 'master' Douwe Maan2016-10-1912-65/+201
|\ \
| * | Rename Labels::CreateService to Labels::FindOrCreateServiceDouglas Barbosa Alexandre2016-10-191-1/+1
| * | Add self.project_foreign_key on both Issue and MergeRequestDouglas Barbosa Alexandre2016-10-193-7/+9
| * | Remove unused method Project#all_labelsDouglas Barbosa Alexandre2016-10-191-4/+0
| * | Update specs to cope with new label types and prioritiesJames Lopez2016-10-191-0/+4
| * | Fix max number of permitted priorities per project labelDouglas Barbosa Alexandre2016-10-191-2/+2
| * | Use join instead of subquery on Label.unprioritized scopeDouglas Barbosa Alexandre2016-10-191-1/+8