.csscomb.json

+{
+  "exclude": [
+    "app/assets/stylesheets/framework/tw_bootstrap_variables.scss",
+    "app/assets/stylesheets/framework/fonts.scss"
+  ],
+  "always-semicolon": true,
+  "color-case": "lower",
+  "block-indent": "  ",
+  "color-shorthand": true,
+  "element-case": "lower",
+  "space-before-colon": "",
+  "space-after-colon": " ",
+  "space-before-combinator": " ",
+  "space-after-combinator": " ",
+  "space-between-declarations": "\n",
+  "space-before-opening-brace": " ",
+  "space-after-opening-brace": "\n",
+  "space-before-closing-brace": "\n",
+  "unitless-zero": true
+}

.gitignore

@@ -15,6 +15,7 @@
 .sass-cache/
 .secret
 .vagrant
+.byebug_history
 Vagrantfile
 backups/*
 config/aws.yml
@@ -23,6 +24,7 @@ config/gitlab.yml
 config/gitlab_ci.yml
 config/initializers/rack_attack.rb
 config/initializers/smtp_settings.rb
+config/initializers/relative_url.rb
 config/resque.yml
 config/unicorn.rb
 config/secrets.yml

.gitlab-ci.yml

-image: "ruby:2.2"
+image: "ruby:2.1"
 
 services:
   - mysql:latest
-  - postgres:latest
   - redis:latest
 
 cache:
-  key: "ruby22"
+  key: "ruby21"
   paths:
   - vendor
 
 variables:
   MYSQL_ALLOW_EMPTY_PASSWORD: "1"
+  # retry tests only in CI environment
+  RSPEC_RETRY_RETRY_COUNT: "3"
 
 before_script:
   - source ./scripts/prepare_build.sh
   - ruby -v
   - which ruby
-  - gem install bundler --no-ri --no-rdoc
+  - retry gem install bundler --no-ri --no-rdoc
   - cp config/gitlab.yml.example config/gitlab.yml
   - touch log/application.log
   - touch log/test.log
-  - bundle install --without postgres production --jobs $(nproc)  "${FLAGS[@]}"
+  - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
   - RAILS_ENV=test bundle exec rake db:drop db:create db:schema:load db:migrate
 
+stages:
+- test
+- notifications
+
 spec:feature:
+  stage: test
   script:
     - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
-  tags:
-    - ruby
-    - mysql
 
 spec:api:
+  stage: test
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
-  tags:
-    - ruby
-    - mysql
 
 spec:models:
+  stage: test
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
-  tags:
-    - ruby
-    - mysql
 
 spec:lib:
+  stage: test
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
-  tags:
-    - ruby
-    - mysql
 
 spec:services:
+  stage: test
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
-  tags:
-    - ruby
-    - mysql
-
-spec:benchmark:
-  script:
-    - RAILS_ENV=test bundle exec rake spec:benchmark
-  tags:
-    - ruby
-    - mysql
-  allow_failure: true
 
 spec:other:
+  stage: test
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
-  tags:
-    - ruby
-    - mysql
 
 spinach:project:half:
+  stage: test
   script:
+    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
-  tags:
-    - ruby
-    - mysql
 
 spinach:project:rest:
+  stage: test
   script:
+    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
-  tags:
-    - ruby
-    - mysql
 
 spinach:other:
+  stage: test
   script:
+    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
-  tags:
-    - ruby
-    - mysql
 
 teaspoon:
+  stage: test
   script:
     - RAILS_ENV=test bundle exec teaspoon
-  tags:
-    - ruby
-    - mysql
 
 rubocop:
+  stage: test
   script:
     - bundle exec rubocop
-  tags:
-    - ruby
-    - mysql
+
+scss-lint:
+  stage: test
+  script:
+    - bundle exec rake scss_lint
 
 brakeman:
+  stage: test
   script:
     - bundle exec rake brakeman
-  tags:
-    - ruby
-    - mysql
 
 flog:
+  stage: test
   script:
     - bundle exec rake flog
-  tags:
-    - ruby
-    - mysql
 
 flay:
+  stage: test
   script:
     - bundle exec rake flay
-  tags:
-    - ruby
-    - mysql
 
 bundler:audit:
+  stage: test
+  only:
+    - master
   script:
-    - "bundle exec bundle-audit update"
-    - "bundle exec bundle-audit check"
-  tags:
-    - ruby
-    - mysql
-  allow_failure: true
+    - "bundle exec bundle-audit check --update --ignore OSVDB-115941"
 
-# Ruby 2.1 jobs
+db-migrate-reset:
+  stage: test
+  script:
+    - RAILS_ENV=test bundle exec rake db:migrate:reset
+
+# Ruby 2.2 jobs
 
-spec:feature:ruby21:
-  image: ruby:2.1
+spec:feature:ruby22:
+  stage: test
+  image: ruby:2.2
   only:
-  - master
+    - master
   script:
     - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
-  tags:
-    - ruby
-    - mysql
 
-spec:api:ruby21:
-  image: ruby:2.1
+spec:api:ruby22:
+  stage: test
+  image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
-  tags:
-    - ruby
-    - mysql
 
-spec:models:ruby21:
-  image: ruby:2.1
+spec:models:ruby22:
+  stage: test
+  image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
-  tags:
-    - ruby
-    - mysql
 
-spec:lib:ruby21:
-  image: ruby:2.1
+spec:lib:ruby22:
+  stage: test
+  image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
-  tags:
-    - ruby
-    - mysql
 
-spec:services:ruby21:
-  image: ruby:2.1
+spec:services:ruby22:
+  stage: test
+  image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
-  tags:
-    - ruby
-    - mysql
 
-spec:benchmark:ruby21:
-  image: ruby:2.1
-  only:
-  - master
-  script:
-    - RAILS_ENV=test bundle exec rake spec:benchmark
-  cache:
-    key: "ruby21"
-    paths:
-    - vendor
-  tags:
-    - ruby
-    - mysql
-  allow_failure: true
-
-spec:other:ruby21:
-  image: ruby:2.1
+spec:other:ruby22:
+  stage: test
+  image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
-  tags:
-    - ruby
-    - mysql
 
-spinach:project:half:ruby21:
-  image: ruby:2.1
+spinach:project:half:ruby22:
+  stage: test
+  image: ruby:2.2
   only:
   - master
   script:
+    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
-  tags:
-    - ruby
-    - mysql
 
-spinach:project:rest:ruby21:
-  image: ruby:2.1
+spinach:project:rest:ruby22:
+  stage: test
+  image: ruby:2.2
   only:
   - master
   script:
+    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
-  tags:
-    - ruby
-    - mysql
 
-spinach:other:ruby21:
-  image: ruby:2.1
+spinach:other:ruby22:
+  stage: test
+  image: ruby:2.2
   only:
   - master
   script:
+    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
-  tags:
-    - ruby
-    - mysql
 
+notify:slack:
+  stage: notifications
+  script:
+    - ./scripts/notify_slack.sh "#builds" "Build on \`$CI_BUILD_REF_NAME\` failed! Commit \`$(git log -1 --oneline)\` See <https://gitlab.com/gitlab-org/$(basename "$PWD")/commit/"$CI_BUILD_REF"/builds>"
+  when: on_failure
+  only:
+    - master@gitlab-org/gitlab-ce
+    - tags@gitlab-org/gitlab-ce
+    - master@gitlab-org/gitlab-ee
+    - tags@gitlab-org/gitlab-ee

.ruby-version

-2.2.4
+2.1.8

.scss-lint.yml

+# Linter Documentation:
+# https://github.com/brigade/scss-lint/blob/master/lib/scss_lint/linter/README.md
+
+scss_files: 'app/assets/stylesheets/**/*.scss'
+
+exclude:
+  - 'app/assets/stylesheets/pages/emojis.scss'
+
+linters:
+  # Reports when you use improper spacing around ! (the "bang") in !default,
+  # !global, !important, and !optional flags.
+  BangFormat:
+    enabled: false
+  
+  # Whether or not to prefer `border: 0` over `border: none`.
+  BorderZero:
+    enabled: false
+  
+  # Reports when you define a rule set using a selector with chained classes
+  # (a.k.a. adjoining classes).
+  ChainedClasses:
+    enabled: false
+
+  # Prefer hexadecimal color codes over color keywords.
+  # (e.g. `color: green` is a color keyword)
+  ColorKeyword:
+    enabled: false
+  
+  # Prefer color literals (keywords or hexadecimal codes) to be used only in
+  # variable declarations. They should be referred to via variables everywhere
+  # else.
+  ColorVariable:
+    enabled: false
+  
+  # Which form of comments to prefer in CSS.
+  Comment:
+    enabled: false
+
+  # Reports @debug statements (which you probably left behind accidentally).
+  DebugStatement:
+    enabled: false
+  
+  # Rule sets should be ordered as follows:
+  # - @extend declarations
+  # - @include declarations without inner @content
+  # - properties, @include declarations with inner @content
+  # - nested rule sets.
+  DeclarationOrder:
+    enabled: false
+
+  # `scss-lint:disable` control comments should be preceded by a comment
+  # explaining why these linters are being disabled for this file.
+  # See https://github.com/brigade/scss-lint#disabling-linters-via-source for
+  # more information.
+  DisableLinterReason:
+    enabled: true
+  
+  # Reports when you define the same property twice in a single rule set.
+  DuplicateProperty:
+    enabled: false
+  
+  # Separate rule, function, and mixin declarations with empty lines.
+  EmptyLineBetweenBlocks:
+    enabled: false
+  
+  # Reports when you have an empty rule set.
+  EmptyRule:
+    enabled: true
+  
+  # Reports when you have an @extend directive.
+  ExtendDirective:
+    enabled: false
+
+  # Files should always have a final newline. This results in better diffs
+  # when adding lines to the file, since SCM systems such as git won't
+  # think that you touched the last line.
+  FinalNewline:
+    enabled: false
+  
+  # HEX colors should use three-character values where possible.
+  HexLength:
+    enabled: true
+  
+  # HEX color values should use lower-case colors to differentiate between
+  # letters and numbers, e.g. `#E3E3E3` vs. `#e3e3e3`.
+  HexNotation:
+    enabled: true
+  
+  # Avoid using ID selectors.
+  IdSelector: