summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master'Grzegorz Bizon2018-01-311-1/+1
|\
| * Move Repository#can_be_merged? to Gitlab::Git::Repositoryfix/move-can-be-merged-to-lib-gitAhmad Sherif2018-01-301-19/+1
* | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-302-1/+10
|\ \
| * | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-302-1/+10
* | | Merge branch 'gitaly-784-repo-write-ref' into 'master'Douwe Maan2018-01-301-0/+2
|\ \ \
| * | | Migrate Git::Repository#write_ref to Gitalygitaly-784-repo-write-refKim "BKC" Carlbäcker2018-01-301-0/+2
| | |/ | |/|
* | | Merge branch '42160-error-500-loading-merge-request-undefined-method-index-fo...Douwe Maan2018-01-301-0/+2
|\ \ \
| * | | Fix truncated_diff_lines for legacy notes without a line42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclassSean McGivern2018-01-301-0/+2
* | | | Decouple more of Repository from RuggedJacob Vosmaer (GitLab)2018-01-301-62/+5
* | | | Merge branch 'osw-short-circuit-mergeable-disccusions-state' into 'master'Sean McGivern2018-01-301-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Check MR state before submitting queries for discussion stateosw-short-circuit-mergeable-disccusions-stateOswaldo Ferreira2018-01-291-2/+2
| |/ /
* | | Fix JIRA not working when a trailing slash is includedStan Hu2018-01-291-1/+1
|/ /
* | Merge branch 'fix-cache-clear-windows' into 'master'Kamil Trzciński2018-01-291-1/+1
|\ \
| * | Replace : with _ in cache key versioningMatija Čupić2018-01-261-1/+1
| |/
* | Fix MR revert check when no merged_at is presentSean McGivern2018-01-291-6/+6
|/
* update code based on feedback42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-errorJames Lopez2018-01-264-3/+7
* add specJames Lopez2018-01-261-0/+1
* disable retry attempts for Import/Export until that is fixedJames Lopez2018-01-261-0/+2
* fix validation error on servicesJames Lopez2018-01-264-3/+5
* Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'Robert Speicher2018-01-251-1/+1
|\
| * Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-241-1/+1
* | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-252-9/+2
|\ \
| * | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-252-9/+2
* | | Merge branch 'contrain-run-git' into 'master'Rémy Coutable2018-01-251-66/+15
|\ \ \
| * | | Make Gitlab::Git::Repository#run_git privatecontrain-run-gitJacob Vosmaer2018-01-251-66/+15
| |/ /
* | | Merge branch '42377-fix-merge-request-can-be-reverted' into 'master'Rémy Coutable2018-01-251-1/+7
|\ \ \ | |/ / |/| |
| * | Look at notes created just before merge when deciding if an MR can be revertedNick Thomas2018-01-251-1/+7
* | | Merge branch 'dm-project-system-hooks-in-transaction' into 'master'Robert Speicher2018-01-241-2/+2
|\ \ \ | |_|/ |/| |
| * | Execute system hooks after-commit when executing project hooksdm-project-system-hooks-in-transactionDouwe Maan2018-01-241-2/+2
| |/
* | Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-241-0/+1
|/
* Merge branch '40612-cannot-change-project-visibility-from-private-even-when-o...Robert Speicher2018-01-221-0/+2
|\
| * ensure fork_source returns nil when project is the root fork, add testsMike Greiling2018-01-221-0/+2
* | Merge branch 'gitaly-write-ref-error-handling' into 'master'Robert Speicher2018-01-221-9/+1
|\ \
| * | Move error-handling to lib/gitlab/gitKim "BKC" Carlbäcker2018-01-221-11/+1
| * | Wrap Rugged-exceptions in Gitlab::Git::Repository#write_refgitaly-write-ref-error-handlingKim "BKC" Carlbäcker2018-01-181-5/+7
* | | Merge branch '41673-blank-query-members-api' into 'master'Rémy Coutable2018-01-221-0/+4
|\ \ \
| * | | Yield no results for blank searches on User name, username and emailMark Fletcher2018-01-211-0/+4
* | | | Merge branch 'gitaly-write-repo-config-prep' into 'master'Douwe Maan2018-01-221-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move rugged-call from Project#write_repository_config to Git::Repository#writ...Kim "BKC" Carlbäcker2018-01-191-1/+1
* | | | Merge branch '41532-email-reason' into 'master'Sean McGivern2018-01-192-19/+36
|\ \ \ \
| * | | | Initial work to add notification reason to emailsMario de la Ossa2018-01-162-19/+36
| | |_|/ | |/| |
* | | | Resolve "Projects API: filter 'with_issues_enabled=true' returns projects wit...Jan Christophersen2018-01-191-0/+1
| |/ / |/| |
* | | Merge branch '42154-fix-artifact-size-calc' into 'master'Robert Speicher2018-01-181-1/+1
|\ \ \
| * | | Fix a bug calculating artifact size for project statisticsNick Thomas2018-01-181-1/+1
| | |/ | |/|
* | | Delete conflicting orphaned routesMichael Kozono2018-01-181-0/+12
|/ /
* | Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-184-23/+63
|\ \
| * | use class reader instead of dynamic constantAlexis Reigel2018-01-171-3/+5
| * | no need for a named parameterAlexis Reigel2018-01-172-2/+2
| * | accepts `.all` as a hook scope as wellAlexis Reigel2018-01-171-1/+2
| * | use safer .hooks_for instead of .public_sendAlexis Reigel2018-01-172-1/+7
View Lorry Controller Status