summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Use full path of user's avatar in webhooks34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absoluteblackst0ne2017-08-091-1/+1
* Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0810-19/+20
|\
| * Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0810-19/+20
* | Merge branch '36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-...Rémy Coutable2017-08-081-7/+12
|\ \ | |/ |/|
| * Add checks for branch existence before changing HEAD36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-oneblackst0ne2017-08-081-7/+12
* | Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-083-17/+8
|\ \
| * | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-071-1/+1
| * | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-071-12/+2
| * | Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-073-4/+5
* | | Merge branch 'master' into ideMike Greiling2017-08-077-37/+50
|\ \ \
| * \ \ Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-16/+7
| |\ \ \ | | |_|/ | |/| |
| | * | Move locked_at removal to post-deployment migrationOswaldo Ferreira2017-08-071-0/+1
| | * | Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-16/+6
| * | | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'Robert Speicher2017-08-071-11/+28
| |\ \ \
| | * | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-071-11/+28
| | |/ /
| * | | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-071-0/+1
| |\ \ \
| | * | | Move some after_create parts to worker to improve performance32844-issuables-performanceJarka Kadlecova2017-08-071-0/+1
| * | | | Merge branch '35761-convdev-perc' into 'master'Sean McGivern2017-08-071-3/+1
| |\ \ \ \
| | * | | | Store & use ConvDev percentages returned by Version app35761-convdev-percJarka Kadlecova2017-08-071-3/+1
| * | | | | Merge branch 'backport-ee-2251' into 'master'Sean McGivern2017-08-072-4/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/25...Nick Thomas2017-08-072-4/+3
| | | |_|/ | | |/| |
| * | | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-071-0/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-0734-313/+711
| | |\ \ \ \
| | * | | | | Rename GitLabProjectImporterService and misc fixesZ.J. van de Weg2017-08-011-1/+1
| | * | | | | Allow projects to be started from a templateZ.J. van de Weg2017-07-281-0/+1
| * | | | | | Merge branch 'group-milestone-references-system-notes' into 'master'Robert Speicher2017-08-071-3/+9
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Support references to group milestonesSean McGivern2017-08-071-3/+9
| | | |/ / / | | |/| | |
* | | | | | Merge branch 'master' into ideMike Greiling2017-08-0710-74/+264
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'wiki_title' into 'master'Robert Speicher2017-08-072-37/+45
| |\ \ \ \ \
| | * | | | | Allow wiki pages to be renamed in the UIwendy04022017-08-032-37/+45
| * | | | | | Merge branch 'dashboard-projects-controller-query-performance' into 'master'Sean McGivern2017-08-071-11/+13
| |\ \ \ \ \ \
| | * | | | | | Memoize a user's personal projects countYorick Peterse2017-08-071-1/+5
| | * | | | | | Remove redundant query from User#recent_pushYorick Peterse2017-08-071-10/+8
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker'Douwe Maan2017-08-072-6/+30
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'gitaly-renames-annotations' into 'master'Sean McGivern2017-08-071-1/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Rename raw -> ruggedJacob Vosmaer2017-08-041-1/+1
| | | |/ / /
| | * | | | Merge branch 'feature/migrate-last-commit-for-path-to-gitaly' into 'master'Robert Speicher2017-08-041-5/+29
| | |\ \ \ \
| | | * | | | Migrate Repository#last_commit_for_path to GitalyAhmad Sherif2017-08-031-5/+29
| * | | | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-041-13/+28
| |/ / / / /
| * | | | | Merge branch 'refactor.notification-recipient-builders' into 'master'Sean McGivern2017-08-041-0/+125
| |\ \ \ \ \
| | * | | | | move the read_ability logic into NotificationRecipienthttp://jneen.net/2017-08-031-4/+18
| | * | | | | use the accessor for `type`http://jneen.net/2017-08-031-1/+1
| | * | | | | fix commenthttp://jneen.net/2017-08-031-1/+2
| | * | | | | use safe navigation on notification_settinghttp://jneen.net/2017-08-031-1/+1
| | * | | | | short-circuit if there is no policy, and add :read_project checkhttp://jneen.net/2017-08-031-3/+6
| | * | | | | style fixeshttp://jneen.net/2017-08-031-7/+8
| | * | | | | don't require projecthttp://jneen.net/2017-08-031-3/+1
| | * | | | | default the project to target.projecthttp://jneen.net/2017-08-031-3/+9
| | * | | | | move Recipient to its own NotificationRecipient filehttp://jneen.net/2017-08-031-0/+102
| | |/ / / /
| * | | | | Merge branch 'fix-jira-integration' into 'master'Rémy Coutable2017-08-041-2/+6
| |\ \ \ \ \
View Lorry Controller Status