summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'use-config-param' into 'master' Sean McGivern2016-11-111-1/+1
|\
| * Use config param in `Repository#update_ref!`teru2016-11-101-1/+1
* | Merge branch 'fix/error-when-invalid-branch-for-new-pipeline-used' into 'mast...Douwe Maan2016-11-101-6/+6
|\ \ | |/ |/|
| * Remove redundant rescue from repository keep_aroundfix/error-when-invalid-branch-for-new-pipeline-usedGrzegorz Bizon2016-11-091-5/+1
| * Remove redundant space from repository model codeGrzegorz Bizon2016-11-091-1/+1
| * Evade some exceptions when using invalid referencesGrzegorz Bizon2016-11-071-1/+5
* | Merge branch 'pipeline-notifications' into 'master' Sean McGivern2016-11-093-17/+18
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-089-15/+126
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-055-15/+57
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-031-1/+1
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-0225-198/+249
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-2518-51/+59
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-242-2/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-217-55/+62
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-2023-90/+306
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use Array rather than compact, feedback:Lin Jen-Shin2016-10-181-1/+1
| * | | | | | | | | | Merge branch 'pipeline-emails' into pipeline-notificationsLin Jen-Shin2016-10-182-5/+7
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rename for a more consistent pipeline worker name, feedback:Lin Jen-Shin2016-10-172-2/+2
| * | | | | | | | | | | Use run_after_commit to avoid race condition, feedback:Lin Jen-Shin2016-10-171-1/+3
| * | | | | | | | | | | Pipeline#user could be nil. Feedback:Lin Jen-Shin2016-10-171-1/+1
| * | | | | | | | | | | It's already async, from Project#execute_services, feedback:Lin Jen-Shin2016-10-171-1/+1
| * | | | | | | | | | | Change service to be a worker, feedback:Lin Jen-Shin2016-10-172-4/+4
| * | | | | | | | | | | Prefix _ to show that it's intended unused, feedback:Lin Jen-Shin2016-10-171-1/+1
| * | | | | | | | | | | Fix spelling, feedback:Lin Jen-Shin2016-10-171-1/+1
| * | | | | | | | | | | It no longer needs a block, feedback:Lin Jen-Shin2016-10-171-3/+1
| * | | | | | | | | | | Remove pusher support because it's covered by notificationsLin Jen-Shin2016-10-171-12/+2
| * | | | | | | | | | | Revert "Split notification integration into another branch"Lin Jen-Shin2016-10-172-1/+12
* | | | | | | | | | | | Merge branch '23403-fix-events-for-private-project-features' into 'security'Robert Speicher2016-11-091-1/+2
* | | | | | | | | | | | Merge branch 'fix-unathorized-cloning' into 'security'Douwe Maan2016-11-091-0/+7
* | | | | | | | | | | | Merge branch 'issue_23548_dev' into 'master'Douwe Maan2016-11-091-22/+30
* | | | | | | | | | | | Merge branch '22481-honour-issue-visibility-for-groups' into 'security' Douwe Maan2016-11-093-6/+48
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Faster searchfaster_project_searchValery Sizov2016-11-081-0/+4
* | | | | | | | | | | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-083-10/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-072-2/+2
| * | | | | | | | | | | Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-073-10/+23
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'process-commits-using-sidekiq' into 'master' Robert Speicher2016-11-074-0/+66
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Process commits in a separate workerprocess-commits-using-sidekiqYorick Peterse2016-11-071-0/+2
| * | | | | | | | | | | Added IssueCollectionYorick Peterse2016-11-072-0/+45
| * | | | | | | | | | | Add the method ExternalIssue#project_idYorick Peterse2016-11-071-0/+9
| * | | | | | | | | | | Add User#projects_with_reporter_access_limited_toYorick Peterse2016-11-071-0/+10
* | | | | | | | | | | | Merge branch 'jacobvosmaer-gitlab/gitlab-ce-git-gc-improvements' into 'master' Douwe Maan2016-11-071-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Refine Git garbage collectionJacob Vosmaer2016-11-041-0/+17
* | | | | | | | | | | | Merge branch '24059-post-facto-fixups' into 'master' Douwe Maan2016-11-071-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Simplify ApplicationSetting#repository_storagesNick Thomas2016-11-071-5/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'issue_23032' into 'master' Sean McGivern2016-11-041-0/+15
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Allow to test JIRA service when project does not have repositoryissue_23032Felipe Artur2016-11-041-0/+15
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'show-status-from-branch' into 'master' Rémy Coutable2016-11-041-4/+11
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-044-7/+39
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Initialize @statuses in status rather than constructorLin Jen-Shin2016-11-031-1/+2