summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master'Robert Speicher2018-01-111-23/+29
|\
| * Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitalyAhmad Sherif2018-01-101-23/+29
* | Merge branch 'feature/migrate-rebase-to-gitaly' into 'master'Robert Speicher2018-01-111-37/+57
|\ \
| * | Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitalyAhmad Sherif2018-01-101-37/+57
| |/
* | Merge branch 'main-js-tidy-up' into 'master'Filipa Lacerda2018-01-1125-10/+22
|\ \
| * | Tidy up main JS filemain-js-tidy-upPhil Hughes2018-01-1025-10/+22
| |/
* | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-1115-0/+427
* | Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-1117-59/+78
|\ \
| * | Added tests for removing soft removed objectsremove-soft-removalsYorick Peterse2018-01-101-0/+77
| * | Remove soft removals related codeYorick Peterse2018-01-0816-59/+1
* | | Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master'Rémy Coutable2018-01-111-28/+38
|\ \ \
| * | | Migrate merged_branch_names to GitalyAhmad Sherif2018-01-111-28/+38
| | |/ | |/|
* | | Merge branch 'option-disable-archive-cache' into 'master'Sean McGivern2018-01-111-0/+14
|\ \ \
| * | | Add option to disable git archive caching in workhorseoption-disable-archive-cacheJacob Vosmaer2018-01-091-0/+14
* | | | Merge branch '41608-clipboard-vue-button' into 'master'Phil Hughes2018-01-111-0/+31
|\ \ \ \
| * | | | Adds props to allow tooltip config. Breaks tests into specific cases41608-clipboard-vue-buttonFilipa Lacerda2018-01-111-1/+7
| * | | | Add tooltip missing to clipboard componentFilipa Lacerda2018-01-101-0/+25
* | | | | Merge branch '39988-hide-new-branch-tag-empty-repo' into 'master'Rémy Coutable2018-01-111-0/+39
|\ \ \ \ \
| * | | | | Hide new branch and tag links for projects with an empty repoMark Fletcher2018-01-091-0/+39
* | | | | | Merge branch 'fix-use-of-append-in-mr-api-spec' into 'master'Grzegorz Bizon2018-01-111-1/+1
|\ \ \ \ \ \
| * | | | | | Remove call to ProjectTeam#<< in MR API specSean McGivern2018-01-111-1/+1
* | | | | | | Merge branch '38068-commits-count' into 'master'Yorick Peterse2018-01-115-0/+68
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Denormalize commits count for merge request diffs38068-commits-countJan Provaznik2018-01-105-0/+68
* | | | | | | Merge branch '41613-fix-redundant-modal' into 'master'Filipa Lacerda2018-01-112-45/+61
|\ \ \ \ \ \ \
| * | | | | | | Update tests to cover modal dialogKushal Pandya2018-01-111-12/+54
| * | | | | | | Update tests for modal changesKushal Pandya2018-01-111-33/+7
* | | | | | | | Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' i...Grzegorz Bizon2018-01-111-2/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Never set special MR titles for external issuesSean McGivern2018-01-101-0/+22
| * | | | | | | | Fix incorrect default merge request title when external issue tracker is acti...Benedikt Huss2018-01-091-2/+2
* | | | | | | | | Merge branch '4020-rebase-message' into 'master'Sean McGivern2018-01-111-7/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Store only generic message if rebase fails4020-rebase-messageJan Provaznik2018-01-091-7/+7
* | | | | | | | | | Merge branch '39214__pipeline_api' into 'master'Sean McGivern2018-01-112-0/+47
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix styleTony Rom2018-01-101-0/+6
| * | | | | | | | | | Add `pipelines` endpoint to merge requests APITony Rom2017-12-152-0/+41
* | | | | | | | | | | Merge branch 'gcp-fix' into 'master'Kamil Trzciński2018-01-115-21/+92
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change failed GCP billing check wordingMatija Čupić2018-01-111-1/+1
| * | | | | | | | | | | Refactor GCP redirect test suiteMatija Čupić2018-01-114-23/+90
| * | | | | | | | | | | Fix GCP Controller specMatija Čupić2018-01-111-1/+5
| * | | | | | | | | | | Fix CheckGcpProjectBillingWorker specMatija Čupić2018-01-111-1/+1
| * | | | | | | | | | | Fix CheckGcpProjectBillingService specMatija Čupić2018-01-111-2/+2
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | fixed abuse_reports specPhil Hughes2018-01-111-1/+1
* | | | | | | | | | | Merge branch 'dispatcher-sessions' into 'master'Phil Hughes2018-01-112-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix specsdispatcher-sessionsClement Ho2018-01-102-2/+2
* | | | | | | | | | | | Fix up Web IDE user preference copy and buttonsJose Ivan Vargas2018-01-113-3/+3
* | | | | | | | | | | | Merge branch 'sh-fix-award-emoji-move-issues' into 'master'Grzegorz Bizon2018-01-111-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix bug where award emojis would be lost when moving issues between projectssh-fix-award-emoji-move-issuesStan Hu2018-01-101-3/+9
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray2018-01-101-1/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix 500 when visiting a commit where blobs do not exist (nil blobs)41491-fix-nil-blob-name-errorEric Eastwood2018-01-091-1/+14
* | | | | | | | | | | | Merge branch 'git-write-ref-prep' into 'master'Robert Speicher2018-01-101-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prepKim "BKC" Carlbäcker2018-01-091-3/+2