1. 03 Dec, 2018 15 commits
    • Douwe Maan's avatar
      Revert "[Rails5] Set request.format in commits_controller" · 19ad2a49
      Douwe Maan authored
      This reverts commit 6da19415.
      
      # Conflicts:
      #	app/controllers/projects/commits_controller.rb
      19ad2a49
    • Douwe Maan's avatar
      Revert "[Rails5] Set request.format for artifacts_controller" · 16f7243f
      Douwe Maan authored
      This reverts commit c48e7dc2.
      
      # Conflicts:
      #	app/controllers/projects/artifacts_controller.rb
      16f7243f
    • Douwe Maan's avatar
      Revert "[Rails5] Explicitly set request.format for blob_controller" · 76bc2f08
      Douwe Maan authored
      This reverts commit 037334d2.
      
      # Conflicts:
      #	app/controllers/projects/blob_controller.rb
      76bc2f08
    • Douwe Maan's avatar
      Revert "Resolve "[Rails5] `ActionView::MissingTemplate` in... · 8403eee8
      Douwe Maan authored
      Revert "Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wiki/user_views_wiki_page_spec.rb""
      
      This reverts commit 1292b99b.
      8403eee8
    • Kamil Trzciński's avatar
      Merge branch 'fix-mr-widget-unrelated-deployment-status' into 'master' · 8a465b0c
      Kamil Trzciński authored
      Fix unrelated deployment status in MR widget
      
      Closes #54125
      
      See merge request gitlab-org/gitlab-ce!23175
      8a465b0c
    • Achilleas Pipinellis's avatar
      Merge branch 'patch-31' into 'master' · 76d4e6d6
      Achilleas Pipinellis authored
      Update architecture.md
      
      See merge request gitlab-org/gitlab-ce!23430
      76d4e6d6
    • Dmitriy Zaporozhets's avatar
      Merge branch 'jupyter-tls' into 'master' · 99289464
      Dmitriy Zaporozhets authored
      HTTPS for JupyterHub installation
      
      See merge request gitlab-org/gitlab-ce!23479
      99289464
    • Amit  Rathi's avatar
      HTTPS for JupyterHub installation · 9a034a86
      Amit Rathi authored
      9a034a86
    • Sean McGivern's avatar
      Merge branch 'order-of-notification-settings' into 'master' · d2e280c4
      Sean McGivern authored
      reorder notification settings by noisy-ness
      
      See merge request gitlab-org/gitlab-ce!23490
      d2e280c4
    • Achilleas Pipinellis's avatar
      Merge branch 'patch-31' into 'master' · b7292467
      Achilleas Pipinellis authored
      Updated Katex "Supported Functions" link
      
      See merge request gitlab-org/gitlab-ce!23343
      b7292467
    • Achilleas Pipinellis's avatar
      Merge branch 'gt-change-auto-devops-banner-link-path' into 'master' · 99cf483e
      Achilleas Pipinellis authored
      Change auto devops banner link path
      
      Closes #54689
      
      See merge request gitlab-org/gitlab-ce!23476
      99cf483e
    • Shinya Maeda's avatar
      Squashed commit of the following: · 4bd00e53
      Shinya Maeda authored
      commit 04b06a2293fa12660a9c213a9db27fe90b83248b
      Merge: d580841d4ed a445aa0a
      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 2ee8c40f
          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 b55aeca2
          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 fbbe5ccd
          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 8a581d53
          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
      4bd00e53
    • Evan Read's avatar
      Merge branch 'patch-34' into 'master' · ca5f6f07
      Evan Read authored
      slightly improve readability
      
      See merge request gitlab-org/gitlab-ce!23466
      ca5f6f07
    • Stan Hu's avatar
      Merge branch 'bump_gpgme_gem' into 'master' · fe6adf11
      Stan Hu authored
      Bump gpgme gem version from 2.0.13 to 2.0.18
      
      See merge request gitlab-org/gitlab-ce!23491
      fe6adf11
    • Abulhair Saparov's avatar
      60c595c9
  2. 01 Dec, 2018 1 commit
  3. 30 Nov, 2018 24 commits