summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-1714-53/+140
|\
| * Make ruby lint happysh-backport-10-3-4-security-fixesOswaldo Ferreira2018-01-171-0/+1
| * 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 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-163-33/+84
| * 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
| * Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-inte...Stan Hu2018-01-164-10/+4
* | In development, allow the toggling of the performance barRémy Coutable2018-01-171-0/+1
* | Merge branch '41118-add-sorting-to-deployments-api' into 'master'Rémy Coutable2018-01-171-1/+3
|\ \
| * | Adds sorting to deployments APIJacopo2018-01-171-1/+3
| |/
* | 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 '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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
View Lorry Controller Status