summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change project view default for existing users and anonymous visitors to ↵dz-fix-project-viewDmitriy Zaporozhets2017-04-106-4/+56
| | | | | | files+readme Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* 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
| | | | | |
* | | | | | Merge branch 'alkuzad/gitlab-ce-namespaces_encoding_docs' into 'master' Achilleas Pipinellis2017-04-1025-193/+203
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about namespace encoding to API docs Closes #25722 See merge request !10536
| * | | | | Add URL encoding link to issues APIAchilleas Pipinellis2017-04-101-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Fix wrong copy edits for URL-encoded substitutions in API docsalkuzad/gitlab-ce-namespaces_encoding_docsAchilleas Pipinellis2017-04-1014-77/+77
| | | | | |
| * | | | | Mention URL path encoding to all API docsAchilleas Pipinellis2017-04-0824-161/+161
| | | | | |
| * | | | | Add information about namespace encoding to API docsDawid Goslawski2017-04-0810-102/+112
| | | | | |
* | | | | | Merge branch 'spec_for_schema' into 'master' Rémy Coutable2017-04-102-0/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec for schema.rb Closes #21978 See merge request !10580
| * | | | | | Add spec for schema.rbblackst0ne2017-04-102-0/+27
| | | | | | |
* | | | | | | Merge branch 'test-all-etag-routes' into 'master' Sean McGivern2017-04-103-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-routesAdam Niedzielski2017-04-103-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 McGivern2017-04-102-1/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix email not being sent after project export Closes #30676 See merge request !10578
| * | | | | | Fix email not being sent after project exportmhasbini2017-04-092-1/+17
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'clean_carrierwave_tempfiles' into 'master'Rémy Coutable2017-04-104-5/+28
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean carrierwave tempfiles Closes #28540 See merge request !9466
| * | | | | Periodically clean up temporary upload files to recover storage spaceblackst0ne2017-04-104-5/+28
|/ / / / /
* | | | | Merge branch 'refactor-behaviors' into 'master' Alfredo Sumaran2017-04-097-205/+185
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Refactor javascript behaviors directory See merge request !10439
| * | | | consolidate all behavior imports into an index.js filerefactor-behaviorsMike Greiling2017-04-042-8/+10
| | | | |
| * | | | refactor and fix eslint violations in behaviors directoryMike Greiling2017-04-045-197/+175
| | | | |
* | | | | Merge branch 'remove_is_admin' into 'master' Robert Speicher2017-04-0924-40/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `User#is_admin?` method Closes #30584 See merge request !10520
| * | | | | Remove the User#is_admin? methodblackst0ne2017-04-0924-40/+40
| | |/ / / | |/| | |