summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* ESLint + Karma fixesTim Zallmann2018-03-281-1/+14
* Revert "Merge branch 'workhorse-gitaly-mandatory' into 'master'"Sean McGivern2018-03-281-4/+4
* Merge branch 'tc-sh-fix-issue-5461-ce' into 'master'Rémy Coutable2018-03-281-0/+4
|\
| * Clean the test path after each spec runStan Hu2018-03-281-0/+4
* | Merge branch 'dz-improve-app-settings-2' into 'master'Filipa Lacerda2018-03-281-4/+26
|\ \
| * | Fix admin settings specdz-improve-app-settings-2Dmitriy Zaporozhets2018-03-271-1/+1
| * | Move ci/cd, influx and prometheus app settings to expandable sectionsDmitriy Zaporozhets2018-03-271-4/+26
* | | Remove some easy cases of 'path_to_repo' useJacob Vosmaer (GitLab)2018-03-283-26/+1
* | | Merge branch 'ide-wordwrap' into 'master'Tim Zallmann2018-03-281-24/+16
|\ \ \
| * | | Enable word wrap in IDEPhil Hughes2018-03-271-24/+16
* | | | Merge branch 'dm-refs-contains-sha-encoding' into 'master'Sean McGivern2018-03-281-1/+4
|\ \ \ \
| * | | | Fix listing commit branch/tags that contain special charactersdm-refs-contains-sha-encodingDouwe Maan2018-03-271-1/+4
* | | | | Merge branch '44712-update-asciidoctor-from-1.5.3-to-1.5.6.2' into 'master'Douwe Maan2018-03-281-1/+1
|\ \ \ \ \
| * | | | | Update asciidoctor to 1.5.6.2Takuya Noguchi2018-03-281-1/+1
* | | | | | Merge branch '43603-ci-lint-support' into 'master'Kamil Trzciński2018-03-283-18/+146
|\ \ \ \ \ \
| * | | | | | Build ci/lint pageMayra Cabrera2018-03-261-15/+12
| * | | | | | Make ci/lint page context aware:Mayra Cabrera2018-03-263-3/+134
* | | | | | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński2018-03-285-69/+500
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ceAlessio Caiazza2018-03-275-69/+500
* | | | | | | Merge branch 'update-unresolved-discussions-vue-component' into 'master'Clement Ho2018-03-274-13/+29
|\ \ \ \ \ \ \
| * | | | | | | Add i18n and update specs for ShaMismatch vue componentGeorge Tsiolis2018-03-274-13/+29
* | | | | | | | [FIX] Fixed bug in dropdown selector when selecting the same selection againbitsapien2018-03-272-1/+27
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch 'reduce-query-count-for-mergerequestscontroller-show' into 'master'Douwe Maan2018-03-271-0/+11
|\ \ \ \ \ \ \
| * | | | | | | Fix N+1 in `MergeRequest#merge_request_diff_for`reduce-query-count-for-mergerequestscontroller-showSean McGivern2018-03-211-0/+11
* | | | | | | | Merge branch 'jej/add-protected-branch-policy' into 'master'Nick Thomas2018-03-277-3/+221
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Revert exploratory branch restriction policyjej/add-protected-branch-policyJames Edwards-Jones2018-03-261-44/+6
| * | | | | | | API uses ProtectedBranchPolicy for destroy/createJames Edwards-Jones2018-03-261-3/+31
| * | | | | | | ProtectedBranchPolicy used from Controller for destroy/updateJames Edwards-Jones2018-03-264-0/+78
| * | | | | | | DestroyService for protected tags/branches used from controllerJames Edwards-Jones2018-03-264-1/+91
| * | | | | | | Branch unprotection restriction starting pointJames Edwards-Jones2018-03-261-0/+60
* | | | | | | | 'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choicesElias Werberich2018-03-272-1/+27
* | | | | | | | Make all workhorse gitaly calls opt-outJacob Vosmaer (GitLab)2018-03-271-4/+4
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'test-hook-logs-xss' into 'master'Douwe Maan2018-03-271-0/+21
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add a test to make sure there's no XSS for hook logstest-hook-logs-xssLin Jen-Shin2018-03-271-0/+21
* | | | | | | Merge branch '5347-fix-multiple-clusters-incorrect-details-injected' into 'ma...Kamil Trzciński2018-03-275-5/+9
|\ \ \ \ \ \ \
| * | | | | | | Rearrange DeploymentPlatform methodsMayra Cabrera2018-03-225-5/+9
* | | | | | | | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-2741-86/+2065
|\ \ \ \ \ \ \ \
| * | | | | | | | remove some lintMicaël Bergeron2018-03-265-5/+1
| * | | | | | | | personal snippets will now comply with `background_upload`Micaël Bergeron2018-03-261-0/+6
| * | | | | | | | remove lintMicaël Bergeron2018-03-221-4/+5
| * | | | | | | | fix the api jobs spec from having EE specific testsMicaël Bergeron2018-03-221-23/+0
| * | | | | | | | fix the failing specsMicaël Bergeron2018-03-223-3/+6
| * | | | | | | | Backport EE changesMicaël Bergeron2018-03-221-0/+0
| * | | | | | | | Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into 40781-o...Micaël Bergeron2018-03-221-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix pipeline serializer specSean McGivern2018-03-151-1/+1
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-22248-715/+8150
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Backport ee-40781-os-to-ceMicaël Bergeron2018-03-224-29/+52
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-091-0/+87
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-08403-8091/+10263
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | [cherry-pick] '4862-verify-file-checksums'Sean McGivern2018-03-087-1/+223