Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace pipelines image in docs27755-update-pipelines-documentation | Achilleas Pipinellis | 2017-04-10 | 1 | -0/+0 |
| | | | | [ci skip] | ||||
* | 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 |
| | | | | | | |||||
* | | | | | | Merge branch 'alkuzad/gitlab-ce-namespaces_encoding_docs' into 'master' | Achilleas Pipinellis | 2017-04-10 | 25 | -193/+203 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about namespace encoding to API docs Closes #25722 See merge request !10536 | ||||
| * | | | | | Add URL encoding link to issues API | Achilleas Pipinellis | 2017-04-10 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | Fix wrong copy edits for URL-encoded substitutions in API docsalkuzad/gitlab-ce-namespaces_encoding_docs | Achilleas Pipinellis | 2017-04-10 | 14 | -77/+77 |
| | | | | | | |||||
| * | | | | | Mention URL path encoding to all API docs | Achilleas Pipinellis | 2017-04-08 | 24 | -161/+161 |
| | | | | | | |||||
| * | | | | | Add information about namespace encoding to API docs | Dawid Goslawski | 2017-04-08 | 10 | -102/+112 |
| | | | | | | |||||
* | | | | | | Merge branch 'spec_for_schema' into 'master' | Rémy Coutable | 2017-04-10 | 2 | -0/+27 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec for schema.rb Closes #21978 See merge request !10580 | ||||
| * | | | | | | Add spec for schema.rb | blackst0ne | 2017-04-10 | 2 | -0/+27 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'test-all-etag-routes' into 'master' | Sean McGivern | 2017-04-10 | 3 | -34/+124 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test all enabled routes in ETag caching middleware and fix pipeline routes Closes #30563 See merge request !10535 | ||||
| * | | | | | | | Test all enabled routes in ETag caching middleware and fix pipeline routestest-all-etag-routes | Adam Niedzielski | 2017-04-10 | 3 | -34/+124 |
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract route matching logic to Gitlab::EtagCaching::Router. Fix pipeline routes: 1. "project_pipelines" has to come after "commit_pipelines" and "merge_request_pipelines" because it is more generic 2. "commit_pipelines": "\s" (any whitespace character) => "\S" (any non-whitespace character). | ||||
* | | | | | | | Merge branch '30676-project-export-email' into 'master' | Sean McGivern | 2017-04-10 | 2 | -1/+17 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix email not being sent after project export Closes #30676 See merge request !10578 | ||||
| * | | | | | | Fix email not being sent after project export | mhasbini | 2017-04-09 | 2 | -1/+17 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'clean_carrierwave_tempfiles' into 'master' | Rémy Coutable | 2017-04-10 | 4 | -5/+28 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean carrierwave tempfiles Closes #28540 See merge request !9466 | ||||
| * | | | | | Periodically clean up temporary upload files to recover storage space | blackst0ne | 2017-04-10 | 4 | -5/+28 |
|/ / / / / | |||||
* | | | | | Merge branch 'refactor-behaviors' into 'master' | Alfredo Sumaran | 2017-04-09 | 7 | -205/+185 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Refactor javascript behaviors directory See merge request !10439 | ||||
| * | | | | consolidate all behavior imports into an index.js filerefactor-behaviors | Mike Greiling | 2017-04-04 | 2 | -8/+10 |
| | | | | | |||||
| * | | | | refactor and fix eslint violations in behaviors directory | Mike Greiling | 2017-04-04 | 5 | -197/+175 |
| | | | | | |||||
* | | | | | Merge branch 'remove_is_admin' into 'master' | Robert Speicher | 2017-04-09 | 24 | -40/+40 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `User#is_admin?` method Closes #30584 See merge request !10520 | ||||
| * | | | | | Remove the User#is_admin? method | blackst0ne | 2017-04-09 | 24 | -40/+40 |
| | |/ / / | |/| | | |