summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Optimize /admin/applications so that it does not timeoutsh-fix-oauth-application-pageStan Hu2019-09-093-2/+7
| | | | | | | | | | | | | | | | | | On our dev instance, /admin/applications as not loading because: 1. There was an unindexed query by `application_id`. 2. There was an expensive query that attempted to load 1 million unique entries via ActiveRecord just to find the unique count. We fix the first issue by adding an index for that column. We fix the second issue with a simple SELECT COUNT(DISTINCT resource_owner_id) SQL query. In addition, we add pagination to avoid loading more than 20 applications at once. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67228
* Merge branch 'qa/e2e-tests-for-issue-weights' into 'master'Walmyr Lima e Silva Filho2019-09-091-1/+1
|\ | | | | | | | | Backport of end-to-end test for visualizing issue weight on different pages See merge request gitlab-org/gitlab-ce!32766
| * Update view for testabilityWalmyr Lima2019-09-061-1/+1
| |
* | Merge branch 'jivanvl-add-caret-icon-dashboard' into 'master'Clement Ho2019-09-091-3/+35
|\ \ | | | | | | | | | | | | Add caret icons to the monitoring dashboard See merge request gitlab-org/gitlab-ce!32239
| * | Add caret icons to the monitoring dashboardjivanvl-add-caret-icon-dashboardJose Vargas2019-09-091-3/+35
| | | | | | | | | | | | | | | The carets will function as a button that will allow the panels from the monitoring dashboard to collapse and show panels
* | | Merge branch '13095-missing-borders-between-settings-items' into 'master'Paul Slaughter2019-09-091-3/+7
|\ \ \ | | | | | | | | | | | | | | | | [CE] Resolve "Missing borders between settings items" See merge request gitlab-org/gitlab-ce!32828
| * | | CE - Resolve "Missing borders between settings items"Marcel van Remmerden2019-09-091-3/+7
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14877
* | | | Merge branch 'api_settings' into 'master'Douglas Barbosa Alexandre2019-09-092-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve application settings API Closes #58180 See merge request gitlab-org/gitlab-ce!31149
| * | | | Settings API: domain_{black,white}list should be arraysMathieu Parent2019-09-092-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As in documentation. Fixes: #58180. Also remove the requirement between domain_blacklist_enabled and domain_blacklist.
| * | | | Show domain_blacklist and domain_whitelist in the settings APIMathieu Parent2019-09-092-2/+6
| | | | |
* | | | | Create new feature flagged UI for cloud providersEnrique Alcántara2019-09-097-23/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create HAML UI select a cloud provider to create a cluster. - Add query param to :new cluster view to display a specific cluster provider form depending on the value of the provider query param. - Update unit tests and e2e tests to reflect these changes
* | | | | Expose update project service JSON endpointPeter Leitzen2019-09-092-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | Utilize `json_fields` to expose fields via `Service#as_json(only: json_fields)`.
* | | | | Merge branch '60724-watch-button' into 'master'Clement Ho2019-09-092-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Give notification buttons btn-xs class Closes #60724 See merge request gitlab-org/gitlab-ce!32827
| * | | | Give notification buttons btn-xs class60724-watch-buttonJarek Ostrowski2019-09-092-3/+3
| | |/ / | |/| | | | | | | | | | Add changelog
* | | | Merge branch ↵Clement Ho2019-09-091-0/+49
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | '9102-hide-dismissed-vulnerabilities-in-the-group-security-dashboard-backport' into 'master' Add toggle to show/hide dismissed vulnerabilities (ports ee!15333) See merge request gitlab-org/gitlab-ce!32413
| * | | Backport "Add toggle to hide dismissed vulnerabilities"9102-hide-dismissed-vulnerabilities-in-the-group-security-dashboard-backportPaul Gascou-Vaillancourt2019-09-041-0/+49
| | | | | | | | | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15333
* | | | Merge branch 'events-delete-all' into 'master'Lin Jen-Shin2019-09-095-5/+5
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Use delete_all for deleting events See merge request gitlab-org/gitlab-ce!32751
| * | | Use delete_all for deleting eventsevents-delete-allJan Provaznik2019-09-075-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Because we don't have any destroy callbacks (or other logic triggered on event destroy), there is no reason for deleting events inefficiently one by one, instead we can use :delete_all.
* | | | Application Statistics APIManoj MJ2019-09-0913-38/+180
| | | | | | | | | | | | | | | | | | | | This change implements Application Statistics API
* | | | Merge branch 'remove-unnecessary-freeze-in-app-helpers' into 'master'Stan Hu2019-09-081-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid calling freeze on already frozen strings in app/helpers See merge request gitlab-org/gitlab-ce!32789
| * | | | Avoid calling freeze on already frozen strings in app/helpersdineshpanda2019-09-041-3/+3
| | | | |
* | | | | Add method to authorize reading from prometheus proxyRyan Cobb2019-09-072-0/+5
| |/ / / |/| | |
* | | | Allow to load ECDSA certificates for pages domainsVladimir Shushlin2019-09-073-4/+38
| | | | | | | | | | | | | | | | Just replace RSA.new with PKey.read
* | | | Update keyboard shortcuts modal and docMarcel Amirault2019-09-067-213/+159
| | | | | | | | | | | | | | | | | | | | Add missing shortcuts, remove shortcuts that don't exist, and reorder as needed
* | | | Merge branch 'qa/e2e-tests-for-multiple-boards-on-group-level' into 'master'Walmyr Lima e Silva Filho2019-09-062-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update view for testability See merge request gitlab-org/gitlab-ce!32644
| * | | | Update views for testabilityqa/e2e-tests-for-multiple-boards-on-group-levelWalmyr Lima2019-09-052-3/+4
| | | | |
* | | | | Back porting changes to trigger user create event on Trial sign upAishwarya Subramanian2019-09-061-0/+1
| |_|_|/ |/| | |
* | | | Fix sharing localStorage with all MRsIgor2019-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Expose id field in the serializer in order to store comments content in the localStorage under the correct key
* | | | Quote branch names in how to merge instructionsLee Tickett2019-09-061-8/+9
| | | |
* | | | Merge branch 'sh-add-sidekiq-logging-for-bad-ci' into 'master'Grzegorz Bizon2019-09-061-1/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Log errors for failed pipeline creation in PostReceive See merge request gitlab-org/gitlab-ce!32633
| * | | | Log errors for failed pipeline creation in PostReceivesh-add-sidekiq-logging-for-bad-ciStan Hu2019-09-051-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a pipeline fails to create in `PostReceive`, the error is silently discarded, making it difficult to understand why a pipeline was not created. We now add a Sidekiq warning message for this. Adding a Sentry exception when this happens would generate a lot of noise for invalid CI files. Relates to https://gitlab.com/gitlab-org/gitlab-ee/issues/14720
* | | | | Merge branch '67032-add-projects-param-to-issuable-finder' into 'master'Kamil Trzciński2019-09-061-4/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add projects parameter to IssuableFinder Closes #67032 and gitlab-ee#10904 See merge request gitlab-org/gitlab-ce!32694
| * | | | | Add projects parameter to IssuableFinderLin Jen-Shin2019-09-061-4/+19
| |/ / / /
* | | | | Merge branch 'instance-group-level-knative' into 'master'Grzegorz Bizon2019-09-062-3/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Knative installation on group and instance level clusters Closes #62667 and #62666 See merge request gitlab-org/gitlab-ce!32128
| * | | | | Enable Knative installation on group and instance level clustersAlishan Ladhani2019-09-052-3/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Show Knative install button on group/instance cluster pages - Allow Knative to be installed on group/instance clusters - Add feature specs for installing applications on group/instance clusters - Add changelog entry - Update docs to reflect that Knative can now be installed on group-level and instance-level clusters
* | | | | Show weight on new board issue (CE-backport)Winnie Hellmann2019-09-061-1/+5
| | | | |
* | | | | Merge branch 'sh-add-margin-member-list' into 'master'Annabel Dunstone Gray2019-09-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add padding to left of "Sort by" in members dropdown See merge request gitlab-org/gitlab-ce!32602
| * | | | | Add padding to left of "Sort by" in members dropdownsh-add-margin-member-listStan Hu2019-09-051-1/+1
| | | | | |
* | | | | | Merge branch 'ce-detect-github-pull-requests' into 'master'Kamil Trzciński2019-09-068-2/+169
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port CreateGithubPullRequestEvents migration from EE See merge request gitlab-org/gitlab-ce!31802
| * | | | | | CE port for pipelines for external pull requestsce-detect-github-pull-requestsFabio Pitino2019-09-058-2/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect if pipeline runs for a GitHub pull request When using a mirror for CI/CD only we register a pull_request webhook. When a pull_request webhook is received, if the source branch SHA matches the actual head of the branch in the repository we create immediately a new pipeline for the external pull request. Otherwise we store the pull request info for when the push webhook is received. When using "only/except: external_pull_requests" we can detect if the pipeline has a open pull request on GitHub and create or not the job based on that.
* | | | | | | Merge branch 'fix-style-lint-errors-pipeline-ce' into 'master'Filipa Lacerda2019-09-064-4/+16
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Adds backport change for pipeline.scss See merge request gitlab-org/gitlab-ce!32670
| * | | | | | Adds backport change for pipeline.scssfix-style-lint-errors-pipeline-cepburdette2019-09-044-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the necessary backport changes for pipeline.scss. This commit is neccessary from the changes made in MR 16135 Revert schema.rb which was automatically added will investigate
* | | | | | | Merge branch 'add-label-push-opts' into 'master'Ash McKenzie2019-09-065-14/+37
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support adding and removing labels w/ push opts Closes #5942 See merge request gitlab-org/gitlab-ce!31831
| * | | | | | | Simplify filter_labels method in IssuableBaseServiceadd-label-push-optsChristian Couder2019-09-041-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IssuableBaseService::filter_labels() has been refactored to call a new `label_ids_to_filter` method.
| * | | | | | | Avoid creating labels when removing themChristian Couder2019-09-043-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IssuableBaseService has been updated so that labels are not created when push options to remove them are received.
| * | | | | | | Support adding and removing labels w/ push optsChristian Couder2019-09-044-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequests::PushOptionsHandlerService has been updated to allow adding and removing labels to a merge request using git push options. To create a new merge request and add 2 labels to it: git push -u origin -o merge_request.create \ -o merge_request.label="My label 1" \ -o merge_request.label="My label 2" To update an existing merge request and remove a label while adding a different label: git push -u origin -o merge_request.label="My added label" \ -o merge_request.unlabel="My removed label" Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
* | | | | | | | Fixes pot failureMayra Cabrera2019-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes duplicated entry
* | | | | | | | If user can't activate error tracking display a learn more button pointingManeschi Romain2019-09-057-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to doc
* | | | | | | | Update text on project import and mirroring formsAdam Hegyi2019-09-052-0/+2
| | | | | | | |
* | | | | | | | Merge branch 'group_level_jupyterhub' into 'master'Robert Speicher2019-09-053-8/+4
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Group level JupyterHub See merge request gitlab-org/gitlab-ce!32512