summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* simplify global object refs27729-improve-webpack-dev-environmentMike Greiling2017-04-111-6/+4
* fix locally-running rspec testsMike Greiling2017-04-111-0/+13
* Make webpack host configurableLin Jen-Shin2017-04-111-1/+3
* add CHANGELOG.md entry for !10604Mike Greiling2017-04-111-0/+4
* update documentation with new helper nameMike Greiling2017-04-111-2/+2
* override webpack helper with one that works with our rack proxyMike Greiling2017-04-113-5/+25
* Merge branch '30678-improve-dev-server-process' into 'master' Jacob Schatz2017-04-115-22/+402
|\
| * add CHANGELOG.md entry for !1058130678-improve-dev-server-processMike Greiling2017-04-101-0/+4
| * add license approbals for nodemon dependenciesMike Greiling2017-04-101-0/+18
| * use nodemon to watch for changes to webpack config and restart the dev server...Mike Greiling2017-04-102-12/+312
| * add license approval for ansi-htmlMike Greiling2017-04-101-0/+6
| * watch node_modules for changes when a module is missingMike Greiling2017-04-103-11/+63
* | Merge branch 'fix_cache_expiration_in_repository' into 'master' Robert Speicher2017-04-103-4/+4
|\ \
| * | Fix redundant cache expiration in Repositoryblackst0ne2017-04-103-4/+4
* | | Merge branch 'dm-remove-copy-link-on-svgs' into 'master' Robert Speicher2017-04-1010-45/+63
|\ \ \
| * | | Don't show 'Copy content' button on text files that are not rendered as textDouwe Maan2017-04-1010-45/+63
|/ / /
* | | Merge branch 'rs-fix-doc-anchor-link' into 'master' Achilleas Pipinellis2017-04-101-1/+1
|\ \ \
| * | | Fix "Generate new recovery codes using SSH" documentation linkrs-fix-doc-anchor-linkRobert Speicher2017-04-061-1/+1
* | | | Merge branch 'dewet-do-disclaimer' into 'master' Achilleas Pipinellis2017-04-102-3/+6
|\ \ \ \
| * | | | Disclaimer for testing guide not be be used in proddewet-do-disclaimerDe Wet Blomerus2017-04-052-3/+6
* | | | | Merge branch '1595-ee-backport-environments-tests' into 'master' Clement Ho2017-04-102-4/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Backport of EE changes in environments tests1595-ee-backport-environments-testsFilipa Lacerda2017-04-072-4/+6
* | | | | Merge branch 'backport-ee-1525' into 'master' Robert Speicher2017-04-1012-107/+286
|\ \ \ \ \
| * | | | | Don't pass `env` anymore to GitAccess, ChangeAccess, and ForcePushbackport-ee-1525Rémy Coutable2017-04-103-7/+4
| * | | | | Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs methodRémy Coutable2017-04-103-79/+72
| * | | | | Retrieve Git-specific env in Gitlab::Git::Repository#ruggedRémy Coutable2017-04-102-1/+39
| * | | | | Set Git-specific env in /api/internal/allowedRémy Coutable2017-04-103-20/+31
| * | | | | Add a Gitlab::Git::Env to store Git-specific env thread-safelyRémy Coutable2017-04-102-0/+140
* | | | | | Merge branch 'document-polling-interval' into 'master' Stan Hu2017-04-105-2/+29
|\ \ \ \ \ \
| * | | | | | Document how polling interval is useddocument-polling-intervalAdam Niedzielski2017-04-105-2/+29
* | | | | | | Merge branch 'add-vue-loader' into 'master' Filipa Lacerda2017-04-1017-112/+938
|\ \ \ \ \ \ \
| * | | | | | | add license approvals for vue-loaderadd-vue-loaderMike Greiling2017-04-091-0/+30
| * | | | | | | fix closing tags of async_button componentMike Greiling2017-04-091-4/+5
| * | | | | | | add CHANGELOG.md entry for !10517Mike Greiling2017-04-091-0/+4
| * | | | | | | add eslint support to vue filesMike Greiling2017-04-093-4/+56
| * | | | | | | convert pipeline async_button component to vue templateMike Greiling2017-04-093-25/+27
| * | | | | | | convert pipeline error state to vue templateMike Greiling2017-04-095-22/+24
| * | | | | | | convert pipeline empty state to vue templateMike Greiling2017-04-095-36/+37
| * | | | | | | update Vue to match vue-template-compilerMike Greiling2017-04-092-4/+4
| * | | | | | | clean up webpack configMike Greiling2017-04-091-5/+6
| * | | | | | | add vue-loader dependencies and basic configMike Greiling2017-04-093-17/+750
* | | | | | | | Update CHANGELOG.md for 9.0.5James Lopez2017-04-104-12/+6
* | | | | | | | Merge branch 'merge-request-parser-merge-requests-for-nodes' into 'master' Douwe Maan2017-04-101-11/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | Reuse "merge_requests_for_nodes" in "MergeRequestParser"merge-request-parser-merge-requests-for-nodesAdam Niedzielski2017-04-101-11/+30
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '25274-gitlab_flow-md-broken-download-link-in-resources' into 'm...Achilleas Pipinellis2017-04-101-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove broken linkSean Packham (GitLab)2017-04-101-1/+0
* | | | | | | | | Merge branch 'todos-docs-update' into 'master' Sean McGivern2017-04-101-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Update todos.mdtodos-docs-updateVictor Wu2017-04-071-1/+1
* | | | | | | | | Merge branch 'ci-favicon-back-in' into 'master' Filipa Lacerda2017-04-102-3/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed karmaci-favicon-back-inPhil Hughes2017-04-101-3/+3
View Lorry Controller Status