summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Make external_dashboard_url available to frontendReuben Pereira2019-05-291-0/+1
| | | | | - On Operations settings page - On Metrics dashboard page
* Merge branch 'mc/feature/reports-download' into 'master'Grzegorz Bizon2019-05-292-2/+15
|\ | | | | | | | | | | | | Allow downloading report artifacts Closes #49265 See merge request gitlab-org/gitlab-ce!27974
| * Extract Ci::Build#report_artifacts into methodmc/feature/reports-downloadMatija Čupić2019-05-281-0/+4
| | | | | | | | | | Extracts combining the job_artifacts relation with the with_reports scope for getting report artifacts into a method.
| * Rename with_all_reports to with_reportsMatija Čupić2019-05-281-4/+9
| |
| * Add all reports scope to Ci::JobArtifactMatija Čupić2019-05-281-0/+4
| |
* | Add notify_only_default_branch option to PipelinesEmailServicePeter Marko2019-05-281-3/+15
|/
* Store Let's Encrypt private key in settingsVladimir Shushlin2019-05-281-0/+6
| | | | | | | | | | | | | | | | Storing this key in secrets.yml was a bad idea, it would require users using HA setups to manually replicate secrets across nodes during update, it also needed support from omnibus package * Revert "Generate Let's Encrypt private key" This reverts commit 444959bfa0b79e827a2a1a7a314acac19390f976. * Add Let's Encrypt private key to settings as encrypted attribute * Generate Let's Encrypt private key in database migration
* Update GitLab Runner Helm Chart to 0.5.1/11.11.1Steve Azzopardi2019-05-271-1/+1
|
* Disable two_step_rebase feature flagDouwe Maan2019-05-271-1/+1
| | | | Disabling because of https://gitlab.com/gitlab-org/gitlab-ce/issues/62353
* Removes duplicated members from api/projects/:id/members/all51854-api-to-get-all-project-group-members-returns-duplicatesJacopo2019-05-271-0/+2
| | | | | | | | When using the members/all api the same user was returned multiple times when he was a member of the project/group and also of one of the ancestor groups. Now the member is returned only once giving priority to the membership on the project and maintaining the same behaviour of the members UI.
* Add changelog entryJacques Erasmus2019-05-271-6/+59
| | | | Added a changelog entry for the feature
* Merge branch 'ce-jej/group-saml-cleans-up-identity' into 'master'Mayra Cabrera2019-05-241-0/+1
|\ | | | | | | | | Adds Identity#for_user for use in an EE MR See merge request gitlab-org/gitlab-ce!28697
| * Adds Identity#for_user for use in an EE MRce-jej/group-saml-cleans-up-identityJames Edwards-Jones2019-05-241-0/+1
| |
* | Remove un-used methodsThong Kuah2019-05-241-8/+0
| | | | | | | | | | These two methods were used in emitting AUTO_DEVOPS_DOMAIN which has now been dropped.
* | Stop emitting AUTO_DEVOPS_DOMAIN Ci variableThong Kuah2019-05-242-30/+1
| | | | | | | | Update documentation to reflect removal
* | JupyterHub Repo IntegrationAmit Rathi2019-05-221-0/+9
| |
* | Merge branch 'sh-bump-shoulda-matcher' into 'master'Jan Provaznik2019-05-221-0/+2
|\ \ | | | | | | | | | | | | Bump shoulda-matchers to 4.0.1 See merge request gitlab-org/gitlab-ce!28443
| * | Fix remaining failures in shoulda-matcherStan Hu2019-05-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Rails 5, belongs_to now adds a presence validation to the association, and so as of shoulda-matchers 4.0.0 the belong_to matcher follows suit and tests that this validation is there by setting the association to nil and asserting that there are validation errors. This exposed an error with the `validate_branches` method: we need to check the source and target project exist.
* | | Merge branch ↵Nick Thomas2019-05-224-61/+39
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | '61935-remove-code-left-over-from-when-clusters-were-always-project-specific' into 'master' remove `Clusters::Platforms::Kubernetes#actual_namespace` Closes #61935 See merge request gitlab-org/gitlab-ce!28391
| * | Remove legacy Kubernetes #actual_namespace61935-remove-code-left-over-from-when-clusters-were-always-project-specificTiger2019-05-214-61/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Kubernetes clusters were originally built they could only exist at the project level, and so there was logic included that assumed there would only ever be a single Kubernetes namespace per cluster. We now support clusters at the group and instance level, which allows multiple namespaces. This change consolidates various project-specific fallbacks to generate namespaces, and hands all responsibility to the Clusters::KubernetesNamespace model. There is now no concept of a single namespace for a Clusters::Platforms::Kubernetes; to retrieve a namespace a project must now be supplied in all cases. This simplifies upcoming work to use a separate Kubernetes namespace per project environment (instead of a namespace per project).
* | | Merge branch 'update-gitlab-runner-helm-chart-to-0-5-0' into 'master'Nick Thomas2019-05-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.5.0/11.11.0 See merge request gitlab-org/gitlab-ce!28497
| * | | Update GitLab Runner Helm Chart to 0.5.0update-gitlab-runner-helm-chart-to-0-5-0Steve Azzopardi2019-05-201-1/+1
| |/ /
* | | Bump devise to 4.6Utkarsh Gupta2019-05-211-9/+0
|/ / | | | | | | Signed-off-by: Utkarsh Gupta <guptautkarsh2102@gmail.com>
* | Merge branch 'environment_terminal_methods' into 'master'Stan Hu2019-05-201-2/+2
|\ \ | | | | | | | | | | | | Use Environment#deployment_platform method instead See merge request gitlab-org/gitlab-ce!28000
| * | Use Environment#deployment_platform method insteadenvironment_terminal_methodsThong Kuah2019-05-201-2/+2
| | | | | | | | | | | | | | | | | | As this method does have `deployment_platform(environment: self.name)`, which is what the form EE needs. Allows us to remove two overrides in EE.
* | | Added filtering jobs by age to jobs/request API endpointDmitry Chepurovskiy2019-05-201-0/+2
| | |
* | | Fix typos in the whole gitlab-ce projectYoginth2019-05-201-1/+1
|/ /
* | Merge branch '60379-remove-ci-preparing-state-feature-flag' into 'master'James Lopez2019-05-171-2/+0
|\ \ | | | | | | | | | | | | | | | | | | Stop configuring group clusters on creation Closes #60379 See merge request gitlab-org/gitlab-ce!27245
| * | Stop configuring group clusters on creation60379-remove-ci-preparing-state-feature-flagTiger2019-05-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Immediate configuration is not ideal for group and instance level clusters as projects that may never be deployed would still have Kubernetes namespaces and service accounts created for them. As of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25586 we now create only the resources that are required for the project being deployed, at the time of deployment.
* | | Make ApplicationData a plain module include60550-make-application-data-plain-moduleDylan Griffith2019-05-161-39/+35
|/ /
* | Merge branch 'jc-omit-count-diverging-commits-max' into 'master'Lin Jen-Shin2019-05-161-1/+22
|\ \ | | | | | | | | | | | | Omit max-count for diverging_commit_counts behind feature flag See merge request gitlab-org/gitlab-ce!28157
| * | Omit max-count for diverging_commit_counts behind feature flagjc-omit-count-diverging-commits-maxJohn Cai2019-05-141-1/+22
| | | | | | | | | | | | | | | | | | | | | We want to optimize the query for the CountDivergingCommits rpc by removing the --max-count argument now that we have commit graphs enabled for all repositories during housekeeping. However, we want to test this first behind a feature flag.
* | | Properly clear the merge error upon rebase failuresh-fix-rebase-error-clearingStan Hu2019-05-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | If `merge_error` is ever set after a failure, it is never cleared, even after a subsequent, successful rebase. We now clear this field whenever a successful rebase occurs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56139
* | | Merge branch 'jej/list-sessions-for-user' into 'master'Stan Hu2019-05-161-11/+38
|\ \ \ | |_|/ |/| | | | | | | | Sessions can be listed for a given user See merge request gitlab-org/gitlab-ce!28306
| * | Sessions can be listed for a given userjej/list-sessions-for-userJames Edwards-Jones2019-05-151-11/+38
| | | | | | | | | | | | | | | | | | Adds ActiveSession#session_ids_for_user for listing session IDs for a given user, and adds ActiveSession#list_sessions for listing session data directly.
* | | Merge branch 'make-autocomplete-faster-with-lots-of-results' into 'master'53811-move-multiple-issue-boards-for-projects-to-coreStan Hu2019-05-141-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Optimise upload path calls See merge request gitlab-org/gitlab-ce!28264
| * | | Optimise upload path callsSean McGivern2019-05-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | String#underscore isn't particularly slow, but it's possible for us to call it many times in a users autocomplete request, with mostly-static values ('User', 'Group', etc.). We can memoise this and save a surprising amount of time (around 10% of the total request time in some cases).
* | | | Merge branch 'fix-project-visibility-level-validation' into 'master'Stan Hu2019-05-141-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project visibility level validation Closes #59379 See merge request gitlab-org/gitlab-ce!28305
| * | | | Fix project visibility level validationPeter Marko2019-05-141-2/+6
| | | | |
* | | | | Merge branch '55583-rename-method-conflicts' into 'master'Jan Provaznik2019-05-144-30/+30
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Rename methods that conflict in Rails 5.2 Closes #55583 See merge request gitlab-org/gitlab-ce!28281
| * | | | Rename methods that conflict in Rails 5.255583-rename-method-conflictsHeinrich Lee Yu2019-05-124-30/+30
| |/ / / | | | | | | | | | | | | | | | | Adds suffix to enum methods and changes `in_groups` to `of_groups`
* | | | Merge branch '61302-remove-ignore_column-ci_cd' into 'master'Douglas Barbosa Alexandre2019-05-131-1/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "Remove ignore_column ci_id" Closes #61302 See merge request gitlab-org/gitlab-ce!28234
| * | | Remove ignore_column from Project model61302-remove-ignore_column-ci_cdDmitriy Zaporozhets2019-05-101-1/+0
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Resolve "JIRA service: NoMethodError: undefined method `find' for nil:NilClass"Patrick Derichs2019-05-101-0/+1
|/ /
* | Change DetectRepositoryLanguagesWorker to not receive userDiego Silva2019-05-091-1/+1
| | | | | | | | Fixes #60425
* | Added user time settings fields to profileEzekiel Kigbo2019-05-072-0/+7
| | | | | | | | | | | | Udpated user_edit_profile_spec with time preferences Minor update form fields
* | Merge branch 'mc/feature/pipeline-tracking-ce' into 'master'Grzegorz Bizon2019-05-071-0/+4
|\ \ | | | | | | | | | | | | Add bridge relation between Pipelines and Bridges CE backport See merge request gitlab-org/gitlab-ce!28152
| * | Backport EE changesmc/feature/pipeline-tracking-ceMatija Čupić2019-05-061-0/+4
| |/ | | | | | | | | Backports the EE changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11264
* | Merge branch 'show-disabled-mirrors' into 'master'Nick Thomas2019-05-071-0/+4
|\ \ | | | | | | | | | | | | CE Show disabled project repo mirrors See merge request gitlab-org/gitlab-ce!27326
| * | Show disabled project repo mirrorsshow-disabled-mirrorsLuke Bennett2019-05-071-0/+4
| | | | | | | | | | | | | | | Show disabled mirrors with a badge so that they can be deleted by project owners.