summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Reduce cognitivty complexity moresyasonik2019-04-241-4/+8
| | | | |
| * | | | Try to reduce complexity againsyasonik2019-04-241-10/+4
| | | | |
| * | | | Reduce congnitive complexitysyasonik2019-04-241-8/+7
| | | | |
| * | | | Bring in line with EE needssyasonik2019-04-241-1/+1
| | | | |
| * | | | Inherit from BaseServicerpereira22019-04-241-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Change MetricsDashboard::Service to inherit from BaseService so that it can reuse methods like initialize, success, error.
| * | | | Refactor dashboard proccesing into stagessyasonik2019-04-241-1/+1
| | | | |
| * | | | Rubocop cleanupsyasonik2019-04-241-1/+1
| | | | |
| * | | | Add unit tests and fix broken endpointsyasonik2019-04-241-2/+2
| | | | |
| * | | | Use existing common metricssyasonik2019-04-241-1/+0
| | | | |
| * | | | Save multi-dashboard logic for another MRsyasonik2019-04-241-1/+1
| | | | |
| * | | | Add inital dashboard endpoint supportsyasonik2019-04-241-0/+14
| | | | |
* | | | | Add Let's Encrypt application settingsVladimir Shushlin2019-04-271-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Store Let's Encrypt account email in application settings Also add explicit terms of service consent
* | | | | Add ProjectMetricsDashboardSetting model and tableReuben Pereira2019-04-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new table will be used to store the external_dashboard_url which allows users to add a link to their external dashboards (ex Grafana) to the Metrics dashboard.
* | | | | Added list_pages method to avoid loading all wiki pages contentFrancisco Javier López2019-04-251-2/+2
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inside a wiki, when we show the sidebar or browse to the `pages`, all page contents are retrieved from Gitaly and that is a waste of resources, since no content from that pages are going to be showed. This MR introduces the method `ProjectWiki#list_pages`, which uses new wiki_list_pages RPC call to retrieve pages without content Also in the `WikisController` we're using the method to show pages in the sidebar and also on the `pages` page.
* | | | Merge branch '54656-500-error-on-save-of-general-pipeline-settings-timeout' ↵Stan Hu2019-04-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "500 error on save of general pipeline settings timeout" Closes gitlab-ee#11281 See merge request gitlab-org/gitlab-ce!27416
| * | | | Redirect to settings page on invalid updateMatija Čupić2019-04-241-1/+1
| |/ / /
* | | | Remove "You are already signed in" bannerIllya Klymov2019-04-242-7/+12
|/ / /
* | | Merge branch '60730-service-response' into 'master'Dmitriy Zaporozhets2019-04-241-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Introduce ServiceResponse to wrap around response Closes #60730 See merge request gitlab-org/gitlab-ce!27516
| * | | Introduce ServiceResponse to wrap around responseLin Jen-Shin2019-04-221-4/+4
| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/60730
* | | | Move scoped_label into label presenterJan Provaznik2019-04-231-1/+1
|/ / / | | | | | | | | | | | | | | | | | | When rendering a label we want to check 'scoped_label' feature availability on a project/group where label is being used. For this reason a label presenter is used in UI and information about context project/group is passed to this presenter.
* | | Merge branch 'ce-issue-10671' into 'master'Grzegorz Bizon2019-04-191-4/+4
|\ \ \ | | | | | | | | | | | | | | | | CE part for extract EE specific lines from issue.rb See merge request gitlab-org/gitlab-ce!27481
| * | | Aligned IssuesController implementation with EEPatrick Derichs2019-04-181-4/+4
| | | |
* | | | Migrate correlation and tracing code to LabKitan-use-labkitAndrew Newdigate2019-04-181-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is a fairly straightforward refactor to extract the tracing and correlation-id code from the gitlab rails codebase into the new LabKit-Ruby project. The corresponding import into LabKit-Ruby was in https://gitlab.com/gitlab-org/labkit-ruby/merge_requests/1 The code itself remains very similar for now. Extracting it allows us to reuse it in other projects, such as Gitaly-Ruby. This will give us the advantages of correlation-ids and distributed tracing in that project too.
* | | Merge branch 'jivl-add-feature-flag-gon-ee' into 'master'Fatih Acet2019-04-171-0/+3
|\ \ \ | | | | | | | | | | | | | | | | make the monitoring bundle reusable See merge request gitlab-org/gitlab-ce!27402
| * | | Make the monitoring bundle reusablejivl-add-feature-flag-gon-eeJose Vargas2019-04-161-0/+3
| | | | | | | | | | | | | | | | Also push the frontend flag in the clusters controller
* | | | Revert "Revert "Merge branch '24704-download-repository-path' into 'master'""Nick Thomas2019-04-161-1/+1
|/ / / | | | | | | | | | This reverts commit 171818df0a72097aa1a804c8213666b3f66b0966.
* | | Merge branch 'mc/feature/custom-metrics-ce' into 'master'Kamil Trzciński2019-04-161-14/+16
|\ \ \ | | | | | | | | | | | | | | | | Backport metrics report type See merge request gitlab-org/gitlab-ce!26798
| * | | Backport changes from EEMatija Čupić2019-04-161-14/+16
| | | | | | | | | | | | | | | | | | | | This backports the changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10452
* | | | Externalize several strings inMartin Wortschack2019-04-162-4/+4
| |_|/ |/| | | | | | | | | | | | | | - app/services - app/controllers - app/presenters
* | | Merge branch 'forbid-the-usage-of-reload' into 'master'Lin Jen-Shin2019-04-154-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Forbid the usage of reload Closes #60218 See merge request gitlab-org/gitlab-ce!27125
| * | | Forbid the use of `#reload` and prefer `#reset`forbid-the-usage-of-reloadKamil Trzciński2019-04-154-4/+4
| | |/ | |/| | | | | | | | | | | | | | | | The `#reload` makes to load all objects into memory, and the main purpose of `#reload` is to drop the association cache. The `#reset` seems to solve exactly that case.
* | | Add ability to do variable substitutionReuben Pereira2019-04-151-3/+26
| | | | | | | | | | | | | | | | | | - In prometheus proxy api, allow variables to be replaced. For example, if 'up{env="%{ci_environment_slug}"}' is passed to the endpoint, it becomes 'up{env="production"}' before being sent to prometheus.
* | | Added write_repository scope for personal access tokenHoratiu Eugen Vlad2019-04-154-4/+4
| | |
* | | Remove rails-deprecated_sanitizer dependency17014-remove-rails-deprecated_sanitizerDmitriy Zaporozhets2019-04-121-2/+2
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Revert "Merge branch '24704-download-repository-path' into 'master'"revert-24704-download-repository-pathPatrick Bajao2019-04-111-1/+1
|/ | | | | This reverts commit 6c75bd015cba181f028bc87c396c3d8e43b5dc3e, reversing changes made to 1be7f5aaa38aba79843eae8835be6c99c025e982.
* Merge branch 'docs-zj-update-n-plus-one-comments' into 'master'Douglas Barbosa Alexandre2019-04-093-4/+3
|\ | | | | | | | | Update comments about N + 1 Gitaly calls See merge request gitlab-org/gitlab-ce!27178
| * Update comments about N + 1 Gitaly callsZeger-Jan van de Weg2019-04-093-4/+3
| | | | | | | | | | To make sure all known issues are linked to the correct epic, I've gone through the code base, and updated the comments where required.
* | Move Contribution Analytics related spec in ↵Imre Farkas2019-04-093-5/+19
| | | | | | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* | Merge branch 'osw-multi-assignees-merge-requests' into 'master'Nick Thomas2019-04-093-12/+7
|\ \ | | | | | | | | | | | | [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-083-12/+7
| | | | | | | | | | | | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* | | Merge branch 'improve/rack-clean-path-info' into 'master'Douwe Maan2019-04-091-32/+1
|\ \ \ | | | | | | | | | | | | | | | | Use Rack::Utils.clean_path_info instead of copy-pasted version. See merge request gitlab-org/gitlab-ce!27001
| * | | Use Rack::Utils.clean_path_info instead of copy-pasted version.Vasiliy Ermolovich2019-04-041-32/+1
| | | |
* | | | 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
* | Externalize strings in flash messagesMartin Wortschack2019-04-0813-34/+34
| | | | | | | | | | - Externalize strings in controllers - Update PO file
* | 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-064-4/+7
| | | | | | | | | | | | | | | | | | | | | | 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
| |
* | Add part of needed codeGosia Ksionek2019-04-052-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add columns to store project creation settings Add project creation level column in groups and default project creation column in application settings Remove obsolete line from schema Update migration with project_creation_level column existence check Rename migrations to avoid conflicts Update migration methods Update migration method
* | Merge branch 'revert-3962b00b' into 'master'Andreas Brandl2019-04-053-19/+5
|\ \ | | | | | | | | | | | | Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'" See merge request gitlab-org/gitlab-ce!27051