summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Incorporate feedbackee/ee-34102-online-view-of-artifacts-feZeger-Jan van de Weg2017-10-044-13/+38
* Add extra assertions about how the link will openEric Eastwood2017-10-041-1/+4
* Dry up external_link? usageEric Eastwood2017-10-041-9/+8
* Add JSON as external pages artifactEric Eastwood2017-10-031-1/+1
* Add translation method to external artifact tooltipEric Eastwood2017-10-031-1/+1
* Revert back to original size now that we no longer changed the artifacts zipEric Eastwood2017-10-031-1/+1
* Update tests for new implementationZeger-Jan van de Weg2017-10-032-58/+3
* Redirect to pages daemonZeger-Jan van de Weg2017-10-039-55/+102
* Restore lost artifacts browser imageEric Eastwood2017-10-031-0/+0
* Fix up artifacts zip size after adding index.htmlEric Eastwood2017-10-031-1/+1
* Add test for external HTML artifactEric Eastwood2017-10-034-6/+26
* Use CSS to space external link icon from textEric Eastwood2017-10-032-2/+3
* Add docs for online view of HTML artifactsEric Eastwood2017-10-032-1/+7
* Add changelog for online view of HTML artifactsEric Eastwood2017-10-032-1/+6
* Backend for HTML serving with GitLab PagesZeger-Jan van de Weg2017-10-035-4/+87
* Add external link FE for online artifactsEric Eastwood2017-10-034-7/+60
* Merge branch 'jira-dev-panel-integration-limitations' into 'master'Victor Wu2017-10-031-0/+7
|\
| * Add doc regarding nested groups limitationOswaldo Ferreira2017-10-021-1/+2
| * Explain limitation for Jira dev panel integration on relative URL GLOswaldo Ferreira2017-10-021-0/+6
|/
* Merge branch 'ce-to-ee-2017-09-29' into 'master'Lin Jen-Shin (godfat)2017-10-02146-334/+1574
|\
| * Remove duplicated method, aligning to CELin Jen-Shin2017-10-021-8/+0
| * Resolve conflictLin Jen-Shin2017-10-021-7/+0
| * We shouldn't delete existing user, otherwiseLin Jen-Shin2017-10-021-2/+1
| * Remove duplicated entryLin Jen-Shin2017-10-021-1/+0
| * Merge remote-tracking branch 'ee/master' into ce-to-ee-2017-09-29Lin Jen-Shin2017-10-0238-156/+162
| |\ | |/ |/|
* | Merge branch 'ee-gitaly-create-repository' into 'master'Douwe Maan2017-10-0216-48/+78
|\ \
| * | (EE) Create repositories via GitalyJacob Vosmaer (GitLab)2017-10-0216-48/+78
|/ /
* | Merge branch 'lint-changelog-yaml' into 'master'Robert Speicher2017-10-0215-38/+33
|\ \
| * | Remove changelogs with invalid extensionsSean McGivern2017-10-029-35/+0
| * | Extend changelog checker to test file extensionsSean McGivern2017-10-021-2/+5
| * | Fix invalid changelog entriesSean McGivern2017-10-022-2/+2
| * | Manually add CHANGELOG entry for !13325Sean McGivern2017-10-021-0/+2
| * | Add static analysis job to find invalid YAML in changelogsSean McGivern2017-10-023-1/+26
* | | Merge branch 'n-plus-1-notice' into 'master'Sean McGivern2017-10-021-8/+11
|\ \ \ | |/ / |/| |
| * | Adds a Gitaly n+1 notice to commit handling on access checkAlejandro Rodríguez2017-09-301-8/+11
* | | Merge branch 'sh-delta-check-with-annotated-tags' into 'master'Douwe Maan2017-10-023-0/+26
|\ \ \
| * | | Fix EE delta size check handling with annotated tagsStan Hu2017-09-293-0/+26
| |/ /
* | | Merge branch 'fix-disable-autodevops-banner-docs' into 'master'Achilleas Pipinellis2017-10-021-1/+1
|\ \ \
| * | | Fix Ruby code for disabling Auto DevOps bannerAthar Hameed2017-09-281-1/+1
| |/ /
* | | Merge branch 'sh-fix-gitlab-qa-admin' into 'master'Grzegorz Bizon2017-09-301-9/+4
* | | Merge branch 'codeclimate-requests' into 'master'Phil Hughes2017-09-293-53/+11
|\ \ \
| * | | Makes code quality requests in parallelFilipa Lacerda2017-09-293-53/+11
|/ / /
| | * Fix conflicts in lib/api/api_guard.rb and lib/api/helpers.rbDouwe Maan2017-09-292-22/+5
| | * fixed conflict in board_new_issue.jsPhil Hughes2017-09-291-10/+1
| | * Resolve conflicts, according to:Lin Jen-Shin2017-09-294-16/+3
| | * Resolve conflictsLin Jen-Shin2017-09-2911-50/+2
| | * Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-09-29Lin Jen-Shin2017-09-29157-319/+1664
| | |\ | |/ / |/| |
| | * Merge branch '38432-fix-notes-type-for-import' into 'master'Rémy Coutable2017-09-2912-37/+155
| | |\
| | | * Fix notes type created from importLin Jen-Shin (godfat)2017-09-2912-37/+155
| | |/
| | * Merge branch 'add-composite-index-on-merge-requests-merge-commit-sha' into 'm...Sean McGivern2017-09-293-1/+40
| | |\
View Lorry Controller Status