summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'osw-multi-assignees-merge-requests' into 'master'Nick Thomas2019-04-091-1/+1
|\ \ | | | | | | | | | | | | [Backport] Support multiple assignees for merge requests See merge request gitlab-org/gitlab-ce!27089
| * | [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-081-1/+1
| | | | | | | | | | | | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* | | Resolve Environments#additional_metrics TypeError, ensure unix formatSarah Yasonik2019-04-091-1/+1
| |/ |/|
* | Set release name when adding release notes to an existing tagJason Goodman2019-04-091-7/+3
|/ | | | Also set the release sha and author
* Enable Gitaly FindCommit caching for TreeControllersh-add-gitaly-ref-name-caching-tree-controllerStan Hu2019-04-071-0/+2
| | | | | | Accessing /namespace/project/tree/master appears to query FindCommit 5 times with identical parameters. This reduces the number of FindCommit queries to 1.
* Expand FindCommit caching to blob and refssh-improve-find-commit-cachingStan Hu2019-04-063-2/+5
| | | | | | | | | | | This enables FindCommit caching to the following actions: * BlobController#show * RefsController#logs_tree It also improves caching in CommitsController since some duplicate requests were occuring inside the before_action definitions.
* Add Knative metrics to PrometheusChris Baumbauer2019-04-061-6/+17
|
* Enable FindCommit caching for project and commits pagesStan Hu2019-04-051-0/+2
| | | | | This reduces a handful of duplicate FindCommit calls while viewing the projects and commits pages.
* Fall back to project repository type by defaultBob Van Landuyt2019-04-051-4/+2
| | | | | | | | | | | | This makes sure that we always have a repository type when trying to parse a repository from a path. This is needed because sometimes we want to perform access checks as if the project already existed, for example when creating a project on push. Before this we were only doing that when accessing git over http, this makes sure it also works correctly when accessing git over SSH
* Merge branch '58375-api-controller' into 'master'Sean McGivern2019-04-051-0/+37
|\ | | | | | | | | | | | | Add a prometheus proxy API per environment Closes #58375 See merge request gitlab-org/gitlab-ce!26841
| * Allow message strings to be translatedrpereira22019-04-051-2/+2
| |
| * Call permit! on paramsrpereira22019-04-051-1/+1
| |
| * Remove permitting of paramsrpereira22019-04-051-12/+5
| | | | | | | | - It is now being done in ProxyService class.
| * Add spec for invalid environment idrpereira22019-04-051-2/+1
| |
| * Streamline controller specsPeter Leitzen2019-04-051-4/+2
| |
| * Add a Prometheus API per environmentrpereira22019-04-051-0/+47
| | | | | | | | | | | | The api will proxy requests to the environment's prometheus server. The Prometheus::ProxyService class can be reused when we add support for group prometheus servers.
* | Fix and expand Gitaly FindCommit cachingsh-fix-ref-name-cachingStan Hu2019-04-043-9/+15
|/ | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26248 added support for deduplicating FindCommit requests using Gitaly ref name caching. However, not all endpoints were covered, and in one case the Gitaly wrapper wasn't actually surrounding the serialization step. We can safely cache ref names between FindCommit calls for #index and #show endpoints for merge requests and pipelines. This can significantly reduce the number of FindCommit requests.
* Renamed terminal_specification to channel_specificationFrancisco Javier López2019-04-042-2/+2
| | | | | | We're moving from using terminology related to terminals when we refer to Websockets connections in Workhorse. It's more appropiate a concept like channel.
* Allow to sort wiki pages by date and titleIgor2019-04-041-1/+4
| | | | | - Add controls for sorting by title and date - Execute Gitaly call which now accepts sorting params for wikis
* Merge branch '24704-download-repository-path' into 'master'Kushal Pandya2019-04-041-1/+1
|\ | | | | | | | | | | | | Download a folder from repository Closes #24704 See merge request gitlab-org/gitlab-ce!26532
| * Download a folder from repositoryPatrick Bajao2019-04-021-1/+1
| | | | | | | | | | | | | | | | Add `GetArchiveRequest` to git-archive params. Modifies `Git::Repository#archive_metadata` to append `path` to `ArchivePrefix` so it'll not hit the cache of repository archive when it already exists.
| * Add download directory in menuKia Mei Somabes2019-04-021-1/+1
| | | | | | | | Add subdirectory params for RepositoriesController#archive
* | Merge branch 'support-time-windows-api' into 'master'James Lopez2019-04-041-1/+11
|\ \ | | | | | | | | | | | | Support time window parameters in additional metrics endpoint See merge request gitlab-org/gitlab-ce!26228
| * | Specify time window for additional metrics apisupport-time-windows-apisyasonik2019-04-031-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for start and end parameters in the #additional_metrics endpoint of the EnvironmentsController. start and end are meant to be unix timestamps, per the Prometheus API (as the consumer of this endpoint will eventually be transitioned to a prometheus endpoint). This functionality is behind the :metrics_time_window feature flag for development.
* | | Merge branch '13784-validate-variables-for-masking' into 'master'Clement Ho2019-04-031-1/+1
|\ \ \ | |/ / |/| | | | | | | | Simple masking frontend - CE See merge request gitlab-org/gitlab-ce!26751
| * | Add control for variable value maskingmfluharty2019-03-291-1/+1
| | | | | | | | | | | | | | | | | | Show masked switch for each variable When toggled on, the variable value will be masked in runner logs Show warning message if the switch is on but the value is not maskable
* | | Merge branch 'sh-cache-pipeline-find-commits' into 'master'Kamil Trzciński2019-04-021-4/+10
|\ \ \ | |_|/ |/| | | | | | | | Cache FindCommit results in pipelines view See merge request gitlab-org/gitlab-ce!26776
| * | Cache FindCommit results in pipelines viewsh-cache-pipeline-find-commitsStan Hu2019-04-021-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | For each pipeline, the controller will call `Pipeline#latest?` to determine if the pipeline's ref is the latest for that branch. Since it's likely that the same branches are being used in each pipeline, we can reduce Gitaly overhead by caching the results of the FindCommit call.
* | | Merge branch 'jarv/dev-to-gitlab-2019-04-02' into 'master'Robert Speicher2019-04-022-6/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Jarv/dev to gitlab 2019 04 02 Closes #2810 See merge request gitlab-org/gitlab-ce!26846
| * | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵jarv/dev-to-gitlab-2019-04-02John Jarvis2019-04-022-6/+3
| |\ \ | | | | | | | | | | | | jarv/dev-to-gitlab-2019-04-02
| | * \ Merge branch 'security-56224' into 'master'GitLab Release Tools Bot2019-04-021-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Fix related branches visible in issues for guests See merge request gitlab/gitlabhq!2996
| | | * | Hide related branches when user does not have permissionMark Chao2019-03-211-0/+1
| | | | | | | | | | | | | | | | | | | | Guest user of a project should not see branches
| | * | | Merge branch 'security-id-potential-denial-languages' into 'master'GitLab Release Tools Bot2019-04-021-6/+2
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | Return cached languages if they've been detected before See merge request gitlab/gitlabhq!2998
| | | * | Return cached languages if they've been detected beforeIgor Drozdov2019-03-201-6/+2
| | | | |
* | | | | (CE Port) "Follow-up from "(EE port) Externalize strings in projects ↵Martin Wortschack2019-04-021-2/+2
|/ / / / | | | | | | | | | | | | controllers""
* | | | Allow streaming io objects into GitalyBob Van Landuyt2019-04-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to set the encoding of an IO passed without reading it into memory. This is useful if we want to stream files into Gitaly. Like we do when uploading a new file to the repository.
* | | | Merge branch 'sh-fix-gitaly-find-commit-caching' into 'master'Kamil Trzciński2019-03-291-1/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Allow ref name caching CommitService#find_commit Closes #57083 See merge request gitlab-org/gitlab-ce!26248
| * | | Allow ref name caching CommitService#find_commitStan Hu2019-03-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a given merge request, it's quite common to see duplicate FindCommit Gitaly requests because the Gitaly CommitService caches the request by the commit SHA, not by the ref name. However, most of the duplicate requests use the ref name, so the cache is never actually used in practice. This leads to unnecessary requests that slow performance. This commit allows certain callers to bypass the ref name to OID conversion in the cache. We don't do this by default because it's possible the tip of the branch changes during the commit, which would cause the caller to get stale data. This commit also forces the Ci::Pipeline to use the full ref name so that caching can work for merge requests. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57083
* | | | Revert "Merge branch '13784-validate-variables-for-masking' into 'master'"Kamil Trzciński2019-03-271-1/+1
|/ / / | | | | | | This reverts merge request !25476
* | | Scaffold UI elements for minimal versionMiranda Fluharty2019-03-271-1/+1
| | | | | | | | | | | | | | | Add a masked switch to variable rows Copy some behavior from the protected switch
* | | Externalize strings in projects controllersMartin Wortschack2019-03-2719-51/+53
| | | | | | | | | | | | | | | | | | | | | - concerns - dashboard - groups - import
* | | Merge branch 'remove-expand-diff-feature-flag' into 'master'Filipa Lacerda2019-03-271-4/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove expand diff to full file feature flag See merge request gitlab-org/gitlab-ce!26614
| * | | Remove expand diff to full file feature flagPhil Hughes2019-03-261-4/+0
| |/ /
* | | Allow multiple repositories per projectBob Van Landuyt2019-03-262-6/+12
|/ / | | | | | | | | | | | | | | This changes the repository type from a binary `wiki?` to a type. So we can have more than 2 repository types. Now everywhere we called `.wiki?` and expected a boolean, we check that type.
* | Reject HEAD requests to info/refs endpointStan Hu2019-03-191-0/+5
| | | | | | | | | | | | | | | | | | In production, we see high error rates due to clients attempting to use the dumb Git HTTP protocol with HEAD /foo/bar.git/info/refs endpoint. This isn't supported and causes Error 500s because Workhorse doesn't send along its secret because it's not proxying this request. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54579
* | Remove diff tree filtering feature flagPhil Hughes2019-03-181-1/+0
|/
* Refactor groups and projects boards actionsHeinrich Lee Yu2019-03-131-38/+1
| | | | Move common functionality to BoardsActions concern
* Remove unnecessary license check in operations controllerReuben Pereira2019-03-081-5/+0
|
* Merge branch 'expand-diff-to-full-file' into 'master'Douwe Maan2019-03-072-49/+8
|\ | | | | | | | | | | | | Expand diff to entire file Closes #19054 See merge request gitlab-org/gitlab-ce!24406
| * Move diff_line preparation into presenterMark Chao2019-03-071-35/+4
| | | | | | | | Update spec