diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-24 06:09:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-24 06:09:48 +0300 |
| commit | 5ff6f278d33ccb9c4b24130580f754c7fcd2f39e (patch) | |
| tree | 261ab8fea575d6e6277fccb609dafc583291d4d5 /app | |
| parent | 28b18e348cae42472a31e94217706795a4821762 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/boards/index.js | 1 | ||||
| -rw-r--r-- | app/views/projects/ci/lints/show.html.haml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js index 1c5f8ec6986..cbd3280f0d3 100644 --- a/app/assets/javascripts/boards/index.js +++ b/app/assets/javascripts/boards/index.js @@ -86,6 +86,7 @@ export default () => { boardId: $boardApp.dataset.boardId, groupId: Number($boardApp.dataset.groupId) || null, rootPath: $boardApp.dataset.rootPath, + canUpdate: $boardApp.dataset.canUpdate, }, store, apolloProvider, diff --git a/app/views/projects/ci/lints/show.html.haml b/app/views/projects/ci/lints/show.html.haml index 2e79852f4c9..ca169f808b5 100644 --- a/app/views/projects/ci/lints/show.html.haml +++ b/app/views/projects/ci/lints/show.html.haml @@ -1,6 +1,6 @@ - page_title _("CI Lint") - page_description _("Validate your GitLab CI configuration file") -- unless Feature.enabled?(:monaco_ci) +- unless Feature.enabled?(:monaco_ci, default_enabled: true) - content_for :library_javascripts do = page_specific_javascript_tag('lib/ace.js') @@ -17,7 +17,7 @@ .file-holder .js-file-title.file-title.clearfix = _("Contents of .gitlab-ci.yml") - - if Feature.enabled?(:monaco_ci) + - if Feature.enabled?(:monaco_ci, default_enabled: true) .file-editor.code .js-edit-mode-pane.qa-editor#editor{ data: { 'editor-loading': true } }< %pre.editor-loading-content= params[:content] |