summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Implement review suggestions55199-error-tracking-controllerrpereira22019-02-062-6/+6
| | | | | - Use if else end instead of unless guard. - Use allow in before block instead of expect.
* Implement review commentsrpereira22019-02-063-86/+122
| | | | | - Change error tracking list_projects route to be a collection route within the error_tracking resource.
* Split long linesrpereira22019-02-062-6/+16
|
* Update usage of Sentry project servicerpereira22019-02-062-7/+7
| | | | The name of the service has changed.
* Use fully qualified name in ProjectSerializerrpereira22019-02-061-1/+1
| | | | | | | Use full name of ErrorTracking::ProjectEntity because sometimes the pipeline fails when it seems to assume that the ProjectEntity in ErrorTracking::ProjectSerializer refers to ProjectEntity and not ErrorTracking::ProjectEntity.
* Correct error_tracking_controller params permitrpereira22019-02-061-5/+0
| | | | | Fix how params are being permitted for the list_projects endpoint. Also, do not set polling interval for list_projects endpoint.
* Fix route for listing Sentry projectsrpereira22019-02-061-5/+3
|
* Add list_projects endpoint to error trackingrpereira22019-02-063-1/+116
| | | | | Add an endpoint that returns a list of sentry projects, given an api_host and token.
* Rename ListSentryProjectsServicerpereira22019-02-062-180/+0
|
* Refactor specs to use let and subject betterrpereira22019-02-061-31/+22
|
* Remove duplicate code that occurred after rebaserpereira22019-02-061-49/+0
|
* Refactor list_sentry_projects_service and specrpereira22019-02-062-19/+14
| | | | | - Use better variable name. - Use tap to make code clearer.
* Reduce cognitive complexity of execute methodrpereira22019-02-061-6/+7
|
* Move test setup into a before blockrpereira22019-02-061-4/+10
|
* Handle case when error_tracking_setting is nilrpereira22019-02-062-1/+31
| | | | | | - Build a new error_tracking_setting and use it to call list_projects. - Also return an error when Sentry api returns a response with expected keys missing.
* Remove code for working with reactive cachingrpereira22019-02-062-23/+0
|
* Return error response when sentry returns errorrpereira22019-02-062-0/+16
|
* Add service for getting sentry projects listrpereira22019-02-062-0/+164
| | | | | Add a service that calls the project_error_tracking_setting model to get a list of sentry projects.
* Refactor model and specrpereira22019-02-061-7/+7
| | | | | | - Move some specs into contexts - Let get_slugs method take a parameter and return a specific slug. - Add rescues when using Addressable::URI.
* Add method to get api_hostrpereira22019-02-061-0/+8
|
* Add specs for org and project name methodsrpereira22019-02-061-0/+41
|
* Merge branch '55199-list-projects-service' into 'master'Sean McGivern2019-02-062-0/+193
|\ | | | | | | | | Add service to get sentry projects list See merge request gitlab-org/gitlab-ce!24681
| * Add service to get sentry projects listReuben Pereira2019-02-062-0/+193
|/
* Merge branch 'bvl-fix-race-condition-creating-signature' into 'master'Rémy Coutable2019-02-066-5/+70
|\ | | | | | | | | | | | | Avoid race conditions when creating GpgSignature Closes #57304 See merge request gitlab-org/gitlab-ce!24939
| * Avoid race conditions when creating GpgSignatureBob Van Landuyt2019-02-066-5/+70
| | | | | | | | This avoids race conditions when creating GpgSignature.
* | Merge branch '7048_add_preference_ui_for_group_overview_be-ce' into 'master'Grzegorz Bizon2019-02-063-8/+9
|\ \ | | | | | | | | | | | | Add UI for "Group Overview default" preference in User Settings See merge request gitlab-org/gitlab-ce!24761
| * | Add render_if_exists for sidebar and preferencesVictor Zagorodny2019-02-052-1/+4
| | |
| * | Make parameters list more easily changeableGilbert Roulot2019-02-051-7/+5
| | |
* | | Merge branch 'sh-bump-supported-ruby-versions-docs' into 'master'Dmitriy Zaporozhets2019-02-061-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump required Ruby version in install doc Closes #57350 See merge request gitlab-org/gitlab-ce!24966
| * | | Bump required Ruby version in install docStan Hu2019-02-061-2/+2
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57350
* | | | Merge branch 'remove-security-branches' into 'master'Marin Jankovski2019-02-063-14/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove requirement to target security branches See merge request gitlab-org/gitlab-ce!24962
| * | | | Remove requirement to target security branchesYorick Peterse2019-02-063-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the requirement and any mention of targeting security branches when working on security releases. The release process documentation changes for these CE changes can be found in merge request https://gitlab.com/gitlab-org/release/docs/merge_requests/97. The proposal to remove security branches was approved in https://gitlab.com/gitlab-org/release/framework/issues/165#note_138139016.
* | | | | Merge branch 'revert-c5f1b834' into 'master'Fatih Acet2019-02-061-70/+23
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Revert "Convert noteable_note_spec.js to Vue test utils" See merge request gitlab-org/gitlab-ce!24961
| * | | | Revert "Convert noteable_note_spec.js to Vue test utils"Winnie Hellmann2019-02-061-70/+23
| | | | |
* | | | | Merge branch 'workhorse-8-3-0' into 'master'Rémy Coutable2019-02-062-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Update Workhorse to v8.3.0 See merge request gitlab-org/gitlab-ce!24959
| * | | | Update Workhorse to v8.3.0Nick Thomas2019-02-062-1/+6
| | | | |
* | | | | Merge branch ↵Phil Hughes2019-02-065-74/+177
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '56989-reduce-bundle-size-by-loading-markdown-it-only-when-needed' into 'master' Reduce Bundle Size by lazy loading markdown-it Closes #56989 See merge request gitlab-org/gitlab-ce!24763
| * | | | | Reduce Bundle Size by lazy loading markdown-itTim Zallmann2019-02-065-74/+177
|/ / / / /
* | | | | Merge branch '56014-better-squash-commit-messages' into 'master'Nick Thomas2019-02-0624-78/+283
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Allow custom squash commit messages See merge request gitlab-org/gitlab-ce!24518
| * | | | Allow custom squash commit messagesLuke Duncalfe2019-02-0624-78/+283
|/ / / /
* | | | Merge branch ↵Filipa Lacerda2019-02-0614-77/+346
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43681-display-last-activity-and-created-at-datetimes-for-users-in-admin-users' into 'master' Resolve "Display last activity and created at datetimes for users" Closes #43681 See merge request gitlab-org/gitlab-ce!24181
| * | | | Add last activity to user administrationBrandon Labuschagne2019-02-0514-77/+346
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The columns 'Created on' and 'Last activity' have been added to the admin -> users view. Sorting options have also been added for last activity and the search bar has been moved to match the issues page.
* | | | Merge branch ↵Filipa Lacerda2019-02-061-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ee-9258-support-alerts-from-external-prometheus-servers-frontend' into 'master' Backport for gitlab-ee!9239 See merge request gitlab-org/gitlab-ce!24818
| * | | | Backport for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9239Simon Knox2019-02-061-0/+2
| | | | |
* | | | | Merge branch 'cluster_application_version_updated' into 'master'Grzegorz Bizon2019-02-0610-106/+63
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update version column on updated and installed See merge request gitlab-org/gitlab-ce!24810
| * | | | | Refactor specs to run shared parts only when usedThong Kuah2019-02-077-24/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All applications except for Jupyter have the same #set_initial_status, so create a new shared example which we include in all application specs except for juptyer_spec. Juptyer specs already have specs for it's version of #set_initial_status
| * | | | | Update version on :installed, not :installingThong Kuah2019-02-079-89/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes this consistent with :updated. And also avoids a potential issue where an install errors which means that that the recorded version won't necessarily reflect the version that is actually installed.
| * | | | | Update version column after application is updatedThong Kuah2019-02-062-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: updating version column after :updating is not ideal in the updating -> update_erroed case. This will mean that the application now records the version as the version that failed to upgrade, not the version that it is currently on.
* | | | | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-02-0610-36/+42
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'security-makrdown-release-description-vulnerability' into 'master'Yorick Peterse2019-02-062-1/+28
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Markdown of release notes leaks confidential issue titles and MR titles to any users See merge request gitlab/gitlabhq!2869
View Lorry Controller Status