Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master' | Robert Speicher | 2018-01-11 | 1 | -23/+29 |
|\ | |||||
| * | Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitaly | Ahmad Sherif | 2018-01-10 | 1 | -23/+29 |
* | | Merge branch 'feature/migrate-rebase-to-gitaly' into 'master' | Robert Speicher | 2018-01-11 | 1 | -37/+57 |
|\ \ | |||||
| * | | Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitaly | Ahmad Sherif | 2018-01-10 | 1 | -37/+57 |
| |/ | |||||
* | | Merge branch 'main-js-tidy-up' into 'master' | Filipa Lacerda | 2018-01-11 | 25 | -10/+22 |
|\ \ | |||||
| * | | Tidy up main JS filemain-js-tidy-up | Phil Hughes | 2018-01-10 | 25 | -10/+22 |
| |/ | |||||
* | | Adds Rubocop rule for line break around conditionals | 🙈 jacopo beschi 🙉 | 2018-01-11 | 15 | -0/+427 |
* | | Merge branch 'remove-soft-removals' into 'master' | Douwe Maan | 2018-01-11 | 17 | -59/+78 |
|\ \ | |||||
| * | | Added tests for removing soft removed objectsremove-soft-removals | Yorick Peterse | 2018-01-10 | 1 | -0/+77 |
| * | | Remove soft removals related code | Yorick Peterse | 2018-01-08 | 16 | -59/+1 |
* | | | Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master' | Rémy Coutable | 2018-01-11 | 1 | -28/+38 |
|\ \ \ | |||||
| * | | | Migrate merged_branch_names to Gitaly | Ahmad Sherif | 2018-01-11 | 1 | -28/+38 |
| | |/ | |/| | |||||
* | | | Merge branch 'option-disable-archive-cache' into 'master' | Sean McGivern | 2018-01-11 | 1 | -0/+14 |
|\ \ \ | |||||
| * | | | Add option to disable git archive caching in workhorseoption-disable-archive-cache | Jacob Vosmaer | 2018-01-09 | 1 | -0/+14 |
* | | | | Merge branch '41608-clipboard-vue-button' into 'master' | Phil Hughes | 2018-01-11 | 1 | -0/+31 |
|\ \ \ \ | |||||
| * | | | | Adds props to allow tooltip config. Breaks tests into specific cases41608-clipboard-vue-button | Filipa Lacerda | 2018-01-11 | 1 | -1/+7 |
| * | | | | Add tooltip missing to clipboard component | Filipa Lacerda | 2018-01-10 | 1 | -0/+25 |
* | | | | | Merge branch '39988-hide-new-branch-tag-empty-repo' into 'master' | Rémy Coutable | 2018-01-11 | 1 | -0/+39 |
|\ \ \ \ \ | |||||
| * | | | | | Hide new branch and tag links for projects with an empty repo | Mark Fletcher | 2018-01-09 | 1 | -0/+39 |
* | | | | | | Merge branch 'fix-use-of-append-in-mr-api-spec' into 'master' | Grzegorz Bizon | 2018-01-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove call to ProjectTeam#<< in MR API spec | Sean McGivern | 2018-01-11 | 1 | -1/+1 |
* | | | | | | | Merge branch '38068-commits-count' into 'master' | Yorick Peterse | 2018-01-11 | 5 | -0/+68 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Denormalize commits count for merge request diffs38068-commits-count | Jan Provaznik | 2018-01-10 | 5 | -0/+68 |
* | | | | | | | Merge branch '41613-fix-redundant-modal' into 'master' | Filipa Lacerda | 2018-01-11 | 2 | -45/+61 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update tests to cover modal dialog | Kushal Pandya | 2018-01-11 | 1 | -12/+54 |
| * | | | | | | | Update tests for modal changes | Kushal Pandya | 2018-01-11 | 1 | -33/+7 |
* | | | | | | | | Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' i... | Grzegorz Bizon | 2018-01-11 | 1 | -2/+24 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Never set special MR titles for external issues | Sean McGivern | 2018-01-10 | 1 | -0/+22 |
| * | | | | | | | | Fix incorrect default merge request title when external issue tracker is acti... | Benedikt Huss | 2018-01-09 | 1 | -2/+2 |
* | | | | | | | | | Merge branch '4020-rebase-message' into 'master' | Sean McGivern | 2018-01-11 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Store only generic message if rebase fails4020-rebase-message | Jan Provaznik | 2018-01-09 | 1 | -7/+7 |
* | | | | | | | | | | Merge branch '39214__pipeline_api' into 'master' | Sean McGivern | 2018-01-11 | 2 | -0/+47 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix style | Tony Rom | 2018-01-10 | 1 | -0/+6 |
| * | | | | | | | | | | Add `pipelines` endpoint to merge requests API | Tony Rom | 2017-12-15 | 2 | -0/+41 |
* | | | | | | | | | | | Merge branch 'gcp-fix' into 'master' | Kamil Trzciński | 2018-01-11 | 5 | -21/+92 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Change failed GCP billing check wording | Matija Čupić | 2018-01-11 | 1 | -1/+1 |
| * | | | | | | | | | | | Refactor GCP redirect test suite | Matija Čupić | 2018-01-11 | 4 | -23/+90 |
| * | | | | | | | | | | | Fix GCP Controller spec | Matija Čupić | 2018-01-11 | 1 | -1/+5 |
| * | | | | | | | | | | | Fix CheckGcpProjectBillingWorker spec | Matija Čupić | 2018-01-11 | 1 | -1/+1 |
| * | | | | | | | | | | | Fix CheckGcpProjectBillingService spec | Matija Čupić | 2018-01-11 | 1 | -2/+2 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | fixed abuse_reports spec | Phil Hughes | 2018-01-11 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'dispatcher-sessions' into 'master' | Phil Hughes | 2018-01-11 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix specsdispatcher-sessions | Clement Ho | 2018-01-10 | 2 | -2/+2 |
* | | | | | | | | | | | | Fix up Web IDE user preference copy and buttons | Jose Ivan Vargas | 2018-01-11 | 3 | -3/+3 |
* | | | | | | | | | | | | Merge branch 'sh-fix-award-emoji-move-issues' into 'master' | Grzegorz Bizon | 2018-01-11 | 1 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix bug where award emojis would be lost when moving issues between projectssh-fix-award-emoji-move-issues | Stan Hu | 2018-01-10 | 1 | -3/+9 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '41491-fix-nil-blob-name-error' into 'master' | Annabel Dunstone Gray | 2018-01-10 | 1 | -1/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix 500 when visiting a commit where blobs do not exist (nil blobs)41491-fix-nil-blob-name-error | Eric Eastwood | 2018-01-09 | 1 | -1/+14 |
* | | | | | | | | | | | | Merge branch 'git-write-ref-prep' into 'master' | Robert Speicher | 2018-01-10 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prep | Kim "BKC" Carlbäcker | 2018-01-09 | 1 | -3/+2 |