Skip to content
Snippets Groups Projects
  1. Jun 22, 2019
  2. Jun 21, 2019
  3. Jun 20, 2019
  4. Jun 19, 2019
    • Marcia Ramos's avatar
      Merge branch 'sh-pipeline-typo-docs' into 'master' · 2fd3f055
      Marcia Ramos authored
      Fix typo in doc/user/project/pipelines/settings.md
      
      See merge request gitlab-org/gitlab-ce!29851
      
      (cherry picked from commit 9df475eb)
      
      52a0750a Fix typo in doc/user/project/pipelines/settings.md
      37276349 Apply suggestion to doc/user/project/pipelines/settings.md
      2fd3f055
  5. Jun 18, 2019
  6. Jun 17, 2019
    • Yorick Peterse's avatar
      Restore Jira tables in db/schema.rb · d53cd386
      Yorick Peterse authored
      Cherry-picking the schema backport commits led to these changes being
      thrown away, without this being clear.
      Unverified
      d53cd386
    • Yorick Peterse's avatar
      Merge branch 'merge-schema-backport-to-auto-deploy' into '12-1-auto-deploy-0010836' · 76875404
      Yorick Peterse authored
      Merge database schema backport into the auto deploy branch
      
      See merge request gitlab-org/gitlab-ce!29773
      76875404
    • Yorick Peterse's avatar
      Run CI migrations since 11.11.0 · 89720b64
      Yorick Peterse authored
      One can not upgrade straigt from 9.3 to 12.0, due to the schema changes
      being backported. Instead, one must first upgrade to 11.11.X. Omnibus
      already enforces this, and our online upgrade guidelines also cover
      this.
      
      By changing the CI config we don't have to adjust the backport migration
      to handle a migration path that one can not take.
      Unverified
      89720b64
    • Yorick Peterse's avatar
      Backport the EE schema and migrations to CE · fa9be2fd
      Yorick Peterse authored
      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.
      Unverified
      fa9be2fd
    • Yorick Peterse's avatar
      Allow custom names for concurrent foreign keys · c35be608
      Yorick Peterse authored
      This is necessary for backporting the EE schema to ensure backported
      foreign keys use the same key names.
      Unverified
      c35be608
    • Bob Van Landuyt :neckbeard:'s avatar
      Merge branch 'master-i18n' into 'master' · 790bf463
      Bob Van Landuyt :neckbeard: authored
      Master i18n
      
      See merge request gitlab-org/gitlab-ce!29723
      
      (cherry picked from commit 305455cf)
      
      a1dcb7d3 New translations gitlab.pot (Albanian)
      8db4ba3e New translations gitlab.pot (Punjabi)
      c61fad94 New translations gitlab.pot (Italian)
      34bf8941 New translations gitlab.pot (Japanese)
      7d3419a0 New translations gitlab.pot (Korean)
      49f57a69 New translations gitlab.pot (Mongolian)
      34765378 New translations gitlab.pot (Norwegian Bokmal)
      0e7a6679 New translations gitlab.pot (Polish)
      da83606f New translations gitlab.pot (Portuguese)
      baa8d077 New translations gitlab.pot (Portuguese, Brazilian)
      2fd714bc New translations gitlab.pot (Romanian)
      13e4fc39 New translations gitlab.pot (Hungarian)
      68e85259 New translations gitlab.pot (Russian)
      be746bfa New translations gitlab.pot (Serbian (Cyrillic))
      b0357577 New translations gitlab.pot (Serbian (Latin))
      892b407a New translations gitlab.pot (Slovak)
      5290c636 New translations gitlab.pot (Spanish)
      a13e58c6 New translations gitlab.pot (Swahili)
      d7cb5911 New translations gitlab.pot (Swedish)
      a458871c New translations gitlab.pot (Turkish)
      2cf187a9 New translations gitlab.pot (Ukrainian)
      d95c03ab New translations gitlab.pot (Indonesian)
      196b7d5f New translations gitlab.pot (Hindi)
      eabd6864 New translations gitlab.pot (Arabic)
      194d74a2 New translations gitlab.pot (Czech)
      e3237345 New translations gitlab.pot (Bengali)
      e5fec117 New translations gitlab.pot (Bengali, India)
      c55ab12e New translations gitlab.pot (Bulgarian)
      f355bdb5 New translations gitlab.pot (Catalan)
      54f64291 New translations gitlab.pot (Chinese Simplified)
      93d28530 New translations gitlab.pot (Chinese Traditional)
      83d9265b New translations gitlab.pot (Chinese Traditional, Hong Kong)
      4f1ef2d0 New translations gitlab.pot (Croatian)
      a201b464 New translations gitlab.pot (Danish)
      0c49b3f8 New translations gitlab.pot (Hebrew)
      9b2dadf7 New translations gitlab.pot (Dutch)
      5cb639e2 New translations gitlab.pot (Esperanto)
      872ca22c New translations gitlab.pot (Estonian)
      4e51c327 New translations gitlab.pot (Filipino)
      9e2c3477 New translations gitlab.pot (French)
      c5550010 New translations gitlab.pot (Galician)
      a7b4e2fa New translations gitlab.pot (Georgian)
      9a02e9b3 New translations gitlab.pot (German)
      e26abe82 New translations gitlab.pot (Greek)
      54ccdd45 New translations gitlab.pot (Welsh)
      30fa8cbb New translations gitlab.pot (Ukrainian)
      790bf463
  7. Jun 15, 2019
  8. Jun 14, 2019
Loading