Merge branch 'ce-to-ee-2018-10-02' into 'master'

CE upstream - 2018-10-02 21:21 UTC

See merge request gitlab-org/gitlab-ee!7775

.gitlab-ci.yml

@@ -72,10 +72,7 @@ stages:
 
 .use-pg: &use-pg
   services:
-    # As of Jan 2018, we don't have a strong reason to upgrade to 9.6 for CI yet,
-    # so using the least common denominator ensures backwards compatibility
-    # (as many users are still using 9.2).
-    - postgres:9.2
+    - postgres:9.6
     - redis:alpine
 
 .use-mysql: &use-mysql
@@ -579,10 +576,10 @@ setup-test-env:
       - vendor/gitaly-ruby
 
 danger-review:
+  <<: *pull-cache
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger
   stage: test
   allow_failure: true
-  cache: {}
   dependencies: []
   before_script: []
   only:
@@ -596,6 +593,8 @@ danger-review:
       - $CI_COMMIT_REF_NAME =~ /.*-stable(-ee)?-prepare-.*/
   script:
     - git version
+    - node --version
+    - yarn install --frozen-lockfile --cache-folder .yarn-cache
     - danger --fail-on-errors=true
 
 # EE jobs

Dangerfile

@@ -7,3 +7,5 @@ danger.import_dangerfile(path: 'danger/database')
 danger.import_dangerfile(path: 'danger/documentation')
 danger.import_dangerfile(path: 'danger/frozen_string')
 danger.import_dangerfile(path: 'danger/commit_messages')
+danger.import_dangerfile(path: 'danger/prettier')
+danger.import_dangerfile(path: 'danger/eslint')

app/assets/stylesheets/framework/contextual_sidebar.scss

@@ -113,7 +113,7 @@
     }
 
     .avatar-container {
-      margin-right: 0;
+      margin: 0 auto;
     }
   }
 

changelogs/unreleased/align-collapsed-sidebar-avatar-container.yml

+---
+title: Align collapsed sidebar avatar container
+merge_request: 22044
+author: George Tsiolis
+type: other

danger/eslint/Dangerfile

+# frozen_string_literal: true
+
+def get_eslint_files(files)
+  files.select do |file|
+    file.end_with?('.js', '.vue') &&
+      File.read(file).include?('/* eslint-disable')
+  end
+end
+
+eslint_candidates = get_eslint_files(git.added_files + git.modified_files)
+
+return if eslint_candidates.empty?
+
+warn 'This merge request changed files with disabled eslint rules. Please consider fixing them.'
+
+markdown(<<~MARKDOWN)
+  ## Disabled eslint rules
+
+  The following files have disabled `eslint` rules. Please consider fixing them:
+
+  * #{eslint_candidates.map { |path| "`#{path}`" }.join("\n* ")}
+
+  Run the following command for more details
+
+  ```
+  node_modules/.bin/eslint --report-unused-disable-directives --no-inline-config \\
+  #{eslint_candidates.map { |path| "  '#{path}'" }.join(" \\\n")}
+  ```
+MARKDOWN

danger/prettier/Dangerfile

+# frozen_string_literal: true
+
+def get_prettier_files(files)
+  files.select do |file|
+    file.end_with?('.js', '.scss', '.vue')
+  end
+end
+
+prettier_candidates = get_prettier_files(git.added_files + git.modified_files)
+
+return if prettier_candidates.empty?
+
+unpretty = `node_modules/prettier/bin-prettier.js --list-different #{prettier_candidates.join(" ")}`
+             .split(/$/)
+             .map(&:strip)
+             .reject(&:empty?)
+
+return if unpretty.empty?
+
+warn 'This merge request changed frontend files without pretty printing them.'
+
+markdown(<<~MARKDOWN)
+  ## Pretty print Frontend files
+
+  The following files should have been pretty printed with `prettier`:
+
+  * #{unpretty.map { |path| "`#{path}`" }.join("\n* ")}
+
+  Please run
+
+  ```
+  node_modules/.bin/prettier --write \\
+  #{unpretty.map { |path| "  '#{path}'" }.join(" \\\n")}
+  ```
+
+  Also consider auto-formatting [on-save].
+
+  [on-save]: https://docs.gitlab.com/ee/development/new_fe_guide/style/prettier.html
+MARKDOWN