Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '1819-override-ce' into 'master' | Rémy Coutable | 2018-01-15 | 3 | -0/+128 |
|\ | |||||
| * | Merge remote-tracking branch 'upstream/master' into 1819-override-ce | Lin Jen-Shin | 2018-01-12 | 120 | -574/+1899 |
| |\ | |||||
| * | | Use `Gitlab::Utils::Override` over defined?(super) | Lin Jen-Shin | 2017-12-26 | 3 | -0/+128 |
* | | | Merge branch 'feature/migrate-import-repository-to-gitaly' into 'master' | Robert Speicher | 2018-01-15 | 2 | -22/+57 |
|\ \ \ | |||||
| * | | | Migrate importing repository to Gitalyfeature/migrate-import-repository-to-gitaly | Ahmad Sherif | 2018-01-15 | 3 | -23/+58 |
* | | | | Resolve "Managed Prometheus deployment installs a lot of extra stuff" | Mayra Cabrera | 2018-01-15 | 2 | -10/+35 |
* | | | | Merge branch '38540-ssh-env-file' into 'master' | Douwe Maan | 2018-01-15 | 1 | -10/+0 |
|\ \ \ \ | |||||
| * | | | | Remove .ssh/environment file that now breaks the gitlab:check rake task | Ricketts, M (Mike) | 2017-12-22 | 1 | -10/+0 |
* | | | | | Merge branch 'feature/bump-gitaly-version-to-0-69-0' into 'master' | Sean McGivern | 2018-01-15 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Bump Gitaly version to 0.69.0 | Ahmad Sherif | 2018-01-15 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch '42025-fix-issue-api' into 'master' | Sean McGivern | 2018-01-15 | 1 | -2/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | [API] Fix creating issue when assignee_id is empty42025-fix-issue-api | Valery Sizov | 2018-01-15 | 1 | -2/+4 |
* | | | | | Merge branch 'fix-duplication-circuit-breakers' into 'master' | Douwe Maan | 2018-01-15 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix duplication in API::CircuitBreakers | Serdar Dogruyol | 2018-01-15 | 1 | -2/+2 |
* | | | | | Fixing request json mime type | Francisco Javier López | 2018-01-15 | 1 | -3/+1 |
* | | | | | Merge branch 'sh-log-when-user-blocked' into 'master' | Douwe Maan | 2018-01-15 | 1 | -0/+36 |
|\ \ \ \ \ | |||||
| * | | | | | Log and send a system hook if a blocked user fails to loginsh-log-when-user-blocked | Stan Hu | 2018-01-14 | 1 | -0/+36 |
* | | | | | | Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master' | Grzegorz Bizon | 2018-01-15 | 3 | -34/+53 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitaly | Ahmad Sherif | 2018-01-11 | 3 | -34/+53 |
* | | | | | | Introduce PredicateMemoization cop and fix offenses | Lin Jen-Shin | 2018-01-12 | 6 | -10/+38 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch '41882-respect-only-path-in-relative-link-filter' into 'master' | Douwe Maan | 2018-01-12 | 1 | -4/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Ensure that emails contain absolute, rather than relative, links to user uploads | Nick Thomas | 2018-01-11 | 1 | -4/+11 |
* | | | | | | Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master' | Robert Speicher | 2018-01-11 | 2 | -1/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitaly | Ahmad Sherif | 2018-01-10 | 2 | -1/+24 |
* | | | | | | | Merge branch 'feature/migrate-rebase-to-gitaly' into 'master' | Robert Speicher | 2018-01-11 | 2 | -22/+76 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitaly | Ahmad Sherif | 2018-01-10 | 2 | -22/+76 |
| |/ / / / / / | |||||
* | | | | | | | Adds Rubocop rule for line break around conditionals | 🙈 jacopo beschi 🙉 | 2018-01-11 | 51 | -0/+73 |
* | | | | | | | Merge branch 'remove-soft-removals' into 'master' | Douwe Maan | 2018-01-11 | 5 | -5/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove soft removals related code | Yorick Peterse | 2018-01-08 | 5 | -5/+2 |
* | | | | | | | | Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master' | Rémy Coutable | 2018-01-11 | 2 | -17/+47 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Migrate merged_branch_names to Gitaly | Ahmad Sherif | 2018-01-11 | 2 | -17/+47 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'option-disable-archive-cache' into 'master' | Sean McGivern | 2018-01-11 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Add option to disable git archive caching in workhorseoption-disable-archive-cache | Jacob Vosmaer | 2018-01-09 | 1 | -0/+7 |
* | | | | | | | | Merge branch '38068-commits-count' into 'master' | Yorick Peterse | 2018-01-11 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Denormalize commits count for merge request diffs38068-commits-count | Jan Provaznik | 2018-01-10 | 1 | -0/+26 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch '39214__pipeline_api' into 'master' | Sean McGivern | 2018-01-11 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix style | Tony Rom | 2018-01-10 | 1 | -2/+3 |
| * | | | | | | | | Add `pipelines` endpoint to merge requests API | Tony Rom | 2017-12-15 | 1 | -0/+15 |
* | | | | | | | | | Merge branch 'gcp-fix' into 'master' | Kamil Trzciński | 2018-01-11 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add missing user agent header to GCP client | Matija Čupić | 2018-01-11 | 1 | -2/+2 |
| * | | | | | | | | | Fix billing checking | Kamil Trzciński | 2018-01-10 | 1 | -2/+2 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'git-write-ref-prep' into 'master' | Robert Speicher | 2018-01-10 | 1 | -2/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prep | Kim "BKC" Carlbäcker | 2018-01-09 | 1 | -2/+15 |
* | | | | | | | | | | Merge branch 'da-verify-integrity-of-uploaded-files' into 'master' | Robert Speicher | 2018-01-10 | 1 | -0/+44 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix small typos | Douglas Barbosa Alexandre | 2018-01-09 | 1 | -1/+1 |
| * | | | | | | | | | Add rake task to check integrity of uploaded files | Douglas Barbosa Alexandre | 2018-01-08 | 1 | -0/+44 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'zj-migrate-gitlab-project-rm-mv' into 'master' | Douwe Maan | 2018-01-10 | 2 | -34/+18 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Migrate GitlabProject (re)move project endpoints | Zeger-Jan van de Weg | 2018-01-09 | 2 | -34/+18 |
* | | | | | | | | | | Merge branch 'fix/use-mirror-refmaps-instead-mirror-refmap' into 'master' | Sean McGivern | 2018-01-10 | 1 | -3/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add support for multiple refmaps to RemoteService#add_remotefix/use-mirror-refmaps-instead-mirror-refmap | Ahmad Sherif | 2018-01-09 | 1 | -3/+5 |
| | |_|_|/ / / / / / | |/| | | | | | | | |