summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gitaly-write-ref-error-handling' into 'master'Robert Speicher2018-01-221-13/+19
|\
| * Move error-handling to lib/gitlab/gitKim "BKC" Carlbäcker2018-01-221-2/+4
| * Wrap Rugged-exceptions in Gitlab::Git::Repository#write_refgitaly-write-ref-error-handlingKim "BKC" Carlbäcker2018-01-181-13/+17
* | Merge branch 'gitaly-write-repo-config-prep' into 'master'Douwe Maan2018-01-221-0/+4
|\ \
| * | _never_ unset gitlab.full_pathgitaly-write-repo-config-prepKim "BKC" Carlbäcker2018-01-191-2/+2
| * | Move rugged-call from Project#write_repository_config to Git::Repository#writ...Kim "BKC" Carlbäcker2018-01-191-0/+4
* | | Merge branch 'fix-derefenced-target' into 'master'Douwe Maan2018-01-191-2/+2
|\ \ \ | |/ / |/| |
| * | Fix dereferenced_target naming in Gitlab::Git::Ref initializeSerdar Dogruyol2018-01-171-2/+2
* | | Merge branch 'background-migration-fix' into 'master'Douwe Maan2018-01-182-2/+5
|\ \ \
| * | | Reduce UPDATEs for background column type changesbackground-migration-fixYorick Peterse2018-01-182-2/+5
* | | | Merge branch 'gitaly-commit-signature' into 'master'Sean McGivern2018-01-183-6/+37
|\ \ \ \
| * | | | Retrieve commit signatures with GitalyJacob Vosmaer (GitLab)2018-01-183-6/+37
| |/ / /
* | | | Remove Rugged::Walker from Repository#logJacob Vosmaer (GitLab)2018-01-181-26/+1
|/ / /
* | | Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-178-10/+51
|\ \ \
| * | | Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-162-5/+12
| * | | Merge branch 'fix/import-rce-10-3' into 'security-10-3'James Lopez2018-01-163-3/+19
| * | | Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-161-0/+4
| * | | Merge branch 'ac/fix-path-traversal' into 'security-10-3'Robert Speicher2018-01-161-1/+15
| * | | Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3'Robert Speicher2018-01-161-1/+1
* | | | In development, allow the toggling of the performance barRémy Coutable2018-01-171-0/+1
* | | | Remove unused methods from Gitlab::GitJacob Vosmaer (GitLab)2018-01-171-31/+0
| |_|/ |/| |
* | | Merge branch 'fix/gb/improve-manual-action-tooltips' into 'master'Grzegorz Bizon2018-01-171-1/+4
|\ \ \ | |/ / |/| |
| * | Fix running manual action tooltipGrzegorz Bizon2018-01-161-1/+4
* | | Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'Stan Hu2018-01-161-1/+1
|\ \ \
| * | | Prevent RevList failing on non utf8 pathsjej/lfs-rev-list-handles-non-utf-paths-41627James Edwards-Jones2018-01-161-1/+1
* | | | Merge branch '41666-cannot-search-with-keyword-merge' into 'master'Rémy Coutable2018-01-161-9/+4
|\ \ \ \
| * | | | Fix project search results for digits surrounded by colonsSean McGivern2018-01-161-9/+4
* | | | | Merge branch 'feature/migrate-commit-uri-to-gitaly' into 'master'Sean McGivern2018-01-161-5/+32
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Migrate Commit#uri_type to Gitalyfeature/migrate-commit-uri-to-gitalyAhmad Sherif2018-01-152-6/+33
| | |/ / | |/| |
* | | | Merge branch '1819-override-ce' into 'master'Rémy Coutable2018-01-151-0/+111
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into 1819-override-ceLin Jen-Shin2018-01-1277-394/+1574
| |\ \ \ \
| * | | | | Use `Gitlab::Utils::Override` over defined?(super)Lin Jen-Shin2017-12-261-0/+111
* | | | | | Merge branch 'feature/migrate-import-repository-to-gitaly' into 'master'Robert Speicher2018-01-152-22/+57
|\ \ \ \ \ \
| * | | | | | Migrate importing repository to Gitalyfeature/migrate-import-repository-to-gitalyAhmad Sherif2018-01-153-23/+58
| | |_|_|/ / | |/| | | |
* | | | | | Resolve "Managed Prometheus deployment installs a lot of extra stuff"Mayra Cabrera2018-01-152-10/+35
* | | | | | Bump Gitaly version to 0.69.0Ahmad Sherif2018-01-151-1/+1
|/ / / / /
* | | | | Fixing request json mime typeFrancisco Javier López2018-01-151-3/+1
* | | | | Merge branch 'sh-log-when-user-blocked' into 'master'Douwe Maan2018-01-151-0/+36
|\ \ \ \ \
| * | | | | Log and send a system hook if a blocked user fails to loginsh-log-when-user-blockedStan Hu2018-01-141-0/+36
| | |_|/ / | |/| | |
* | | | | Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master'Grzegorz Bizon2018-01-153-34/+53
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitalyAhmad Sherif2018-01-113-34/+53
* | | | | Introduce PredicateMemoization cop and fix offensesLin Jen-Shin2018-01-126-10/+38
| |_|/ / |/| | |
* | | | Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master'Robert Speicher2018-01-112-1/+24
|\ \ \ \
| * | | | Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitalyAhmad Sherif2018-01-102-1/+24
* | | | | Merge branch 'feature/migrate-rebase-to-gitaly' into 'master'Robert Speicher2018-01-112-22/+76
|\ \ \ \ \
| * | | | | Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitalyAhmad Sherif2018-01-102-22/+76
| |/ / / /
* | | | | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-1126-0/+40
* | | | | Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-113-3/+0
|\ \ \ \ \
| * | | | | Remove soft removals related codeYorick Peterse2018-01-083-3/+0
* | | | | | Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master'Rémy Coutable2018-01-112-17/+47
|\ \ \ \ \ \
View Lorry Controller Status