summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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 'builds-api-nplusone' into 'master'Stan Hu2018-01-162-0/+2
|\ \
| * | Use preload instead of includes to avoid joinsbuilds-api-nplusoneMatija Čupić2018-01-152-2/+2
| * | Fix N+1 builds query in Jobs list APIMatija Čupić2018-01-141-0/+1
| * | Eager load user, runner, pipeline and its creatorMatija Čupić2018-01-141-1/+3
| * | Fix N+1 in v3 builds APIMatija Čupić2018-01-131-2/+1
| |/
* | Merge branch '42031-fix-links-to-uploads-in-wikis' into 'master'Douwe Maan2018-01-161-0/+4
|\ \
| * | Fix links to uploaded files on wiki pagesNick Thomas2018-01-161-0/+4
* | | Merge branch 'print-list-of-available-backups' into 'master'Douwe Maan2018-01-161-1/+8
|\ \ \ | |/ / |/| |
| * | Move conditional to a separate methodBalasankar "Balu" C2018-01-151-3/+5
| * | List available backups for restoreBalasankar "Balu" C2018-01-151-1/+6
* | | 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
* | | | Enables Project Milestone Deletion via APIJacopo2018-01-161-0/+9
* | | | 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-153-0/+128
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into 1819-override-ceLin Jen-Shin2018-01-12120-574/+1899
| |\ \ \ \
| * | | | | Use `Gitlab::Utils::Override` over defined?(super)Lin Jen-Shin2017-12-263-0/+128
* | | | | | 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
* | | | | | | Merge branch '38540-ssh-env-file' into 'master'Douwe Maan2018-01-151-10/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove .ssh/environment file that now breaks the gitlab:check rake taskRicketts, M (Mike)2017-12-221-10/+0
* | | | | | | | Merge branch 'feature/bump-gitaly-version-to-0-69-0' into 'master'Sean McGivern2018-01-151-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Bump Gitaly version to 0.69.0Ahmad Sherif2018-01-151-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '42025-fix-issue-api' into 'master'Sean McGivern2018-01-151-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [API] Fix creating issue when assignee_id is empty42025-fix-issue-apiValery Sizov2018-01-151-2/+4
* | | | | | | Merge branch 'fix-duplication-circuit-breakers' into 'master'Douwe Maan2018-01-151-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix duplication in API::CircuitBreakersSerdar Dogruyol2018-01-151-2/+2
* | | | | | | 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 '41882-respect-only-path-in-relative-link-filter' into 'master'Douwe Maan2018-01-121-4/+11
|\ \ \ \ \ \
| * | | | | | Ensure that emails contain absolute, rather than relative, links to user uploadsNick Thomas2018-01-111-4/+11
* | | | | | | 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-1151-0/+73
* | | | | | | | Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-115-5/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove soft removals related codeYorick Peterse2018-01-085-5/+2
* | | | | | | | | Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master'Rémy Coutable2018-01-112-17/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Migrate merged_branch_names to GitalyAhmad Sherif2018-01-112-17/+47
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'option-disable-archive-cache' into 'master'Sean McGivern2018-01-111-0/+7
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add option to disable git archive caching in workhorseoption-disable-archive-cacheJacob Vosmaer2018-01-091-0/+7
View Lorry Controller Status