Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Axil's reviewnew-git-index | Marcia Ramos | 2017-04-11 | 1 | -2/+1 |
| | |||||
* | remove unnecessary line | Marcia Ramos | 2017-04-11 | 1 | -3/+1 |
| | |||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into new-git-index | Marcia Ramos | 2017-04-11 | 1402 | -10462/+80811 |
|\ | |||||
| * | Merge branch '30678-improve-dev-server-process' into 'master' | Jacob Schatz | 2017-04-11 | 5 | -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-process | Mike Greiling | 2017-04-10 | 1 | -0/+4 |
| | | | |||||
| | * | add license approbals for nodemon dependencies | Mike Greiling | 2017-04-10 | 1 | -0/+18 |
| | | | |||||
| | * | use nodemon to watch for changes to webpack config and restart the dev ↵ | Mike Greiling | 2017-04-10 | 2 | -12/+312 |
| | | | | | | | | | | | | server when necessary | ||||
| | * | add license approval for ansi-html | Mike Greiling | 2017-04-10 | 1 | -0/+6 |
| | | | |||||
| | * | watch node_modules for changes when a module is missing | Mike Greiling | 2017-04-10 | 3 | -11/+63 |
| | | | |||||
| * | | Merge branch 'fix_cache_expiration_in_repository' into 'master' | Robert Speicher | 2017-04-10 | 3 | -4/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix redundant cache expiration in Repository Closes #30146 See merge request !10575 | ||||
| | * | | Fix redundant cache expiration in Repository | blackst0ne | 2017-04-10 | 3 | -4/+4 |
| | | | | |||||
| * | | | Merge branch 'dm-remove-copy-link-on-svgs' into 'master' | Robert Speicher | 2017-04-10 | 10 | -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 text | Douwe Maan | 2017-04-10 | 10 | -45/+63 |
| |/ / / | |||||
| * | | | Merge branch 'rs-fix-doc-anchor-link' into 'master' | Achilleas Pipinellis | 2017-04-10 | 1 | -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-link | Robert Speicher | 2017-04-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | Merge branch 'dewet-do-disclaimer' into 'master' | Achilleas Pipinellis | 2017-04-10 | 2 | -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-disclaimer | De Wet Blomerus | 2017-04-05 | 2 | -3/+6 |
| | | | | | | |||||
| * | | | | | Merge branch '1595-ee-backport-environments-tests' into 'master' | Clement Ho | 2017-04-10 | 2 | -4/+6 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Backport of EE changes in environments tests See merge request !10528 | ||||
| | * | | | | Backport of EE changes in environments tests1595-ee-backport-environments-tests | Filipa Lacerda | 2017-04-07 | 2 | -4/+6 |
| | | | | | | |||||
| * | | | | | Merge branch 'backport-ee-1525' into 'master' | Robert Speicher | 2017-04-10 | 12 | -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-1525 | Rémy Coutable | 2017-04-10 | 3 | -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 method | Rémy Coutable | 2017-04-10 | 3 | -79/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | Retrieve Git-specific env in Gitlab::Git::Repository#rugged | Rémy Coutable | 2017-04-10 | 2 | -1/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | Set Git-specific env in /api/internal/allowed | Rémy Coutable | 2017-04-10 | 3 | -20/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | Add a Gitlab::Git::Env to store Git-specific env thread-safely | Rémy Coutable | 2017-04-10 | 2 | -0/+140 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Merge branch 'document-polling-interval' into 'master' | Stan Hu | 2017-04-10 | 5 | -2/+29 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how polling interval multiplier is used Closes #30686 See merge request !10592 | ||||
| | * | | | | | | Document how polling interval is useddocument-polling-interval | Adam Niedzielski | 2017-04-10 | 5 | -2/+29 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'add-vue-loader' into 'master' | Filipa Lacerda | 2017-04-10 | 17 | -112/+938 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add vue loader Closes #29519 See merge request !10517 | ||||
| | * | | | | | | | add license approvals for vue-loaderadd-vue-loader | Mike Greiling | 2017-04-09 | 1 | -0/+30 |
| | | | | | | | | | |||||
| | * | | | | | | | fix closing tags of async_button component | Mike Greiling | 2017-04-09 | 1 | -4/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | add CHANGELOG.md entry for !10517 | Mike Greiling | 2017-04-09 | 1 | -0/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | add eslint support to vue files | Mike Greiling | 2017-04-09 | 3 | -4/+56 |
| | | | | | | | | | |||||
| | * | | | | | | | convert pipeline async_button component to vue template | Mike Greiling | 2017-04-09 | 3 | -25/+27 |
| | | | | | | | | | |||||
| | * | | | | | | | convert pipeline error state to vue template | Mike Greiling | 2017-04-09 | 5 | -22/+24 |
| | | | | | | | | | |||||
| | * | | | | | | | convert pipeline empty state to vue template | Mike Greiling | 2017-04-09 | 5 | -36/+37 |
| | | | | | | | | | |||||
| | * | | | | | | | update Vue to match vue-template-compiler | Mike Greiling | 2017-04-09 | 2 | -4/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | clean up webpack config | Mike Greiling | 2017-04-09 | 1 | -5/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | add vue-loader dependencies and basic config | Mike Greiling | 2017-04-09 | 3 | -17/+750 |
| | | | | | | | | | |||||
| * | | | | | | | | Update CHANGELOG.md for 9.0.5 | James Lopez | 2017-04-10 | 4 | -12/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | | | Merge branch 'merge-request-parser-merge-requests-for-nodes' into 'master' | Douwe Maan | 2017-04-10 | 1 | -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-nodes | Adam Niedzielski | 2017-04-10 | 1 | -11/+30 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch '25274-gitlab_flow-md-broken-download-link-in-resources' into ↵ | Achilleas Pipinellis | 2017-04-10 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove broken link on gitlab_flow.md Closes #25274 See merge request !10590 | ||||
| | * | | | | | | | | Remove broken link | Sean Packham (GitLab) | 2017-04-10 | 1 | -1/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'todos-docs-update' into 'master' | Sean McGivern | 2017-04-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update todos.md Closes #30528 See merge request !10557 | ||||
| | * | | | | | | | | Update todos.mdtodos-docs-update | Victor Wu | 2017-04-07 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'ci-favicon-back-in' into 'master' | Filipa Lacerda | 2017-04-10 | 2 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added back in the CI status favicon See merge request !10534 | ||||
| | * | | | | | | | | | Fixed karmaci-favicon-back-in | Phil Hughes | 2017-04-10 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added back in the CI status favicon | Phil Hughes | 2017-04-10 | 1 | -0/+2 |
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like it was removed with a bad merge conflict resolution | ||||
| * | | | | | | | | | Merge branch 'file-view-container' into 'master' | Jacob Schatz | 2017-04-10 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove limited container on file view See merge request !10542 | ||||
| | * | | | | | | | | | Remove limited container on file viewfile-view-container | Annabel Dunstone Gray | 2017-04-07 | 1 | -3/+3 |
| | | | | | | | | | | |