Merge branch 'ce_upstream' into 'master'

CE upstream @dzaporozhets Please resolve these conflicts ``` Unmerged paths: (use "git add <file>..." to mark resolution) both modified: app/views/groups/group_members/index.html.haml both modified: app/views/projects/project_members/index.html.haml ``` See merge request !67

Merge branch 'ce_upstream' into 'master'
6b028ed8 · Valery Sizov · f4422dba · 8588b70f · 6b028ed8 · 6b028ed8
Commit 6b028ed8 authored 9 years ago by Valery Sizov
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -888,7 +888,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: >-

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,17 @@ Please view this file on the master branch, on stable branches it's out of date.
  
 v 8.3.0 (unreleased)
  - Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera)
+  - Fix 500 error when update group member permission
+  - Trim leading and trailing whitespace of milestone and issueable titles (Jose Corcuera)
+  - Add ignore whitespace change option to commit view
+  - Fire update hook from GitLab
+
+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
  
 v 8.2.1
  - Forcefully update builds that didn't want to update with state machine
@@ -22,7 +33,6 @@ v 8.2.0
  - 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)

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,6 +27,16 @@ The channels people will reach out on can be found on the [getting help page](ht
 Sign up for the mailinglist, answer GitLab questions on StackOverflow or respond in the IRC channel.
 You can also sign up on [CodeTriage](http://www.codetriage.com/gitlabhq/gitlabhq) to help with one issue every day.
  
+## I want to contribute!
+
+If you want to contribute to GitLab, but are not sure where to start,
+look for [issues](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=up-for-grabs)
+with the label `up-for-grabs`.
+These issues will be of reasonable size and challenge, for anyone to start
+contributing to GitLab.
+
+This was inspired by [an article by Kent C. Dodds](https://medium.com/@kentcdodds/first-timers-only-78281ea47455#.i2f363mx4).
+
 ## Issue tracker
  
 To get support for your particular problem please use the [getting help channels](https://about.gitlab.com/getting-help/).
@@ -47,10 +57,10 @@ Please send a merge request with a tested solution or a merge request with a fai
 1. **Observed behavior**
 1. **Relevant logs and/or screenshots:** Please use code blocks (\`\`\`) to format console output, logs, and code as it's very hard to read otherwise.
 1. **Output of checks**
-    * Results of GitLab [Application Check](doc/install/installation.md#check-application-status) (`sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production SANITIZE=true`); we will only investigate if the tests are passing
+    * Results of GitLab [Application Check](doc/install/installation.md#check-application-status) (For installations with omnibus-gitlab package: `sudo gitlab-rake gitlab:check SANITIZE=true`); For installations from source: `sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production SANITIZE=true`); we will only investigate if the tests are passing
    * Version of GitLab you are running; we will only investigate issues in the latest stable and development releases as per the [maintenance policy](MAINTENANCE.md)
    * Add the last commit SHA-1 of the GitLab version you used to replicate the issue (obtainable from the help page)
-    * Describe your setup (use relevant parts from `sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production`)
+    * Describe your setup (use relevant parts from the env info: For installations with omnibus-gitlab package: `sudo gitlab-rake gitlab:env:info`; For installations from source: `sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production`)
 1. **Possible fixes**: If you can, link to the line of code that might be responsible for the problem
  
 ## Merge requests

--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
-2.6.7
+2.6.8
--- a/Gemfile
+++ b/Gemfile
 source "https://rubygems.org"
  
-gem 'rails', '4.1.14'
+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
@@ -16,7 +20,7 @@ gem "pg", '~> 0.18.2', group: :postgres
 # Authentication libraries
 gem 'devise',                 '~> 3.5.2'
 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'
@@ -29,7 +33,7 @@ gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
 gem 'omniauth_crowd'
 gem 'gssapi', group: :kerberos
-gem 'rack-oauth2',            '~> 1.0.5'
+gem 'rack-oauth2',            '~> 1.2.1'
  
 # Two-factor authentication
 gem 'devise-two-factor', '~> 2.0.0'
@@ -97,9 +101,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 'net-ssh',       '~> 3.0.1'
  
 # Diffs
 gem 'diffy', '~> 3.0.3'
@@ -127,8 +132,7 @@ gem 'sidetiq', '~> 0.6.3'
 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'
@@ -156,7 +160,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'
@@ -189,13 +193,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 'gon',                '~> 6.0.1'
 gem 'jquery-atwho-rails', '~> 1.3.2'
 gem 'jquery-rails',       '~> 3.1.3'
 gem 'jquery-scrollto-rails', '~> 1.4.3'
@@ -218,6 +222,7 @@ group :development do
  gem 'rerun', '~> 0.10.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'
@@ -274,7 +279,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
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (2.3.1)
+    CFPropertyList (2.3.2)
    RedCloth (4.2.9)
    ace-rails-ap (2.0.1)
-    actionmailer (4.1.14)
-      actionpack (= 4.1.14)
-      actionview (= 4.1.14)
+    actionmailer (4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.14)
-      actionview (= 4.1.14)
-      activesupport (= 4.1.14)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.4)
+      actionview (= 4.2.4)
+      activesupport (= 4.2.4)
+      rack (~> 1.6)
      rack-test (~> 0.6.2)
-    actionview (4.1.14)
-      activesupport (= 4.1.14)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.4)
+      activesupport (= 4.2.4)
      builder (~> 3.1)
      erubis (~> 2.7.0)
-    activemodel (4.1.14)
-      activesupport (= 4.1.14)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.4)
+      activesupport (= 4.2.4)
+      globalid (>= 0.3.0)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
      builder (~> 3.1)
-    activerecord (4.1.14)
-      activemodel (= 4.1.14)
-      activesupport (= 4.1.14)
-      arel (~> 5.0.0)
+    activerecord (4.2.4)
+      activemodel (= 4.2.4)
+      activesupport (= 4.2.4)
+      arel (~> 6.0)
    activerecord-deprecated_finders (1.0.4)
-    activerecord-session_store (0.1.1)
+    activerecord-session_store (0.1.2)
      actionpack (>= 4.0.0, < 5)
      activerecord (>= 4.0.0, < 5)
      railties (>= 4.0.0, < 5)
-    activeresource (4.0.0)
-      activemodel (~> 4.0)
-      activesupport (~> 4.0)
-      rails-observers (~> 0.1.1)
-    activesupport (4.1.14)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
      json (~> 1.7, >= 1.7.7)
      minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
    acts-as-taggable-on (3.5.0)
      activerecord (>= 3.2, < 5)
    addressable (2.3.8)
-    after_commit_queue (1.1.0)
-      rails (>= 3.0)
+    after_commit_queue (1.3.0)
+      activerecord (>= 3.0)
    annotate (2.6.10)
      activerecord (>= 3.2, <= 4.3)
      rake (~> 10.4)
-    arel (5.0.1.20140414130214)
-    asana (0.0.6)
-      activeresource (>= 3.2.3)
-    asciidoctor (1.5.2)
+    arel (6.0.3)
+    asana (0.4.0)
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.9)
+      faraday_middleware-multi_json (~> 0.0)
+      oauth2 (~> 1.0)
+    asciidoctor (1.5.3)
    ast (2.1.0)
    astrolabe (1.3.1)
      parser (~> 2.2)
    attr_encrypted (1.3.4)
      encryptor (>= 1.3.0)
    attr_required (1.0.0)
-    autoprefixer-rails (5.2.1.2)
+    autoprefixer-rails (6.1.1)
      execjs
      json
    awesome_print (1.2.0)
@@ -85,15 +93,15 @@ GEM
      ruby_parser (~> 3.5.0)
      sass (~> 3.0)
      terminal-table (~> 1.4)
-    browser (1.0.0)
+    browser (1.0.1)
    builder (3.2.2)
-    bullet (4.14.9)
+    bullet (4.14.10)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.9.0)
    bundler-audit (0.4.0)
      bundler (~> 1.2)
      thor (~> 0.18)
-    byebug (6.0.2)
+    byebug (8.2.0)
    cal-heatmap-rails (0.0.1)
    capybara (2.4.4)
      mime-types (>= 1.16)
@@ -111,7 +119,7 @@ GEM
    celluloid (0.16.0)
      timers (~> 4.0.0)
    charlock_holmes (0.7.3)
-    chunky_png (1.3.4)
+    chunky_png (1.3.5)
    cliver (0.3.2)
    coderay (1.1.0)
    coercible (1.0.0)
@@ -122,19 +130,19 @@ GEM
    coffee-script (2.4.1)
      coffee-script-source
      execjs
-    coffee-script-source (1.9.1.1)
-    colored (1.2)
-    colorize (0.5.8)
+    coffee-script-source (1.10.0)
+    colorize (0.7.7)
    connection_pool (2.2.0)
-    coveralls (0.8.2)
+    coveralls (0.8.9)
      json (~> 1.8)
      rest-client (>= 1.6.8, < 2)
      simplecov (~> 0.10.0)
      term-ansicolor (~> 1.3)
      thor (~> 0.19.1)
+      tins (~> 1.6.0)
    crack (0.4.2)
      safe_yaml (~> 1.0.0)
-    creole (0.3.8)
+    creole (0.5.0)
    d3_rails (3.5.6)
      railties (>= 3.1.0)
    daemons (1.2.3)
@@ -154,7 +162,7 @@ GEM
      warden (~> 1.2.3)
    devise-async (0.9.0)
      devise (~> 3.2)
-    devise-two-factor (2.0.0)
+    devise-two-factor (2.0.1)
      activesupport
      attr_encrypted (~> 1.3.2)
      devise (~> 3.5.0)
@@ -163,11 +171,11 @@ GEM
    diff-lcs (1.2.5)
    diffy (3.0.7)
    docile (1.1.5)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
      unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (2.1.4)
+    doorkeeper (2.2.2)
      railties (>= 3.2)
-    dropzonejs-rails (0.7.1)
+    dropzonejs-rails (0.7.2)
      rails (> 3.1)
    email_reply_parser (0.5.8)
    email_spec (1.6.0)
@@ -192,6 +200,9 @@ GEM
      multipart-post (>= 1.2, < 3)
    faraday_middleware (0.10.0)
      faraday (>= 0.7.4, < 0.10)
+    faraday_middleware-multi_json (0.0.6)
+      faraday_middleware
+      multi_json
    fastercsv (1.5.5)
    ffaker (2.0.0)
    ffi (1.9.10)
@@ -203,7 +214,7 @@ GEM
    flog (4.3.2)
      ruby_parser (~> 3.1, > 3.1.0)
      sexp_processor (~> 4.4)
-    flowdock (0.7.0)
+    flowdock (0.7.1)
      httparty (~> 0.7)
      multi_json
    fog (1.25.0)
@@ -225,13 +236,10 @@ GEM
      fog-core (~> 1.22)
      fog-json
      inflecto (~> 0.0.2)
-    fog-core (1.32.1)
+    fog-core (1.35.0)
      builder
      excon (~> 0.45)
      formatador (~> 0.2)
-      mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
    fog-json (1.0.2)
      fog-core (~> 1.0)
      multi_json (~> 1.10)
@@ -243,10 +251,10 @@ GEM
      fog-core (>= 1.21.0)
      fog-json
      fog-xml (>= 0.0.1)
-    fog-sakuracloud (1.0.1)
+    fog-sakuracloud (1.4.0)
      fog-core
      fog-json
-    fog-softlayer (0.4.7)
+    fog-softlayer (1.0.2)
      fog-core
      fog-json
    fog-terremark (0.1.0)
@@ -261,7 +269,7 @@ GEM
    fog-xml (0.1.2)
      fog-core
      nokogiri (~> 1.5, >= 1.5.11)
-    font-awesome-rails (4.4.0.0)
+    font-awesome-rails (4.5.0.0)
      railties (>= 3.2, < 5.0)
    foreman (0.78.0)
      thor (~> 0.19.1)
@@ -271,11 +279,11 @@ GEM
      ruby-progressbar (~> 1.4)
    gemnasium-gitlab-service (0.2.6)
      rugged (~> 0.21)
-    gemojione (2.0.1)
+    gemojione (2.1.0)
      json
    get_process_mem (0.2.0)
    gherkin-ruby (0.3.2)
-    github-linguist (4.7.0)
+    github-linguist (4.7.2)
      charlock_holmes (~> 0.7.3)
      escape_utils (~> 1.1.0)
      mime-types (>= 1.19)
@@ -291,8 +299,8 @@ GEM
      mime-types (~> 1.15)
      posix-spawn (~> 0.3)
    gitlab-license (0.0.4)
-    gitlab_emoji (0.1.1)
-      gemojione (~> 2.0)
+    gitlab_emoji (0.2.0)
+      gemojione (~> 2.1)
    gitlab_git (7.2.20)
      activesupport (~> 4.0)
      charlock_holmes (~> 0.7.3)
@@ -304,6 +312,8 @@ GEM
      omniauth (~> 1.0)
      pyu-ruby-sasl (~> 0.0.3.1)
      rubyntlm (~> 0.3)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
    gollum-grit_adapter (1.0.0)
      gitlab-grit (~> 2.7, >= 2.7.1)
    gollum-lib (4.0.3)
@@ -313,9 +323,11 @@ GEM
      rouge (~> 1.10.1)
      sanitize (~> 2.1.0)
      stringex (~> 2.5.1)
-    gon (5.0.4)
-      actionpack (>= 2.3.0)
+    gon (6.0.1)
+      actionpack (>= 3.0)
      json
+      multi_json
+      request_store (>= 1.0)
    grape (0.13.0)
      activesupport
      builder
@@ -339,7 +351,7 @@ GEM
      haml (>= 4.0.6, < 5.0)
      html2haml (>= 1.0.1)
      railties (>= 4.0.1)
-    hashie (3.4.2)
+    hashie (3.4.3)
    highline (1.6.21)
    hike (1.2.3)
    hipchat (1.5.2)
@@ -357,40 +369,42 @@ GEM
    http-cookie (1.0.2)
      domain_name (~> 0.5)
    http_parser.rb (0.5.3)
-    httparty (0.13.5)
+    httparty (0.13.7)
      json (~> 1.8)
      multi_xml (>= 0.5.2)
-    httpclient (2.6.0.1)
+    httpclient (2.7.0.1)
    i18n (0.7.0)
    ice_cube (0.11.1)
    ice_nine (0.11.1)
    inflecto (0.0.2)
    ipaddress (0.8.0)
    jquery-atwho-rails (1.3.2)
-    jquery-rails (3.1.3)
+    jquery-rails (3.1.4)
      railties (>= 3.0, < 5.0)
      thor (>= 0.14, < 2.0)
    jquery-scrollto-rails (1.4.3)
      railties (> 3.1, < 5.0)
-    jquery-turbolinks (2.0.2)
+    jquery-turbolinks (2.1.0)
      railties (>= 3.1.0)
      turbolinks
    jquery-ui-rails (4.2.1)
      railties (>= 3.2.16)
    json (1.8.3)
-    jwt (1.5.1)
+    jwt (1.5.2)
    kaminari (0.16.3)
      actionpack (>= 3.0.0)
      activesupport (>= 3.0.0)
-    kgio (2.9.3)
+    kgio (2.10.0)
    launchy (2.4.3)
      addressable (~> 2.3)
    letter_opener (1.1.2)
      launchy (~> 2.2)
-    listen (2.10.1)
-      celluloid (~> 0.16.0)
+    listen (2.9.0)
+      celluloid (>= 0.15.2)
      rb-fsevent (>= 0.9.3)
      rb-inotify (>= 0.9)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
    macaddr (1.7.1)
      systemu (~> 2.6.2)
    mail (2.6.3)
@@ -407,16 +421,14 @@ GEM
    multipart-post (2.0.0)
    mysql2 (0.3.20)
    nested_form (0.3.2)
-    net-ldap (0.11)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    netrc (0.10.3)
+    net-ldap (0.12.1)
+    net-ssh (3.0.1)
+    netrc (0.11.0)
    newrelic-grape (2.0.0)
      grape
      newrelic_rpm
    newrelic_rpm (3.9.4.245)
-    nokogiri (1.6.6.2)
+    nokogiri (1.6.6.4)
      mini_portile (~> 0.6.0)
    nprogress-rails (0.1.6.7)
    oauth (0.4.7)
@@ -440,12 +452,15 @@ GEM
    omniauth-github (1.1.2)
      omniauth (~> 1.0)
      omniauth-oauth2 (~> 1.1)
-    omniauth-gitlab (1.0.0)
+    omniauth-gitlab (1.0.1)
      omniauth (~> 1.0)
      omniauth-oauth2 (~> 1.0)
-    omniauth-google-oauth2 (0.2.6)
-      omniauth (> 1.0)
-      omniauth-oauth2 (~> 1.1)
+    omniauth-google-oauth2 (0.2.10)
+      addressable (~> 2.3)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (~> 1.3.1)
    omniauth-kerberos (0.3.0)
      omniauth-multipassword
      timfel-krb5-auth (~> 0.8)
@@ -469,18 +484,18 @@ GEM
      activesupport
      nokogiri (>= 1.4.4)
      omniauth (~> 1.0)
-    opennebula (4.12.1)
+    opennebula (4.14.2)
      json
      nokogiri
      rbvmomi
    org-ruby (0.9.12)
      rubypants (~> 0.2)
    orm_adapter (0.5.0)
-    paranoia (2.1.3)
+    paranoia (2.1.4)
      activerecord (~> 4.0)
-    parser (2.2.2.6)
+    parser (2.2.3.0)
      ast (>= 1.1, < 3.0)
-    pg (0.18.2)
+    pg (0.18.4)
    poltergeist (1.6.0)
      capybara (~> 2.1)
      cliver (~> 0.3.1)
@@ -488,7 +503,7 @@ GEM
      websocket-driver (>= 0.2.0)
    posix-spawn (0.3.11)
    powerpack (0.0.9)
-    pry (0.10.1)
+    pry (0.10.3)
      coderay (~> 1.1.0)
      method_source (~> 0.8.1)
      slop (~> 3.4)
@@ -497,7 +512,7 @@ GEM
    pyu-ruby-sasl (0.0.3.3)
    quiet_assets (1.0.3)
      railties (>= 3.1, < 5.0)
-    rack (1.5.5)
+    rack (1.6.4)
    rack-accept (0.4.5)
      rack (>= 0.4)
    rack-attack (4.3.0)
@@ -505,7 +520,7 @@ GEM
    rack-cors (0.4.0)
    rack-mount (0.8.3)
      rack (>= 1.0.0)
-    rack-oauth2 (1.0.10)
+    rack-oauth2 (1.2.1)
      activesupport (>= 2.3)
      attr_required (>= 0.0.5)
      httpclient (>= 2.4)
@@ -515,28 +530,35 @@ GEM
      rack
    rack-test (0.6.3)
      rack (>= 1.0)
-    rails (4.1.14)
-      actionmailer (= 4.1.14)
-      actionpack (= 4.1.14)
-      actionview (= 4.1.14)
-      activemodel (= 4.1.14)
-      activerecord (= 4.1.14)
-      activesupport (= 4.1.14)
+    rails (4.2.4)
+      actionmailer (= 4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      activemodel (= 4.2.4)
+      activerecord (= 4.2.4)
+      activesupport (= 4.2.4)
      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.14)
-      sprockets-rails (~> 2.0)
-    rails-observers (0.1.2)
-      activemodel (~> 4.0)
-    railties (4.1.14)
-      actionpack (= 4.1.14)
-      activesupport (= 4.1.14)
+      railties (= 4.2.4)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.4)
+      actionpack (= 4.2.4)
+      activesupport (= 4.2.4)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
    rainbow (2.0.0)
    raindrops (0.15.0)
    rake (10.4.2)
    raphael-rails (2.1.2)
-    rb-fsevent (0.9.5)
+    rb-fsevent (0.9.6)
    rb-inotify (0.9.5)
      ffi (>= 0.5.0)
    rblineprof (0.3.6)
@@ -548,13 +570,13 @@ GEM
    rdoc (3.12.2)
      json (~> 1.4)
    redcarpet (3.3.3)
-    redis (3.2.1)
-    redis-actionpack (4.0.0)
+    redis (3.2.2)
+    redis-actionpack (4.0.1)
      actionpack (~> 4)
      redis-rack (~> 1.5.0)
      redis-store (~> 1.1.0)
-    redis-activesupport (4.1.1)
-      activesupport (~> 4)
+    redis-activesupport (4.1.5)
+      activesupport (>= 3, < 5)
      redis-store (~> 1.1.0)
    redis-namespace (1.5.2)
      redis (~> 3.0, >= 3.0.4)
@@ -565,13 +587,13 @@ GEM
      redis-actionpack (~> 4)
      redis-activesupport (~> 4)
      redis-store (~> 1.1.0)
-    redis-store (1.1.6)
+    redis-store (1.1.7)
      redis (>= 2.2)
-    request_store (1.2.0)
+    request_store (1.2.1)
    rerun (0.10.0)
      listen (~> 2.7, >= 2.7.3)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
    rest-client (1.8.0)
      http-cookie (>= 1.0.2, < 2.0)
      mime-types (>= 1.16, < 3.0)
@@ -716,11 +738,11 @@ GEM
    term-ansicolor (1.3.2)
      tins (~> 1.0)
    terminal-table (1.5.2)
-    test_after_commit (0.2.7)
+    test_after_commit (0.4.2)
      activerecord (>= 3.2)
-    thin (1.6.3)
+    thin (1.6.4)
      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
      rack (~> 1.0)
    thor (0.19.1)
    thread_safe (0.3.5)
@@ -758,9 +780,9 @@ GEM
      kgio (~> 2.6)
      rack
      raindrops (~> 0.7)
-    unicorn-worker-killer (0.4.3)
+    unicorn-worker-killer (0.4.4)
      get_process_mem (~> 0)
-      unicorn (~> 4)
+      unicorn (>= 4, < 6)
    uniform_notifier (1.9.0)
    uuid (2.3.8)
      macaddr (~> 1.0)
@@ -772,10 +794,15 @@ GEM
      equalizer (~> 0.0, >= 0.0.9)
    warden (1.2.3)
      rack (>= 1.0)
+    web-console (2.2.1)
+      activemodel (>= 4.0)
+      binding_of_caller (>= 0.7.2)
+      railties (>= 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
    webmock (1.21.0)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
-    websocket-driver (0.6.2)
+    websocket-driver (0.6.3)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.2)
    wikicloth (0.8.1)
@@ -797,7 +824,7 @@ DEPENDENCIES
  addressable (~> 2.3.8)
  after_commit_queue
  annotate (~> 2.6.0)
-  asana (~> 0.0.6)
+  asana (~> 0.4.0)
  asciidoctor (~> 1.5.2)
  attr_encrypted (~> 1.3.4)
  awesome_print (~> 1.2.0)
@@ -816,10 +843,9 @@ DEPENDENCIES
  carrierwave (~> 0.9.0)
  charlock_holmes (~> 0.7.3)
  coffee-rails (~> 4.1.0)
-  colored (~> 1.2)
-  colorize (~> 0.5.8)
+  colorize (~> 0.7.0)
  coveralls (~> 0.8.2)
-  creole (~> 0.3.6)
+  creole (~> 0.5.0)
  d3_rails (~> 3.5.5)
  database_cleaner (~> 1.4.0)
  default_value_for (~> 3.0.0)
@@ -827,7 +853,7 @@ DEPENDENCIES
  devise-async (~> 0.9.0)
  devise-two-factor (~> 2.0.0)
  diffy (~> 3.0.3)
-  doorkeeper (~> 2.1.3)
+  doorkeeper (~> 2.2.0)
  dropzonejs-rails (~> 0.7.1)
  email_reply_parser (~> 0.5.8)
  email_spec (~> 1.6.0)
@@ -850,7 +876,7 @@ DEPENDENCIES
  gitlab_meta (= 7.0)
  gitlab_omniauth-ldap (~> 1.2.1)
  gollum-lib (~> 4.0.2)
-  gon (~> 5.0.0)
+  gon (~> 6.0.1)
  grape (~> 0.13.0)
  grape-entity (~> 0.4.2)
  gssapi
@@ -861,7 +887,7 @@ DEPENDENCIES
  jquery-atwho-rails (~> 1.3.2)
  jquery-rails (~> 3.1.3)
  jquery-scrollto-rails (~> 1.4.3)
-  jquery-turbolinks (~> 2.0.1)
+  jquery-turbolinks (~> 2.1.0)
  jquery-ui-rails (~> 4.2.1)
  kaminari (~> 0.16.3)
  letter_opener (~> 1.1.2)
@@ -871,6 +897,7 @@ DEPENDENCIES
  mysql2 (~> 0.3.16)
  nested_form (~> 0.3.2)
  net-ldap
+  net-ssh (~> 3.0.1)
  newrelic-grape
  newrelic_rpm (~> 3.9.4.245)
  nprogress-rails (~> 0.1.6.7)
@@ -895,8 +922,9 @@ DEPENDENCIES
  quiet_assets (~> 1.0.2)
  rack-attack (~> 4.3.0)
  rack-cors (~> 0.4.0)
-  rack-oauth2 (~> 1.0.5)
-  rails (= 4.1.14)
+  rack-oauth2 (~> 1.2.1)
+  rails (= 4.2.4)
+  rails-deprecated_sanitizer (~> 1.0.3)
  raphael-rails (~> 2.1.2)
  rblineprof
  rdoc (~> 3.6)
@@ -904,6 +932,7 @@ DEPENDENCIES
  redis-rails (~> 4.0.0)
  request_store (~> 1.2.0)
  rerun (~> 0.10.0)
+  responders (~> 2.0)
  rqrcode-rails3 (~> 0.1.7)
  rspec-rails (~> 3.3.0)
  rubocop (~> 0.28.0)
@@ -933,7 +962,7 @@ DEPENDENCIES
  task_list (~> 1.0.2)
  teaspoon (~> 1.0.0)
  teaspoon-jasmine (~> 2.2.0)
-  test_after_commit (~> 0.2.2)
+  test_after_commit (~> 0.4.2)
  thin (~> 1.6.1)
  tinder (~> 1.10.0)
  turbolinks (~> 2.5.0)
@@ -944,6 +973,7 @@ DEPENDENCIES
  unicorn-worker-killer (~> 0.4.2)
  version_sorter (~> 2.0.0)
  virtus (~> 1.0.1)
+  web-console (~> 2.0)
  webmock (~> 1.21.0)
  wikicloth (= 0.8.1)
  

--- a/PROCESS.md
+++ b/PROCESS.md
@@ -44,6 +44,7 @@ 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.
  
 Example workflow: when a UX designer provided a design but it needs frontend work they remove the UX label and add the frontend label.
  

--- a/Procfile
+++ b/Procfile
 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 mailer -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q mailers -q default
 # mail_room: bundle exec mail_room -q -c config/mail_room.yml
--- a/app/assets/images/icon-link.png
+++ b/app/assets/images/icon-link.png
--- 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').
-      one('mouseleave', -> $(this).tooltip('hide'))
+# 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")
  
-  # Safari doesn't support `execCommand`, so instead we inform the user to
-  # copy manually.
-  #
-  # See http://clipboardjs.com/#browser-support
-  clipboard.on 'error', (e) ->
-    if /Mac/i.test(navigator.userAgent)
-      title = "Press &#8984;-C to copy"
-    else
-      title = "Press Ctrl-C to copy"
+showTooltip = (target, title) ->
+  $(target).
+    tooltip(
+      container: 'body'
+      html: 'true'
+      placement: 'auto bottom'
+      title: title
+      trigger: 'manual'
+    ).
+    tooltip('show').
+    one('mouseleave', -> $(this).tooltip('hide'))
  
-    $(e.trigger).
-      tooltip(trigger: 'manual', placement: 'auto bottom', html: true, title: title).
-      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/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/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/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')
+
+      # Toggle 'active' for both buttons
+      $('.js-protocol-switch').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 +45,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/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 {
@@ -114,3 +118,7 @@
    right: 10px;
  }
 }
+
+.block-connector {
+  margin-top: -1px;
+}
--- 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;
 }
@@ -442,3 +446,7 @@ table {
 .space-right {
  margin-right: 10px;
 }
+
+.alert, .progress {
+  margin-bottom: $gl-padding;
+}
--- 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;
@@ -25,7 +24,7 @@
    text-shadow: 0 1px 1px #fff;
    margin: 0;
    text-align: left;
-    padding: 10px 15px;
+    padding: 10px $gl-padding;
  
    .file-actions {
      float: right;
@@ -171,4 +170,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 {
@@ -92,3 +95,7 @@ label {
    background-color: #f7f8fa;
  }
 }
+
+.help-block {
+  margin-bottom: 0;
+}
--- a/app/assets/stylesheets/framework/issue_box.scss
+++ b/app/assets/stylesheets/framework/issue_box.scss
@@ -7,8 +7,9 @@
 .issue-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;

--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -2,10 +2,10 @@ html {
  overflow-y: scroll;
  
  &.touch .tooltip { display: none !important; }
+}
  
-  body {
-    padding-top: $header-height;
-  }
+body {
+  background-color: #EAEBEC !important;
 }
  
 .container {
@@ -18,6 +18,7 @@ html {
 }
  
 .navless-container {
+  padding-top: $header-height;
  margin-top: 30px;
 }