Merge branch 'master' into fix/visibility-level-setting-in-forked-projects

* master: (723 commits) Bump Rack Attack to v4.3.1 for security fix Remove duplicate entry in the changelog Remove extra spaces after branchname Fix merge-request-reopen button title Add branch and tag operation to tree dropdown Use gitlab-shell 2.6.9 Clarify Windows shell executor artifact upload support Fix feature specs: we always show the build status if ci_commit is present Do not display project group/name when issue and MR are in same project Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled Use gitlab-workhorse 0.5.1 Fix ci_projects migration by using the value only from latest row [ci skip] Revert sidebar position for issue and merge request Add info on using private Docker registries in CI [ci skip] Upgrade Poltergeist to 1.8.1. #4131 Fix ux issue with "This issue will be closed automatically" message Move MR Builds tab next to Commits Api support for requesting starred projects for user Fix Rubocop complain. Fix merge widget JS for buttons ... Conflicts: app/models/project.rb

Merge branch 'master' into fix/visibility-level-setting-in-forked-projects
* master: (723 commits) Bump Rack Attack to v4.3.1 for security fix Remove duplicate entry in the changelog Remove extra spaces after branchname Fix merge-request-reopen button title Add branch and tag operation to tree dropdown Use gitlab-shell 2.6.9 Clarify Windows shell executor artifact upload support Fix feature specs: we always show the build status if ci_commit is present Do not display project group/name when issue and MR are in same project Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled Use gitlab-workhorse 0.5.1 Fix ci_projects migration by using the value only from latest row [ci skip] Revert sidebar position for issue and merge request Add info on using private Docker registries in CI [ci skip] Upgrade Poltergeist to 1.8.1. #4131 Fix ux issue with "This issue will be closed automatically" message Move MR Builds tab next to Commits Api support for requesting starred projects for user Fix Rubocop complain. Fix merge widget JS for buttons ... Conflicts: app/models/project.rb
3cfd892f · Tomasz Maczukin · 85ad95be · 4b4cbf0c · 3cfd892f · 3cfd892f
Commit 3cfd892f authored Dec 21, 2015 by Tomasz Maczukin
1000 changed files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ before_script:
  - touch log/application.log
  - touch log/test.log
  - bundle install --without postgres production --jobs $(nproc)  "${FLAGS[@]}"
-  - bundle exec rake db:create RAILS_ENV=test
+  - bundle exec rake db:reset db:create RAILS_ENV=test

 spec:feature:
  script:
@@ -24,6 +24,27 @@ spec:api:
    - ruby
    - mysql

+spec:models:
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
+  tags:
+    - ruby
+    - mysql
+
+spec:lib:
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
+  tags:
+    - ruby
+    - mysql
+
+spec:services:
+  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
@@ -39,9 +60,16 @@ spec:other:
    - ruby
    - mysql

-spinach:project:
+spinach:project:half:
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
+  tags:
+    - ruby
+    - mysql
+
+spinach:project:rest:
  script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
  tags:
    - ruby
    - mysql
@@ -87,3 +115,12 @@ flay:
  tags:
    - ruby
    - mysql
+
+bundler:audit:
+  script: 
+    - "bundle exec bundle-audit update"
+    - "bundle exec bundle-audit check"
+  tags:
+    - ruby
+    - mysql
+  allow_failure: true
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -76,7 +76,7 @@ Style/BlockEndNewline:
  Description: 'Put end statement of multiline block on its own line.'
  Enabled: true

-Style/Blocks:
+Style/BlockDelimiters:
  Description: >-
                Avoid using {...} for multi-line blocks (multiline chaining is
                always ugly).
@@ -232,6 +232,10 @@ Style/EvenOdd:
  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#predicate-methods'
  Enabled: false

+Style/ExtraSpacing:
+  Description: 'Do not use unnecessary spacing.'
+  Enabled: false
+
 Style/FileName:
  Description: 'Use snake_case for source file names.'
  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#snake-case-files'
@@ -431,6 +435,14 @@ Style/OpMethod:
  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#other-arg'
  Enabled: false

+Style/ParallelAssignment:
+  Description: >-
+                  Check for simple usages of parallel assignment.
+                  It will only warn when the number of variables
+                  matches on both sides of the assignment.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parallel-assignment'
+  Enabled: false
+
 Style/ParenthesesAroundCondition:
  Description: >-
                 Don't use parentheses around the condition of an
@@ -669,6 +681,13 @@ Style/TrailingWhitespace:
  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-whitespace'
  Enabled: false

+Style/TrailingUnderscoreVariable:
+  Description: >-
+                 Checks for the usage of unneeded trailing underscores at the
+                 end of parallel variable assignment.
+  AllowNamedUnderscoreVariables: true
+  Enabled: false
+
 Style/TrivialAccessors:
  Description: 'Prefer attr_* methods to trivial readers/writers.'
  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#attr_family'
@@ -690,11 +709,6 @@ Style/UnneededPercentQ:
  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-q'
  Enabled: false

-Style/UnneededPercentX:
-  Description: 'Checks for %x when `` would do.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-x'
-  Enabled: false
-
 Style/VariableInterpolation:
  Description: >-
                 Don't interpolate global, instance and class variables
@@ -735,23 +749,39 @@ Metrics/AbcSize:
  Description: >-
                 A calculated magnitude based on number of assignments,
                 branches, and conditions.
-  Enabled: false
+  Enabled: true
+  Max: 70
+
+Metrics/CyclomaticComplexity:
+  Description: >-
+                 A complexity metric that is strongly correlated to the number
+                 of test cases needed to validate a method.
+  Enabled: true
+  Max: 17
+
+Metrics/PerceivedComplexity:
+  Description: >-
+                 A complexity metric geared towards measuring complexity for a
+                 human reader.
+  Enabled: true
+  Max: 17
+
+Metrics/ParameterLists:
+  Description: 'Avoid parameter lists longer than three or four parameters.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#too-many-params'
+  Enabled: true
+  Max: 8

 Metrics/BlockNesting:
  Description: 'Avoid excessive block nesting'
  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#three-is-the-number-thou-shalt-count'
-  Enabled: false
+  Enabled: true
+  Max: 4

 Metrics/ClassLength:
  Description: 'Avoid classes longer than 100 lines of code.'
  Enabled: false

-Metrics/CyclomaticComplexity:
-  Description: >-
-                 A complexity metric that is strongly correlated to the number
-                 of test cases needed to validate a method.
-  Enabled: false
-
 Metrics/LineLength:
  Description: 'Limit lines to 80 characters.'
  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#80-character-limits'
@@ -762,15 +792,8 @@ Metrics/MethodLength:
  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#short-methods'
  Enabled: false

-Metrics/ParameterLists:
-  Description: 'Avoid parameter lists longer than three or four parameters.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#too-many-params'
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Description: >-
-                 A complexity metric geared towards measuring complexity for a
-                 human reader.
+Metrics/ModuleLength:
+  Description: 'Avoid modules longer than 100 lines of code.'
  Enabled: false

 #################### Lint ################################
@@ -888,7 +911,7 @@ Lint/RequireParentheses:
 Lint/RescueException:
  Description: 'Avoid rescuing the Exception class.'
  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-blind-rescues'
-  Enabled: false
+  Enabled: true

 Lint/ShadowingOuterLocalVariable:
  Description: >-
@@ -956,6 +979,12 @@ Rails/ActionFilter:
  Description: 'Enforces consistent use of action filter methods.'
  Enabled: true

+Rails/Date:
+  Description: >-
+                  Checks the correct usage of date aware methods,
+                  such as Date.today, Date.current etc.
+  Enabled: false
+
 Rails/DefaultScope:
  Description: 'Checks if the argument passed to default_scope is a block.'
  Enabled: false
@@ -982,6 +1011,12 @@ Rails/ScopeArgs:
  Description: 'Checks the arguments of ActiveRecord scopes.'
  Enabled: false

+Rails/TimeZone:
+  Description: 'Checks the correct usage of time zone aware methods.'
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#time'
+  Reference: 'http://danilenko.org/2012/7/6/rails_timezones'
+  Enabled: false
+
 Rails/Validation:
  Description: 'Use validates :attribute, hash of validations.'
  Enabled: false

--- a/.ruby-version
+++ b/.ruby-version
-2.1.6
+2.1.7
--- a/CHANGELOG
+++ b/CHANGELOG
 Please view this file on the master branch, on stable branches it's out of date.

 v 8.3.0 (unreleased)
+  - Bump rack-attack to 4.3.1 for security fix (Stan Hu)
+  - API support for starred projects for authorized user (Zeger-Jan van de Weg)
+  - Add open_issues_count to project API (Stan Hu)
+  - Expand character set of usernames created by Omniauth (Corey Hinshaw)
+  - Add button to automatically merge a merge request when the build succeeds (Zeger-Jan van de Weg)
+  - Provide better diagnostic message upon project creation errors (Stan Hu)
+  - Bump devise to 3.5.3 to fix reset token expiring after account creation (Stan Hu)
+  - Bump gollum-lib to 4.1.0 (Stan Hu)
+  - Fix broken group avatar upload under "New group" (Stan Hu)
+  - Update project repositorize size and commit count during import:repos task (Stan Hu)
+  - Fix API setting of 'public' attribute to false will make a project private (Stan Hu)
+  - Handle and report SSL errors in Web hook test (Stan Hu)
+  - Bump Redis requirement to 2.8 for Sidekiq 4 (Stan Hu)
+  - Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera)
+  - Add rake tasks for git repository maintainance (Zeger-Jan van de Weg)
+  - Fix 500 error when update group member permission
+  - Trim leading and trailing whitespace of milestone and issueable titles (Jose Corcuera)
+  - Recognize issue/MR/snippet/commit links as references
+  - Add ignore whitespace change option to commit view
+  - Fire update hook from GitLab
+  - Style warning about mentioning many people in a comment
+  - Fix: sort milestones by due date once again (Greg Smethells)
+  - Migrate all CI::Services and CI::WebHooks to Services and WebHooks
+  - Don't show project fork event as "imported"
+  - Add API endpoint to fetch merge request commits list
+  - Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled
+  - Expose events API with comment information and author info
+  - Fix: Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583
+  - Run custom Git hooks when branch is created or deleted.
+  - Fix bug when simultaneously accepting multiple MRs results in MRs that are of "merged" status, but not merged to the target branch
+  - Add languages page to graphs
+  - Block LDAP user when they are no longer found in the LDAP server
+  - Improve wording on project visibility levels (Zeger-Jan van de Weg)
+  - Fix editing notes on a merge request diff
+  - Automatically select default clone protocol based on user preferences (Eirik Lygre)
+  - Make Network page as sub tab of Commits
+  - Add copy-to-clipboard button for Snippets
+  - Add indication to merge request list item that MR cannot be merged automatically
+  - Default target branch to patch-n when editing file in protected branch
+  - Add Builds tab to merge request detail page
+  - Allow milestones, issues and MRs to be created from dashboard and group indexes
+  - Use new style for wiki
+  - Use new style for milestone detail page
+  - Fix sidebar tooltips when collapsed
+  - Prevent possible XSS attack with award-emoji
+  - Upgraded Sidekiq to 4.x
+  - Accept COPYING,COPYING.lesser, and licence as license file (Zeger-Jan van de Weg)
+  - Fix emoji aliases problem
+  - Fix award-emojis Flash alert's width
+  - Fix deleting notes on a merge request diff
+  - Display referenced merge request statuses in the issue description (Greg Smethells)
+  - Implement new sidebar for issue and merge request pages
+  - Emoji picker improvements
+  - Suppress warning about missing `.gitlab-ci.yml` if builds are disabled
+  - Do not show build status unless builds are enabled and `.gitlab-ci.yml` is present
+  - Persist runners registration token in database
+  - Fix online editor should not remove newlines at the end of the file
+
+v 8.2.3
+  - Fix application settings cache not expiring after changes (Stan Hu)
+  - Fix Error 500s when creating global milestones with Unicode characters (Stan Hu)
+  - Update documentation for "Guest" permissions
+  - Properly convert Emoji-only comments into Award Emojis
+  - Enable devise paranoid mode to prevent user enumeration attack
+  - Webhook payload has an added, modified and removed properties for each commit
+  - Fix 500 error when creating a merge request that removes a submodule
+
+v 8.2.2
+  - Fix 404 in redirection after removing a project (Stan Hu)
+  - Ensure cached application settings are refreshed at startup (Stan Hu)
+  - Fix Error 500 when viewing user's personal projects from admin page (Stan Hu)
+  - Fix: Raw private snippets access workflow
+  - Prevent "413 Request entity too large" errors when pushing large files with LFS
+  - Fix: As an admin, cannot add oneself as a member to a group/project
+  - Fix invalid links within projects dashboard header
+  - Make current user the first user in assignee dropdown in issues detail page (Stan Hu)
+  - Fix: duplicate email notifications on issue comments
+
+v 8.2.1
+  - Forcefully update builds that didn't want to update with state machine
+  - Fix: saving GitLabCiService as Admin Template

 v 8.2.0
  - Improved performance of finding projects and groups in various places
  - Improved performance of rendering user profile pages and Atom feeds
+  - Expose build artifacts path as config option
  - Fix grouping of contributors by email in graph.
  - Improved performance of finding issues with/without labels
-  - Remove CSS property preventing hard tabs from rendering in Chromium 45 (Stan Hu)
  - Fix Drone CI service template not saving properly (Stan Hu)
  - Fix avatars not showing in Atom feeds and project issues when Gravatar disabled (Stan Hu)
  - Added a GitLab specific profiling tool called "Sherlock" (see GitLab CE merge request #1749)
@@ -46,7 +127,6 @@ v 8.2.0
  - Add email notification to former assignee upon unassignment (Adam Lieskovský)
  - New design for project graphs page
  - Remove deprecated dumped yaml file generated from previous job definitions
-  - Fix incoming email config defaults
  - Show specific runners from projects where user is master or owner
  - MR target branch is now visible on a list view when it is different from project's default one
  - Improve Continuous Integration graphs page
@@ -204,7 +284,6 @@ v 8.0.2
  - Allow AWS S3 Server-Side Encryption with Amazon S3-Managed Keys for backups (Paul Beattie)

 v 8.0.1
-  - Remove git refs used internally by GitLab from network graph (Stan Hu)
  - Improve CI migration procedure and documentation

 v 8.0.0

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
-2.6.7
+2.6.9
--- a/GITLAB_WORKHORSE
+++ b/GITLAB_WORKHORSE
-0.4.1
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
-0.3.1
+0.5.1
--- a/Gemfile
+++ b/Gemfile
 source "https://rubygems.org"

-gem 'rails', '4.1.12'
+gem 'rails', '4.2.4'
+gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+
+# Responders respond_to and respond_with
+gem 'responders', '~> 2.0'

 # Specify a sprockets version due to security issue
 # See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
@@ -14,9 +18,9 @@ gem "mysql2", '~> 0.3.16', group: :mysql
 gem "pg", '~> 0.18.2', group: :postgres

 # Authentication libraries
-gem 'devise',                 '~> 3.5.2'
+gem 'devise',                 '~> 3.5.3'
 gem 'devise-async',           '~> 0.9.0'
-gem 'doorkeeper',             '~> 2.1.3'
+gem 'doorkeeper',             '~> 2.2.0'
 gem 'omniauth',               '~> 1.2.2'
 gem 'omniauth-bitbucket',     '~> 0.0.2'
 gem 'omniauth-facebook',      '~> 3.0.0'
@@ -28,7 +32,7 @@ gem 'omniauth-saml',          '~> 1.4.0'
 gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
 gem 'omniauth_crowd'
-gem 'rack-oauth2',            '~> 1.0.5'
+gem 'rack-oauth2',            '~> 1.2.1'

 # Two-factor authentication
 gem 'devise-two-factor', '~> 2.0.0'
@@ -48,7 +52,7 @@ gem "gitlab_git", '~> 7.2.20'
 gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"

 # Git Wiki
-gem 'gollum-lib', '~> 4.0.2'
+gem 'gollum-lib', '~> 4.1.0'

 # Language detection
 gem "github-linguist", "~> 4.7.0", require: "linguist"
@@ -62,9 +66,6 @@ gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
 # based on human-friendly examples
 gem "stamp", '~> 0.6.0'

-# Enumeration fields
-gem 'enumerize', '~> 0.7.0'
-
 # Pagination
 gem "kaminari", "~> 0.16.3"

@@ -95,9 +96,10 @@ gem 'redcarpet',     '~> 3.3.3'
 gem 'RedCloth',      '~> 4.2.9'
 gem 'rdoc',          '~>3.6'
 gem 'org-ruby',      '~> 0.9.12'
-gem 'creole',        '~>0.3.6'
+gem 'creole',        '~> 0.5.0'
 gem 'wikicloth',     '0.8.1'
 gem 'asciidoctor',   '~> 1.5.2'
+gem 'rouge',         '~> 1.10.1'

 # Diffs
 gem 'diffy', '~> 3.0.3'
@@ -118,15 +120,15 @@ gem 'acts-as-taggable-on', '~> 3.4'

 # Background jobs
 gem 'sinatra', '~> 1.4.4', require: nil
-gem 'sidekiq', '3.3.0'
-gem 'sidetiq', '~> 0.6.3'
+gem 'sidekiq', '~> 4.0'
+gem 'sidekiq-cron', '~> 0.4.0'
+gem 'redis-namespace'

 # HTTP requests
 gem "httparty", '~> 0.13.3'

 # Colored output to console
-gem "colored", '~> 1.2'
-gem "colorize", '~> 0.5.8'
+gem "colorize", '~> 0.7.0'

 # GitLab settings
 gem 'settingslogic', '~> 2.0.9'
@@ -154,7 +156,7 @@ gem "gemnasium-gitlab-service", "~> 0.2"
 gem "slack-notifier", "~> 1.2.0"

 # Asana integration
-gem 'asana', '~> 0.0.6'
+gem 'asana', '~> 0.4.0'

 # FogBugz integration
 gem 'ruby-fogbugz', '~> 0.2.1'
@@ -170,9 +172,10 @@ gem "underscore-rails", "~> 1.4.4"

 # Sanitize user input
 gem "sanitize", '~> 2.0'
+gem 'babosa', '~> 1.0.2'

 # Protect against bruteforcing
-gem "rack-attack", '~> 4.3.0'
+gem "rack-attack", '~> 4.3.1'

 # Ace editor
 gem 'ace-rails-ap', '~> 2.0.1'
@@ -187,13 +190,13 @@ gem "sass-rails", '~> 4.0.5'
 gem "coffee-rails", '~> 4.1.0'
 gem "uglifier", '~> 2.7.2'
 gem 'turbolinks', '~> 2.5.0'
-gem 'jquery-turbolinks', '~> 2.0.1'
+gem 'jquery-turbolinks', '~> 2.1.0'

 gem 'addressable',        '~> 2.3.8'
 gem 'bootstrap-sass',     '~> 3.0'
 gem 'font-awesome-rails', '~> 4.2'
-gem 'gitlab_emoji',       '~> 0.1'
-gem 'gon',                '~> 5.0.0'
+gem 'gitlab_emoji',       '~> 0.2.0'
+gem 'gon',                '~> 6.0.1'
 gem 'jquery-atwho-rails', '~> 1.3.2'
 gem 'jquery-rails',       '~> 3.1.3'
 gem 'jquery-scrollto-rails', '~> 1.4.3'
@@ -203,6 +206,7 @@ gem 'raphael-rails',      '~> 2.1.2'
 gem 'request_store',      '~> 1.2.0'
 gem 'select2-rails',      '~> 3.5.9'
 gem 'virtus',             '~> 1.0.1'
+gem 'net-ssh',            '~> 3.0.1'

 group :development do
  gem "foreman"
@@ -211,9 +215,10 @@ group :development do
  gem "annotate", "~> 2.6.0"
  gem "letter_opener", '~> 1.1.2'
  gem 'quiet_assets', '~> 1.0.2'
-  gem 'rerun', '~> 0.10.0'
+  gem 'rerun', '~> 0.11.0'
  gem 'bullet', require: false
  gem 'rblineprof', platform: :mri, require: false
+  gem 'web-console', '~> 2.0'

  # Better errors handler
  gem 'better_errors', '~> 1.0.1'
@@ -246,7 +251,7 @@ group :development, :test do

  gem 'capybara',            '~> 2.4.0'
  gem 'capybara-screenshot', '~> 1.0.0'
-  gem 'poltergeist',         '~> 1.6.0'
+  gem 'poltergeist',         '~> 1.8.1'

  gem 'teaspoon', '~> 1.0.0'
  gem 'teaspoon-jasmine', '~> 2.2.0'
@@ -256,11 +261,12 @@ group :development, :test do
  gem 'spring-commands-spinach',  '~> 1.0.0'
  gem 'spring-commands-teaspoon', '~> 0.0.2'

-  gem 'rubocop',  '~> 0.28.0',  require: false
+  gem 'rubocop', '~> 0.35.0', require: false
  gem 'coveralls',  '~> 0.8.2', require: false
  gem 'simplecov', '~> 0.10.0', require: false
  gem 'flog', require: false
  gem 'flay', require: false
+  gem 'bundler-audit', require: false

  gem 'benchmark-ips', require: false
 end
@@ -269,7 +275,7 @@ group :test do
  gem 'shoulda-matchers', '~> 2.8.0', require: false
  gem 'email_spec', '~> 1.6.0'
  gem 'webmock', '~> 1.21.0'
-  gem 'test_after_commit', '~> 0.2.2'
+  gem 'test_after_commit', '~> 0.4.2'
  gem 'sham_rack'
 end


--- a/Gemfile.lock
+++ b/Gemfile.lock
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -8,7 +8,7 @@ Below we describe the contributing process to GitLab for two reasons. So that co

 ### Issue team
 - Looks for issues without [workflow labels](#how-we-handle-issues) and triages issue
- Closes invalid issues with a comment (duplicates, [feature requests](#feature-requests), [fixed in newer version](#issue-fixed-in-newer-version), [issue report for old version](#issue-report-for-old-version), not a problem in GitLab, etc.)
+- Closes invalid issues with a comment (duplicates, [fixed in newer version](#issue-fixed-in-newer-version), [issue report for old version](#issue-report-for-old-version), not a problem in GitLab, etc.)
 - Asks for feedback from issue reporter ([invalid issue reports](#improperly-formatted-issue), [format code](#code-format), etc.)
 - Monitors all issues for feedback (but especially ones commented on since automatically watching them)
 - Closes issues with no feedback from the reporter for two weeks
@@ -44,6 +44,9 @@ Workflow labels are purposely not very detailed since that would be hard to keep
 - *UX* needs needs help from a UX designer
 - *Frontend* needs help from a Front-end engineer
 - *Graphics* needs help from a Graphics designer
+- *up-for-grabs* is an issue suitable for first-time contributors, of reasonable difficulty and size. Not exclusive with other labels.
+- *feature proposal* is a proposal for a new feature for GitLab. People are encouraged to vote
+in support or comment for further detail. Do not use `feature request`.

 Example workflow: when a UX designer provided a design but it needs frontend work they remove the UX label and add the frontend label.

@@ -61,7 +64,6 @@ If an issue is complex and needs the attention of a specific person, assignment
 -   Bright orange `#eb6420`: workflow labels for core team members (attached MR, awaiting developer action/feedback)
 -   Light blue `#82C5FF`: functional labels
 -   Green labels `#009800`: issues that can generally be ignored. For example, issues given the following labels normally can be closed immediately:
-    - Feature request (see copy & paste response: [Feature requests](#feature-requests))
    - Support (see copy & paste response: [Support requests and configuration questions](#support-requests-and-configuration-questions)

 ## Be kind
@@ -74,10 +76,6 @@ Be kind to people trying to contribute. Be aware that people may be a non-native

 Thanks for the issue report. Please reformat your issue to conform to the issue tracker guidelines found in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).

-### Feature requests
-
-Thank you for your interest in improving GitLab. We don't use the issue tracker for feature requests. Things that are wrong but are not a regression compared to older versions of GitLab are considered feature requests and not issues. Please use the \[feature request forum\]\(http://feedback.gitlab.com/) for this purpose or create a merge request implementing this feature. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) for more information.
-
 ### Issue report for old version

 Thanks for the issue report but we only support issues for the latest stable version of GitLab. I'm closing this issue but if you still experience this problem in the latest stable version, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
@@ -112,7 +110,12 @@ This merge request has been closed because a request for more information has no

 ### Accepting merge requests

-Is there a request on [the feature request forum](http://feedback.gitlab.com/forums/176466-general) that is similar to this? If so, can you make a comment with a link to it? Please be aware that new functionality that is not marked [accepting merge/pull requests](http://feedback.gitlab.com/forums/176466-general/status/796455) on the forum might not make it into GitLab. You might be asked to make changes and even after implementing them your feature might still be declined. If you want to reduce the chance of this happening please have a discussion in the forum first.
+Is there an issue on the [issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues)
+that is similar to this?
+Could you please link it here?
+Please be aware that new functionality that is not marked
+[accepting merge requests](https://gitlab.com/gitlab-org/gitlab-ce/issues?milestone_id=&scope=all&sort=created_desc&state=opened&utf8=%E2%9C%93&assignee_id=&author_id=&milestone_title=&label_name=Accepting+Merge+Requests)
+might not make it into GitLab.

 ### Only accepting merge requests with green tests


--- a/Procfile
+++ b/Procfile
+# For DEVELOPMENT only. Production uses Runit in
+# https://gitlab.com/gitlab-org/omnibus-gitlab or the init scripts in
+# lib/support/init.d, which call scripts in bin/ .
+#
 web: bundle exec unicorn_rails -p ${PORT:="3000"} -E ${RAILS_ENV:="development"} -c ${UNICORN_CONFIG:="config/unicorn.rb"}
-worker: bundle exec sidekiq -q post_receive -q mailer -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q default
+worker: bundle exec sidekiq -q post_receive -q mailers -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q default
 # mail_room: bundle exec mail_room -q -c config/mail_room.yml
--- a/README.md
+++ b/README.md
@@ -27,8 +27,6 @@ There are two editions of GitLab:
 - GitLab Community Edition (CE) is available freely under the MIT Expat license.
 - GitLab Enterprise Edition (EE) includes [extra features](https://about.gitlab.com/features/#compare) that are more useful for organizations with more than 100 users. To use EE and get official support please [become a subscriber](https://about.gitlab.com/pricing/).

-Included with the GitLab Omnibus Packages is [GitLab CI](https://about.gitlab.com/gitlab-ci/) that can easily build, test and deploy code.
-
 ## Website

 On [about.gitlab.com](https://about.gitlab.com/) you can find more information about:
@@ -71,7 +69,7 @@ GitLab is a Ruby on Rails application that runs on the following software:
 - Ubuntu/Debian/CentOS/RHEL
 - Ruby (MRI) 2.1
 - Git 1.7.10+
- Redis 2.4+
+- Redis 2.8+
 - MySQL or PostgreSQL

 For more information please see the [architecture documentation](http://doc.gitlab.com/ce/development/architecture.html).
@@ -82,7 +80,7 @@ There are a lot of [third-party applications integrating with GitLab](https://ab

 ## GitLab release cycle

-Since 2011 a minor or major version of GitLab is released on the 22nd of every month. Patch and security releases are published when needed. New features are detailed on the [blog](https://about.gitlab.com/blog/) and in the [changelog](CHANGELOG). For more information about the release process see the [release documentation](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/release). Features that will likely be in the next releases can be found on the [feature request forum](http://feedback.gitlab.com/forums/176466-general) with the status [started](http://feedback.gitlab.com/forums/176466-general/status/796456) and [completed](http://feedback.gitlab.com/forums/176466-general/status/796457).
+For more information about the release process see the [release documentation](http://doc.gitlab.com/ce/release/).

 ## Upgrading


--- a/app/assets/images/icon-link.png
+++ b/app/assets/images/icon-link.png
--- a/app/assets/javascripts/api.js.coffee
+++ b/app/assets/javascripts/api.js.coffee
@@ -2,6 +2,8 @@
  groups_path: "/api/:version/groups.json"
  group_path: "/api/:version/groups/:id.json"
  namespaces_path: "/api/:version/namespaces.json"
+  group_projects_path: "/api/:version/groups/:id/projects.json"
+  projects_path: "/api/:version/projects.json"

  group: (group_id, callback) ->
    url = Api.buildUrl(Api.group_path)
@@ -44,6 +46,35 @@
    ).done (namespaces) ->
      callback(namespaces)

+  # Return projects list. Filtered by query
+  projects: (query, callback) ->
+    url = Api.buildUrl(Api.projects_path)
+
+    $.ajax(
+      url: url
+      data:
+        private_token: gon.api_token
+        search: query
+        per_page: 20
+      dataType: "json"
+    ).done (projects) ->
+      callback(projects)
+
+  # Return group projects list. Filtered by query
+  groupProjects: (group_id, query, callback) ->
+    url = Api.buildUrl(Api.group_projects_path)
+    url = url.replace(':id', group_id)
+
+    $.ajax(
+      url: url
+      data:
+        private_token: gon.api_token
+        search: query
+        per_page: 20
+      dataType: "json"
+    ).done (projects) ->
+      callback(projects)
+
  buildUrl: (url) ->
    url = gon.relative_url_root + url if gon.relative_url_root?
    return url.replace(':version', gon.api_version)
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -135,17 +135,25 @@ $ ->
    ), 1

  # Initialize tooltips
-  $('body').tooltip({
-    selector: '.has_tooltip, [data-toggle="tooltip"], .page-sidebar-collapsed .nav-sidebar a'
+  $('body').tooltip(
+    selector: '.has_tooltip, [data-toggle="tooltip"]'
    placement: (_, el) ->
      $el = $(el)
-      if $el.attr('id') == 'js-shortcuts-home'
-        # Place the logo tooltip on the right when collapsed, bottom when expanded
-        $el.parents('header').hasClass('header-collapsed') and 'right' or 'bottom'
-      else
-        # Otherwise use the data-placement attribute, or 'bottom' if undefined
-        $el.data('placement') or 'bottom'
-  })
+      $el.data('placement') || 'bottom'
+  )
+
+  $('.header-logo .home').tooltip(
+    placement: (_, el) ->
+      $el = $(el)
+      if $('.page-with-sidebar').hasClass('page-sidebar-collapsed') then 'right' else 'bottom'
+    container: 'body'
+  )
+
+  $('.page-with-sidebar').tooltip(
+    selector: '.sidebar-collapsed .nav-sidebar a, .sidebar-collapsed a.sidebar-user'
+    placement: 'right'
+    container: 'body'
+  )

  # Form submitter
  $('.trigger-submit').on 'change', ->

--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
 class @AwardsHandler
-  constructor: (@post_emoji_url, @noteable_type, @noteable_id) ->
+  constructor: (@post_emoji_url, @noteable_type, @noteable_id, @aliases) ->

  addAward: (emoji) ->
+    emoji = @normilizeEmojiName(emoji)
    @postEmoji emoji, =>
      @addAwardToEmojiBar(emoji)
    
  addAwardToEmojiBar: (emoji, custom_path = '') ->
+    emoji = @normilizeEmojiName(emoji)
    if @exist(emoji)
      if @isActive(emoji)
        @decrementCounter(emoji)
@@ -73,14 +75,14 @@ class @AwardsHandler

  getImage: (emoji, custom_path) ->
    if custom_path
-      $(".awards-menu li").first().html().replace(/emoji\/.*\.png/, custom_path)
+      $("<img>").attr({src: custom_path, width: 20, height: 20}).wrap("<div>").parent().html()
    else
      $("li[data-emoji='" + emoji + "']").html()


  postEmoji: (emoji, callback) ->
    $.post @post_emoji_url, { note: {
-      note: emoji
+      note: ":" + emoji + ":"
      noteable_type: @noteable_type
      noteable_id: @noteable_id
    }},(data) ->
@@ -88,4 +90,12 @@ class @AwardsHandler
        callback.call()

  findEmojiIcon: (emoji) ->
-    $(".icon[data-emoji='" + emoji + "']")
\ No newline at end of file
+    $(".icon[data-emoji='" + emoji + "']")
+
+  scrollToAwards: ->
+    $('body, html').animate({
+      scrollTop: $('.awards').offset().top - 80
+    }, 200)
+
+  normilizeEmojiName: (emoji) ->
+    @aliases[emoji] || emoji
--- a/app/assets/javascripts/copy_to_clipboard.js.coffee
+++ b/app/assets/javascripts/copy_to_clipboard.js.coffee
 #= require clipboard

-$ ->
-  clipboard = new Clipboard '.js-clipboard-trigger',
-    text: (trigger) ->
-      $target = $(trigger.nextElementSibling || trigger.previousElementSibling)
-      $target.data('clipboard-text') || $target.text().trim()
+genericSuccess = (e) ->
+  showTooltip(e.trigger, 'Copied!')
+
+  # Clear the selection and blur the trigger so it loses its border
+  e.clearSelection()
+  $(e.trigger).blur()

-  clipboard.on 'success', (e) ->
-    $(e.trigger).
-      tooltip(trigger: 'manual', placement: 'auto bottom', title: 'Copied!').
-      tooltip('show')
+# Safari doesn't support `execCommand`, so instead we inform the user to
+# copy manually.
+#
+# See http://clipboardjs.com/#browser-support
+genericError = (e) ->
+  if /Mac/i.test(navigator.userAgent)
+    key = '&#8984;' # Command
+  else
+    key = 'Ctrl'

-    # Clear the selection and blur the trigger so it loses its border
-    e.clearSelection()
-    $(e.trigger).blur()
+  showTooltip(e.trigger, "Press #{key}-C to copy")

-    # Manually hide the tooltip after 1 second
-    setTimeout(->
-      $(e.trigger).tooltip('hide')
-    , 1000)
+showTooltip = (target, title) ->
+  $(target).
+    tooltip(
+      container: 'body'
+      html: 'true'
+      placement: 'auto bottom'
+      title: title
+      trigger: 'manual'
+    ).
+    tooltip('show').
+    one('mouseleave', -> $(this).tooltip('hide'))
+
+$ ->
+  clipboard = new Clipboard '[data-clipboard-target], [data-clipboard-text]'
+  clipboard.on 'success', genericSuccess
+  clipboard.on 'error',   genericError
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -83,7 +83,7 @@ class Dispatcher
      when 'projects:project_members:index'
        new ProjectMembers()
        new UsersSelect()
-      when 'groups:new', 'groups:edit', 'admin:groups:edit'
+      when 'groups:new', 'groups:edit', 'admin:groups:edit', 'admin:groups:new'
        new GroupAvatar()
      when 'projects:tree:show'
        new TreeView()

--- a/app/assets/javascripts/dropzone_input.js.coffee
+++ b/app/assets/javascripts/dropzone_input.js.coffee
+#= require markdown_preview
+
 class @DropzoneInput
  constructor: (form) ->
    Dropzone.autoDiscover = false
@@ -11,17 +13,14 @@ class @DropzoneInput
    uploadProgress = $("<div class=\"div-dropzone-progress\"></div>")
    btnAlert = "<button type=\"button\"" + alertAttr + ">&times;</button>"
    project_uploads_path = window.project_uploads_path or null
-    markdown_preview_path = window.markdown_preview_path or null
    max_file_size = gon.max_file_size or 10

    form_textarea = $(form).find("textarea.markdown-area")
    form_textarea.wrap "<div class=\"div-dropzone\"></div>"
    form_textarea.on 'paste', (event) =>
      handlePaste(event)
-    form_textarea.on "input", ->
-      hideReferencedUsers()
-    form_textarea.on "blur", ->
-      renderMarkdown()
+
+    $(form).setupMarkdownPreview()

    form_dropzone = $(form).find('.div-dropzone')
    form_dropzone.parent().addClass "div-dropzone-wrapper"
@@ -34,42 +33,6 @@ class @DropzoneInput
      "opacity": 0
      "display": "none"

-    # Preview button
-    $(document).off "click", ".js-md-preview-button"
-    $(document).on "click", ".js-md-preview-button", (e) ->
-      ###
-      Shows the Markdown preview.
-
-      Lets the server render GFM into Html and displays it.
-      ###
-      e.preventDefault()
-      form = $(this).closest("form")
-      # toggle tabs
-      form.find(".js-md-write-button").parent().removeClass "active"
-      form.find(".js-md-preview-button").parent().addClass "active"
-
-      # toggle content
-      form.find(".md-write-holder").hide()
-      form.find(".md-preview-holder").show()
-
-      renderMarkdown()
-
-    # Write button
-    $(document).off "click", ".js-md-write-button"
-    $(document).on "click", ".js-md-write-button", (e) ->
-      ###
-      Shows the Markdown textarea.
-      ###
-      e.preventDefault()
-      form = $(this).closest("form")
-      # toggle tabs
-      form.find(".js-md-write-button").parent().addClass "active"
-      form.find(".js-md-preview-button").parent().removeClass "active"
-
-      # toggle content
-      form.find(".md-write-holder").show()
-      form.find(".md-preview-holder").hide()
-
    dropzone = form_dropzone.dropzone(
      url: project_uploads_path
      dictDefaultMessage: ""
@@ -136,41 +99,6 @@ class @DropzoneInput

    child = $(dropzone[0]).children("textarea")

-    hideReferencedUsers = ->
-      referencedUsers = form.find(".referenced-users")
-      referencedUsers.hide()
-
-    renderReferencedUsers = (users) ->
-      referencedUsers = form.find(".referenced-users")
-
-      if referencedUsers.length
-        if users.length >= 10
-          referencedUsers.show()
-          referencedUsers.find(".js-referenced-users-count").text users.length
-        else
-          referencedUsers.hide()
-
-    renderMarkdown = ->
-      preview = form.find(".js-md-preview")
-      mdText = form.find(".markdown-area").val()
-      if mdText.trim().length is 0
-        preview.text "Nothing to preview."
-        hideReferencedUsers()
-      else
-        preview.text "Loading..."
-        $.ajax(
-          type: "POST",
-          url: markdown_preview_path,
-          data: {
-            text: mdText
-          },
-          dataType: "json"
-        ).success (data) ->
-          preview.html data.body
-          preview.syntaxHighlight()
-
-          renderReferencedUsers data.references.users
-
    formatLink = (link) ->
      text = "[#{link.alt}](#{link.url})"
      text = "!#{text}" if link.is_image

--- a/app/assets/javascripts/flash.js.coffee
+++ b/app/assets/javascripts/flash.js.coffee
 class @Flash
  constructor: (message, type)->
-    flash = $(".flash-container")
-    flash.html("")
+    @flash = $(".flash-container")
+    @flash.html("")

-    $('<div/>',
+    innerDiv = $('<div/>',
      class: "flash-#{type}",
      text: message
-    ).appendTo(".flash-container")
+    )
+    innerDiv.appendTo(".flash-container")

-    flash.click -> $(@).fadeOut()
-    flash.show()
+    @flash.click -> $(@).fadeOut()
+    @flash.show()
+
+  pinTo: (selector) ->
+    @flash.detach().appendTo(selector)
--- a/app/assets/javascripts/issuable_context.js.coffee
+++ b/app/assets/javascripts/issuable_context.js.coffee
@@ -5,9 +5,9 @@ class @IssuableContext
    new UsersSelect()
    $('select.select2').select2({width: 'resolve', dropdownAutoWidth: true})

-    $(".context .inline-update").on "change", "select", ->
+    $(".issuable-sidebar .inline-update").on "change", "select", ->
      $(this).submit()
-    $(".context .inline-update").on "change", ".js-assignee", ->
+    $(".issuable-sidebar .inline-update").on "change", ".js-assignee", ->
      $(this).submit()

    $('.issuable-details').waitForImages ->
@@ -21,3 +21,9 @@ class @IssuableContext
          @top = ($('.issuable-affix').offset().top - 70)
        bottom: ->
          @bottom = $('.footer').outerHeight(true)
+
+    $(".edit-link").click (e) ->
+      block = $(@).parents('.block')
+      block.find('.selectbox').show()
+      block.find('.value').hide()
+      block.find('.js-select2').select2("open")
--- a/app/assets/javascripts/issue.js.coffee
+++ b/app/assets/javascripts/issue.js.coffee
@@ -10,12 +10,12 @@ class @Issue
      @initTaskList()

  initTaskList: ->
-    $('.issue-details .js-task-list-container').taskList('enable')
-    $(document).on 'tasklist:changed', '.issue-details .js-task-list-container', @updateTaskList
+    $('.detail-page-description .js-task-list-container').taskList('enable')
+    $(document).on 'tasklist:changed', '.detail-page-description .js-task-list-container', @updateTaskList

  disableTaskList: ->
-    $('.issue-details .js-task-list-container').taskList('disable')
-    $(document).off 'tasklist:changed', '.issue-details .js-task-list-container'
+    $('.detail-page-description .js-task-list-container').taskList('disable')
+    $(document).off 'tasklist:changed', '.detail-page-description .js-task-list-container'

  # TODO (rspeicher): Make the issue description inline-editable like a note so
  # that we can re-use its form here

--- a/app/assets/javascripts/issues.js.coffee
+++ b/app/assets/javascripts/issues.js.coffee
@@ -29,7 +29,7 @@
    $('#filter_issue_search').val($('#issue_search').val())

  initSelects: ->
-    $("select#update_status").select2(width: 'resolve', dropdownAutoWidth: true)
+    $("select#update_state_event").select2(width: 'resolve', dropdownAutoWidth: true)
    $("select#update_assignee_id").select2(width: 'resolve', dropdownAutoWidth: true)
    $("select#update_milestone_id").select2(width: 'resolve', dropdownAutoWidth: true)
    $("select#label_name").select2(width: 'resolve', dropdownAutoWidth: true)

--- a/app/assets/javascripts/markdown_preview.js.coffee
+++ b/app/assets/javascripts/markdown_preview.js.coffee
+# MarkdownPreview
+#
+# Handles toggling the "Write" and "Preview" tab clicks, rendering the preview,
+# and showing a warning when more than `x` users are referenced.
+#
+class @MarkdownPreview
+  # Minimum number of users referenced before triggering a warning
+  referenceThreshold: 10
+
+  showPreview: (form) ->
+    preview = form.find('.js-md-preview')
+    mdText  = form.find('textarea.markdown-area').val()
+
+    if mdText.trim().length == 0
+      preview.text('Nothing to preview.')
+      @hideReferencedUsers(form)
+    else
+      preview.text('Loading...')
+      @renderMarkdown mdText, (response) =>
+        preview.html(response.body)
+        preview.syntaxHighlight()
+        @renderReferencedUsers(response.references.users, form)
+
+  renderMarkdown: (text, success) ->
+    return unless window.markdown_preview_path
+
+    $.ajax
+      type: 'POST'
+      url: window.markdown_preview_path
+      data: { text: text }
+      dataType: 'json'
+      success: success
+
+  hideReferencedUsers: (form) ->
+    referencedUsers = form.find('.referenced-users')
+    referencedUsers.hide()
+
+  renderReferencedUsers: (users, form) ->
+    referencedUsers = form.find('.referenced-users')
+
+    if referencedUsers.length
+      if users.length >= @referenceThreshold
+        referencedUsers.show()
+        referencedUsers.find('.js-referenced-users-count').text(users.length)
+      else
+        referencedUsers.hide()
+
+markdownPreview = new MarkdownPreview()
+
+previewButtonSelector = '.js-md-preview-button'
+writeButtonSelector   = '.js-md-write-button'
+
+$.fn.setupMarkdownPreview = ->
+  $form = $(this)
+
+  form_textarea = $form.find('textarea.markdown-area')
+
+  form_textarea.on 'input', -> markdownPreview.hideReferencedUsers($form)
+  form_textarea.on 'blur',  -> markdownPreview.showPreview($form)
+
+$(document).on 'click', previewButtonSelector, (e) ->
+  e.preventDefault()
+
+  $form = $(this).closest('form')
+
+  # toggle tabs
+  $form.find(writeButtonSelector).parent().removeClass('active')
+  $form.find(previewButtonSelector).parent().addClass('active')
+
+  # toggle content
+  $form.find('.md-write-holder').hide()
+  $form.find('.md-preview-holder').show()
+
+  markdownPreview.showPreview($form)
+
+$(document).on 'click', writeButtonSelector, (e) ->
+  e.preventDefault()
+
+  $form = $(this).closest('form')
+
+  # toggle tabs
+  $form.find(writeButtonSelector).parent().addClass('active')
+  $form.find(previewButtonSelector).parent().removeClass('active')
+
+  # toggle content
+  $form.find('.md-write-holder').show()
+  $form.find('.md-preview-holder').hide()
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -40,12 +40,12 @@ class @MergeRequest
    this.$('.all-commits').removeClass 'hide'

  initTaskList: ->
-    $('.merge-request-details .js-task-list-container').taskList('enable')
-    $(document).on 'tasklist:changed', '.merge-request-details .js-task-list-container', @updateTaskList
+    $('.detail-page-description .js-task-list-container').taskList('enable')
+    $(document).on 'tasklist:changed', '.detail-page-description .js-task-list-container', @updateTaskList

  disableTaskList: ->
-    $('.merge-request-details .js-task-list-container').taskList('disable')
-    $(document).off 'tasklist:changed', '.merge-request-details .js-task-list-container'
+    $('.detail-page-description .js-task-list-container').taskList('disable')
+    $(document).off 'tasklist:changed', '.detail-page-description .js-task-list-container'

  # TODO (rspeicher): Make the merge request description inline-editable like a
  # note so that we can re-use its form here

--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -43,6 +43,7 @@
 #
 class @MergeRequestTabs
  diffsLoaded: false
+  buildsLoaded: false
  commitsLoaded: false

  constructor: (@opts = {}) ->
@@ -54,6 +55,12 @@ class @MergeRequestTabs

  bindEvents: ->
    $(document).on 'shown.bs.tab', '.merge-request-tabs a[data-toggle="tab"]', @tabShown
+    $(document).on 'click', '.js-show-tab', @showTab
+
+  showTab: (event) =>
+    event.preventDefault()
+
+    @activateTab $(event.target).data('action')

  tabShown: (event) =>
    $target = $(event.target)
@@ -63,12 +70,14 @@ class @MergeRequestTabs
      @loadCommits($target.attr('href'))
    else if action == 'diffs'
      @loadDiff($target.attr('href'))
+    else if action == 'builds'
+      @loadBuilds($target.attr('href'))

    @setCurrentAction(action)

  scrollToElement: (container) ->
    if window.location.hash
-      $el = $("#{container} #{window.location.hash}")
+      $el = $("div#{container} #{window.location.hash}")
      $('body').scrollTo($el.offset().top) if $el.length

  # Activate a tab based on the current action
@@ -101,7 +110,7 @@ class @MergeRequestTabs
    action = 'notes' if action == 'show'

    # Remove a trailing '/commits' or '/diffs'
-    new_state = @_location.pathname.replace(/\/(commits|diffs)(\.html)?\/?$/, '')
+    new_state = @_location.pathname.replace(/\/(commits|diffs|builds)(\.html)?\/?$/, '')

    # Append the new action if we're on a tab other than 'notes'
    unless action == 'notes'
@@ -124,7 +133,7 @@ class @MergeRequestTabs
    @_get
      url: "#{source}.json"
      success: (data) =>
-        document.getElementById('commits').innerHTML = data.html
+        document.querySelector("div#commits").innerHTML = data.html
        $('.js-timeago').timeago()
        @commitsLoaded = true
        @scrollToElement("#commits")
@@ -135,10 +144,22 @@ class @MergeRequestTabs
    @_get
      url: "#{source}.json" + @_location.search
      success: (data) =>
-        document.getElementById('diffs').innerHTML = data.html
+        document.querySelector("div#diffs").innerHTML = data.html
+        $('div#diffs .js-syntax-highlight').syntaxHighlight()
        @diffsLoaded = true
        @scrollToElement("#diffs")

+  loadBuilds: (source) ->
+    return if @buildsLoaded
+
+    @_get
+      url: "#{source}.json"
+      success: (data) =>
+        document.querySelector("div#builds").innerHTML = data.html
+        $('.js-timeago').timeago()
+        @buildsLoaded = true
+        @scrollToElement("#builds")
+
  # Show or hide the loading spinner
  #
  # status - Boolean, true to show, false to hide

--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -10,17 +10,20 @@ class @MergeRequestWidget
  constructor: (@opts) ->
    modal = $('#modal_merge_info').modal(show: false)

-  mergeInProgress: ->
+  mergeInProgress: (deleteSourceBranch = false)->
    $.ajax
      type: 'GET'
      url: $('.merge-request').data('url')
      success: (data) =>
        if data.state == "merged"
-          location.reload()
+          urlSuffix = if deleteSourceBranch then '?delete_source=true' else ''
+
+          window.location.href = window.location.href + urlSuffix
        else if data.merge_error
          $('.mr-widget-body').html("<h4>" + data.merge_error + "</h4>")
        else
-          setTimeout(merge_request_widget.mergeInProgress, 2000)
+          callback = -> merge_request_widget.mergeInProgress(deleteSourceBranch)
+          setTimeout(callback, 2000)
      dataType: 'json'

  getMergeStatus: ->

--- a/app/assets/javascripts/new_commit_form.js.coffee
+++ b/app/assets/javascripts/new_commit_form.js.coffee
@@ -3,7 +3,7 @@ class @NewCommitForm
    @newBranch = form.find('.js-new-branch')
    @originalBranch = form.find('.js-original-branch')
    @createMergeRequest = form.find('.js-create-merge-request')
-    @createMergeRequestFormGroup = form.find('.js-create-merge-request-form-group')
+    @createMergeRequestContainer = form.find('.js-create-merge-request-container')

    @renderDestination()
    @newBranch.keyup @renderDestination
@@ -12,10 +12,10 @@ class @NewCommitForm
    different = @newBranch.val() != @originalBranch.val()

    if different
-      @createMergeRequestFormGroup.show()
+      @createMergeRequestContainer.show()
      @createMergeRequest.prop('checked', true) unless @wasDifferent
    else
-      @createMergeRequestFormGroup.hide()
+      @createMergeRequestContainer.hide()
      @createMergeRequest.prop('checked', false)

    @wasDifferent = different
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -111,6 +111,12 @@ class @Notes
  Note: for rendering inline notes use renderDiscussionNote
  ###
  renderNote: (note) ->
+    unless note.valid
+      if note.award
+        flash = new Flash('You have already used this award emoji!', 'alert')
+        flash.pinTo('.header-content')
+      return
+
    # render note if it not present in loaded list
    # or skip if rendered
    if @isNewNote(note) && !note.award
@@ -122,6 +128,7 @@ class @Notes

    if note.award
      awards_handler.addAwardToEmojiBar(note.note, note.emoji_path)
+      awards_handler.scrollToAwards()

  ###
  Check if note does not exists on page
@@ -141,6 +148,8 @@ class @Notes
    @note_ids.push(note.id)
    form = $("form[rel='" + note.discussion_id + "']")
    row = form.closest("tr")
+    note_html = $(note.html)
+    note_html.syntaxHighlight()

    # is this the first note of discussion?
    if row.is(".js-temp-notes-holder")
@@ -151,14 +160,16 @@ class @Notes
      row.next().find(".note").remove()

      # Add note to 'Changes' page discussions
-      $(".notes[rel='" + note.discussion_id + "']").append note.html
+      $(".notes[rel='" + note.discussion_id + "']").append note_html

      # Init discussion on 'Discussion' page if it is merge request page
      if $('body').attr('data-page').indexOf('projects:merge_request') == 0
-        $('ul.main-notes-list').append(note.discussion_with_diff_html)
+        discussion_html = $(note.discussion_with_diff_html)
+        discussion_html.syntaxHighlight()
+        $('ul.main-notes-list').append(discussion_html)
    else
      # append new note to all matching discussions
-      $(".notes[rel='" + note.discussion_id + "']").append note.html
+      $(".notes[rel='" + note.discussion_id + "']").append note_html

    # cleanup after successfully creating a diff/discussion note
    @removeDiscussionNoteForm(form)
@@ -279,7 +290,7 @@ class @Notes
    $html.find('.js-task-list-container').taskList('enable')

    # Find the note's `li` element by ID and replace it with the updated HTML
-    $note_li = $("#note_#{note.id}")
+    $note_li = $('.note-row-' + note.id)
    $note_li.replaceWith($html)

  ###
@@ -339,18 +350,26 @@ class @Notes
  ###
  removeNote: ->
    note = $(this).closest(".note")
-    notes = note.closest(".notes")
+    note_id = note.attr('id')
+
+    $('.note[id="' + note_id + '"]').each ->
+      note = $(this)
+      notes = note.closest(".notes")
+      count = notes.closest(".notes_holder").find(".discussion-notes-count")

-    # check if this is the last note for this line
-    if notes.find(".note").length is 1
+      # check if this is the last note for this line
+      if notes.find(".note").length is 1

-      # for discussions
-      notes.closest(".discussion").remove()
+        # for discussions
+        notes.closest(".discussion").remove()

-      # for diff lines
-      notes.closest("tr").remove()
+        # for diff lines
+        notes.closest("tr").remove()
+      else
+        # update notes count
+        count.get(0).lastChild.nodeValue = " #{notes.children().length - 1}"

-    note.remove()
+      note.remove()

  ###
  Called in response to clicking the delete attachment link
@@ -362,8 +381,8 @@ class @Notes
    note = $(this).closest(".note")
    note.find(".note-attachment").remove()
    note.find(".note-body > .note-text").show()
-    note.find(".js-note-attachment-delete").hide()
-    note.find(".note-edit-form").hide()
+    note.find(".note-header").show()
+    note.find(".current-note-edit-form").remove()

  ###
  Called when clicking on the "reply" button for a diff line.

--- a/app/assets/javascripts/project.js.coffee
+++ b/app/assets/javascripts/project.js.coffee
 class @Project
  constructor: ->
-    # Git clone panel switcher
-    cloneHolder = $('.git-clone-holder')
-    if cloneHolder.length
-      $('a, button', cloneHolder).click ->
-        $('a, button', cloneHolder).removeClass 'active'
-        $(@).addClass 'active'
-        $('#project_clone', cloneHolder).val $(@).data 'clone'
-        $(".clone").text("").append $(@).data 'clone'
+    # Git protocol switcher
+    $('.js-protocol-switch').click ->
+      return if $(@).hasClass('active')
+
+
+      # Remove the active class for all buttons (ssh, http, kerberos if shown)
+      $('.active').not($(@)).removeClass('active');
+      # Add the active class for the clicked button
+      $(@).toggleClass('active')
+
+      url = $(@).data('clone')
+
+      # Update the input field
+      $('#project_clone').val(url)
+
+      # Update the command line instructions
+      $('.clone').text(url)

    # Ref switcher
    $('.project-refs-select').on 'change', ->
@@ -39,4 +48,4 @@ class @Project
        when 4 then label = ' On Mention '
      $('#notifications-button').empty().append("<i class='fa fa-bell'></i>" + label + "<i class='fa fa-angle-down'></i>")
      $(@).parents('ul').find('li.active').removeClass 'active'
-      $(@).parent().addClass 'active'
\ No newline at end of file
+      $(@).parent().addClass 'active'
--- a/app/assets/javascripts/project_select.js.coffee
+++ b/app/assets/javascripts/project_select.js.coffee
+class @ProjectSelect
+  constructor: ->
+    $('.ajax-project-select').each (i, select) ->
+      @groupId = $(select).data('group-id')
+      @includeGroups = $(select).data('include-groups')
+
+      placeholder = "Search for project"
+      placeholder += " or group" if @includeGroups
+
+      $(select).select2
+        placeholder: placeholder
+        minimumInputLength: 0
+        query: (query) =>
+          finalCallback = (projects) ->
+            data = { results: projects }
+            query.callback(data)
+
+          if @includeGroups
+            projectsCallback = (projects) ->
+              groupsCallback = (groups) ->
+                data = groups.concat(projects)
+                finalCallback(data)
+
+              Api.groups query.term, false, groupsCallback
+          else
+            projectsCallback = finalCallback
+
+          if @groupId
+            Api.groupProjects @groupId, query.term, projectsCallback
+          else
+            Api.projects query.term, projectsCallback
+
+        id: (project) ->
+          project.web_url
+
+        text: (project) ->
+          project.name_with_namespace || project.name
+
+        dropdownCssClass: "ajax-project-dropdown"
--- a/app/assets/javascripts/sidebar.js.coffee
+++ b/app/assets/javascripts/sidebar.js.coffee
@@ -5,6 +5,7 @@ $(document).on("click", '.toggle-nav-collapse', (e) ->

  $('.page-with-sidebar').toggleClass("#{collapsed} #{expanded}")
  $('header').toggleClass("header-collapsed header-expanded")
+  $('.sidebar-wrapper').toggleClass("sidebar-collapsed sidebar-expanded")
  $('.toggle-nav-collapse i').toggleClass("fa-angle-right fa-angle-left")
  $.cookie("collapsed_nav", $('.page-with-sidebar').hasClass(collapsed), { path: '/' })
 )
--- a/app/assets/javascripts/user.js.coffee
+++ b/app/assets/javascripts/user.js.coffee
@@ -2,3 +2,9 @@ class @User
  constructor: ->
    $('.profile-groups-avatars').tooltip("placement": "top")
    new ProjectsList()
+
+    $('.hide-project-limit-message').on 'click', (e) ->
+      path = '/'
+      $.cookie('hide_project_limit_message', 'false', { path: path })
+      $(@).parents('.project-limit-message').remove()
+      e.preventDefault()
--- a/app/assets/javascripts/users_select.js.coffee
+++ b/app/assets/javascripts/users_select.js.coffee
@@ -32,17 +32,15 @@ class @UsersSelect
              if showNullUser
                nullUser = {
                  name: 'Unassigned',
-                  avatar: null,
-                  username: 'none',
                  id: 0
                }
                data.results.unshift(nullUser)

              if showAnyUser
+                name = showAnyUser
+                name = 'Any User' if name == true
                anyUser = {
-                  name: 'Any',
-                  avatar: null,
-                  username: 'none',
+                  name: name,
                  id: null
                }
                data.results.unshift(anyUser)
@@ -50,7 +48,6 @@ class @UsersSelect
            if showEmailUser && data.results.length == 0 && query.term.match(/^[^@]+@[^@]+$/)
              emailUser = {
                name: "Invite \"#{query.term}\"",
-                avatar: null,
                username: query.term,
                id: query.term
              }
@@ -58,11 +55,8 @@ class @UsersSelect

            query.callback(data)

-        initSelection: (element, callback) =>
-          id = $(element).val()
-          if id != "" && id != "0"
-            @user(id, callback)
-
+        initSelection: (args...) =>
+          @initSelection(args...)
        formatResult: (args...) =>
          @formatResult(args...)
        formatSelection: (args...) =>
@@ -71,16 +65,24 @@ class @UsersSelect
        escapeMarkup: (m) -> # we do not want to escape markup since we are displaying html in results
          m

+  initSelection: (element, callback) ->
+    id = $(element).val()
+    if id == "0"
+      nullUser = { name: 'Unassigned' }
+      callback(nullUser)
+    else if id != ""
+      @user(id, callback)
+
  formatResult: (user) ->
    if user.avatar_url
      avatar = user.avatar_url
    else
      avatar = gon.default_avatar_url

-    "<div class='user-result'>
+    "<div class='user-result #{'no-username' unless user.username}'>
       <div class='user-image'><img class='avatar s24' src='#{avatar}'></div>
       <div class='user-name'>#{user.name}</div>
-       <div class='user-username'>#{user.username}</div>
+       <div class='user-username'>#{user.username || ""}</div>
     </div>"

  formatSelection: (user) ->

--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
 @import "framework/fonts";
 @import "framework/variables";
 @import "framework/mixins";
-@import "framework/layout";
 @import 'framework/tw_bootstrap_variables';
 @import 'framework/tw_bootstrap';
+@import "framework/layout";

 @import "framework/avatar.scss";
 @import "framework/blocks.scss";
@@ -25,6 +25,7 @@
 @import "framework/markdown_area.scss";
 @import "framework/mobile.scss";
 @import "framework/pagination.scss";
+@import "framework/panels.scss";
 @import "framework/selects.scss";
 @import "framework/sidebar.scss";
 @import "framework/tables.scss";

--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -68,6 +68,10 @@
  .oneline {
    line-height: 42px;
  }
+
+  > p:last-child {
+    margin-bottom: 0;
+  }
 }

 .cover-block {
@@ -112,5 +116,14 @@
    position: absolute;
    top: 10px;
    right: 10px;
+
+    &.left {
+      left: 10px;
+      right: auto;
+    }
  }
 }
+
+.block-connector {
+  margin-top: -1px;
+}
--- a/app/assets/stylesheets/framework/callout.scss
+++ b/app/assets/stylesheets/framework/callout.scss
@@ -7,8 +7,8 @@

 /* Common styles for all types */
 .bs-callout {
-  margin: 20px 0;
-  padding: 20px;
+  margin: $gl-padding 0;
+  padding: $gl-padding;
  border-left: 3px solid $border-color;
  color: $text-color;
  background: $background-color;
@@ -42,4 +42,3 @@
  border-color: #5cA64d;
  color: #3c763d;
 }
-
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -7,7 +7,7 @@

 /** COMMON CLASSES **/
 .prepend-top-10 { margin-top:10px }
-.prepend-top-default { margin-top: $gl-padding; }
+.prepend-top-default { margin-top: $gl-padding !important; }
 .prepend-top-20 { margin-top:20px }
 .prepend-left-10 { margin-left:10px }
 .prepend-left-20 { margin-left:20px }
@@ -52,6 +52,10 @@ pre {
  }
 }

+hr {
+  margin: $gl-padding 0;
+}
+
 .dropdown-menu > li > a {
  text-shadow: none;
 }
@@ -64,7 +68,7 @@ pre {
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus {
  background: $gl-primary;
-  color: #FFF
+  color: #FFF;
 }

 .str-truncated {
@@ -329,7 +333,7 @@ table {
 }

 .well {
-  margin-bottom: 0;
+  margin-bottom: $gl-padding;
 }

 .search_box {
@@ -337,10 +341,6 @@ table {
  text-align: center;
 }

-.task-status {
-  margin-left: 10px;
-}
-
 #nprogress .spinner {
  top: 15px !important;
  right: 10px !important;
@@ -379,9 +379,8 @@ table {
  text-align: center;
  margin-top: 5px;
  margin-bottom: $gl-padding;
-  height: 56px;
+  height: auto;
  margin-top: -$gl-padding;
-  padding-top: $gl-padding;

  &.no-bottom {
    margin-bottom: 0;
@@ -390,6 +389,23 @@ table {
  &.no-top {
    margin-top: 0;
  }
+
+  li a {
+    display: inline-block;
+    padding-top: $gl-padding;
+    padding-bottom: 11px;
+    margin-bottom: -1px;
+  }
+
+  &.bottom-border {
+    border-bottom: 1px solid $border-color;
+    height: 57px;
+  }
+
+  &.wide {
+    margin-left: -$gl-padding;
+    margin-right: -$gl-padding;
+  }
 }

 .center-middle-menu {
@@ -433,3 +449,26 @@ table {
 .space-right {
  margin-right: 10px;
 }
+
+.alert, .progress {
+  margin-bottom: $gl-padding;
+}
+
+.new-project-item-select-holder {
+  display: inline-block;
+  position: relative;
+
+  .new-project-item-select {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 250px !important;
+    visibility: hidden;
+  }
+}
+
+.content-separator {
+  margin-left: -$gl-padding;
+  margin-right: -$gl-padding;
+  border-top: 1px solid $border-color;
+}
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -8,7 +8,6 @@
  border: none;
  border-top: 1px solid #E7E9EE;
  border-bottom: 1px solid #E7E9EE;
-  margin-bottom: 1em;

  &.readme-holder {
    border-bottom: 0;
@@ -22,10 +21,9 @@
    position: relative;
    background: $background-color;
    border-bottom: 1px solid $border-color;
-    text-shadow: 0 1px 1px #fff;
    margin: 0;
    text-align: left;
-    padding: 10px 15px;
+    padding: 10px $gl-padding;

    .file-actions {
      float: right;
@@ -171,4 +169,3 @@
    }
  }
 }
-
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -22,9 +22,10 @@ input[type='text'].danger {
 }

 .form-actions {
-  padding: 17px 20px 18px;
-  margin-top: 18px;
-  margin-bottom: 18px;
+  margin: -$gl-padding;
+  margin-top: 0;
+  margin-bottom: -$gl-padding;
+  padding: $gl-padding;
  background-color: $background-color;
  border-top: 1px solid $border-color;
 }
@@ -73,6 +74,8 @@ label {

 .form-control {
  @include box-shadow(none);
+  height: 42px;
+  padding: 8px $gl-padding;
 }

 .wiki-content {
@@ -88,7 +91,19 @@ label {
 }

 .input-group {
+  .select2-container {
+    display: table-cell;
+    width: 200px !important;
+  }
  .input-group-addon {
    background-color: #f7f8fa;
  }
+  .input-group-addon:not(:first-child):not(:last-child) {
+    border-left: 0;
+    border-right: 0;
+  }
+}
+
+.help-block {
+  margin-bottom: 0;
 }
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -6,15 +6,17 @@ header {
  transition-duration: .3s;

  &.navbar-empty {
+    height: 58px;
    background: #FFF;
    border-bottom: 1px solid #EEE;

    .center-logo {
-      margin: 8px 0;
+      margin: 11px 0;
      text-align: center;

-      img {
-        height: 32px;
+      #tanuki-logo, img {
+        width: 36px;
+        height: 36px;
      }
    }
  }

--- a/app/assets/stylesheets/framework/issue_box.scss
+++ b/app/assets/stylesheets/framework/issue_box.scss
@@ -4,31 +4,32 @@
 *
 */

-.issue-box {
+.status-box {
  @include border-radius(2px);

-  display: inline-block;
-  padding: 10px $gl-padding;
+  display: block;
+  float: left;
+  padding: 0 $gl-padding;
  font-weight: normal;
  margin-right: 10px;
  font-size: $gl-font-size;

-  &.issue-box-closed {
+  &.status-box-closed {
    background-color: $gl-danger;
    color: #FFF;
  }

-  &.issue-box-merged {
+  &.status-box-merged {
    background-color: $gl-primary;
    color: #FFF;
  }

-  &.issue-box-open {
+  &.status-box-open {
    background-color: #019875;
    color: #FFF;
  }

-  &.issue-box-expired {
+  &.status-box-expired {
    background: #cea61b;
    color: #FFF;
  }

--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -2,9 +2,13 @@ html {
  overflow-y: scroll;

  &.touch .tooltip { display: none !important; }
+}
+
+body {
+  background-color: #EAEBEC !important;

-  body {
-    padding-top: $header-height;
+  &.navless {
+    background-color: white !important;
  }
 }

@@ -18,7 +22,8 @@ html {
 }

 .navless-container {
-  margin-top: 30px;
+  margin-top: $header-height;
+  padding-top: $gl-padding * 2;
 }

 .container-limited {

--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -7,7 +7,7 @@
  padding: 0;
  list-style: none;

-  li {
+  > li {
    padding: 10px 15px;
    min-height: 20px;
    border-bottom: 1px solid #eee;
@@ -72,13 +72,6 @@
  }
 }

-ol, ul {
-  &.styled {
-    li {
-      padding: 2px;
-    }
-  }
-}

 /** light list with border-bottom between li **/
 ul.bordered-list {
@@ -95,8 +88,14 @@ ul.bordered-list {
  }
 }

-li.task-list-item {
-  list-style-type: none;
+ul.task-list {
+  li.task-list-item {
+    list-style-type: none;
+  }
+
+  ul:not(.task-list) {
+    padding-left: 1.3em;
+  }
 }

 ul.content-list {
@@ -127,3 +126,36 @@ ul.content-list {
  }
 }

+.panel > .content-list {
+  li {
+    margin: 0;
+  }
+}
+
+ul.controls {
+  padding-top: 1px;
+  float: right;
+  list-style: none;
+
+  .btn {
+    padding: 10px 14px;
+  }
+
+  > li {
+    float: left;
+    margin-right: 10px;
+    
+    &:last-child {
+      margin-right: 0;
+    }
+
+    .author_link {
+      display: inline-block;
+
+      .avatar-inline {
+        margin-left: 0;
+        margin-right: 0;
+      }
+    }
+  }
+}
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -73,11 +73,8 @@
 }

 .referenced-users {
-  padding: 10px 0;
-  color: #999;
-  margin-left: 10px;
-  margin-top: 1px;
-  margin-right: 130px;
+  color: #4c4e54;
+  padding-top: 10px;
 }

 .md-preview-holder {
@@ -90,7 +87,7 @@

 .new_note,
 .edit_note,
-.issuable-description,
+.detail-page-description,
 .milestone-description,
 .wiki-content,
 .merge-request-form {

--- a/app/assets/stylesheets/framework/mobile.scss
+++ b/app/assets/stylesheets/framework/mobile.scss
@@ -82,9 +82,6 @@
  }

  .center-top-menu {
-    height: 45px;
-    margin-bottom: 30px;
-
    li a {
      font-size: 14px;
      padding: 19px 10px;

--- a/app/assets/stylesheets/framework/pagination.scss
+++ b/app/assets/stylesheets/framework/pagination.scss
@@ -32,3 +32,7 @@
    }
  }
 }
+
+.panel > .gl-pagination {
+  margin: 0;
+}
--- a/app/assets/stylesheets/framework/panels.scss
+++ b/app/assets/stylesheets/framework/panels.scss
+.panel {
+  margin-bottom: $gl-padding;
+
+  .panel-heading {
+    padding: 7px $gl-padding;
+  }
+
+  .panel-body {
+    padding: $gl-padding;
+
+    .form-actions {
+      margin: -$gl-padding;
+      margin-top: $gl-padding;
+    }
+  }
+}
+
+.container-blank .panel .panel-heading {
+  line-height: 42px !important;  
+}
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -15,6 +15,16 @@
      border-left: none;
      padding-top: 5px;
    }
+
+    .select2-chosen {
+      color: $gl-text-color;
+    }
+
+    &.select2-default {
+      .select2-chosen {
+        color: #999;
+      }
+    }
  }
 }

@@ -23,6 +33,7 @@
  border: 1px solid #e7e9ed;
 }

+
 .select2-drop {
  @include box-shadow(rgba(76, 86, 103, 0.247059) 0px 0px 1px 0px, rgba(31, 37, 50, 0.317647) 0px 2px 18px 0px);
  @include border-radius (0px);
@@ -48,17 +59,38 @@
  color: #313236;
 }

+.select2-container-multi {
+  .select2-choices {
+    @include border-radius(2px);
+    border-color: $input-border;
+    background: white;
+    padding-left: $gl-padding / 2;
+
+    .select2-search-field input {
+      padding: $gl-padding / 2;
+      font-size: 13px;
+      height: auto;
+      font-family: inherit;
+      font-size: inherit;
+    }

-.select2-container-multi .select2-choices {
-  @include border-radius(2px);
-  border-color: #CCC;
-}
-
-.select2-container-multi .select2-choices .select2-search-field input {
-  padding: 8px 14px;
-  font-size: 13px;
-  line-height: 18px;
-  height: auto;
+    .select2-search-choice {
+      margin: 8px 0 0 8px;
+      background: white;
+      box-shadow: none;
+      border-color: $input-border;
+      color: $gl-text-color;
+      line-height: 15px;
+
+      .select2-search-choice-close {
+        top: 5px;
+      }
+
+      &.select2-search-choice-focus {
+        border-color: $gl-text-color;
+      }
+    }
+  }
 }

 .select2-drop-active {
@@ -123,10 +155,16 @@
 }

 .user-result {
+  min-height: 24px;
+
  .user-image {
    float: left;
  }
-  .user-name {
+
+  &.no-username {
+    .user-name {
+      line-height: 24px;
+    }
  }
 }

@@ -143,4 +181,4 @@

 .ajax-users-dropdown {
  min-width: 250px !important;
-}
\ No newline at end of file
+}
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
 .page-with-sidebar {
+  padding-top: $header-height;
+  transition-duration: .3s;
+
  .sidebar-wrapper {
    position: fixed;
    top: 0;
@@ -14,19 +17,15 @@
 .sidebar-wrapper {
  z-index: 99;
  background: $background-color;
-  transition-duration: .3s;
 }

 .content-wrapper {
-  min-height: 100vh;
  width: 100%;
  padding: 20px;
-  background: #EAEBEC;

  .container-fluid {
    background: #FFF;
    padding: $gl-padding;
-    min-height: 90vh;

    &.container-blank {
      background: none;
@@ -36,6 +35,83 @@
  }
 }

+.sidebar-wrapper {
+  .header-logo {
+    border-bottom: 1px solid transparent;
+    float: left;
+    height: $header-height;
+    width: $sidebar_width;
+    position: fixed;
+    z-index: 999;
+    overflow: hidden;
+    transition-duration: .3s;
+
+    a {
+      float: left;
+      height: $header-height;
+      width: 100%;
+      padding: 11px 0 11px 22px;
+      overflow: hidden;
+      outline: none;
+      transition-duration: .3s;
+
+      img {
+        width: 36px;
+        height: 36px;
+      }
+
+      #tanuki-logo, img {
+        float: left;
+      }
+
+      .gitlab-text-container {
+        width: 230px;
+
+        h3 {
+          width: 158px;
+          float: left;
+          margin: 0;
+          margin-left: 14px;
+          font-size: 19px;
+          line-height: 41px;
+          font-weight: normal;
+        }
+      }
+    }
+
+    &:hover {
+      background-color: #EEE;
+    }
+  }
+
+  .sidebar-user {
+    padding: 9px 22px;
+    position: fixed;
+    bottom: 40px;
+    width: $sidebar_width;
+    overflow: hidden;
+    transition-duration: .3s;
+
+    .username {
+      margin-left: 10px;
+      width: $sidebar_width - 2 * 10px;
+      font-size: 16px;
+      line-height: 34px;
+    }
+  }
+}
+
+
+.tanuki-shape {
+  transition: all 0.8s;
+
+  &:hover {
+    fill: rgb(255, 255, 255);
+    transition: all 0.1s;
+  }
+}
+
+
 .nav-sidebar {
  margin-top: 14 + $header-height;
  margin-bottom: 100px;
@@ -62,7 +138,7 @@
      color: $gray;
      display: block;
      text-decoration: none;
-      padding-left: 22px;
+      padding-left: 23px;
      font-weight: normal;
      outline: none;

@@ -86,6 +162,10 @@
        padding: 0px 8px;
        @include border-radius(6px);
      }
+
+      &.back-link i {
+        transition-duration: .3s;
+      }
    }
  }
 }
@@ -101,7 +181,6 @@

 @mixin expanded-sidebar {
  padding-left: $sidebar_width;
-  transition-duration: .3s;

  .sidebar-wrapper {
    width: $sidebar_width;
@@ -115,16 +194,15 @@

      &.back-link {
        i {
-          visibility: hidden;
+          opacity: 0;
        }
      }
    }
  }
 }

-@mixin folded-sidebar {
-  padding-left: 60px;
-  transition-duration: .3s;
+@mixin collapsed-sidebar {
+  padding-left: $sidebar_collapsed_width;

  .sidebar-wrapper {
    width: $sidebar_collapsed_width;
@@ -133,7 +211,7 @@
      width: $sidebar_collapsed_width;

      a {
-        padding-left: 12px;
+        padding-left: ($sidebar_collapsed_width - 36) / 2;

        .gitlab-text-container {
          display: none;
@@ -144,9 +222,13 @@
    .nav-sidebar {
      width: $sidebar_collapsed_width;

-      li a {
-        span {
-          display: none;
+      li {
+        width: auto;
+
+        a {
+          span {
+            display: none;
+          }
        }
      }
    }
@@ -156,7 +238,7 @@
    }

    .sidebar-user {
-      padding-left: 12px;
+      padding-left: ($sidebar_collapsed_width - 36) / 2;
      width: $sidebar_collapsed_width;

      .username {
@@ -187,11 +269,11 @@

 @media (max-width: $screen-md-max) {
  .page-sidebar-collapsed {
-    @include folded-sidebar;
+    @include collapsed-sidebar;
  }

  .page-sidebar-expanded {
-    @include folded-sidebar;
+    @include collapsed-sidebar;
  }

  .collapse-nav {
@@ -201,83 +283,10 @@

 @media(min-width: $screen-md-max) {
  .page-sidebar-collapsed {
-    @include folded-sidebar;
+    @include collapsed-sidebar;
  }

  .page-sidebar-expanded {
    @include expanded-sidebar;
  }
 }
-
-.sidebar-user {
-  padding: 9px 22px;
-  position: fixed;
-  bottom: 40px;
-  width: $sidebar_width;
-  overflow: hidden;
-  transition-duration: .3s;
-
-  .username {
-    margin-left: 10px;
-    width: $sidebar_width - 2 * 10px;
-    font-size: 16px;
-    line-height: 34px;
-  }
-}
-
-.sidebar-wrapper {
-  .header-logo {
-    border-bottom: 1px solid transparent;
-    float: left;
-    height: $header-height;
-    width: $sidebar_width;
-    overflow: hidden;
-    transition-duration: .3s;
-
-    a {
-      float: left;
-      height: $header-height;
-      width: 100%;
-      padding: 10px 22px;
-      overflow: hidden;
-      outline: none;
-
-      img {
-        width: 36px;
-        height: 36px;
-      }
-
-      #tanuki-logo, img {
-        float: left;
-      }
-
-      .gitlab-text-container {
-        width: 230px;
-
-        h3 {
-          width: 158px;
-          float: left;
-          margin: 0;
-          margin-left: 14px;
-          font-size: 19px;
-          line-height: 41px;
-          font-weight: normal;
-        }
-      }
-    }
-
-    &:hover {
-      background-color: #EEE;
-    }
-  }
-}
-
-
-.tanuki-shape {
-  transition: all 0.8s;
-
-  &:hover {
-    fill: rgb(255, 255, 255);
-    transition: all 0.1s;
-  }
-}
--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -6,6 +6,8 @@

 table {
  &.table {
+    margin-bottom: $gl-padding;
+    
    .dropdown-menu a {
      text-decoration: none;
    }

--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -10,8 +10,7 @@
    margin-left: -$gl-padding;
    margin-right: -$gl-padding;
    color: $gl-gray;
-    border-bottom: 1px solid #ECEEF1;
-    border-right: 1px solid #ECEEF1;
+    border-bottom: 1px solid $border-white-light;

    &:target {
      background: $hover;

--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -190,6 +190,10 @@
    .btn {
      min-width: 124px;
    }
+
+    .btn-clipboard {
+      min-width: 0px;
+    }
  }

  &.panel-small {

--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -181,6 +181,10 @@ body {
  line-height: 1.3;
  font-size: 1.25em;
  font-weight: 600;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
 }

 .page-title-empty {
@@ -216,6 +220,7 @@ pre {

 .monospace {
  font-family: $monospace_font;
+  font-size: 90%;
 }

 code {
@@ -256,3 +261,9 @@ textarea.js-gfm-input {
 .strikethrough {
  text-decoration: line-through;
 }
+
+h1, h2, h3, h4 {
+  small {
+    color: $gl-gray;
+  }
+}
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -19,7 +19,7 @@ $border-color: #dce0e6;
 $table-border-color: #eef0f2;
 $background-color: #F7F8FA;
 $header-height: 58px;
-$fixed-layout-width: 1200px;
+$fixed-layout-width: 1280px;
 $gl-gray: #7f8fa4;
 $gl-padding: 16px;
 $gl-avatar-size: 46px;

--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
+.awards {
+  @include clearfix;
+  line-height: 34px;
+
+  .award {
+    @include border-radius(5px);
+
+    border: 1px solid;
+    padding: 0px 10px;
+    float: left;
+    margin-right: 5px;
+    border-color: $border-color;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #dce0e5;
+    }
+
+    &.active {
+      border-color: $border-gray-light;
+      background-color: $gray-light;
+
+      &:hover {
+        background-color: #dce0e5;
+      }
+
+      .counter {
+        font-weight: bold;
+      }
+    }
+
+    .icon {
+      float: left;
+      margin-right: 10px;
+    }
+
+    .counter {
+      float: left;
+    }
+  }
+
+  .awards-controls {
+    margin-left: 10px;
+    float: left;
+
+    .add-award {
+      font-size: 24px;
+      color: $gl-gray;
+      position: relative;
+      top: 2px;
+
+      &:hover,
+      &:link {
+        text-decoration: none;
+      }
+    }
+
+    .awards-menu {
+      padding: $gl-padding;
+      min-width: 214px;
+
+      > li {
+        cursor: pointer;
+        width: 30px;
+        height: 30px;
+        text-align: center;
+        @include border-radius(5px);
+
+        img {
+          margin-bottom: 2px;
+        }
+
+        &:hover {
+          background-color: #ccc;
+        }
+      }
+    }
+  }
+
+  .awards-menu{
+    li {
+      float: left;
+      margin: 3px;
+    }
+  }
+}
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -67,9 +67,4 @@
      color: #3084bb !important;
    }
  }
-
-  .build-top-menu {
-    margin-top: 0;
-    margin-bottom: 2px;
-  }
 }
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -2,10 +2,6 @@
  display: block;
 }

-.commit-title{
-  margin-bottom: 10px;
-}
-
 .commit-author, .commit-committer{
  display: block;
  color: #999;
@@ -41,6 +37,8 @@
 .commit-box {
  .commit-title {
    margin: 0;
+    font-size: 23px;
+    color: #313236;
  }

  .commit-description {
@@ -108,16 +106,3 @@
    z-index: 2;
  }
 }
-
-.commit-ci-menu {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-  margin-top: 5px;
-  height: 56px;
-  margin: -16px;
-  padding: 16px;
-  text-align: center;
-  margin-top: 0px;
-  margin-bottom: 2px;
-}
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
+.detail-page-header {
+  margin: -$gl-padding;
+  padding: 7px $gl-padding;
+  margin-bottom: 0px;
+  border-bottom: 1px solid $border-color;
+  color: #5c5d5e;
+  font-size: 16px;
+  line-height: 42px;
+
+  .author {
+    color: #5c5d5e;
+  }
+
+  .identifier {
+    color: #5c5d5e;
+  }
+}
+
+.detail-page-description {
+  .title {
+    margin: 0;
+    font-size: 23px;
+    color: #313236;
+  }
+
+  .description {
+    margin-top: 6px;
+
+    p:last-child {
+      margin-bottom: 0;
+    }
+  }
+}
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -19,48 +19,38 @@
      color: #B94A48;
    }
  }
-  .commit-button-annotation {
-    display: inline-block;
-    margin: 0;
-    padding: 2px;
-
-    > * {
-      float: left;
-    }
-
-    .message {
-      display: inline-block;
-      margin: 5px 8px 0 8px;
-    }
-  }

  .file-title {
    @extend .monospace;
+
+    line-height: 42px;
+    padding-top: 7px;
+    padding-bottom: 7px;
  }

  .editor-ref {
    background: $background-color;
-    padding: 11px 15px;
+    padding-right: $gl-padding;
    border-right: 1px solid $border-color;
-    display: inline-block;
-    margin: -5px -5px;
+    display: block;
+    float: left;
    margin-right: 10px;
  }

  .editor-file-name {
-    .new-file-name {
-      display: inline-block;
-      width: 450px;
-    }
+    @extend .monospace;
+    
+    float: left;
+    margin-right: 10px;
+  }

-    .form-control {
-      margin-top: -3px;
-    }
+  .new-file-name {
+    display: inline-block;
+    width: 450px;
+    float: left;
  }

-  .form-actions {
-    margin: -$gl-padding;
-    margin-top: 0;
-    padding: $gl-padding
+  .select2 {
+    float: right;
  }
 }
--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
-.new-group-member-holder {
-  margin-top: 50px;
-  padding-top: 20px;
-}
-
 .member-search-form {
  float: left;
 }
@@ -15,4 +10,4 @@
  .form-control {
    height: 42px;
  }
-}
\ No newline at end of file
+}
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -24,20 +24,6 @@
  }
 }

-.issuable-context-title {
-  margin-bottom: 5px;
-
-  .avatar {
-    margin-left: 0;
-  }
-
-  label {
-    color: $gl-gray;
-    font-weight: normal;
-    margin-right: 4px;
-  }
-}
-
 .project-issuable-filter {
  .controls {
    float: right;
@@ -50,33 +36,11 @@
 }

 .issuable-details {
-  .page-title {
-    margin-top: -15px;
-    padding: 10px 0;
-    margin-bottom: 0;
-    color: #5c5d5e;
-    font-size: 16px;
-
-    .author {
-      color: #5c5d5e;
-    }
+  section {
+    border-right: 1px solid $border-white-light;

-    .issue-id {
-      color: #5c5d5e;
-    }
-  }
-
-  .issue-title {
-    margin: 0;
-    font-size: 23px;
-    color: #313236;
-  }
-
-  .description {
-    margin-top: 6px;
-
-    p:last-child {
-      margin-bottom: 0;
+    .issuable-discussion {
+      margin-right: 1px;
    }
  }
 }
@@ -89,83 +53,65 @@
  }
 }

-.cross-project-reference {
-  text-align: center;
-  width: 100%;
-
-  .slead {
-    padding: 5px;
-  }
-
-  span, button {
-    background-color: $background-color;
+.issuable-show-labels {
+  a {
+    margin-right: 5px;
+    margin-bottom: 5px;
+    display: inline-block;
+    .color-label {
+      padding: 6px 10px;
+    }
  }
 }

-.awards {
-  @include clearfix;
-  line-height: 34px;
-  margin: 2px 0;
-
-  .award {
-    @include border-radius(5px);
+.issuable-sidebar {
+  .block {
+    @include clearfix;
+    padding:  $gl-padding 0;
+    border-bottom: 1px solid #F0F0F0;

-    border: 1px solid;
-    padding: 0px 10px;
-    float: left;
-    margin: 0 5px;
-    border-color: $border-color;
-    cursor: pointer;
+    &:last-child {
+      border: none;
+    }
+  }

-    &.active {
-      border-color: $border-gray-light;
-      background-color: $gray-light;
+  .title {
+    color: $gl-text-color;
+    margin-bottom: 8px;

-      .counter {
-        font-weight: bold;
-      }
+    .avatar {
+      margin-left: 0;
    }

-    .icon {
-      float: left;
-      margin-right: 10px;
+    label {
+      font-weight: normal;
+      margin-right: 4px;
    }

-    .counter {
-      float: left;
+    .edit-link {
+      color: $gl-gray;
    }
  }

-  .awards-controls {
-    margin-left: 10px;
-    float: left;
+  .cross-project-reference {
+    font-weight: bold;
+    color: $gl-link-color;

-    .add-award {
-      font-size: 24px;
-      color: $gl-gray;
-      position: relative;
-      top: 2px;
-
-      &:hover,
-      &:link {
-        text-decoration: none;
-      }
+    button {
+      float: right;
    }
+  }

-    .awards-menu {
-      padding: $gl-padding;
-      min-width: 214px;
+  .selectbox {
+    display: none
+  }

-      > li {
-        margin: 5px;
-      }
-    }
+  .btn-clipboard {
+    color: $gl-gray;
  }

-  .awards-menu{
-    li {
-      float: left;
-      margin: 3px;
-    }
+  .participants .avatar {
+    margin-top: 6px;
+    margin-right: 2px;
  }
 }
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -56,21 +56,30 @@
  }
 }

-.issue-show-labels {
-  a {
-    margin-right: 5px;
-    margin-bottom: 5px;
-    display: inline-block;
-    .color-label {
-      padding: 6px 10px;
-    }
-  }
-}
-
 form.edit-issue {
  margin: 0;
 }

+.merge-requests-title {
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.merge-request-id {
+  display: inline-block;
+  width: 3em;
+}
+
+.merge-request-info {
+  padding-left: 5px;
+}
+
+.merge-request-status {
+  color: $gl-gray;
+  font-size: 15px;
+  font-weight: bold;
+}
+
 .merge-request,
 .issue {
  &.today {
@@ -132,11 +141,6 @@ form.edit-issue {
  }
 }

-.issue-closed-by-widget {
-  padding: 16px 0;
-  margin: 0px;
-}
-
 .issue-form .select2-container {
  width: 250px !important;
 }
--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
@@ -19,6 +19,7 @@
    h1:first-child {
      font-weight: normal;
      margin-bottom: 30px;
+      margin-top: 0;
    }

    img {

--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -4,7 +4,6 @@
 */
 .mr-state-widget {
  background: #F7F8FA;
-  margin-bottom: 20px;
  color: $gl-gray;
  border: 1px solid #dce0e6;
  @include border-radius(2px);
@@ -19,6 +18,7 @@
  .accept-merge-holder {
    .accept-action {
      display: inline-block;
+      float: left;

      .accept_merge_request {
        &.ci-pending,
@@ -37,14 +37,15 @@

    .accept-control {
      display: inline-block;
+      float: left;
      margin: 0;
      margin-left: 20px;
      padding: 5px;
+      padding-top: 12px;
      line-height: 20px;

      &.right {
        float: right;
-        padding-top: 12px;
        a {
          color: $gl-gray;
        }
@@ -82,12 +83,16 @@
    &.ci-error {
      color: $gl-danger;
    }
+
+    a.monospace {
+      color: inherit;
+    }
  }

  .mr-widget-body,
  .ci_widget,
  .mr-widget-footer {
-    padding: 15px;
+    padding: $gl-padding;
  }

  .normal {
@@ -116,28 +121,6 @@
  }
 }

-.merge-request .merge-request-tabs {
-  @include nav-menu;
-  margin: -$gl-padding;
-  padding: $gl-padding;
-  text-align: center;
-  margin-bottom: 1px;
-}
-
-// Mobile
-@media (max-width: 480px) {
-  .merge-request .merge-request-tabs {
-    margin: 0;
-    padding: 0;
-
-    li {
-      a {
-        padding: 0;
-      }
-    }
-  }
-}
-
 .mr_source_commit,
 .mr_target_commit {
  .commit {
@@ -155,7 +138,7 @@
  font-family: $monospace_font;
  font-weight: bold;
  overflow: hidden;
-  font-size: 14px;
+  font-size: 90%;
  margin: 0 3px;
 }

@@ -192,27 +175,12 @@
  line-height: 1.1;
 }

-.merge-request-form-info {
-  padding-top: 15px;
-}
-
 // hide mr close link for inline diff comment form
 .diff-file .close-mr-link,
 .diff-file .reopen-mr-link {
  display: none;
 }

-.merge-request-show-labels {
-  a {
-    margin-right: 5px;
-    margin-bottom: 5px;
-    display: inline-block;
-    .color-label {
-      padding: 6px 10px;
-    }
-  }
-}
-
 .merge-request-form .select2-container {
  width: 250px !important;
 }
@@ -223,7 +191,7 @@
  .btn-clipboard {
    @extend .pull-right;

-    margin-right: 18px;
+    margin-right: 20px;
    margin-top: 5px;
    position: absolute;
    right: 0;

--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -7,6 +7,7 @@
 }
 .reply-btn {
  @extend .btn-primary;
+  margin: 10px $gl-padding;
 }
 .diff-file .diff-content {
  tr.line_holder:hover {
@@ -38,9 +39,8 @@
 }

 .new_note, .edit_note {
-  .buttons {
-    margin-top: 8px;
-    margin-bottom: 3px;
+  .note-form-actions {
+    margin-top: $gl-padding;
  }

  .note-preview-holder {
@@ -79,8 +79,7 @@
  padding: $gl-padding;
  margin-left: -$gl-padding;
  margin-right: -$gl-padding;
-  border-right: 1px solid #ECEEF1;
-  border-top: 1px solid #ECEEF1;
+  border-top: 1px solid $border-color;
  margin-bottom: -$gl-padding;
 }

@@ -150,7 +149,6 @@

  .discussion-reply-holder {
    background: $background-color;
-    padding: 10px 15px;
    border-top: 1px solid $border-color;
  }
 }

--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -109,13 +109,9 @@ ul.notes {
          }
        }

-        // Reduce left padding of first task list ul element
-        ul.task-list:first-child {
-          padding-left: 10px;
-
-          // sub-tasks should be padded normally
-          ul {
-            padding-left: 20px;
+        ul.task-list {
+          ul:not(.task-list) {
+            padding-left: 1.3em;
          }
        }


--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -5,12 +5,6 @@
  }
 }

-.btn-build-token {
-  float: left;
-  padding: 6px 20px;
-  margin-right: 12px;
-}
-
 .profile-avatar-form-option {
  hr {
    margin: 10px 0;

--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -5,7 +5,7 @@
    font-weight: normal;
  }
 }
-.no-ssh-key-message {
+.no-ssh-key-message, .project-limit-message {
  background-color: #f28d35;
  margin-bottom: 16px;
 }
@@ -18,10 +18,6 @@
  }
 }

-.project-edit-content {
-  padding: 7px;
-}
-
 .project-name-holder {
  .help-inline {
    vertical-align: top;
@@ -30,12 +26,6 @@
 }

 .project-home-panel {
-  text-align: center;
-  background: #f7f8fa;
-  margin: -$gl-padding;
-  padding: $gl-padding;
-  padding: 44px 0 17px 0;
-
  .project-identicon-holder {
    margin-bottom: 16px;

@@ -90,7 +80,12 @@
  }

  .visibility-level-label {
+    @extend .btn;
+    @extend .btn-gray;
+
    color: $gray;
+    cursor: default;
+
    i {
      color: inherit;
    }
@@ -100,7 +95,6 @@
    display: inline-table;
    position: relative;
    top: 17px;
-    margin-bottom: 44px;
  }

  .project-repo-buttons {
@@ -178,6 +172,11 @@
    &:active {
      outline: none;
    }
+
+    &.btn-clipboard {
+      padding-left: 15px;
+      padding-right: 15px;
+    }
  }

  .active {
@@ -366,7 +365,7 @@ table.table.protected-branches-list tr.no-border {

 .project-stats {
  text-align: center;
-  margin-top: 15px;
+  margin-top: $gl-padding;
  margin-bottom: 0;
  padding-top: 10px;
  padding-bottom: 4px;
@@ -552,4 +551,4 @@ pre.light-well {
    z-index: 100;
    position: relative;
  }
-}
\ No newline at end of file
+}
--- a/app/assets/stylesheets/pages/snippets.scss
+++ b/app/assets/stylesheets/pages/snippets.scss
@@ -27,56 +27,28 @@
 }

 .snippet-holder {
-  .snippet-details {
-    .page-title {
-      margin-top: -15px;
-      padding: 10px 0;
-      margin-bottom: 0;
-      color: #5c5d5e;
-      font-size: 16px;
-
-      .author {
-        color: #5c5d5e;
-      }
-
-      .snippet-id {
-        color: #5c5d5e;
-      }
-    }
-
-    .snippet-title {
-      margin: 0;
-      font-size: 23px;
-      color: #313236;
-    }
-
-    @media (max-width: $screen-md-max) {
-      .new-snippet-link {
-        display: none;
-      }
-    }
-
-    @media (max-width: $screen-sm-max) {
-      .creator,
-      .page-title .btn-close {
-        display: none;
-      }
-    }
-  }
+  margin-bottom: -$gl-padding;

  .file-holder {
    border-top: 0;
  }
-}

+  .file-actions {
+    .btn-clipboard {
+      @extend .btn;
+    }
+  }
+}

 .snippet-box {
  @include border-radius(2px);

-  display: inline-block;
-  padding: 10px $gl-padding;
+  display: block;
+  float: left;
+  padding: 0 $gl-padding;
  font-weight: normal;
  margin-right: 10px;
  font-size: $gl-font-size;
  border: 1px solid;
+  line-height: 40px;
 }
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -35,3 +35,20 @@
    border-color: $gl-warning;
  }
 }
+
+.ci-status-icon-success {
+  @extend .cgreen;
+}
+.ci-status-icon-failed {
+  @extend .cred;
+}
+.ci-status-icon-running,
+.ci-status-icon-pending {
+  // These are standard text color
+}
+.ci-status-icon-canceled,
+.ci-status-icon-disabled,
+.ci-status-icon-not-found,
+.ci-status-icon-skipped {
+  @extend .cgray;
+}
--- a/app/assets/stylesheets/pages/ui_dev_kit.scss
+++ b/app/assets/stylesheets/pages/ui_dev_kit.scss
 .gitlab-ui-dev-kit {
  > h2 {
-    font-size: 27px;
-    border-bottom: 1px solid #CCC;
-    color: #666;
-    margin: 30px 0;
+    margin: 35px 0 20px;
    font-weight: bold;
  }
 }
--- a/app/assets/stylesheets/pages/wiki.scss
+++ b/app/assets/stylesheets/pages/wiki.scss
@@ -4,3 +4,8 @@
  margin-right: auto;
  padding-right: 7px;
 }
+
+.wiki-last-edit-by {
+  font-size: 80%;
+  font-weight: normal;
+}
--- a/app/controllers/abuse_reports_controller.rb
+++ b/app/controllers/abuse_reports_controller.rb
@@ -10,7 +10,7 @@ class AbuseReportsController < ApplicationController

    if @abuse_report.save
      if current_application_settings.admin_notification_email.present?
-        AbuseReportMailer.delay.notify(@abuse_report.id)
+        AbuseReportMailer.notify(@abuse_report.id).deliver_later
      end

      message = "Thank you for your report. A GitLab administrator will look into it shortly."

--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -13,6 +13,12 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
    end
  end

+  def reset_runners_token
+    @application_setting.reset_runners_registration_token!
+    flash[:notice] = 'New runners registration token has been generated!'
+    redirect_to admin_runners_path
+  end
+
  private

  def set_application_setting

--- a/app/controllers/admin/builds_controller.rb
+++ b/app/controllers/admin/builds_controller.rb
+class Admin::BuildsController < Admin::ApplicationController
+  def index
+    @scope = params[:scope]
+    @all_builds = Ci::Build
+    @builds = @all_builds.order('created_at DESC')
+    @builds =
+      case @scope
+      when 'all'
+        @builds
+      when 'finished'
+        @builds.finished
+      else
+        @builds.running_or_pending.reverse_order
+      end
+    @builds = @builds.page(params[:page]).per(30)
+  end
+
+  def cancel_all
+    Ci::Build.running_or_pending.each(&:cancel)
+
+    redirect_to admin_builds_path
+  end
+end
--- a/app/controllers/admin/impersonation_controller.rb
+++ b/app/controllers/admin/impersonation_controller.rb
@@ -5,14 +5,20 @@ class Admin::ImpersonationController < Admin::ApplicationController
  before_action :authorize_impersonator!

  def create
-    session[:impersonator_id] = current_user.username
-    session[:impersonator_return_to] = request.env['HTTP_REFERER']
+    if @user.blocked?
+      flash[:alert] = "You cannot impersonate a blocked user"

-    warden.set_user(user, scope: 'user')
+      redirect_to admin_user_path(@user)
+    else
+      session[:impersonator_id] = current_user.username
+      session[:impersonator_return_to] = admin_user_path(@user)
+
+      warden.set_user(user, scope: 'user')

-    flash[:alert] = "You are impersonating #{user.username}."
+      flash[:alert] = "You are impersonating #{user.username}."

-    redirect_to root_path
+      redirect_to root_path
+    end
  end

  def destroy

--- a/app/controllers/admin/runner_projects_controller.rb
+++ b/app/controllers/admin/runner_projects_controller.rb
+class Admin::RunnerProjectsController < Admin::ApplicationController
+  before_action :project, only: [:create]
+
+  def index
+    @runner_projects = project.runner_projects.all
+    @runner_project = project.runner_projects.new
+  end
+
+  def create
+    @runner = Ci::Runner.find(params[:runner_project][:runner_id])
+
+    if @runner.assign_to(@project, current_user)
+      redirect_to admin_runner_path(@runner)
+    else
+      redirect_to admin_runner_path(@runner), alert: 'Failed adding runner to project'
+    end
+  end
+
+  def destroy
+    rp = Ci::RunnerProject.find(params[:id])
+    runner = rp.runner
+    rp.destroy
+
+    redirect_to admin_runner_path(runner)
+  end
+
+  private
+
+  def project
+    @project = Project.find_with_namespace(
+      [params[:namespace_id], '/', params[:project_id]].join('')
+    )
+    @project || render_404
+  end
+end
--- a/app/controllers/admin/runners_controller.rb
+++ b/app/controllers/admin/runners_controller.rb
+class Admin::RunnersController < Admin::ApplicationController
+  before_action :runner, except: :index
+
+  def index
+    @runners = Ci::Runner.order('id DESC')
+    @runners = @runners.search(params[:search]) if params[:search].present?
+    @runners = @runners.page(params[:page]).per(30)
+    @active_runners_cnt = Ci::Runner.online.count
+  end
+
+  def show
+    @builds = @runner.builds.order('id DESC').first(30)
+    @projects =
+      if params[:search].present?
+        ::Project.search(params[:search])
+      else
+        Project.all
+      end
+    @projects = @projects.where.not(id: @runner.projects.select(:id)) if @runner.projects.any?
+    @projects = @projects.page(params[:page]).per(30)
+  end
+
+  def update
+    @runner.update_attributes(runner_params)
+
+    respond_to do |format|
+      format.js
+      format.html { redirect_to admin_runner_path(@runner) }
+    end
+  end
+
+  def destroy
+    @runner.destroy
+
+    redirect_to admin_runners_path
+  end
+
+  def resume
+    if @runner.update_attributes(active: true)
+      redirect_to admin_runners_path, notice: 'Runner was successfully updated.'
+    else
+      redirect_to admin_runners_path, alert: 'Runner was not updated.'
+    end
+  end
+
+  def pause
+    if @runner.update_attributes(active: false)
+      redirect_to admin_runners_path, notice: 'Runner was successfully updated.'
+    else
+      redirect_to admin_runners_path, alert: 'Runner was not updated.'
+    end
+  end
+
+  private
+
+  def runner
+    @runner ||= Ci::Runner.find(params[:id])
+  end
+
+  def runner_params
+    params.require(:runner).permit(:token, :description, :tag_list, :active)
+  end
+end
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
 class AutocompleteController < ApplicationController
  skip_before_action :authenticate_user!, only: [:users]
+  before_action :find_users, only: [:users]

  def users
-    begin
-      @users =
-        if params[:project_id].present?
-          project = Project.find(params[:project_id])
-
-          if can?(current_user, :read_project, project)
-            project.team.users
-          end
-        elsif params[:group_id]
-          group = Group.find(params[:group_id])
-
-          if can?(current_user, :read_group, group)
-            group.users
-          end
-        elsif current_user
-          User.all
-        end
-    rescue ActiveRecord::RecordNotFound
-      if current_user
-        return render json: {}, status: 404
-      end
-    end
-
-    if @users.nil? && current_user.nil?
-      authenticate_user!
-    end
-
    @users ||= User.none
    @users = @users.search(params[:search]) if params[:search].present?
    @users = @users.active
    @users = @users.reorder(:name)
    @users = @users.page(params[:page]).per(PER_PAGE)

-    unless params[:search].present?
+    if params[:search].blank?
      # Include current user if available to filter by "Me"
      if params[:current_user] && current_user
        @users = [*@users, current_user].uniq
@@ -49,4 +23,25 @@ class AutocompleteController < ApplicationController
    @user = User.find(params[:id])
    render json: @user, only: [:name, :username, :id], methods: [:avatar_url]
  end
+
+  private
+
+  def find_users
+    @users =
+      if params[:project_id].present?
+        project = Project.find(params[:project_id])
+        return render_404 unless can?(current_user, :read_project, project)
+
+        project.team.users
+      elsif params[:group_id].present?
+        group = Group.find(params[:group_id])
+        return render_404 unless can?(current_user, :read_group, group)
+
+        group.users
+      elsif current_user
+        User.all
+      else
+        User.none
+      end
+  end
 end
--- a/app/controllers/ci/admin/application_controller.rb
+++ b/app/controllers/ci/admin/application_controller.rb
-module Ci
-  module Admin
-    class ApplicationController < Ci::ApplicationController
-      before_action :authenticate_user!
-      before_action :authenticate_admin!
-
-      layout "ci/admin"
-    end
-  end
-end
--- a/app/controllers/ci/admin/application_settings_controller.rb
+++ b/app/controllers/ci/admin/application_settings_controller.rb
-module Ci
-  class Admin::ApplicationSettingsController < Ci::Admin::ApplicationController
-    before_action :set_application_setting
-
-    def show
-    end
-
-    def update
-      if @application_setting.update_attributes(application_setting_params)
-        redirect_to ci_admin_application_settings_path,
-          notice: 'Application settings saved successfully'
-      else
-        render :show
-      end
-    end
-
-    private
-
-    def set_application_setting
-      @application_setting = Ci::ApplicationSetting.current
-      @application_setting ||= Ci::ApplicationSetting.create_from_defaults
-    end
-
-    def application_setting_params
-      params.require(:application_setting).permit(
-        :all_broken_builds,
-        :add_pusher,
-      )
-    end
-  end
-end
--- a/app/controllers/ci/admin/builds_controller.rb
+++ b/app/controllers/ci/admin/builds_controller.rb
-module Ci
-  class Admin::BuildsController < Ci::Admin::ApplicationController
-    def index
-      @scope = params[:scope]
-      @builds = Ci::Build.order('created_at DESC').page(params[:page]).per(30)
-
-      @builds =
-        case @scope
-        when "pending"
-          @builds.pending
-        when "running"
-          @builds.running
-        else
-          @builds
-        end
-    end
-  end
-end
--- a/app/controllers/ci/admin/events_controller.rb
+++ b/app/controllers/ci/admin/events_controller.rb
-module Ci
-  class Admin::EventsController < Ci::Admin::ApplicationController
-    EVENTS_PER_PAGE = 50
-
-    def index
-      @events = Ci::Event.admin.order('created_at DESC').page(params[:page]).per(EVENTS_PER_PAGE)
-    end
-  end
-end
--- a/app/controllers/ci/admin/projects_controller.rb
+++ b/app/controllers/ci/admin/projects_controller.rb
-module Ci
-  class Admin::ProjectsController < Ci::Admin::ApplicationController
-    def index
-      @projects = Ci::Project.ordered_by_last_commit_date.page(params[:page]).per(30)
-    end
-
-    def destroy
-      project.destroy
-
-      redirect_to ci_projects_url
-    end
-
-    protected
-
-    def project
-      @project ||= Ci::Project.find(params[:id])
-    end
-  end
-end
--- a/app/controllers/ci/admin/runner_projects_controller.rb
+++ b/app/controllers/ci/admin/runner_projects_controller.rb
-module Ci
-  class Admin::RunnerProjectsController < Ci::Admin::ApplicationController
-    layout 'ci/project'
-
-    def index
-      @runner_projects = project.runner_projects.all
-      @runner_project = project.runner_projects.new
-    end
-
-    def create
-      @runner = Ci::Runner.find(params[:runner_project][:runner_id])
-
-      if @runner.assign_to(project, current_user)
-        redirect_to ci_admin_runner_path(@runner)
-      else
-        redirect_to ci_admin_runner_path(@runner), alert: 'Failed adding runner to project'
-      end
-    end
-
-    def destroy
-      rp = Ci::RunnerProject.find(params[:id])
-      runner = rp.runner
-      rp.destroy
-
-      redirect_to ci_admin_runner_path(runner)
-    end
-
-    private
-
-    def project
-      @project ||= Ci::Project.find(params[:project_id])
-    end
-  end
-end
--- a/app/controllers/ci/admin/runners_controller.rb
+++ b/app/controllers/ci/admin/runners_controller.rb
-module Ci
-  class Admin::RunnersController < Ci::Admin::ApplicationController
-    before_action :runner, except: :index
-
-    def index
-      @runners = Ci::Runner.order('id DESC')
-      @runners = @runners.search(params[:search]) if params[:search].present?
-      @runners = @runners.page(params[:page]).per(30)
-      @active_runners_cnt = Ci::Runner.online.count
-    end
-
-    def show
-      @builds = @runner.builds.order('id DESC').first(30)
-      @projects = Ci::Project.all
-      if params[:search].present?
-        @gl_projects = ::Project.search(params[:search])
-        @projects = @projects.where(gitlab_id: @gl_projects.select(:id))
-      end
-      @projects = @projects.where("ci_projects.id NOT IN (?)", @runner.projects.pluck(:id)) if @runner.projects.any?
-      @projects = @projects.joins(:gl_project)
-      @projects = @projects.page(params[:page]).per(30)
-    end
-
-    def update
-      @runner.update_attributes(runner_params)
-
-      respond_to do |format|
-        format.js
-        format.html { redirect_to ci_admin_runner_path(@runner) }
-      end
-    end
-
-    def destroy
-      @runner.destroy
-
-      redirect_to ci_admin_runners_path
-    end
-
-    def resume
-      if @runner.update_attributes(active: true)
-        redirect_to ci_admin_runners_path, notice: 'Runner was successfully updated.'
-      else
-        redirect_to ci_admin_runners_path, alert: 'Runner was not updated.'
-      end
-    end
-
-    def pause
-      if @runner.update_attributes(active: false)
-        redirect_to ci_admin_runners_path, notice: 'Runner was successfully updated.'
-      else
-        redirect_to ci_admin_runners_path, alert: 'Runner was not updated.'
-      end
-    end
-
-    def assign_all
-      Ci::Project.unassigned(@runner).all.each do |project|
-        @runner.assign_to(project, current_user)
-      end
-
-      redirect_to ci_admin_runner_path(@runner), notice: "Runner was assigned to all projects"
-    end
-
-    private
-
-    def runner
-      @runner ||= Ci::Runner.find(params[:id])
-    end
-
-    def runner_params
-      params.require(:runner).permit(:token, :description, :tag_list, :active)
-    end
-  end
-end
--- a/app/controllers/ci/application_controller.rb
+++ b/app/controllers/ci/application_controller.rb
@@ -4,24 +4,16 @@ module Ci
      "app/helpers/ci"
    end

-    helper_method :gl_project
-
    private

-    def authenticate_token!
-      unless project.valid_token?(params[:token])
-        return head(403)
-      end
-    end
-
    def authorize_access_project!
-      unless can?(current_user, :read_project, gl_project)
+      unless can?(current_user, :read_project, project)
        return page_404
      end
    end

    def authorize_manage_builds!
-      unless can?(current_user, :manage_builds, gl_project)
+      unless can?(current_user, :manage_builds, project)
        return page_404
      end
    end
@@ -31,7 +23,7 @@ module Ci
    end

    def authorize_manage_project!
-      unless can?(current_user, :admin_project, gl_project)
+      unless can?(current_user, :admin_project, project)
        return page_404
      end
    end
@@ -58,9 +50,5 @@ module Ci
        count: count
      }
    end
-
-    def gl_project
-      ::Project.find(@project.gitlab_id)
-    end
  end
 end
--- a/app/controllers/ci/lints_controller.rb
+++ b/app/controllers/ci/lints_controller.rb
 module Ci
-  class LintsController < Ci::ApplicationController
+  class LintsController < ApplicationController
    before_action :authenticate_user!

    def show

--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@@ -3,13 +3,12 @@ module Ci
    before_action :project, except: [:index]
    before_action :authenticate_user!, except: [:index, :build, :badge]
    before_action :authorize_access_project!, except: [:index, :badge]
-    before_action :authorize_manage_project!, only: [:toggle_shared_runners, :dumped_yaml]
    before_action :no_cache, only: [:badge]
    protect_from_forgery

    def show
      # Temporary compatibility with CI badges pointing to CI project page
-      redirect_to namespace_project_path(project.gl_project.namespace, project.gl_project)
+      redirect_to namespace_project_path(project.namespace, project)
    end

    # Project status badge
@@ -20,16 +19,10 @@ module Ci
      send_file image.path, filename: image.name, disposition: 'inline', type:"image/svg+xml"
    end

-    def toggle_shared_runners
-      project.toggle!(:shared_runners_enabled)
-
-      redirect_to namespace_project_runners_path(project.gl_project.namespace, project.gl_project)
-    end
-
    protected

    def project
-      @project ||= Ci::Project.find(params[:id])
+      @project ||= Project.find_by(ci_id: params[:id].to_i)
    end

    def no_cache

--- a/app/controllers/ci/runner_projects_controller.rb
+++ b/app/controllers/ci/runner_projects_controller.rb
-module Ci
-  class RunnerProjectsController < Ci::ApplicationController
-    before_action :authenticate_user!
-    before_action :project
-    before_action :authorize_manage_project!
-
-    def create
-      @runner = Ci::Runner.find(params[:runner_project][:runner_id])
-
-      return head(403) unless current_user.ci_authorized_runners.include?(@runner)
-
-      path = runners_path(@project.gl_project)
-
-      if @runner.assign_to(project, current_user)
-        redirect_to path
-      else
-        redirect_to path, alert: 'Failed adding runner to project'
-      end
-    end
-
-    def destroy
-      runner_project = project.runner_projects.find(params[:id])
-      runner_project.destroy
-
-      redirect_to runners_path(@project.gl_project)
-    end
-
-    private
-
-    def project
-      @project ||= Ci::Project.find(params[:project_id])
-    end
-  end
-end
--- a/app/controllers/concerns/global_milestones.rb
+++ b/app/controllers/concerns/global_milestones.rb
@@ -2,8 +2,10 @@ module GlobalMilestones
  extend ActiveSupport::Concern

  def milestones
+    epoch = DateTime.parse('1970-01-01')
    @milestones = MilestonesFinder.new.execute(@projects, params)
    @milestones = GlobalMilestone.build_collection(@milestones)
+    @milestones = @milestones.sort_by { |x| x.due_date.nil? ? epoch : x.due_date }
    @milestones = Kaminari.paginate_array(@milestones).page(params[:page]).per(ApplicationController::PER_PAGE)
  end


--- a/app/controllers/dashboard/snippets_controller.rb
+++ b/app/controllers/dashboard/snippets_controller.rb
 class Dashboard::SnippetsController < Dashboard::ApplicationController
  def index
-    @snippets = SnippetsFinder.new.execute(current_user,
+    @snippets = SnippetsFinder.new.execute(
+      current_user,
      filter: :by_user,
      user: current_user,
      scope: params[:scope]

--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -46,7 +46,7 @@ class Groups::MilestonesController < Groups::ApplicationController
  end

  def milestone_path(title)
-    group_milestone_path(@group, title.parameterize, title: title)
+    group_milestone_path(@group, title.to_slug.to_s, title: title)
  end

  def projects

--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@ -40,7 +40,9 @@ class PasswordsController < Devise::PasswordsController
  def throttle_reset
    return unless resource && resource.recently_sent_password_reset?

-    redirect_to new_password_path(resource_name),
-      alert: I18n.t('devise.passwords.recently_reset')
+    # Throttle reset attempts, but return a normal message to
+    # avoid user enumeration attack.
+    redirect_to new_user_session_path,
+      notice: I18n.t('devise.passwords.send_paranoid_instructions')
  end
 end
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -70,6 +70,7 @@ class ProfilesController < Profiles::ApplicationController
      :email,
      :hide_no_password,
      :hide_no_ssh_key,
+      :hide_project_limit,
      :linkedin,
      :location,
      :name,

--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -21,18 +21,14 @@ class Projects::ApplicationController < ApplicationController
    unless @repository.branch_names.include?(@ref)
      redirect_to(
        namespace_project_tree_path(@project.namespace, @project, @ref),
-        notice: "This action is not allowed unless you are on top of a branch"
+        notice: "This action is not allowed unless you are on a branch"
      )
    end
  end

  private

-  def ci_enabled
+  def builds_enabled
    return render_404 unless @project.builds_enabled?
  end
-
-  def ci_project
-    @ci_project ||= @project.ensure_gitlab_ci_project
-  end
 end
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -162,12 +162,20 @@ class Projects::BlobController < Projects::ApplicationController
  end

  def sanitized_new_branch_name
-    @new_branch ||= sanitize(strip_tags(params[:new_branch]))
+    sanitize(strip_tags(params[:new_branch]))
  end

  def editor_variables
    @current_branch = @ref
-    @new_branch = params[:new_branch].present? ? sanitized_new_branch_name : @ref
+
+    @new_branch =
+      if params[:new_branch].present?
+        sanitized_new_branch_name
+      elsif ::Gitlab::GitAccess.new(current_user, @project).can_push_to_branch?(@ref)
+        @ref
+      else
+        @repository.next_patch_branch
+      end

    @file_path =
      if action_name.to_s == 'create'

--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -3,7 +3,7 @@ class Projects::BranchesController < Projects::ApplicationController
  # Authorize
  before_action :require_non_empty_project
  before_action :authorize_download_code!
-  before_action :authorize_push_code!, only: [:create, :destroy]
+  before_action :authorize_push_code!, only: [:new, :create, :destroy]

  def index
    @sort = params[:sort] || 'name'

--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
--- a/app/controllers/projects/ci_services_controller.rb
+++ b/app/controllers/projects/ci_services_controller.rb
--- a/app/controllers/projects/ci_settings_controller.rb
+++ b/app/controllers/projects/ci_settings_controller.rb
--- a/app/controllers/projects/ci_web_hooks_controller.rb
+++ b/app/controllers/projects/ci_web_hooks_controller.rb
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
--- a/app/controllers/projects/graphs_controller.rb
+++ b/app/controllers/projects/graphs_controller.rb
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
--- a/app/controllers/projects/raw_controller.rb
+++ b/app/controllers/projects/raw_controller.rb
--- a/app/controllers/projects/runner_projects_controller.rb
+++ b/app/controllers/projects/runner_projects_controller.rb
--- a/app/controllers/projects/runners_controller.rb
+++ b/app/controllers/projects/runners_controller.rb
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
--- a/app/controllers/projects/triggers_controller.rb
+++ b/app/controllers/projects/triggers_controller.rb
--- a/app/controllers/projects/variables_controller.rb
+++ b/app/controllers/projects/variables_controller.rb
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
--- a/app/finders/milestones_finder.rb
+++ b/app/finders/milestones_finder.rb
--- a/app/finders/projects_finder.rb
+++ b/app/finders/projects_finder.rb
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
--- a/app/helpers/branches_helper.rb
+++ b/app/helpers/branches_helper.rb
--- a/app/helpers/button_helper.rb
+++ b/app/helpers/button_helper.rb
--- a/app/helpers/ci/gitlab_helper.rb
+++ b/app/helpers/ci/gitlab_helper.rb
--- a/app/helpers/ci/projects_helper.rb
+++ b/app/helpers/ci/projects_helper.rb
--- a/app/helpers/ci_badge_helper.rb
+++ b/app/helpers/ci_badge_helper.rb
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
--- a/app/helpers/clipboard_helper.rb
+++ b/app/helpers/clipboard_helper.rb
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
--- a/app/helpers/emails_helper.rb
+++ b/app/helpers/emails_helper.rb
--- a/app/helpers/external_wiki_helper.rb
+++ b/app/helpers/external_wiki_helper.rb
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
--- a/app/helpers/gitlab_routing_helper.rb
+++ b/app/helpers/gitlab_routing_helper.rb
--- a/app/helpers/graph_helper.rb
+++ b/app/helpers/graph_helper.rb
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
--- a/app/helpers/namespaces_helper.rb
+++ b/app/helpers/namespaces_helper.rb
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
--- a/app/helpers/runners_helper.rb
+++ b/app/helpers/runners_helper.rb
--- a/app/helpers/selects_helper.rb
+++ b/app/helpers/selects_helper.rb
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
--- a/app/helpers/triggers_helper.rb
+++ b/app/helpers/triggers_helper.rb
--- a/app/helpers/visibility_level_helper.rb
+++ b/app/helpers/visibility_level_helper.rb
--- a/app/mailers/base_mailer.rb
+++ b/app/mailers/base_mailer.rb
--- a/app/mailers/ci/emails/builds.rb
+++ b/app/mailers/ci/emails/builds.rb
--- a/app/mailers/ci/notify.rb
+++ b/app/mailers/ci/notify.rb
--- a/app/mailers/emails/builds.rb
+++ b/app/mailers/emails/builds.rb
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
--- a/app/models/broadcast_message.rb
+++ b/app/models/broadcast_message.rb
--- a/app/models/ci/application_setting.rb
+++ b/app/models/ci/application_setting.rb
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
--- a/app/models/ci/event.rb
+++ b/app/models/ci/event.rb
--- a/app/models/ci/project.rb
+++ b/app/models/ci/project.rb
--- a/app/models/ci/project_status.rb
+++ b/app/models/ci/project_status.rb
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
--- a/app/models/ci/runner_project.rb
+++ b/app/models/ci/runner_project.rb
--- a/app/models/ci/service.rb
+++ b/app/models/ci/service.rb
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
--- a/app/models/ci/variable.rb
+++ b/app/models/ci/variable.rb
--- a/app/models/ci/web_hook.rb
+++ b/app/models/ci/web_hook.rb
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
--- a/app/models/commit_range.rb
+++ b/app/models/commit_range.rb
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
--- a/app/models/concerns/participable.rb
+++ b/app/models/concerns/participable.rb
--- a/app/models/concerns/referable.rb
+++ b/app/models/concerns/referable.rb
--- a/app/models/concerns/strip_attribute.rb
+++ b/app/models/concerns/strip_attribute.rb
--- a/app/models/concerns/taskable.rb
+++ b/app/models/concerns/taskable.rb
--- a/app/models/concerns/token_authenticatable.rb
+++ b/app/models/concerns/token_authenticatable.rb
--- a/app/models/event.rb
+++ b/app/models/event.rb
--- a/app/models/global_milestone.rb
+++ b/app/models/global_milestone.rb
--- a/app/models/hooks/project_hook.rb
+++ b/app/models/hooks/project_hook.rb
--- a/app/models/hooks/web_hook.rb
+++ b/app/models/hooks/web_hook.rb
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
--- a/app/models/label.rb
+++ b/app/models/label.rb
--- a/app/models/lfs_object.rb
+++ b/app/models/lfs_object.rb
--- a/app/models/lfs_objects_project.rb
+++ b/app/models/lfs_objects_project.rb
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/app/models/project.rb
+++ b/app/models/project.rb
--- a/app/models/project_services/bamboo_service.rb
+++ b/app/models/project_services/bamboo_service.rb
--- a/app/models/project_services/buildkite_service.rb
+++ b/app/models/project_services/buildkite_service.rb
--- a/spec/models/project_services/gitlab_ci_service_spec.rb
+++ b/spec/models/project_services/gitlab_ci_service_spec.rb
--- a/app/models/project_services/ci/hip_chat_message.rb
+++ b/app/models/project_services/ci/hip_chat_message.rb
--- a/app/models/project_services/ci/hip_chat_service.rb
+++ b/app/models/project_services/ci/hip_chat_service.rb
--- a/app/models/project_services/ci/mail_service.rb
+++ b/app/models/project_services/ci/mail_service.rb
--- a/app/models/project_services/ci/slack_message.rb
+++ b/app/models/project_services/ci/slack_message.rb
--- a/app/models/project_services/ci/slack_service.rb
+++ b/app/models/project_services/ci/slack_service.rb
--- a/app/models/project_services/drone_ci_service.rb
+++ b/app/models/project_services/drone_ci_service.rb
--- a/app/models/project_services/external_wiki_service.rb
+++ b/app/models/project_services/external_wiki_service.rb
--- a/app/models/project_services/flowdock_service.rb
+++ b/app/models/project_services/flowdock_service.rb
--- a/app/models/project_services/gemnasium_service.rb
+++ b/app/models/project_services/gemnasium_service.rb
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
--- a/app/models/project_services/slack_service.rb
+++ b/app/models/project_services/slack_service.rb
--- a/app/models/project_services/slack_service/base_message.rb
+++ b/app/models/project_services/slack_service/base_message.rb
--- a/app/models/project_services/slack_service/build_message.rb
+++ b/app/models/project_services/slack_service/build_message.rb
--- a/app/models/project_services/teamcity_service.rb
+++ b/app/models/project_services/teamcity_service.rb
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
--- a/app/models/service.rb
+++ b/app/models/service.rb
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
--- a/app/models/user.rb
+++ b/app/models/user.rb
--- a/app/models/users_star_project.rb
+++ b/app/models/users_star_project.rb
--- a/app/services/ci/create_builds_service.rb
+++ b/app/services/ci/create_builds_service.rb
--- a/app/services/ci/create_commit_service.rb
+++ b/app/services/ci/create_commit_service.rb
--- a/app/services/ci/create_trigger_request_service.rb
+++ b/app/services/ci/create_trigger_request_service.rb
--- a/app/services/ci/event_service.rb
+++ b/app/services/ci/event_service.rb
--- a/app/services/ci/image_for_build_service.rb
+++ b/app/services/ci/image_for_build_service.rb
--- a/app/services/ci/register_build_service.rb
+++ b/app/services/ci/register_build_service.rb
--- a/app/services/ci/test_hook_service.rb
+++ b/app/services/ci/test_hook_service.rb
--- a/app/services/create_branch_service.rb
+++ b/app/services/create_branch_service.rb
--- a/app/services/create_commit_builds_service.rb
+++ b/app/services/create_commit_builds_service.rb
--- a/app/services/create_release_service.rb
+++ b/app/services/create_release_service.rb
--- a/app/services/create_tag_service.rb
+++ b/app/services/create_tag_service.rb
--- a/app/services/delete_branch_service.rb
+++ b/app/services/delete_branch_service.rb
--- a/app/services/files/base_service.rb
+++ b/app/services/files/base_service.rb
--- a/app/services/git_hooks_service.rb
+++ b/app/services/git_hooks_service.rb
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
--- a/app/services/git_tag_push_service.rb
+++ b/app/services/git_tag_push_service.rb
--- a/app/services/gravatar_service.rb
+++ b/app/services/gravatar_service.rb
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
--- a/app/services/issues/update_service.rb
+++ b/app/services/issues/update_service.rb
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
--- a/app/services/merge_requests/merge_when_build_succeeds_service.rb
+++ b/app/services/merge_requests/merge_when_build_succeeds_service.rb
--- a/app/services/merge_requests/refresh_service.rb
+++ b/app/services/merge_requests/refresh_service.rb
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
--- a/app/services/projects/fork_service.rb
+++ b/app/services/projects/fork_service.rb
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
--- a/app/services/update_release_service.rb
+++ b/app/services/update_release_service.rb
--- a/app/uploaders/artifact_uploader.rb
+++ b/app/uploaders/artifact_uploader.rb
--- a/app/validators/color_validator.rb
+++ b/app/validators/color_validator.rb
--- a/lib/email_validator.rb
+++ b/lib/email_validator.rb
--- a/app/validators/line_code_validator.rb
+++ b/app/validators/line_code_validator.rb
--- a/app/validators/namespace_name_validator.rb
+++ b/app/validators/namespace_name_validator.rb
--- a/app/validators/namespace_validator.rb
+++ b/app/validators/namespace_validator.rb
--- a/app/validators/url_validator.rb
+++ b/app/validators/url_validator.rb
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
--- a/app/views/admin/builds/_build.html.haml
+++ b/app/views/admin/builds/_build.html.haml
--- a/app/views/admin/builds/index.html.haml
+++ b/app/views/admin/builds/index.html.haml
--- a/app/views/admin/labels/_form.html.haml
+++ b/app/views/admin/labels/_form.html.haml
--- a/app/views/admin/labels/_label.html.haml
+++ b/app/views/admin/labels/_label.html.haml
--- a/app/views/admin/labels/edit.html.haml
+++ b/app/views/admin/labels/edit.html.haml
--- a/app/views/admin/labels/new.html.haml
+++ b/app/views/admin/labels/new.html.haml
--- a/app/views/ci/admin/runners/_runner.html.haml
+++ b/app/views/ci/admin/runners/_runner.html.haml
--- a/app/views/ci/admin/runners/index.html.haml
+++ b/app/views/ci/admin/runners/index.html.haml
--- a/app/views/ci/admin/runners/show.html.haml
+++ b/app/views/ci/admin/runners/show.html.haml
--- a/app/views/ci/admin/runners/update.js.haml
+++ b/app/views/ci/admin/runners/update.js.haml
--- a/app/views/admin/users/_head.html.haml
+++ b/app/views/admin/users/_head.html.haml
--- a/app/views/admin/users/_projects.html.haml
+++ b/app/views/admin/users/_projects.html.haml
--- a/app/views/admin/users/edit.html.haml
+++ b/app/views/admin/users/edit.html.haml
--- a/app/views/admin/users/projects.html.haml
+++ b/app/views/admin/users/projects.html.haml
--- a/app/views/ci/admin/application_settings/_form.html.haml
+++ b/app/views/ci/admin/application_settings/_form.html.haml
--- a/app/views/ci/admin/application_settings/show.html.haml
+++ b/app/views/ci/admin/application_settings/show.html.haml
--- a/app/views/ci/admin/builds/_build.html.haml
+++ b/app/views/ci/admin/builds/_build.html.haml
--- a/app/views/ci/admin/builds/index.html.haml
+++ b/app/views/ci/admin/builds/index.html.haml
--- a/app/views/ci/admin/events/index.html.haml
+++ b/app/views/ci/admin/events/index.html.haml
--- a/app/views/ci/admin/projects/_project.html.haml
+++ b/app/views/ci/admin/projects/_project.html.haml
--- a/app/views/ci/admin/projects/index.html.haml
+++ b/app/views/ci/admin/projects/index.html.haml
--- a/app/views/ci/admin/runner_projects/index.html.haml
+++ b/app/views/ci/admin/runner_projects/index.html.haml
--- a/app/views/ci/commits/_commit.html.haml
+++ b/app/views/ci/commits/_commit.html.haml
--- a/app/views/ci/shared/_guide.html.haml
+++ b/app/views/ci/shared/_guide.html.haml
--- a/app/views/ci/user_sessions/new.html.haml
+++ b/app/views/ci/user_sessions/new.html.haml
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
--- a/app/views/dashboard/groups/index.html.haml
+++ b/app/views/dashboard/groups/index.html.haml
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
--- a/app/views/dashboard/milestones/_milestone.html.haml
+++ b/app/views/dashboard/milestones/_milestone.html.haml
--- a/app/views/dashboard/milestones/index.html.haml
+++ b/app/views/dashboard/milestones/index.html.haml
--- a/app/views/dashboard/milestones/show.html.haml
+++ b/app/views/dashboard/milestones/show.html.haml
--- a/app/views/dashboard/projects/index.html.haml
+++ b/app/views/dashboard/projects/index.html.haml
--- a/app/views/dashboard/projects/starred.html.haml
+++ b/app/views/dashboard/projects/starred.html.haml
--- a/app/views/events/_commit.html.haml
+++ b/app/views/events/_commit.html.haml
--- a/app/views/explore/projects/_filter.html.haml
+++ b/app/views/explore/projects/_filter.html.haml
--- a/app/views/explore/projects/index.html.haml
+++ b/app/views/explore/projects/index.html.haml
--- a/app/views/explore/projects/starred.html.haml
+++ b/app/views/explore/projects/starred.html.haml
--- a/app/views/explore/projects/trending.html.haml
+++ b/app/views/explore/projects/trending.html.haml
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
--- a/app/views/groups/group_members/_group_member.html.haml
+++ b/app/views/groups/group_members/_group_member.html.haml
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
--- a/app/views/groups/group_members/update.js.haml
+++ b/app/views/groups/group_members/update.js.haml
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
--- a/app/views/groups/milestones/index.html.haml
+++ b/app/views/groups/milestones/index.html.haml
--- a/app/views/groups/milestones/new.html.haml
+++ b/app/views/groups/milestones/new.html.haml
--- a/app/views/groups/milestones/show.html.haml
+++ b/app/views/groups/milestones/show.html.haml
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
--- a/app/views/help/ui.html.haml
+++ b/app/views/help/ui.html.haml
--- a/app/views/import/bitbucket/status.html.haml
+++ b/app/views/import/bitbucket/status.html.haml
--- a/app/views/import/fogbugz/new.html.haml
+++ b/app/views/import/fogbugz/new.html.haml
--- a/app/views/import/fogbugz/new_user_map.html.haml
+++ b/app/views/import/fogbugz/new_user_map.html.haml
--- a/app/views/import/fogbugz/status.html.haml
+++ b/app/views/import/fogbugz/status.html.haml
--- a/app/views/import/github/status.html.haml
+++ b/app/views/import/github/status.html.haml
--- a/app/views/import/gitlab/status.html.haml
+++ b/app/views/import/gitlab/status.html.haml
--- a/app/views/import/gitorious/status.html.haml
+++ b/app/views/import/gitorious/status.html.haml
--- a/app/views/import/google_code/new.html.haml
+++ b/app/views/import/google_code/new.html.haml
--- a/app/views/import/google_code/new_user_map.html.haml
+++ b/app/views/import/google_code/new_user_map.html.haml
--- a/app/views/import/google_code/status.html.haml
+++ b/app/views/import/google_code/status.html.haml
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
--- a/app/views/layouts/ci/_nav_admin.html.haml
+++ b/app/views/layouts/ci/_nav_admin.html.haml
--- a/app/views/layouts/ci/_nav_project.html.haml
+++ b/app/views/layouts/ci/_nav_project.html.haml
--- a/app/views/layouts/ci/_page.html.haml
+++ b/app/views/layouts/ci/_page.html.haml
--- a/app/views/layouts/ci/admin.html.haml
+++ b/app/views/layouts/ci/admin.html.haml
--- a/app/views/layouts/ci/application.html.haml
+++ b/app/views/layouts/ci/application.html.haml
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
--- a/app/views/layouts/errors.html.haml
+++ b/app/views/layouts/errors.html.haml
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
--- a/app/views/layouts/nav/_explore.html.haml
+++ b/app/views/layouts/nav/_explore.html.haml
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
--- a/app/views/layouts/nav/_group_settings.html.haml
+++ b/app/views/layouts/nav/_group_settings.html.haml
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
--- a/app/views/ci/notify/build_fail_email.html.haml
+++ b/app/views/ci/notify/build_fail_email.html.haml
--- a/app/views/ci/notify/build_fail_email.text.erb
+++ b/app/views/ci/notify/build_fail_email.text.erb
--- a/app/views/ci/notify/build_success_email.html.haml
+++ b/app/views/ci/notify/build_success_email.html.haml
--- a/app/views/ci/notify/build_success_email.text.erb
+++ b/app/views/ci/notify/build_success_email.text.erb
--- a/app/views/notify/repository_push_email.html.haml
+++ b/app/views/notify/repository_push_email.html.haml
--- a/app/views/notify/repository_push_email.text.haml
+++ b/app/views/notify/repository_push_email.text.haml
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
--- a/app/views/profiles/applications.html.haml
+++ b/app/views/profiles/applications.html.haml
--- a/app/views/profiles/keys/_form.html.haml
+++ b/app/views/profiles/keys/_form.html.haml
--- a/app/views/profiles/keys/_key_table.html.haml
+++ b/app/views/profiles/keys/_key_table.html.haml
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
--- a/app/views/profiles/keys/new.html.haml
+++ b/app/views/profiles/keys/new.html.haml
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
--- a/app/views/projects/_commit_button.html.haml
+++ b/app/views/projects/_commit_button.html.haml
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
--- a/app/views/projects/_last_commit.html.haml
+++ b/app/views/projects/_last_commit.html.haml
--- a/app/views/projects/_md_preview.html.haml
+++ b/app/views/projects/_md_preview.html.haml
--- a/app/views/projects/_readme.html.haml
+++ b/app/views/projects/_readme.html.haml
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
--- a/app/views/projects/blob/_actions.html.haml
+++ b/app/views/projects/blob/_actions.html.haml
--- a/app/views/projects/blob/_blob.html.haml
+++ b/app/views/projects/blob/_blob.html.haml
--- a/app/views/projects/blob/_download.html.haml
+++ b/app/views/projects/blob/_download.html.haml
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
--- a/app/views/projects/blob/_new_dir.html.haml
+++ b/app/views/projects/blob/_new_dir.html.haml
--- a/app/views/projects/blob/_upload.html.haml
+++ b/app/views/projects/blob/_upload.html.haml
--- a/app/views/projects/blob/edit.html.haml
+++ b/app/views/projects/blob/edit.html.haml
--- a/app/views/projects/blob/new.html.haml
+++ b/app/views/projects/blob/new.html.haml
--- a/app/views/projects/blob/show.html.haml
+++ b/app/views/projects/blob/show.html.haml
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
--- a/app/views/projects/branches/_commit.html.haml
+++ b/app/views/projects/branches/_commit.html.haml
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
--- a/app/views/projects/branches/new.html.haml
+++ b/app/views/projects/branches/new.html.haml
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
--- a/app/views/projects/ci_services/_form.html.haml
+++ b/app/views/projects/ci_services/_form.html.haml
--- a/app/views/projects/ci_services/edit.html.haml
+++ b/app/views/projects/ci_services/edit.html.haml
--- a/app/views/projects/ci_services/index.html.haml
+++ b/app/views/projects/ci_services/index.html.haml
--- a/app/views/projects/ci_settings/_form.html.haml
+++ b/app/views/projects/ci_settings/_form.html.haml
--- a/app/views/projects/ci_settings/_no_runners.html.haml
+++ b/app/views/projects/ci_settings/_no_runners.html.haml
--- a/app/views/projects/ci_settings/edit.html.haml
+++ b/app/views/projects/ci_settings/edit.html.haml
--- a/app/views/projects/ci_web_hooks/index.html.haml
+++ b/app/views/projects/ci_web_hooks/index.html.haml
--- a/app/views/projects/commit/_builds.html.haml
+++ b/app/views/projects/commit/_builds.html.haml
--- a/app/views/projects/commit/_ci_menu.html.haml
+++ b/app/views/projects/commit/_ci_menu.html.haml
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
--- a/app/views/projects/commit/builds.html.haml
+++ b/app/views/projects/commit/builds.html.haml
--- a/app/views/projects/commit/show.html.haml
+++ b/app/views/projects/commit/show.html.haml
--- a/app/views/projects/commit_statuses/_commit_status.html.haml
+++ b/app/views/projects/commit_statuses/_commit_status.html.haml
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
--- a/app/views/projects/commits/show.atom.builder
+++ b/app/views/projects/commits/show.atom.builder
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
--- a/app/views/projects/deploy_keys/_form.html.haml
+++ b/app/views/projects/deploy_keys/_form.html.haml
--- a/app/views/projects/deploy_keys/new.html.haml
+++ b/app/views/projects/deploy_keys/new.html.haml
--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
--- a/app/views/projects/graphs/_head.html.haml
+++ b/app/views/projects/graphs/_head.html.haml
--- a/app/views/projects/graphs/ci/_overall.haml
+++ b/app/views/projects/graphs/ci/_overall.haml
--- a/app/views/projects/graphs/languages.html.haml
+++ b/app/views/projects/graphs/languages.html.haml
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
--- a/app/views/projects/issues/_closed_by_box.html.haml
+++ b/app/views/projects/issues/_closed_by_box.html.haml
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
--- a/app/views/projects/issues/edit.html.haml
+++ b/app/views/projects/issues/edit.html.haml
--- a/app/views/projects/issues/new.html.haml
+++ b/app/views/projects/issues/new.html.haml
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
--- a/app/views/projects/issues/update.js.haml
+++ b/app/views/projects/issues/update.js.haml
--- a/app/views/projects/labels/_form.html.haml
+++ b/app/views/projects/labels/_form.html.haml
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
--- a/app/views/projects/labels/edit.html.haml
+++ b/app/views/projects/labels/edit.html.haml
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
--- a/app/views/projects/labels/new.html.haml
+++ b/app/views/projects/labels/new.html.haml
--- a/app/views/projects/merge_requests/_discussion.html.haml
+++ b/app/views/projects/merge_requests/_discussion.html.haml
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
--- a/app/views/projects/merge_requests/cancel_merge_when_build_succeeds.js.haml
+++ b/app/views/projects/merge_requests/cancel_merge_when_build_succeeds.js.haml
--- a/app/views/projects/merge_requests/edit.html.haml
+++ b/app/views/projects/merge_requests/edit.html.haml
--- a/app/views/projects/merge_requests/merge.js.haml
+++ b/app/views/projects/merge_requests/merge.js.haml
--- a/app/views/projects/merge_requests/new.html.haml
+++ b/app/views/projects/merge_requests/new.html.haml
--- a/app/views/projects/merge_requests/show/_builds.html.haml
+++ b/app/views/projects/merge_requests/show/_builds.html.haml
--- a/app/views/projects/merge_requests/show/_commits.html.haml
+++ b/app/views/projects/merge_requests/show/_commits.html.haml
--- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml
+++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_box.html.haml
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
--- a/app/views/projects/merge_requests/update.js.haml
+++ b/app/views/projects/merge_requests/update.js.haml
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
--- a/app/views/projects/merge_requests/widget/_merged.html.haml
+++ b/app/views/projects/merge_requests/widget/_merged.html.haml
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
--- a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
--- a/app/views/projects/milestones/_milestone.html.haml
+++ b/app/views/projects/milestones/_milestone.html.haml
--- a/app/views/projects/milestones/edit.html.haml
+++ b/app/views/projects/milestones/edit.html.haml
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
--- a/app/views/projects/milestones/new.html.haml
+++ b/app/views/projects/milestones/new.html.haml
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
--- a/app/views/projects/network/_head.html.haml
+++ b/app/views/projects/network/_head.html.haml
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
--- a/app/views/projects/notes/_edit_form.html.haml
+++ b/app/views/projects/notes/_edit_form.html.haml
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
--- a/app/views/projects/notes/_notes_with_form.html.haml
+++ b/app/views/projects/notes/_notes_with_form.html.haml
--- a/app/views/projects/project_members/_group_members.html.haml
+++ b/app/views/projects/project_members/_group_members.html.haml
--- a/app/views/projects/project_members/_project_member.html.haml
+++ b/app/views/projects/project_members/_project_member.html.haml
--- a/app/views/projects/project_members/_team.html.haml
+++ b/app/views/projects/project_members/_team.html.haml
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
--- a/app/views/projects/releases/edit.html.haml
+++ b/app/views/projects/releases/edit.html.haml
--- a/app/views/projects/repositories/_download_archive.html.haml
+++ b/app/views/projects/repositories/_download_archive.html.haml
--- a/app/views/projects/repositories/_feed.html.haml
+++ b/app/views/projects/repositories/_feed.html.haml
--- a/app/views/projects/runners/_runner.html.haml
+++ b/app/views/projects/runners/_runner.html.haml
--- a/app/views/projects/runners/_shared_runners.html.haml
+++ b/app/views/projects/runners/_shared_runners.html.haml
--- a/app/views/projects/runners/_specific_runners.html.haml
+++ b/app/views/projects/runners/_specific_runners.html.haml
--- a/app/views/projects/runners/edit.html.haml
+++ b/app/views/projects/runners/edit.html.haml
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
--- a/app/views/projects/snippets/edit.html.haml
+++ b/app/views/projects/snippets/edit.html.haml
--- a/app/views/projects/snippets/new.html.haml
+++ b/app/views/projects/snippets/new.html.haml
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
--- a/app/views/projects/tags/_tag.html.haml
+++ b/app/views/projects/tags/_tag.html.haml
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
--- a/app/views/projects/tags/show.html.haml
+++ b/app/views/projects/tags/show.html.haml
--- a/app/views/projects/tree/_tree_content.html.haml
+++ b/app/views/projects/tree/_tree_content.html.haml
--- a/app/views/projects/tree/_tree_header.html.haml
+++ b/app/views/projects/tree/_tree_header.html.haml
--- a/app/views/projects/triggers/index.html.haml
+++ b/app/views/projects/triggers/index.html.haml
--- a/app/views/projects/variables/show.html.haml
+++ b/app/views/projects/variables/show.html.haml
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
--- a/app/views/projects/wikis/_main_links.html.haml
+++ b/app/views/projects/wikis/_main_links.html.haml
--- a/app/views/projects/wikis/_nav.html.haml
+++ b/app/views/projects/wikis/_nav.html.haml
--- a/app/views/projects/wikis/_new.html.haml
+++ b/app/views/projects/wikis/_new.html.haml
--- a/app/views/projects/wikis/edit.html.haml
+++ b/app/views/projects/wikis/edit.html.haml
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
--- a/app/views/projects/wikis/pages.html.haml
+++ b/app/views/projects/wikis/pages.html.haml
--- a/app/views/projects/wikis/show.html.haml
+++ b/app/views/projects/wikis/show.html.haml
--- a/app/views/shared/_clone_panel.html.haml
+++ b/app/views/shared/_clone_panel.html.haml
--- a/app/views/shared/_confirm_modal.html.haml
+++ b/app/views/shared/_confirm_modal.html.haml
--- a/app/views/shared/_file_highlight.html.haml
+++ b/app/views/shared/_file_highlight.html.haml
--- a/app/views/shared/_group_form.html.haml
+++ b/app/views/shared/_group_form.html.haml
--- a/app/views/shared/_issues.html.haml
+++ b/app/views/shared/_issues.html.haml
--- a/app/views/shared/_merge_requests.html.haml
+++ b/app/views/shared/_merge_requests.html.haml
--- a/app/views/shared/_milestone_expired.html.haml
+++ b/app/views/shared/_milestone_expired.html.haml
--- a/app/views/shared/_new_commit_form.html.haml
+++ b/app/views/shared/_new_commit_form.html.haml
--- a/app/views/shared/_new_project_item_select.html.haml
+++ b/app/views/shared/_new_project_item_select.html.haml
--- a/app/views/shared/_project_limit.html.haml
+++ b/app/views/shared/_project_limit.html.haml
--- a/app/views/shared/_service_settings.html.haml
+++ b/app/views/shared/_service_settings.html.haml
--- a/app/views/shared/issuable/_context.html.haml
+++ b/app/views/shared/issuable/_context.html.haml
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
--- a/app/views/projects/merge_requests/show/_participants.html.haml
+++ b/app/views/projects/merge_requests/show/_participants.html.haml
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
--- a/app/views/shared/snippets/_form.html.haml
+++ b/app/views/shared/snippets/_form.html.haml
--- a/app/views/shared/snippets/_header.html.haml
+++ b/app/views/shared/snippets/_header.html.haml
--- a/app/views/sherlock/transactions/_general.html.haml
+++ b/app/views/sherlock/transactions/_general.html.haml
--- a/app/views/snippets/edit.html.haml
+++ b/app/views/snippets/edit.html.haml
--- a/app/views/snippets/new.html.haml
+++ b/app/views/snippets/new.html.haml
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
--- a/app/views/votes/_votes_block.html.haml
+++ b/app/views/votes/_votes_block.html.haml
--- a/app/workers/build_email_worker.rb
+++ b/app/workers/build_email_worker.rb
--- a/app/workers/ci/hip_chat_notifier_worker.rb
+++ b/app/workers/ci/hip_chat_notifier_worker.rb
--- a/app/workers/ci/slack_notifier_worker.rb
+++ b/app/workers/ci/slack_notifier_worker.rb
--- a/app/workers/ci/web_hook_worker.rb
+++ b/app/workers/ci/web_hook_worker.rb
--- a/app/workers/email_receiver_worker.rb
+++ b/app/workers/email_receiver_worker.rb
--- a/app/workers/emails_on_push_worker.rb
+++ b/app/workers/emails_on_push_worker.rb
--- a/app/workers/merge_worker.rb
+++ b/app/workers/merge_worker.rb
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
--- a/app/workers/stuck_ci_builds_worker.rb
+++ b/app/workers/stuck_ci_builds_worker.rb
--- a/bin/background_jobs
+++ b/bin/background_jobs
--- a/bin/ci/upgrade.rb
+++ b/bin/ci/upgrade.rb
--- a/bin/parallel-rsync-repos
+++ b/bin/parallel-rsync-repos
--- a/bin/rails
+++ b/bin/rails
--- a/bin/rake
+++ b/bin/rake
--- a/bin/setup
+++ b/bin/setup
--- a/bin/upgrade.rb
+++ b/bin/upgrade.rb
--- a/config/application.rb
+++ b/config/application.rb
--- a/config/environment.rb
+++ b/config/environment.rb
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
--- a/config/initializers/4_ci_app.rb
+++ b/config/initializers/4_ci_app.rb
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
--- a/config/initializers/default_url_options.rb
+++ b/config/initializers/default_url_options.rb
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
--- a/config/initializers/rack_attack.rb.example
+++ b/config/initializers/rack_attack.rb.example
--- a/config/initializers/rack_lineprof.rb
+++ b/config/initializers/rack_lineprof.rb
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
--- a/config/initializers/sherlock.rb
+++ b/config/initializers/sherlock.rb
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
--- a/config/initializers/smtp_settings.rb.sample
+++ b/config/initializers/smtp_settings.rb.sample
--- a/config/initializers/static_files.rb
+++ b/config/initializers/static_files.rb
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
--- a/config/locales/sherlock.en.yml
+++ b/config/locales/sherlock.en.yml
--- a/config/routes.rb
+++ b/config/routes.rb
--- a/config/schedule.yml
+++ b/config/schedule.yml
--- a/db/migrate/20121220064453_init_schema.rb
+++ b/db/migrate/20121220064453_init_schema.rb
--- a/db/migrate/20140122112253_create_merge_request_diffs.rb
+++ b/db/migrate/20140122112253_create_merge_request_diffs.rb
--- a/db/migrate/20140903115954_migrate_to_new_shell.rb
+++ b/db/migrate/20140903115954_migrate_to_new_shell.rb
--- a/db/migrate/20151028152939_add_merge_when_build_succeeds_to_merge_request.rb
+++ b/db/migrate/20151028152939_add_merge_when_build_succeeds_to_merge_request.rb
--- a/db/migrate/20151203162133_add_hide_project_limit_to_users.rb
+++ b/db/migrate/20151203162133_add_hide_project_limit_to_users.rb
--- a/db/migrate/20151203162134_add_build_events_to_services.rb
+++ b/db/migrate/20151203162134_add_build_events_to_services.rb
--- a/db/migrate/20151209144329_migrate_ci_web_hooks.rb
+++ b/db/migrate/20151209144329_migrate_ci_web_hooks.rb
--- a/db/migrate/20151209145909_migrate_ci_emails.rb
+++ b/db/migrate/20151209145909_migrate_ci_emails.rb
--- a/db/migrate/20151210072243_add_runners_registration_token_to_application_settings.rb
+++ b/db/migrate/20151210072243_add_runners_registration_token_to_application_settings.rb
--- a/db/migrate/20151210125232_migrate_ci_slack_service.rb
+++ b/db/migrate/20151210125232_migrate_ci_slack_service.rb
--- a/db/migrate/20151210125927_migrate_ci_hip_chat_service.rb
+++ b/db/migrate/20151210125927_migrate_ci_hip_chat_service.rb
--- a/db/migrate/20151210125928_add_ci_to_project.rb
+++ b/db/migrate/20151210125928_add_ci_to_project.rb
--- a/db/migrate/20151210125929_add_project_id_to_ci.rb
+++ b/db/migrate/20151210125929_add_project_id_to_ci.rb
--- a/db/migrate/20151210125930_migrate_ci_to_project.rb
+++ b/db/migrate/20151210125930_migrate_ci_to_project.rb
--- a/db/migrate/20151210125931_add_index_to_ci_tables.rb
+++ b/db/migrate/20151210125931_add_index_to_ci_tables.rb
--- a/db/migrate/20151210125932_drop_null_for_ci_tables.rb
+++ b/db/migrate/20151210125932_drop_null_for_ci_tables.rb
--- a/db/schema.rb
+++ b/db/schema.rb
--- a/doc/README.md
+++ b/doc/README.md
--- a/doc/api/README.md
+++ b/doc/api/README.md
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
--- a/doc/api/tags.md
+++ b/doc/api/tags.md
--- a/doc/ci/README.md
+++ b/doc/ci/README.md
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
--- a/doc/ci/img/builds_tab.png
+++ b/doc/ci/img/builds_tab.png
--- a/doc/ci/languages/README.md
+++ b/doc/ci/languages/README.md
--- a/doc/ci/languages/php.md
+++ b/doc/ci/languages/php.md
--- a/doc/ci/quick_start/README.md
+++ b/doc/ci/quick_start/README.md
--- a/doc/ci/quick_start/build_status.png
+++ b/doc/ci/quick_start/build_status.png
--- a/doc/ci/quick_start/commit_status.png
+++ b/doc/ci/quick_start/commit_status.png
--- a/doc/ci/quick_start/img/build_log.png
+++ b/doc/ci/quick_start/img/build_log.png
--- a/doc/ci/quick_start/img/builds_status.png
+++ b/doc/ci/quick_start/img/builds_status.png
--- a/doc/ci/quick_start/img/new_commit.png
+++ b/doc/ci/quick_start/img/new_commit.png
--- a/doc/ci/quick_start/img/runners_activated.png
+++ b/doc/ci/quick_start/img/runners_activated.png
--- a/doc/ci/quick_start/img/single_commit_status_pending.png
+++ b/doc/ci/quick_start/img/single_commit_status_pending.png
--- a/doc/ci/quick_start/img/status_pending.png
+++ b/doc/ci/quick_start/img/status_pending.png
--- a/doc/ci/quick_start/new_commit.png
+++ b/doc/ci/quick_start/new_commit.png
--- a/doc/ci/quick_start/projects.png
+++ b/doc/ci/quick_start/projects.png
--- a/doc/ci/quick_start/runners.png
+++ b/doc/ci/quick_start/runners.png
--- a/doc/ci/quick_start/runners_activated.png
+++ b/doc/ci/quick_start/runners_activated.png
--- a/doc/ci/services/README.md
+++ b/doc/ci/services/README.md
--- a/doc/ci/services/docker-services.md
+++ b/doc/ci/services/docker-services.md
--- a/doc/ci/services/mysql.md
+++ b/doc/ci/services/mysql.md
--- a/doc/ci/services/postgres.md
+++ b/doc/ci/services/postgres.md
--- a/doc/ci/services/redis.md
+++ b/doc/ci/services/redis.md
--- a/doc/ci/ssh_keys/README.md
+++ b/doc/ci/ssh_keys/README.md
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
--- a/doc/customization/issue_closing.md
+++ b/doc/customization/issue_closing.md
--- a/doc/development/db_dump.md
+++ b/doc/development/db_dump.md
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
--- a/doc/integration/bitbucket.md
+++ b/doc/integration/bitbucket.md
--- a/doc/integration/crowd.md
+++ b/doc/integration/crowd.md
--- a/doc/integration/github.md
+++ b/doc/integration/github.md
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
--- a/doc/integration/google.md
+++ b/doc/integration/google.md
--- a/doc/integration/ldap.md
+++ b/doc/integration/ldap.md
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
--- a/doc/integration/twitter.md
+++ b/doc/integration/twitter.md
--- a/doc/operations/moving_repositories.md
+++ b/doc/operations/moving_repositories.md
--- a/doc/permissions/permissions.md
+++ b/doc/permissions/permissions.md
--- a/doc/public_access/public_access.md
+++ b/doc/public_access/public_access.md
--- a/doc/raketasks/README.md
+++ b/doc/raketasks/README.md
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
--- a/doc/raketasks/check.md
+++ b/doc/raketasks/check.md
--- a/doc/raketasks/check_repos_output.png
+++ b/doc/raketasks/check_repos_output.png
--- a/doc/raketasks/list_repos.md
+++ b/doc/raketasks/list_repos.md
--- a/doc/release/README.md
+++ b/doc/release/README.md
--- a/doc/release/monthly.md
+++ b/doc/release/monthly.md
--- a/doc/release/patch.md
+++ b/doc/release/patch.md
--- a/doc/security/README.md
+++ b/doc/security/README.md
--- a/doc/security/user_file_uploads.md
+++ b/doc/security/user_file_uploads.md
--- a/doc/ssh/README.md
+++ b/doc/ssh/README.md
--- a/doc/update/8.1-to-8.2.md
+++ b/doc/update/8.1-to-8.2.md
--- a/doc/update/8.2-to-8.3.md
+++ b/doc/update/8.2-to-8.3.md
--- a/doc/update/patch_versions.md
+++ b/doc/update/patch_versions.md
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
--- a/doc/workflow/README.md
+++ b/doc/workflow/README.md
--- a/doc/workflow/award_emoji.png
+++ b/doc/workflow/award_emoji.png
--- a/doc/workflow/gitlab_flow.md
+++ b/doc/workflow/gitlab_flow.md
--- a/doc/workflow/importing/README.md
+++ b/doc/workflow/importing/README.md
--- a/doc/workflow/importing/migrating_from_svn.md
+++ b/doc/workflow/importing/migrating_from_svn.md
--- a/doc/workflow/lfs/lfs_administration.md
+++ b/doc/workflow/lfs/lfs_administration.md
--- a/doc/workflow/git_lfs.md
+++ b/doc/workflow/git_lfs.md
--- a/doc/workflow/merge_when_build_succeeds.md
+++ b/doc/workflow/merge_when_build_succeeds.md
--- a/doc/workflow/merge_when_build_succeeds/enable.png
+++ b/doc/workflow/merge_when_build_succeeds/enable.png
--- a/doc/workflow/merge_when_build_succeeds/status.png
+++ b/doc/workflow/merge_when_build_succeeds/status.png
--- a/doc/workflow/voting_slider.png
+++ b/doc/workflow/voting_slider.png
--- a/features/admin/groups.feature
+++ b/features/admin/groups.feature
--- a/features/admin/projects.feature
+++ b/features/admin/projects.feature
--- a/features/explore/projects.feature
+++ b/features/explore/projects.feature
--- a/features/group/members.feature
+++ b/features/group/members.feature
--- a/features/group/milestones.feature
+++ b/features/group/milestones.feature
--- a/features/groups.feature
+++ b/features/groups.feature
--- a/features/project/active_tab.feature
+++ b/features/project/active_tab.feature
--- a/features/project/commits/branches.feature
+++ b/features/project/commits/branches.feature
--- a/features/project/commits/comments.feature
+++ b/features/project/commits/comments.feature
--- a/features/project/commits/commits.feature
+++ b/features/project/commits/commits.feature
--- a/features/project/commits/diff_comments.feature
+++ b/features/project/commits/diff_comments.feature
--- a/features/project/commits/tags.feature
+++ b/features/project/commits/tags.feature
--- a/features/project/commits/user_lookup.feature
+++ b/features/project/commits/user_lookup.feature
--- a/features/project/create.feature
+++ b/features/project/create.feature
--- a/features/project/graph.feature
+++ b/features/project/graph.feature
--- a/features/project/issues/award_emoji.feature
+++ b/features/project/issues/award_emoji.feature
--- a/features/project/issues/filter_labels.feature
+++ b/features/project/issues/filter_labels.feature
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
--- a/features/project/issues/labels.feature
+++ b/features/project/issues/labels.feature
--- a/features/project/issues/milestones.feature
+++ b/features/project/issues/milestones.feature
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
--- a/features/project/merge_requests/accept.feature
+++ b/features/project/merge_requests/accept.feature
--- a/features/project/service.feature
+++ b/features/project/service.feature
--- a/features/project/shortcuts.feature
+++ b/features/project/shortcuts.feature
--- a/features/project/source/browse_files.feature
+++ b/features/project/source/browse_files.feature
--- a/features/project/team_management.feature
+++ b/features/project/team_management.feature
--- a/features/steps/admin/groups.rb
+++ b/features/steps/admin/groups.rb
--- a/features/steps/admin/labels.rb
+++ b/features/steps/admin/labels.rb
--- a/features/steps/admin/projects.rb
+++ b/features/steps/admin/projects.rb
--- a/features/steps/admin/settings.rb
+++ b/features/steps/admin/settings.rb
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
--- a/features/steps/explore/groups.rb
+++ b/features/steps/explore/groups.rb
--- a/features/steps/explore/projects.rb
+++ b/features/steps/explore/projects.rb
--- a/features/steps/group/members.rb
+++ b/features/steps/group/members.rb
--- a/features/steps/group/milestones.rb
+++ b/features/steps/group/milestones.rb
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
--- a/features/steps/profile/profile.rb
+++ b/features/steps/profile/profile.rb
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
--- a/features/steps/project/create.rb
+++ b/features/steps/project/create.rb
--- a/features/steps/project/forked_merge_requests.rb
+++ b/features/steps/project/forked_merge_requests.rb
--- a/features/steps/project/graph.rb
+++ b/features/steps/project/graph.rb
--- a/features/steps/project/hooks.rb
+++ b/features/steps/project/hooks.rb
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
--- a/features/steps/project/issues/labels.rb
+++ b/features/steps/project/issues/labels.rb
--- a/features/steps/project/issues/milestones.rb
+++ b/features/steps/project/issues/milestones.rb
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
--- a/features/steps/project/merge_requests/acceptance.rb
+++ b/features/steps/project/merge_requests/acceptance.rb
--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
--- a/features/steps/project/services.rb
+++ b/features/steps/project/services.rb
--- a/features/steps/project/snippets.rb
+++ b/features/steps/project/snippets.rb
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
--- a/features/steps/project/source/markdown_render.rb
+++ b/features/steps/project/source/markdown_render.rb
--- a/features/steps/project/team_management.rb
+++ b/features/steps/project/team_management.rb
--- a/features/steps/project/wiki.rb
+++ b/features/steps/project/wiki.rb
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
--- a/features/steps/shared/group.rb
+++ b/features/steps/shared/group.rb
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
--- a/features/steps/shared/project_tab.rb
+++ b/features/steps/shared/project_tab.rb
--- a/features/steps/shared/user.rb
+++ b/features/steps/shared/user.rb
--- a/features/steps/snippets/snippets.rb
+++ b/features/steps/snippets/snippets.rb
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
--- a/lib/api/commit_statuses.rb
+++ b/lib/api/commit_statuses.rb
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
--- a/lib/api/project_hooks.rb
+++ b/lib/api/project_hooks.rb
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
--- a/lib/api/tags.rb
+++ b/lib/api/tags.rb
--- a/lib/api/triggers.rb
+++ b/lib/api/triggers.rb
--- a/lib/award_emoji.rb
+++ b/lib/award_emoji.rb
--- a/lib/backup/lfs.rb
+++ b/lib/backup/lfs.rb
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
--- a/lib/banzai.rb
+++ b/lib/banzai.rb
--- a/lib/banzai/cross_project_reference.rb
+++ b/lib/banzai/cross_project_reference.rb
--- a/lib/banzai/filter.rb
+++ b/lib/banzai/filter.rb
--- a/lib/gitlab/markdown/abstract_reference_filter.rb
+++ b/lib/gitlab/markdown/abstract_reference_filter.rb
--- a/lib/gitlab/markdown/autolink_filter.rb
+++ b/lib/gitlab/markdown/autolink_filter.rb
--- a/lib/banzai/filter/commit_range_reference_filter.rb
+++ b/lib/banzai/filter/commit_range_reference_filter.rb
--- a/lib/banzai/filter/commit_reference_filter.rb
+++ b/lib/banzai/filter/commit_reference_filter.rb
--- a/lib/gitlab/markdown/emoji_filter.rb
+++ b/lib/gitlab/markdown/emoji_filter.rb
--- a/lib/gitlab/markdown/external_issue_reference_filter.rb
+++ b/lib/gitlab/markdown/external_issue_reference_filter.rb
--- a/lib/gitlab/markdown/external_link_filter.rb
+++ b/lib/gitlab/markdown/external_link_filter.rb
--- a/lib/gitlab/markdown/issue_reference_filter.rb
+++ b/lib/gitlab/markdown/issue_reference_filter.rb
--- a/lib/gitlab/markdown/label_reference_filter.rb
+++ b/lib/gitlab/markdown/label_reference_filter.rb
--- a/lib/banzai/filter/markdown_filter.rb
+++ b/lib/banzai/filter/markdown_filter.rb
--- a/lib/gitlab/markdown/merge_request_reference_filter.rb
+++ b/lib/gitlab/markdown/merge_request_reference_filter.rb
--- a/lib/gitlab/markdown/redactor_filter.rb
+++ b/lib/gitlab/markdown/redactor_filter.rb
--- a/lib/gitlab/markdown/reference_filter.rb
+++ b/lib/gitlab/markdown/reference_filter.rb
--- a/lib/gitlab/markdown/reference_gatherer_filter.rb
+++ b/lib/gitlab/markdown/reference_gatherer_filter.rb
--- a/lib/gitlab/markdown/relative_link_filter.rb
+++ b/lib/gitlab/markdown/relative_link_filter.rb
--- a/lib/gitlab/markdown/sanitization_filter.rb
+++ b/lib/gitlab/markdown/sanitization_filter.rb
--- a/lib/gitlab/markdown/snippet_reference_filter.rb
+++ b/lib/gitlab/markdown/snippet_reference_filter.rb
--- a/lib/gitlab/markdown/syntax_highlight_filter.rb
+++ b/lib/gitlab/markdown/syntax_highlight_filter.rb
--- a/lib/gitlab/markdown/table_of_contents_filter.rb
+++ b/lib/gitlab/markdown/table_of_contents_filter.rb
--- a/lib/gitlab/markdown/task_list_filter.rb
+++ b/lib/gitlab/markdown/task_list_filter.rb
--- a/lib/gitlab/markdown/upload_link_filter.rb
+++ b/lib/gitlab/markdown/upload_link_filter.rb
--- a/lib/gitlab/markdown/user_reference_filter.rb
+++ b/lib/gitlab/markdown/user_reference_filter.rb
--- a/lib/banzai/lazy_reference.rb
+++ b/lib/banzai/lazy_reference.rb
--- a/lib/banzai/pipeline.rb
+++ b/lib/banzai/pipeline.rb
--- a/lib/banzai/pipeline/asciidoc_pipeline.rb
+++ b/lib/banzai/pipeline/asciidoc_pipeline.rb
--- a/lib/banzai/pipeline/atom_pipeline.rb
+++ b/lib/banzai/pipeline/atom_pipeline.rb
--- a/lib/banzai/pipeline/base_pipeline.rb
+++ b/lib/banzai/pipeline/base_pipeline.rb
--- a/lib/banzai/pipeline/combined_pipeline.rb
+++ b/lib/banzai/pipeline/combined_pipeline.rb
--- a/lib/banzai/pipeline/description_pipeline.rb
+++ b/lib/banzai/pipeline/description_pipeline.rb
--- a/lib/banzai/pipeline/email_pipeline.rb
+++ b/lib/banzai/pipeline/email_pipeline.rb
--- a/lib/banzai/pipeline/full_pipeline.rb
+++ b/lib/banzai/pipeline/full_pipeline.rb
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
--- a/lib/banzai/pipeline/note_pipeline.rb
+++ b/lib/banzai/pipeline/note_pipeline.rb
--- a/lib/banzai/pipeline/plain_markdown_pipeline.rb
+++ b/lib/banzai/pipeline/plain_markdown_pipeline.rb
--- a/lib/banzai/pipeline/post_process_pipeline.rb
+++ b/lib/banzai/pipeline/post_process_pipeline.rb
--- a/lib/banzai/pipeline/reference_extraction_pipeline.rb
+++ b/lib/banzai/pipeline/reference_extraction_pipeline.rb
--- a/lib/banzai/pipeline/single_line_pipeline.rb
+++ b/lib/banzai/pipeline/single_line_pipeline.rb
--- a/lib/banzai/reference_extractor.rb
+++ b/lib/banzai/reference_extractor.rb
--- a/lib/banzai/renderer.rb
+++ b/lib/banzai/renderer.rb
--- a/lib/ci/api/api.rb
+++ b/lib/ci/api/api.rb
--- a/lib/ci/api/builds.rb
+++ b/lib/ci/api/builds.rb
--- a/lib/ci/api/commits.rb
+++ b/lib/ci/api/commits.rb
--- a/lib/ci/api/entities.rb
+++ b/lib/ci/api/entities.rb
--- a/lib/ci/api/helpers.rb
+++ b/lib/ci/api/helpers.rb
--- a/lib/ci/api/projects.rb
+++ b/lib/ci/api/projects.rb
--- a/lib/ci/api/runners.rb
+++ b/lib/ci/api/runners.rb
--- a/lib/ci/api/triggers.rb
+++ b/lib/ci/api/triggers.rb
--- a/lib/ci/charts.rb
+++ b/lib/ci/charts.rb
--- a/lib/ci/current_settings.rb
+++ b/lib/ci/current_settings.rb
--- a/lib/ci/git.rb
+++ b/lib/ci/git.rb
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
--- a/lib/ci/scheduler.rb
+++ b/lib/ci/scheduler.rb
--- a/lib/gitlab/asciidoc.rb
+++ b/lib/gitlab/asciidoc.rb
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
--- a/lib/gitlab/backend/shell.rb
+++ b/lib/gitlab/backend/shell.rb
--- a/lib/gitlab/bitbucket_import/project_creator.rb
+++ b/lib/gitlab/bitbucket_import/project_creator.rb
--- a/lib/gitlab/blacklist.rb
+++ b/lib/gitlab/blacklist.rb
--- a/lib/gitlab/build_data_builder.rb
+++ b/lib/gitlab/build_data_builder.rb
--- a/lib/gitlab/closing_issue_extractor.rb
+++ b/lib/gitlab/closing_issue_extractor.rb
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
--- a/lib/gitlab/diff/file.rb
+++ b/lib/gitlab/diff/file.rb
--- a/lib/gitlab/email/message/repository_push.rb
+++ b/lib/gitlab/email/message/repository_push.rb
--- a/lib/gitlab/fogbugz_import/importer.rb
+++ b/lib/gitlab/fogbugz_import/importer.rb
--- a/lib/gitlab/fogbugz_import/project_creator.rb
+++ b/lib/gitlab/fogbugz_import/project_creator.rb
--- a/lib/gitlab/git/hook.rb
+++ b/lib/gitlab/git/hook.rb
--- a/lib/gitlab/github_import/client.rb
+++ b/lib/gitlab/github_import/client.rb
--- a/lib/gitlab/gitlab_import/client.rb
+++ b/lib/gitlab/gitlab_import/client.rb
--- a/lib/gitlab/gitlab_import/project_creator.rb
+++ b/lib/gitlab/gitlab_import/project_creator.rb
--- a/lib/gitlab/gitorious_import/project_creator.rb
+++ b/lib/gitlab/gitorious_import/project_creator.rb
--- a/lib/gitlab/google_code_import/importer.rb
+++ b/lib/gitlab/google_code_import/importer.rb
--- a/lib/gitlab/google_code_import/project_creator.rb
+++ b/lib/gitlab/google_code_import/project_creator.rb
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
--- a/lib/gitlab/lfs/response.rb
+++ b/lib/gitlab/lfs/response.rb
--- a/lib/gitlab/lfs/router.rb
+++ b/lib/gitlab/lfs/router.rb
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
--- a/lib/gitlab/markdown/commit_range_reference_filter.rb
+++ b/lib/gitlab/markdown/commit_range_reference_filter.rb
--- a/lib/gitlab/markdown/commit_reference_filter.rb
+++ b/lib/gitlab/markdown/commit_reference_filter.rb
--- a/lib/gitlab/markdown/cross_project_reference.rb
+++ b/lib/gitlab/markdown/cross_project_reference.rb
--- a/lib/gitlab/markdown/pipeline.rb
+++ b/lib/gitlab/markdown/pipeline.rb
--- a/lib/gitlab/o_auth/auth_hash.rb
+++ b/lib/gitlab/o_auth/auth_hash.rb
--- a/lib/gitlab/push_data_builder.rb
+++ b/lib/gitlab/push_data_builder.rb
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
--- a/lib/gitlab/seeder.rb
+++ b/lib/gitlab/seeder.rb
--- a/lib/gitlab/sherlock/transaction.rb
+++ b/lib/gitlab/sherlock/transaction.rb
--- a/lib/omni_auth/request_forgery_protection.rb
+++ b/lib/omni_auth/request_forgery_protection.rb
--- a/lib/rouge/formatters/html_gitlab.rb
+++ b/lib/rouge/formatters/html_gitlab.rb
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
--- a/lib/support/init.d/gitlab.default.example
+++ b/lib/support/init.d/gitlab.default.example
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
--- a/lib/tasks/ci/schedule_builds.rake
+++ b/lib/tasks/ci/schedule_builds.rake
--- a/lib/tasks/gitlab/backup.rake
+++ b/lib/tasks/gitlab/backup.rake
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
--- a/lib/tasks/gitlab/git.rake
+++ b/lib/tasks/gitlab/git.rake
--- a/lib/tasks/gitlab/import.rake
+++ b/lib/tasks/gitlab/import.rake
--- a/lib/tasks/gitlab/list_repos.rake
+++ b/lib/tasks/gitlab/list_repos.rake
--- a/lib/tasks/gitlab/task_helpers.rake
+++ b/lib/tasks/gitlab/task_helpers.rake
--- a/lib/tasks/spec.rake
+++ b/lib/tasks/spec.rake
--- a/lib/tasks/spinach.rake
+++ b/lib/tasks/spinach.rake
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
--- a/shared/lfs-objects/.gitkeep
+++ b/shared/lfs-objects/.gitkeep
--- a/spec/benchmarks/lib/gitlab/markdown/reference_filter_spec.rb
+++ b/spec/benchmarks/lib/gitlab/markdown/reference_filter_spec.rb
--- a/spec/controllers/abuse_reports_controller_spec.rb
+++ b/spec/controllers/abuse_reports_controller_spec.rb
--- a/spec/controllers/admin/impersonation_controller_spec.rb
+++ b/spec/controllers/admin/impersonation_controller_spec.rb
--- a/spec/controllers/autocomplete_controller_spec.rb
+++ b/spec/controllers/autocomplete_controller_spec.rb
--- a/spec/controllers/commit_controller_spec.rb
+++ b/spec/controllers/commit_controller_spec.rb
--- a/spec/controllers/groups/milestones_controller_spec.rb
+++ b/spec/controllers/groups/milestones_controller_spec.rb
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
--- a/spec/controllers/projects/milestones_controller_spec.rb
+++ b/spec/controllers/projects/milestones_controller_spec.rb
--- a/spec/controllers/projects/raw_controller_spec.rb
+++ b/spec/controllers/projects/raw_controller_spec.rb
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
--- a/spec/controllers/snippets_controller_spec.rb
+++ b/spec/controllers/snippets_controller_spec.rb
--- a/spec/factories.rb
+++ b/spec/factories.rb
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
--- a/spec/factories/ci/commits.rb
+++ b/spec/factories/ci/commits.rb
--- a/spec/factories/ci/events.rb
+++ b/spec/factories/ci/events.rb
--- a/spec/factories/ci/projects.rb
+++ b/spec/factories/ci/projects.rb
--- a/spec/factories/ci/runner_projects.rb
+++ b/spec/factories/ci/runner_projects.rb
--- a/spec/factories/ci/web_hook.rb
+++ b/spec/factories/ci/web_hook.rb
--- a/spec/factories/commit_statuses.rb
+++ b/spec/factories/commit_statuses.rb
--- a/spec/factories/lfs_objects.rb
+++ b/spec/factories/lfs_objects.rb
--- a/spec/factories/lfs_objects_projects.rb
+++ b/spec/factories/lfs_objects_projects.rb
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
--- a/spec/features/ci/admin/builds_spec.rb
+++ b/spec/features/ci/admin/builds_spec.rb
--- a/spec/features/ci/admin/runners_spec.rb
+++ b/spec/features/ci/admin/runners_spec.rb
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
--- a/spec/features/ci/admin/events_spec.rb
+++ b/spec/features/ci/admin/events_spec.rb
--- a/spec/features/ci/admin/projects_spec.rb
+++ b/spec/features/ci/admin/projects_spec.rb
--- a/spec/features/ci_settings_spec.rb
+++ b/spec/features/ci_settings_spec.rb
--- a/spec/features/ci_web_hooks_spec.rb
+++ b/spec/features/ci_web_hooks_spec.rb
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
--- a/spec/features/issues/filter_by_milestone_spec.rb
+++ b/spec/features/issues/filter_by_milestone_spec.rb
--- a/spec/features/issues/note_polling_spec.rb
+++ b/spec/features/issues/note_polling_spec.rb
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
--- a/spec/features/ci/lint_spec.rb
+++ b/spec/features/ci/lint_spec.rb
--- a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
+++ b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
--- a/spec/features/password_reset_spec.rb
+++ b/spec/features/password_reset_spec.rb
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
--- a/spec/features/security/group_access_spec.rb
+++ b/spec/features/security/group_access_spec.rb
--- a/spec/features/task_lists_spec.rb
+++ b/spec/features/task_lists_spec.rb
--- a/spec/features/triggers_spec.rb
+++ b/spec/features/triggers_spec.rb
--- a/spec/features/variables_spec.rb
+++ b/spec/features/variables_spec.rb
--- a/spec/finders/projects_finder_spec.rb
+++ b/spec/finders/projects_finder_spec.rb
--- a/spec/fixtures/markdown.md.erb
+++ b/spec/fixtures/markdown.md.erb
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
--- a/spec/helpers/ci_status_helper_spec.rb
+++ b/spec/helpers/ci_status_helper_spec.rb
--- a/spec/helpers/groups_helper.rb
+++ b/spec/helpers/groups_helper.rb
--- a/spec/helpers/visibility_level_helper_spec.rb
+++ b/spec/helpers/visibility_level_helper_spec.rb
--- a/spec/javascripts/fixtures/issues_show.html.haml
+++ b/spec/javascripts/fixtures/issues_show.html.haml
--- a/spec/javascripts/fixtures/merge_request_tabs.html.haml
+++ b/spec/javascripts/fixtures/merge_request_tabs.html.haml
--- a/spec/javascripts/fixtures/merge_requests_show.html.haml
+++ b/spec/javascripts/fixtures/merge_requests_show.html.haml
--- a/spec/lib/banzai/cross_project_reference_spec.rb
+++ b/spec/lib/banzai/cross_project_reference_spec.rb
--- a/spec/lib/banzai/filter/autolink_filter_spec.rb
+++ b/spec/lib/banzai/filter/autolink_filter_spec.rb
--- a/spec/lib/banzai/filter/commit_range_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/commit_range_reference_filter_spec.rb
--- a/spec/lib/banzai/filter/commit_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/commit_reference_filter_spec.rb
--- a/spec/lib/banzai/filter/emoji_filter_spec.rb
+++ b/spec/lib/banzai/filter/emoji_filter_spec.rb
--- a/spec/lib/banzai/filter/external_issue_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/external_issue_reference_filter_spec.rb
--- a/spec/lib/banzai/filter/external_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/external_link_filter_spec.rb
--- a/spec/lib/banzai/filter/issue_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/issue_reference_filter_spec.rb
--- a/spec/lib/banzai/filter/label_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/label_reference_filter_spec.rb
--- a/spec/lib/banzai/filter/merge_request_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/merge_request_reference_filter_spec.rb
--- a/spec/lib/banzai/filter/redactor_filter_spec.rb
+++ b/spec/lib/banzai/filter/redactor_filter_spec.rb
--- a/spec/lib/banzai/filter/reference_gatherer_filter_spec.rb
+++ b/spec/lib/banzai/filter/reference_gatherer_filter_spec.rb
--- a/spec/lib/banzai/filter/relative_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/relative_link_filter_spec.rb
--- a/spec/lib/banzai/filter/sanitization_filter_spec.rb
+++ b/spec/lib/banzai/filter/sanitization_filter_spec.rb
--- a/spec/lib/banzai/filter/snippet_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/snippet_reference_filter_spec.rb
--- a/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
+++ b/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
--- a/spec/lib/banzai/filter/table_of_contents_filter_spec.rb
+++ b/spec/lib/banzai/filter/table_of_contents_filter_spec.rb
--- a/spec/lib/banzai/filter/task_list_filter_spec.rb
+++ b/spec/lib/banzai/filter/task_list_filter_spec.rb
--- a/spec/lib/banzai/filter/upload_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/upload_link_filter_spec.rb
--- a/spec/lib/banzai/filter/user_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/user_reference_filter_spec.rb
--- a/spec/lib/ci/ansi2html_spec.rb
+++ b/spec/lib/ci/ansi2html_spec.rb
--- a/spec/lib/ci/charts_spec.rb
+++ b/spec/lib/ci/charts_spec.rb
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
--- a/spec/lib/disable_email_interceptor_spec.rb
+++ b/spec/lib/disable_email_interceptor_spec.rb
--- a/spec/lib/extracts_path_spec.rb
+++ b/spec/lib/extracts_path_spec.rb
--- a/spec/lib/file_size_validator_spec.rb
+++ b/spec/lib/file_size_validator_spec.rb
--- a/spec/lib/git_ref_validator_spec.rb
+++ b/spec/lib/git_ref_validator_spec.rb
--- a/spec/lib/gitlab/asciidoc_spec.rb
+++ b/spec/lib/gitlab/asciidoc_spec.rb
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
--- a/spec/lib/gitlab/backend/grack_auth_spec.rb
+++ b/spec/lib/gitlab/backend/grack_auth_spec.rb
--- a/spec/lib/gitlab/backend/shell_spec.rb
+++ b/spec/lib/gitlab/backend/shell_spec.rb
--- a/spec/lib/gitlab/bitbucket_import/client_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/client_spec.rb
--- a/spec/lib/gitlab/bitbucket_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/project_creator_spec.rb
--- a/spec/lib/gitlab/build_data_builder_spec.rb
+++ b/spec/lib/gitlab/build_data_builder_spec.rb
--- a/spec/lib/gitlab/closing_issue_extractor_spec.rb
+++ b/spec/lib/gitlab/closing_issue_extractor_spec.rb
--- a/spec/lib/gitlab/color_schemes_spec.rb
+++ b/spec/lib/gitlab/color_schemes_spec.rb
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
--- a/spec/lib/gitlab/diff/file_spec.rb
+++ b/spec/lib/gitlab/diff/file_spec.rb
--- a/spec/lib/gitlab/diff/parser_spec.rb
+++ b/spec/lib/gitlab/diff/parser_spec.rb
--- a/spec/lib/gitlab/email/attachment_uploader_spec.rb
+++ b/spec/lib/gitlab/email/attachment_uploader_spec.rb
--- a/spec/lib/gitlab/email/message/repository_push_spec.rb
+++ b/spec/lib/gitlab/email/message/repository_push_spec.rb
--- a/spec/lib/gitlab/email/receiver_spec.rb
+++ b/spec/lib/gitlab/email/receiver_spec.rb
--- a/spec/lib/gitlab/email/reply_parser_spec.rb
+++ b/spec/lib/gitlab/email/reply_parser_spec.rb
--- a/spec/lib/gitlab/git_access_spec.rb
+++ b/spec/lib/gitlab/git_access_spec.rb
--- a/spec/lib/gitlab/git_access_wiki_spec.rb
+++ b/spec/lib/gitlab/git_access_wiki_spec.rb
--- a/spec/lib/gitlab/github_import/client_spec.rb
+++ b/spec/lib/gitlab/github_import/client_spec.rb
--- a/spec/lib/gitlab/github_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/github_import/project_creator_spec.rb
--- a/spec/lib/gitlab/gitlab_import/client_spec.rb
+++ b/spec/lib/gitlab/gitlab_import/client_spec.rb
--- a/spec/lib/gitlab/gitlab_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/gitlab_import/project_creator_spec.rb
--- a/spec/lib/gitlab/gitorious_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/gitorious_import/project_creator_spec.rb
--- a/spec/lib/gitlab/google_code_import/client_spec.rb
+++ b/spec/lib/gitlab/google_code_import/client_spec.rb
--- a/spec/lib/gitlab/google_code_import/importer_spec.rb
+++ b/spec/lib/gitlab/google_code_import/importer_spec.rb
--- a/spec/lib/gitlab/google_code_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/google_code_import/project_creator_spec.rb
--- a/spec/lib/gitlab/incoming_email_spec.rb
+++ b/spec/lib/gitlab/incoming_email_spec.rb
--- a/spec/lib/gitlab/inline_diff_spec.rb
+++ b/spec/lib/gitlab/inline_diff_spec.rb
--- a/spec/lib/gitlab/key_fingerprint_spec.rb
+++ b/spec/lib/gitlab/key_fingerprint_spec.rb
--- a/spec/lib/gitlab/ldap/access_spec.rb
+++ b/spec/lib/gitlab/ldap/access_spec.rb
--- a/spec/lib/gitlab/ldap/adapter_spec.rb
+++ b/spec/lib/gitlab/ldap/adapter_spec.rb
--- a/spec/lib/gitlab/ldap/auth_hash_spec.rb
+++ b/spec/lib/gitlab/ldap/auth_hash_spec.rb
--- a/spec/lib/gitlab/ldap/authentication_spec.rb
+++ b/spec/lib/gitlab/ldap/authentication_spec.rb
--- a/spec/lib/gitlab/ldap/config_spec.rb
+++ b/spec/lib/gitlab/ldap/config_spec.rb
--- a/spec/lib/gitlab/ldap/user_spec.rb
+++ b/spec/lib/gitlab/ldap/user_spec.rb
--- a/spec/lib/gitlab/lfs/lfs_router_spec.rb
+++ b/spec/lib/gitlab/lfs/lfs_router_spec.rb
--- a/spec/lib/gitlab/markdown/autolink_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/autolink_filter_spec.rb
--- a/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
--- a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
--- a/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
+++ b/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
--- a/spec/lib/gitlab/markdown/emoji_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/emoji_filter_spec.rb
--- a/spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
--- a/spec/lib/gitlab/markdown/external_link_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/external_link_filter_spec.rb
--- a/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
--- a/spec/lib/gitlab/markdown/label_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/label_reference_filter_spec.rb
--- a/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
--- a/spec/lib/gitlab/markdown/redactor_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/redactor_filter_spec.rb
--- a/spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
--- a/spec/lib/gitlab/markdown/relative_link_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/relative_link_filter_spec.rb
--- a/spec/lib/gitlab/markdown/sanitization_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/sanitization_filter_spec.rb
--- a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
--- a/spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
--- a/spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
--- a/spec/lib/gitlab/markdown/task_list_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/task_list_filter_spec.rb
--- a/spec/lib/gitlab/markdown/upload_link_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/upload_link_filter_spec.rb
--- a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
--- a/spec/lib/gitlab/markup_helper_spec.rb
+++ b/spec/lib/gitlab/markup_helper_spec.rb
--- a/spec/lib/gitlab/note_data_builder_spec.rb
+++ b/spec/lib/gitlab/note_data_builder_spec.rb
--- a/spec/lib/gitlab/o_auth/auth_hash_spec.rb
+++ b/spec/lib/gitlab/o_auth/auth_hash_spec.rb
--- a/spec/lib/gitlab/o_auth/user_spec.rb
+++ b/spec/lib/gitlab/o_auth/user_spec.rb
--- a/spec/lib/gitlab/popen_spec.rb
+++ b/spec/lib/gitlab/popen_spec.rb
--- a/spec/lib/gitlab/project_search_results_spec.rb
+++ b/spec/lib/gitlab/project_search_results_spec.rb
--- a/spec/lib/gitlab/push_data_builder_spec.rb
+++ b/spec/lib/gitlab/push_data_builder_spec.rb
--- a/spec/lib/gitlab/reference_extractor_spec.rb
+++ b/spec/lib/gitlab/reference_extractor_spec.rb
--- a/spec/lib/gitlab/regex_spec.rb
+++ b/spec/lib/gitlab/regex_spec.rb
--- a/spec/lib/gitlab/sherlock/collection_spec.rb
+++ b/spec/lib/gitlab/sherlock/collection_spec.rb
--- a/spec/lib/gitlab/sherlock/file_sample_spec.rb
+++ b/spec/lib/gitlab/sherlock/file_sample_spec.rb
--- a/spec/lib/gitlab/sherlock/line_profiler_spec.rb
+++ b/spec/lib/gitlab/sherlock/line_profiler_spec.rb
--- a/spec/lib/gitlab/sherlock/line_sample_spec.rb
+++ b/spec/lib/gitlab/sherlock/line_sample_spec.rb
--- a/spec/lib/gitlab/sherlock/location_spec.rb
+++ b/spec/lib/gitlab/sherlock/location_spec.rb
--- a/spec/lib/gitlab/sherlock/middleware_spec.rb
+++ b/spec/lib/gitlab/sherlock/middleware_spec.rb
--- a/spec/lib/gitlab/sherlock/query_spec.rb
+++ b/spec/lib/gitlab/sherlock/query_spec.rb
--- a/spec/lib/gitlab/sherlock/transaction_spec.rb
+++ b/spec/lib/gitlab/sherlock/transaction_spec.rb
--- a/spec/lib/gitlab/sql/union_spec.rb
+++ b/spec/lib/gitlab/sql/union_spec.rb
--- a/spec/lib/gitlab/themes_spec.rb
+++ b/spec/lib/gitlab/themes_spec.rb
--- a/spec/lib/gitlab/upgrader_spec.rb
+++ b/spec/lib/gitlab/upgrader_spec.rb
--- a/spec/lib/gitlab/uploads_transfer_spec.rb
+++ b/spec/lib/gitlab/uploads_transfer_spec.rb
--- a/spec/lib/gitlab/url_builder_spec.rb
+++ b/spec/lib/gitlab/url_builder_spec.rb
--- a/spec/lib/gitlab/version_info_spec.rb
+++ b/spec/lib/gitlab/version_info_spec.rb
--- a/spec/lib/repository_cache_spec.rb
+++ b/spec/lib/repository_cache_spec.rb
--- a/spec/mailers/ci/notify_spec.rb
+++ b/spec/mailers/ci/notify_spec.rb
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
--- a/spec/models/broadcast_message_spec.rb
+++ b/spec/models/broadcast_message_spec.rb
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
--- a/spec/models/ci/project_services/hip_chat_message_spec.rb
+++ b/spec/models/ci/project_services/hip_chat_message_spec.rb
--- a/spec/models/ci/project_services/hip_chat_service_spec.rb
+++ b/spec/models/ci/project_services/hip_chat_service_spec.rb
--- a/spec/models/ci/project_services/mail_service_spec.rb
+++ b/spec/models/ci/project_services/mail_service_spec.rb
--- a/spec/models/ci/project_services/slack_message_spec.rb
+++ b/spec/models/ci/project_services/slack_message_spec.rb
--- a/spec/models/ci/project_services/slack_service_spec.rb
+++ b/spec/models/ci/project_services/slack_service_spec.rb
--- a/spec/models/ci/project_spec.rb
+++ b/spec/models/ci/project_spec.rb
--- a/spec/models/ci/runner_project_spec.rb
+++ b/spec/models/ci/runner_project_spec.rb
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
--- a/spec/models/ci/service_spec.rb
+++ b/spec/models/ci/service_spec.rb
--- a/spec/models/ci/trigger_spec.rb
+++ b/spec/models/ci/trigger_spec.rb
--- a/spec/models/ci/variable_spec.rb
+++ b/spec/models/ci/variable_spec.rb
--- a/spec/models/ci/web_hook_spec.rb
+++ b/spec/models/ci/web_hook_spec.rb
--- a/spec/models/commit_range_spec.rb
+++ b/spec/models/commit_range_spec.rb
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
--- a/spec/models/concerns/case_sensitivity_spec.rb
+++ b/spec/models/concerns/case_sensitivity_spec.rb