summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Allow a member to have an access level equal to parent groupsh-allow-equal-level-in-subgroup-membershipStan Hu2019-04-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | Suppose you have this configuration: 1. Subgroup `hello/world` 2. Subgroup `hello/mergers`. 3. Project `hello/world/my-project` has invited group `hello/world` to access protected branches. 4. The rule allows the group to merge but no one can push. 5. User `newuser` has Owner access to the parent group `hello`. Previously, there was no way for the user `newuser` to be added to the `hello/mergers` group since the validation only allowed a user to be added at a higher access level. Since membership in a subgroup confers certain access rights, such as being able to merge or push code to protected branches, we have to loosen the validation and allow someone to be added at an equal level granted by the parent group. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11323
* Fix environment automatic on_stop triggerShinya Maeda2019-04-301-0/+44
| | | | | | | Due to the nature of pipelines for merge requests, deployments.ref can be a merge request ref instead of a branch name. We support the environment auto-stop hook for this case
* Remove disabled pages domainsVladimir Shushlin2019-04-301-0/+28
| | | | | Domain will be removed by verification worker after 1 week of being disabled
* Minor refactor of prometheus_specDylan Griffith2019-04-291-4/+2
|
* In Prometheus use update! instead of updateDylan Griffith2019-04-291-1/+1
| | | | | In order to not miss any errors since we are not checking the return value of update
* Deactivate any prometheus_service upon destroyThong Kuah2019-04-291-0/+17
| | | | Basically does the reverse of after_transition to :installed.
* Teach Prometheus about #uninstall_commandThong Kuah2019-04-291-0/+28
| | | | Add specs
* Expose can_uninstall in cluster_status.jsonThong Kuah2019-04-297-0/+51
| | | | | | | | Only prometheus can be uninstalled atm, the rest will be dealt with later. Presumption is that new application types will have uninstallation implmemented at the same time.
* Merge branch 'fix-ci-commit-ref-name-and-slug' into 'master'Sean McGivern2019-04-293-0/+68
|\ | | | | | | | | | | | | Make `CI_COMMIT_REF_NAME` and `SLUG` variable idempotent Closes #60822 See merge request gitlab-org/gitlab-ce!27663
| * Fix CI_COMMIT_REF_NAME and SLUG variableShinya Maeda2019-04-293-0/+68
| | | | | | | | | | | | | | With Pipelines for Merge Requests feature, users cannout keep using $CI_COMMIT_REF_NAME and _SLUG predefined variables for dynamic environments. We fix this problem by explicitly looking at the source ref.
* | Merge branch 'use-keyword-args-for-databuilder-push' into 'master'Douglas Barbosa Alexandre2019-04-291-6/+5
|\ \ | | | | | | | | | | | | Use keyword args for databuilder push See merge request gitlab-org/gitlab-ce!24088
| * | Use all keyword args for DataBuilder::Push.build()Jonathon Reinhart2019-04-251-6/+5
| | |
* | | Merge remote-tracking branch 'origin/master'John T Skarbek2019-04-298-2/+323
|\ \ \
| * \ \ Merge branch 'bvl-initialize-design-repo-ce' into 'master'Douwe Maan2019-04-291-0/+65
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Port changes for design management to CE See merge request gitlab-org/gitlab-ce!27555
| | * | | Port changes for design management to CEBob Van Landuyt2019-04-291-0/+65
| | | |/ | | |/| | | | | | | | | | | | | | | | | This ports the changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10462/ to CE
| * | | Fix deployments for Kubernetes service templatesTiger2019-04-291-0/+6
| |/ / | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27687
| * | Add Let's Encrypt application settingsVladimir Shushlin2019-04-271-0/+14
| | | | | | | | | | | | | | | Store Let's Encrypt account email in application settings Also add explicit terms of service consent
| * | Add deployment events to chat notification servicesJason Goodman2019-04-264-0/+181
| | | | | | | | | | | | | | | This enables sending a chat message to Slack or Mattermost upon a successful, failed, or canceled deployment
| * | Add ProjectMetricsDashboardSetting model and tableReuben Pereira2019-04-261-0/+55
| | | | | | | | | | | | | | | | | | 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.
| * | Merge branch 'use-constant-for-helm-runner-check' into 'master'Grzegorz Bizon2019-04-261-2/+2
| |\ \ | | |/ | |/| | | | | | | Use constants for asserstion for helm chart test See merge request gitlab-org/gitlab-ce!27629
| | * Use constants for assertion for helm chart testSteve Azzopardi2019-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | We are duplicating the value from the constant `Clusters::Applications::Runner::VERSION` inside of the tests which results into developers having to update the tests as well when they want to upgrade the Helm chart used for GitLab Runner
* | | Merge branch 'security-approval-race-condition' into 'master'GitLab Release Tools Bot2019-04-251-0/+19
|\ \ \ | | | | | | | | | | | | | | | | Add ApplicationRecord#safe_ensure_unique method See merge request gitlab/gitlabhq!3054
| * | | Add ApplicationRecord#safe_ensure_unique methodPatrick Bajao2019-04-121-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Port of https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/866 to CE excluding the migration and service changes as they don't apply to CE.
* | | | Merge branch 'security-pb-email-watchers-no-access' into 'master'GitLab Release Tools Bot2019-04-251-4/+36
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Stop sending emails to users who can't read commit See merge request gitlab/gitlabhq!3060
| * | | Stop sending emails to users who can't read commitPatrick Bajao2019-04-161-4/+36
| |/ / | | | | | | | | | | | | | | | This is to ensure that only users will be able receive an email if they can read a commit from the repository even if they are watching the activity of it.
* | | Merge branch 'fix-lazy-blobs-requesting-all-previous-blobs' into 'master'Dmitriy Zaporozhets2019-04-251-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensure that we only request blobs in one batch Closes #60829 See merge request gitlab-org/gitlab-ce!27625
| * | | Ensure that we only request blobs in one batchSean McGivern2019-04-241-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blob.lazy adds a blob to a batch to load at a later point, using the BatchLoader library. Whenever any lazy blob's attributes are accessed, all lazy blobs requested to that point will be loaded. BatchLoader, the library we use for this, should only request items in a batch once. That is, if we have these batches: 1. a, b, c 2. d, e, f Then a, b, and c should only be requested in the first batch. But if you modify the list of items in the batch, then the second batch will request a, b, c, d, e, f, which is almost certainly not what we want! https://github.com/exAspArk/batch-loader/issues/44 is the upstream issue for this, but we can also solve this in our application by not modifying the arguments we're using inside a BatchLoader batch.
* | | | Update list_last_commits_for_tree response path field to path_bytesJohn Cai2019-04-241-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Updates the gitaly client to use path_bytes field instead of the deprecated path field in list_last_commits_for_tree_response. Also adds a test to guard against non-utf8 path data
* | | | Added list_pages method to avoid loading all wiki pages contentFrancisco Javier López2019-04-252-48/+92
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'add-ci-variable-protected-ref' into 'master'Grzegorz Bizon2019-04-243-3/+5
|\ \ \ | | | | | | | | | | | | | | | | Add CI variable CI_REF_PROTECTED See merge request gitlab-org/gitlab-ce!26716
| * | | Make sure that CI_COMMIT_REF_PROTECTED is a boolJason van den Hurk2019-04-181-1/+1
| | | |
| * | | Change CI_REF_PROTECTED variable to CI_COMMIT_REF_PROTECTEDJason van den Hurk2019-04-103-3/+3
| | | |
| * | | Added the CI_REF_PROTECTED variable to the Gitlab runnerJason van den Hurk2019-04-103-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | This variable shows if the branch the runner is executing is protected or not. References: #50909
* | | | Merge branch 'sh-disable-internal-ids-available-check' into 'master'Sean McGivern2019-04-241-1/+10
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Always use internal ID tables in development and production Closes #60718 See merge request gitlab-org/gitlab-ce!27544
| * | | Always use internal ID tables in development and productionsh-disable-internal-ids-available-checkStan Hu2019-04-221-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid quiet failures that cause consistency errors in the database, we should now assume that the internal_ids table is available since we've had this table for close to a year. For tests that have migrations, we make this check thread-safe via SafeRequestStore. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60718
* | | | Upgrade Rails to 5.1.6.1Jasper Maes2019-04-231-3/+2
|/ / / | | | | | | | | | Model.new.attributes now also returns encrypted attributes.
* | | Merge branch 'update-gitlab-runner-helm-chart-to-0-4-0' into 'master'James Lopez2019-04-221-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.4.0/11.10.0 See merge request gitlab-org/gitlab-ce!27508
| * | | Update GitLab Runner Helm Chart to 0.4.0update-gitlab-runner-helm-chart-to-0-4-0Steve Azzopardi2019-04-191-2/+2
| | | |
* | | | Fix wrong use of ActiveRecord in PoolRepositoryJacob Vosmaer2019-04-202-1/+3
| | | |
* | | | Extract ProjectStatistics updates into a concernAlessio Caiazza2019-04-192-88/+8
|/ / / | | | | | | | | | Refactor existing tests as a shared example
* | | Merge branch '39858-add-group-owned-info-to-projects-api' into 'master'Douwe Maan2019-04-191-0/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Return group information on Project endpoint Closes #39858 See merge request gitlab-org/gitlab-ce!27427
| * | | Adds namespace information to project endpoint39858-add-group-owned-info-to-projects-apiMayra Cabrera2019-04-181-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Namespace now return avatar_url and web_url - NamespaceBasic entity was modified to include avatar_url and web_url, information is fetched differently depending if the Namespace is a user or a group Includes documentation changes Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39858
* | | | Bump version of knative from 0.3 -> 0.5Chris Baumbauer2019-04-171-1/+1
|/ / /
* | | Merge branch 'mc/feature/custom-metrics-ce' into 'master'Kamil Trzciński2019-04-162-4/+24
|\ \ \ | | | | | | | | | | | | | | | | Backport metrics report type See merge request gitlab-org/gitlab-ce!26798
| * | | Backport changes from EEMatija Čupić2019-04-162-4/+24
| |/ / | | | | | | | | | | | | This backports the changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10452
* | | Merge branch 'rewind-iid-on-pipelines' into 'master'Sean McGivern2019-04-161-0/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rewind iid on pipelines Closes #59362 See merge request gitlab-org/gitlab-ce!26490
| * | | Rewind IID on Ci::Pipelinesrewind-iid-on-pipelinesKamil Trzciński2019-04-161-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If no pipeline is created we currently have IID gap. This is due to fact that we generate IID not on save, but rather ahead of time. This results, us, losing IIDs.
* | | | Don't render artifact download links on the project tags page for builds ↵drew cimino2019-04-121-7/+8
|/ / / | | | | | | | | | with expired artifacts
* | | Fix grouping wiki pages by directoryIgor2019-04-121-3/+5
| |/ |/| | | | | | | | | | | | | If a page has the same name as a directory the WikiPage#group_by_directory method can have a wrong behaviour This commit fixes it
* | Add frozen_string_literal to HipChat filesrestore-hipchatSean McGivern2019-04-101-0/+2
| |