summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Axil's reviewnew-git-indexMarcia Ramos2017-04-111-2/+1
|
* remove unnecessary lineMarcia Ramos2017-04-111-3/+1
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into new-git-indexMarcia Ramos2017-04-111402-10462/+80811
|\
| * Merge branch '30678-improve-dev-server-process' into 'master' Jacob Schatz2017-04-115-22/+402
| |\ | | | | | | | | | | | | | | | | | | Make webpack-dev-server process more resilient when switching branches. Closes #30678 See merge request !10581
| | * 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 ↵Mike Greiling2017-04-102-12/+312
| | | | | | | | | | | | server when necessary
| | * 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 Repository Closes #30146 See merge request !10575
| | * | 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 text See merge request !10563
| | * | | 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 link See merge request !10512
| | * | | Fix "Generate new recovery codes using SSH" documentation linkrs-fix-doc-anchor-linkRobert Speicher2017-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Merge branch 'dewet-do-disclaimer' into 'master' Achilleas Pipinellis2017-04-102-3/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Disclaimer for testing guide not be be used in prod See merge request !10468
| | * | | | 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 tests See merge request !10528
| | * | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport Git-env code from EE "Fix push rules on Git 2.11" (gitlab-org/gitlab-ee!1525) See merge request !10547
| | * | | | | Don't pass `env` anymore to GitAccess, ChangeAccess, and ForcePushbackport-ee-1525Rémy Coutable2017-04-103-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs methodRémy Coutable2017-04-103-79/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | Retrieve Git-specific env in Gitlab::Git::Repository#ruggedRémy Coutable2017-04-102-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | Set Git-specific env in /api/internal/allowedRémy Coutable2017-04-103-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | Add a Gitlab::Git::Env to store Git-specific env thread-safelyRémy Coutable2017-04-102-0/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Merge branch 'document-polling-interval' into 'master' Stan Hu2017-04-105-2/+29
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how polling interval multiplier is used Closes #30686 See merge request !10592
| | * | | | | | 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 vue loader Closes #29519 See merge request !10517
| | * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Merge branch 'merge-request-parser-merge-requests-for-nodes' into 'master' Douwe Maan2017-04-101-11/+30
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse "merge_requests_for_nodes" in "MergeRequestParser" See merge request !10585
| | * | | | | | | | 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 ↵Achilleas Pipinellis2017-04-101-1/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove broken link on gitlab_flow.md Closes #25274 See merge request !10590
| | * | | | | | | | 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.md Closes #30528 See merge request !10557
| | * | | | | | | | Update todos.mdtodos-docs-updateVictor Wu2017-04-071-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'ci-favicon-back-in' into 'master' Filipa Lacerda2017-04-102-3/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added back in the CI status favicon See merge request !10534
| | * | | | | | | | | Fixed karmaci-favicon-back-inPhil Hughes2017-04-101-3/+3
| | | | | | | | | | |
| | * | | | | | | | | Added back in the CI status faviconPhil Hughes2017-04-101-0/+2
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like it was removed with a bad merge conflict resolution
| * | | | | | | | | Merge branch 'file-view-container' into 'master' Jacob Schatz2017-04-101-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove limited container on file view See merge request !10542
| | * | | | | | | | | Remove limited container on file viewfile-view-containerAnnabel Dunstone Gray2017-04-071-3/+3
| | | | | | | | | | |