This instance will be upgraded to Heptapod 0.31.0rc on 2022-05-19 at 11:00 UTC+2 (a few minutes of down time)

  1. 04 Dec, 2018 2 commits
    • Yorick Peterse's avatar
      Updated documentation of CE to EE merges · 07b6dca9a8c0
      Yorick Peterse authored
      This updates the documentation of automatic CE to EE merges to cover the
      new automatic merging setup.
      07b6dca9a8c0
    • Yorick Peterse's avatar
      Automatically merge CE master into EE master · eeff5334d26b
      Yorick Peterse authored
      This sets up GitLab CI to automatically push CE master changes into EE
      master, or revert them if the changes cause merge conflicts. The CI
      configuration contains a single job to do this: `merge:master`. This job
      is executed for every push to master, and periodically using a CI
      schedule.
      
      The periodic job is necessary because incremental jobs may not be able
      to revert commits if newly added commits depend on these commits. By
      re-running the job periodically (including all changes since a large
      enough time frame), we can ensure that such commits are also reverted
      (if they still conflict at that time).
      
      The job runs in its own "merge" stage, _after_ the build and prepare
      stages, but _before_ running the tests. This ensures that randomly
      failing tests won't prevent code from being merged into EE. Running the
      stage after the "prepare" stage reduces the chances of the job reverting
      CE changes just because it ran before a corresponding EE MR was merged
      into EE master.
      eeff5334d26b
  2. 03 Dec, 2018 12 commits
    • Dmitriy Zaporozhets's avatar
      Merge branch 'improve_auto_devops_migration_debug' into 'master' · 2364ba08ba9b
      Dmitriy Zaporozhets authored
      Add echo so that we know which branch was taken
      
      See merge request gitlab-org/gitlab-ce!23499
      2364ba08ba9b
    • Kamil Trzciński's avatar
      Merge branch 'fix-mr-widget-unrelated-deployment-status' into 'master' · 2a388853e58d
      Kamil Trzciński authored
      Fix unrelated deployment status in MR widget
      
      Closes #54125
      
      See merge request gitlab-org/gitlab-ce!23175
      2a388853e58d
    • Achilleas Pipinellis's avatar
      Merge branch 'patch-31' into 'master' · 04b4a36161ef
      Achilleas Pipinellis authored
      Update architecture.md
      
      See merge request gitlab-org/gitlab-ce!23430
      04b4a36161ef
    • Dmitriy Zaporozhets's avatar
      Merge branch 'jupyter-tls' into 'master' · 485ecd618dab
      Dmitriy Zaporozhets authored
      HTTPS for JupyterHub installation
      
      See merge request gitlab-org/gitlab-ce!23479
      485ecd618dab
    • Amit  Rathi's avatar
      HTTPS for JupyterHub installation · 039aeec12298
      Amit Rathi authored
      039aeec12298
    • Sean McGivern's avatar
      Merge branch 'order-of-notification-settings' into 'master' · 0f1646c24a80
      Sean McGivern authored
      reorder notification settings by noisy-ness
      
      See merge request gitlab-org/gitlab-ce!23490
      0f1646c24a80
    • Achilleas Pipinellis's avatar
      Merge branch 'patch-31' into 'master' · 9f232bca7b24
      Achilleas Pipinellis authored
      Updated Katex "Supported Functions" link
      
      See merge request gitlab-org/gitlab-ce!23343
      9f232bca7b24
    • Achilleas Pipinellis's avatar
      Merge branch 'gt-change-auto-devops-banner-link-path' into 'master' · 6ddce4fc1522
      Achilleas Pipinellis authored
      Change auto devops banner link path
      
      Closes #54689
      
      See merge request gitlab-org/gitlab-ce!23476
      6ddce4fc1522
    • Shinya Maeda's avatar
      Squashed commit of the following: · 6b321cd87b3b
      Shinya Maeda authored
      commit 04b06a2293fa12660a9c213a9db27fe90b83248b
      Merge: d580841d4ed a445aa0a926
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Mon Dec 3 10:51:55 2018 +0900
      
          Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status
      
      commit d580841d4ed944f01e6417fa77842826843b6a04
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Fri Nov 30 18:11:04 2018 +0900
      
          Add environment to all_models.yml
      
      commit 689fbe2699a3adf10804312e680fa336e4560eaf
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Fri Nov 30 17:00:35 2018 +0900
      
          Proper way to get uniq relationship
      
      commit c0733c6ecd535a6a1b6243080a2226836890f479
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Fri Nov 30 16:20:40 2018 +0900
      
          Revert build change
      
      commit 19dc55a8fe6e0fa575858d51144516b7fb0120de
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Fri Nov 30 16:19:18 2018 +0900
      
          Add uniq option
      
      commit 0a6995f311c09b453fd0aecff2f6052de38efc27
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Fri Nov 30 16:14:30 2018 +0900
      
          Drop persisted_environment
      
      commit 3f68fc783b0ee0d66e03de6d979616c4c4892118
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Wed Nov 28 13:59:04 2018 +0900
      
          Return empty array if pipeline is nil
      
      commit 73801c5c3d06339e38dce7461a71285bcdbb8f45
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Nov 27 16:34:47 2018 +0900
      
          Add changelog
      
      commit d461699abf2835cc51949a5138e829628209dd6d
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Nov 27 16:32:20 2018 +0900
      
          Squashed commit of the following:
      
          commit 77ab5259605e217a39b04d2cea6204277e42d2b5
          Merge: 7ac1ed50612 2ee8c40fc16
          Author: Shinya Maeda <shinya@gitlab.com>
          Date:   Tue Nov 27 16:31:07 2018 +0900
      
              Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status
      
          commit 7ac1ed50612620df6408220b0a7cfcb626a04c48
          Merge: 49ba5c5aeff b55aeca25e7
          Author: Shinya Maeda <shinya@gitlab.com>
          Date:   Mon Nov 26 20:01:43 2018 +0900
      
              Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status
      
          commit 49ba5c5aeff3efee7b7498d443372021c3f4f8b5
          Merge: aa3fd0ff9e8 fbbe5ccd1be
          Author: Shinya Maeda <shinya@gitlab.com>
          Date:   Mon Nov 26 15:27:36 2018 +0900
      
              Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status
      
          commit aa3fd0ff9e8a418a233ebaa60b38c081cab50099
          Author: Shinya Maeda <shinya@gitlab.com>
          Date:   Tue Nov 20 18:28:53 2018 +0900
      
              Fix static analysis
      
          commit 7afe5f37003869a73dbb297229f8533f78b82684
          Merge: e65b9580ff4 8a581d531ba
          Author: Shinya Maeda <shinya@gitlab.com>
          Date:   Tue Nov 20 18:27:33 2018 +0900
      
              Merge branch 'master-ce' into fix-mr-widget-unrelated-deployment-status
      
          commit e65b9580ff422359113e1a4e37c212f7b13aba4d
          Author: Shinya Maeda <shinya@gitlab.com>
          Date:   Mon Nov 19 17:59:48 2018 +0900
      
              Ignore deployments from project import/export
      
          commit 9eb4ddab8415c1ef61a3c646bdc4602bcf4ebe24
          Author: Shinya Maeda <shinya@gitlab.com>
          Date:   Mon Nov 19 16:26:00 2018 +0900
      
              Add memoization
      
          commit 57f0bea3aaaa07b75d18e52068c532277350cda0
          Author: Shinya Maeda <shinya@gitlab.com>
          Date:   Mon Nov 19 16:21:39 2018 +0900
      
              Fix unrelated deployment status in MR widget
      6b321cd87b3b
    • Evan Read's avatar
      Merge branch 'patch-34' into 'master' · 8ab8021579ae
      Evan Read authored
      slightly improve readability
      
      See merge request gitlab-org/gitlab-ce!23466
      8ab8021579ae
    • Stan Hu's avatar
      Merge branch 'bump_gpgme_gem' into 'master' · b7e25f99bd62
      Stan Hu authored
      Bump gpgme gem version from 2.0.13 to 2.0.18
      
      See merge request gitlab-org/gitlab-ce!23491
      b7e25f99bd62
    • Abulhair Saparov's avatar
      Bump gpgme gem version from 2.0.13 to 2.0.18 · 3963ce2f67bd
      Abulhair Saparov authored
      3963ce2f67bd
  3. 02 Dec, 2018 1 commit
  4. 01 Dec, 2018 1 commit
  5. 30 Nov, 2018 24 commits