1. 18 6月, 2019 1 次提交
  2. 17 6月, 2019 3 次提交
    • I
      CE port of IP address restriction for groups · 1ac1f1f6
      Imre Farkas 提交于
      1ac1f1f6
    • Y
      Backport the EE schema and migrations to CE · 8469f59d
      Yorick Peterse 提交于
      This backports all EE schema changes to CE, including EE migrations,
      ensuring both use the same schema.
      
      == Updated tests
      
      A spec related to ghost and support bot users had to be modified to make
      it pass. The spec in question assumes that the "support_bot" column
      exists when defining the spec. In the single codebase setup this is not
      the case, as the column is backported in a later migration. Any attempt
      to use a different schema version or use of "around" blocks to
      conditionally disable specs won't help, as reverting the backport
      migration would also drop the "support_bot" column. Removing the
      "support_bot" tests entirely appears to be the only solution.
      
      We also need to update some foreign key tests now that we have
      backported the EE columns. Fortunately, these changes are very minor.
      
      == Backporting migrations
      
      This commit moves EE specific migrations (except those for the Geo
      tracking database) and related files to CE, and also removes any traces
      of the ee/db directory.
      
      Some migrations had to be modified or removed, as they no longer work
      with the schema being backported. These migrations were all quite old,
      so we opted for removing them where modifying them would take too much
      time and effort.
      
      Some old migrations were modified in EE, while also existing in CE. In
      these cases we took the EE code, and in one case removed them entirely.
      It's not worth spending time trying to merge these changes somehow as we
      plan to remove old migrations around the release of 12.0, see
      https://gitlab.com/gitlab-org/gitlab-ce/issues/59177 for more details.
      8469f59d
    • L
      CE backport for changes in EE MR 13894 · f7163afb
      Luke Duncalfe 提交于
      This backports to CE changes that allow the recording of the
      repository_type in the table lfs_objects_projects.
      
      This is in order to allow future pruning of unreferenced LFS objects,
      as we will need to know which repository to look in for the LFS pointer
      file.
      
      The EE MR that contains the original code and a full explanation of the
      changes is
      https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894
      
      EE Issue https://gitlab.com/gitlab-org/gitlab-ee/issues/9490
      
      Note that there was a lot of CE code changed in the EE MR because we
      want to allow the wiki repository to also use LFS. See
      https://gitlab.com/gitlab-org/gitlab-ce/issues/43721. As the wiki is
      an unlicensed feature, a full backport is required to enable this.
      f7163afb
  3. 14 6月, 2019 2 次提交
  4. 13 6月, 2019 2 次提交
  5. 11 6月, 2019 4 次提交
  6. 07 6月, 2019 2 次提交
    • V
      Add certificate valid time to pages domain table · d1d05ae4
      Vladimir Shushlin 提交于
      Save certificate validity time for pages domains on save
      Fill validity time for existing pages domains in background migration
      d1d05ae4
    • V
      Add pages domains acme orders · c3338c92
      Vladimir Shushlin 提交于
      Extract acme double to helper
      
      Create ACME challanges for pages domains
      
      * Create order & challange through API
      * save them to database
      * request challenge validation
      
      We're saving order and challenge as one entity,
      that wouldn't be correct if we would order certificates for
      several domains simultaneously, but we always order certificate
      per domain
      
      Add controller for processing acme challenges redirected from pages
      
      Don't save acme challenge url - we don't use it
      
      Validate acme challenge attributes
      
      Encrypt private_key in acme orders
      c3338c92
  7. 06 6月, 2019 3 次提交
    • N
      Revert "Merge branch 'pages-domain_ssl-valid-period' into 'master'" · 10dcfac1
      Nick Thomas 提交于
      This reverts merge request !28743
      10dcfac1
    • V
      Add certificate valid time to pages domain table · 3aab750d
      Vladimir Shushlin 提交于
      Save certificate validity time for pages domains on save
      Fill validity time for existing pages domains in background migration
      3aab750d
    • K
      Add project level git depth setting · ad9ae16d
      Krasimir Angelov 提交于
      Introduce default_git_depth in project's CI/CD settings and set it to
      50. Use it if there is no GIT_DEPTH variable specified. Apply this
      default only to newly created projects and keep it nil for old ones
      in order to not break pipelines that rely on non-shallow clones.
      
      default_git_depth can be updated from CI/CD Settings in the UI, must be
      either nil or integer between 0 and 1000 (incl).
      
      Inherit default_git_depth from the origin project when forking projects.
      
      MR pipelines are run on a MR ref (refs/merge-requests/:iid/merge) and it
      contains unique commit (i.e. merge commit) which doesn't exist in the
      other branch/tags refs. We need to add it cause otherwise it may break
      pipelines for old projects that have already enabled Pipelines for merge
      results and have git depth 0.
      
      Document new default_git_depth project CI/CD setting
      ad9ae16d
  8. 01 6月, 2019 1 次提交
  9. 31 5月, 2019 3 次提交
  10. 30 5月, 2019 1 次提交
  11. 29 5月, 2019 1 次提交
  12. 28 5月, 2019 1 次提交
    • V
      Store Let's Encrypt private key in settings · 4687ff7c
      Vladimir Shushlin 提交于
      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 444959bf.
      
      * Add Let's Encrypt private key to settings
        as encrypted attribute
      
      * Generate Let's Encrypt private key
        in database migration
      4687ff7c
  13. 20 5月, 2019 1 次提交
  14. 16 5月, 2019 1 次提交
  15. 08 5月, 2019 1 次提交
  16. 07 5月, 2019 1 次提交
  17. 06 5月, 2019 2 次提交
  18. 04 5月, 2019 1 次提交
  19. 03 5月, 2019 1 次提交
  20. 02 5月, 2019 1 次提交
  21. 01 5月, 2019 1 次提交
  22. 27 4月, 2019 3 次提交
  23. 23 4月, 2019 1 次提交
  24. 18 4月, 2019 1 次提交
  25. 12 4月, 2019 1 次提交