1. 22.06.2019 1 коммит
  2. 21.06.2019 2 коммита
  3. 19.06.2019 1 коммит
    • Marcia Ramos's avatar
      Merge branch 'sh-pipeline-typo-docs' into 'master'
      · 2fd3f055
      Marcia Ramos создал
      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
  4. 18.06.2019 4 коммита
  5. 17.06.2019 6 коммитов
    • Yorick Peterse's avatar
      Restore Jira tables in db/schema.rb
      · d53cd386
      Yorick Peterse создал
      Cherry-picking the schema backport commits led to these changes being
      thrown away, without this being clear.
      d53cd386
    • Yorick Peterse's avatar
      Merge branch 'merge-schema-backport-to-auto-deploy' into '12-1-auto-deploy-0010836'
      · 76875404
      Yorick Peterse создал
      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 создал
      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.
      89720b64
    • Yorick Peterse's avatar
      Backport the EE schema and migrations to CE
      · fa9be2fd
      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/d...
      fa9be2fd
    • Yorick Peterse's avatar
      Allow custom names for concurrent foreign keys
      · c35be608
      Yorick Peterse создал
      This is necessary for backporting the EE schema to ensure backported
      foreign keys use the same key names.
      c35be608
    • Bob Van Landuyt's avatar
      Merge branch 'master-i18n' into 'master'
      · 790bf463
      Bob Van Landuyt создал
      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)
      a1...
      790bf463
  6. 15.06.2019 8 коммитов
  7. 14.06.2019 18 коммитов