Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG Gemfile VERSION app/models/group.rb app/views/groups/edit.html.haml db/schema.rb doc/install/installation.md doc/update/5.4-to-6.0.md

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG Gemfile VERSION app/models/group.rb app/views/groups/edit.html.haml db/schema.rb doc/install/installation.md doc/update/5.4-to-6.0.md
903726c8 · Dmitriy Zaporozhets · 6221dc58 · faafde2d · 903726c8 · 903726c8
Commit 903726c8 authored Feb 11, 2014 by Dmitriy Zaporozhets
502 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ doc/code/*
 .secret
 *.log
 public/uploads.*
+public/assets/
--- a/CHANGELOG
+++ b/CHANGELOG
+v 6.6.0
+  - Permissions: Developer now can manage issue tracker (modify any issue)
+  - Improve Code Compare page performance
+  - Group avatar
+  - Pygments.rb replaced with highlight.js   
+  - Improve Merge request diff store logic
+  - Improve render performnace for MR show page
+  - Fixed Assembla hardcoded project name
+  - Jira integration documentation
+  - Refactored app/services
+  - Remove snippet expiration
+  - Mobile UI improvements (Drew Blessing)
+  - Fix block/remove UI for admin::users#show page
+  - Show users' group membership on users' activity page
+
 v 6.5.1
  - Fix branch selectbox when create merge request from fork


--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -67,7 +67,13 @@ If you can, please submit a merge request with the fix or improvements including
 1. Link relevant [issues](https://gitlab.com/gitlab-org/gitlab-ce/issues) and/or [feedback items](http://feedback.gitlab.com/) from the merge request description and leave a comment on them with a link back to the MR
 1. Be prepared to answer questions and incorporate feedback even if requests for this arrive weeks or months after your MR submittion

-Please keep the change in a single MR as small as possible. If you want to contribute a large feature think very hard what the minimum viable change is. Can you split functionality? Can you only submit the backend/API code? Can you start with a very simple UI? The smaller a MR is the more likely it is it will be merged, after that you can send more MR's to enhance it.
+Please keep the change in a single MR **as small as possible**. If you want to contribute a large feature think very hard what the minimum viable change is. Can you split functionality? Can you only submit the backend/API code? Can you start with a very simple UI? The smaller a MR is the more likely it is it will be merged, after that you can send more MR's to enhance it.
+
+The **official merge window** is in the beginning of the month from the 1st to the 7th day of the month.
+The best time to submit a MR and get feedback fast.
+Before this time the GitLab.com team is still dealing with work that is created by the monthly release such as assisting subscribers with upgrade issues, the release of Enterprise Edition and the upgrade of GitLab Cloud.
+After the 7th it is already getting closer to the release date of the next version.
+This means there is less time to fix the issues created by merging large new features.

 We will accept a merge requests if it:

@@ -78,7 +84,7 @@ We will accept a merge requests if it:
 * Fixes one specific issue or implements one specific feature (do not combine things, send separate merge requests if needed)
 * Keeps the GitLab code base clean and well structured
 * Contains functionality we think other users will benefit from too
-* Doesn't add unnessecary configuration options since they complicate future changes
+* Doesn't add avoidable configuration options since these complicate future changes
 * Contains a single commit (please use `git rebase -i` to squash commits)

 For examples of feedback on merge requests please look at already [closed merge requests](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests?assignee_id=&label_name=&milestone_id=&scope=&sort=&state=closed).
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,6 @@ gem "protected_attributes"
 gem 'rails-observers'
 gem 'actionpack-page_caching'
 gem 'actionpack-action_caching'
-gem 'activerecord-deprecated_finders'

 # Supported DBs
 gem "mysql2", group: :mysql
@@ -30,23 +29,20 @@ gem 'omniauth-github'

 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", "~> 4.0.0"
+gem "gitlab_git", '~> 5.3.0'

 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'

 # LDAP Auth
-gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap"
+gem 'gitlab_omniauth-ldap', '1.0.4', require: "omniauth-ldap"
 gem 'net-ldap'

-# Syntax highlighter
-gem "gitlab-pygments.rb", '~> 0.5.4', require: 'pygments.rb'
-
 # Git Wiki
-gem "gitlab-gollum-lib", "~> 1.0.2", require: 'gollum-lib'
+gem "gitlab-gollum-lib", "~> 1.1.0", require: 'gollum-lib'

 # Language detection
-gem "gitlab-linguist", "~> 2.9.6", require: "linguist"
+gem "gitlab-linguist", "~> 3.0.0", require: "linguist"

 # API
 gem "grape", "~> 0.6.1"
@@ -141,6 +137,9 @@ gem "sanitize"
 # Protect against bruteforcing
 gem "rack-attack"

+# Ace editor
+gem 'ace-rails-ap'
+
 gem "sass-rails"
 gem "coffee-rails"
 gem "uglifier"

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,6 +8,7 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
+    ace-rails-ap (2.0.1)
    actionmailer (4.0.2)
      actionpack (= 4.0.2)
      mail (~> 2.5.4)
@@ -158,36 +159,32 @@ GEM
    gitlab-flowdock-git-hook (0.4.2.2)
      gitlab-grit (>= 2.4.1)
      multi_json
-    gitlab-gollum-lib (1.0.2)
+    gitlab-gollum-lib (1.1.0)
      github-markdown (~> 0.5.3)
      github-markup (>= 0.7.5, < 1.0.0)
      gitlab-grit (~> 2.6.1)
-      gitlab-pygments.rb (~> 0.5.4)
      nokogiri (~> 1.5.9)
      sanitize (~> 2.0.3)
      stringex (~> 1.5.1)
    gitlab-grack (2.0.0.pre)
      rack (~> 1.5.1)
-    gitlab-grit (2.6.3)
+    gitlab-grit (2.6.4)
      charlock_holmes (~> 0.6.9)
      diff-lcs (~> 1.1)
      mime-types (~> 1.15)
      posix-spawn (~> 0.3.6)
-    gitlab-linguist (2.9.6)
+    gitlab-linguist (3.0.0)
      charlock_holmes (~> 0.6.6)
      escape_utils (~> 0.2.4)
-      gitlab-pygments.rb (~> 0.5.4)
      mime-types (~> 1.19)
-    gitlab-pygments.rb (0.5.4)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    gitlab_git (4.0.0)
+    gitlab_git (5.3.0)
      activesupport (~> 4.0.0)
+      charlock_holmes (~> 0.6.9)
      gitlab-grit (~> 2.6.1)
-      gitlab-linguist (~> 2.9.5)
-      gitlab-pygments.rb (~> 0.5.4)
+      gitlab-linguist (~> 3.0.0)
+      rugged (~> 0.19.0)
    gitlab_meta (6.0)
-    gitlab_omniauth-ldap (1.0.3)
+    gitlab_omniauth-ldap (1.0.4)
      net-ldap (~> 0.3.1)
      omniauth (~> 1.0)
      pyu-ruby-sasl (~> 0.0.3.1)
@@ -324,7 +321,7 @@ GEM
      multi_json (~> 1.0)
      websocket-driver (>= 0.2.0)
    polyglot (0.3.3)
-    posix-spawn (0.3.6)
+    posix-spawn (0.3.8)
    protected_attributes (1.0.5)
      activemodel (>= 4.0.1, < 5.0)
    pry (0.9.12.4)
@@ -423,6 +420,7 @@ GEM
    ruby-hmac (0.4.0)
    ruby-progressbar (1.2.0)
    rubyntlm (0.1.1)
+    rugged (0.19.0)
    safe_yaml (0.9.7)
    sanitize (2.0.6)
      nokogiri (>= 1.4.4)
@@ -543,15 +541,14 @@ GEM
    websocket-driver (0.3.1)
    xpath (2.0.0)
      nokogiri (~> 1.3)
-    yajl-ruby (1.1.0)

 PLATFORMS
  ruby

 DEPENDENCIES
+  ace-rails-ap
  actionpack-action_caching
  actionpack-page_caching
-  activerecord-deprecated_finders
  acts-as-taggable-on
  annotate (~> 2.6.0.beta2)
  asciidoctor
@@ -579,13 +576,12 @@ DEPENDENCIES
  gemoji (~> 1.3.0)
  github-markup (~> 0.7.4)!
  gitlab-flowdock-git-hook (~> 0.4.2)
-  gitlab-gollum-lib (~> 1.0.2)
+  gitlab-gollum-lib (~> 1.1.0)
  gitlab-grack (~> 2.0.0.pre)
-  gitlab-linguist (~> 2.9.6)
-  gitlab-pygments.rb (~> 0.5.4)
-  gitlab_git (~> 4.0.0)
+  gitlab-linguist (~> 3.0.0)
+  gitlab_git (~> 5.3.0)
  gitlab_meta (= 6.0)
-  gitlab_omniauth-ldap (= 1.0.3)
+  gitlab_omniauth-ldap (= 1.0.4)
  gon (~> 5.0.0)
  grape (~> 0.6.1)
  grape-entity (~> 0.3.0)

--- a/PROCESS.md
+++ b/PROCESS.md
@@ -73,7 +73,7 @@ Thanks for the issue report. Please reformat your issue to conform to the issue

 ### Feature requests

-Thanks for your interest in GitLab. We don't use the GitHub issue tracker for feature requests. Please use 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.
+Thanks for your interest in GitLab. We don't use the issue tracker for feature requests. Please use 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

@@ -81,7 +81,7 @@ Thanks for the issue report but we only support issues for the latest stable ver

 ### Support requests and configuration questions

-Thanks for your interest in GitLab. We don't use the GitHub issue tracker for support requests and configuration questions. Please use the \[support forum\]\(https://groups.google.com/forum/#!forum/gitlabhq), \[Stack Overflow\]\(http://stackoverflow.com/questions/tagged/gitlab), the unofficial #gitlab IRC channel on Freenode or the http://www.gitlab.com paid services for this purpose. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) for more information.
+Thanks for your interest in GitLab. We don't use the issue tracker for support requests and configuration questions. Please use the \[support forum\]\(https://groups.google.com/forum/#!forum/gitlabhq), \[Stack Overflow\]\(http://stackoverflow.com/questions/tagged/gitlab), the unofficial #gitlab IRC channel on Freenode or the http://www.gitlab.com paid services for this purpose. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) for more information.

 ### Code format


--- a/README.md
+++ b/README.md
@@ -4,17 +4,14 @@

 ![animated-screenshots](https://gist.github.com/fnkr/2f9badd56bfe0ed04ee7/raw/4f48806fbae97f556c2f78d8c2d299c04500cb0d/compiled.gif)

-### GitLab allows you to
- * keep your code secure on your own server
- * manage repositories, users and access permissions
- * communicate through issues, line-comments and wiki pages
- * perform code review with merge requests
+### Gitlab is open source software to collaborate on code

-### GitLab is
-
-* powered by Ruby on Rails
-* completely free and open source (MIT license)
-* used by more than 25.000 organizations to keep their code secure
+* Manage git repositories with fine grained access controls that keep your code secure
+* Perform code reviews and enhance collaboration with merge requests
+* Each project can also have an issue tracker and a wiki
+* Used by more than 50,000 organizations, GitLab is the most popular solution to manage git repositories on-premises
+* Completely free and open source (MIT Expat license)
+* Powered by Ruby on Rails

 ### Code status

@@ -68,11 +65,9 @@

 ### New versions and upgrading

-Since 2011 GitLab is released on the 22nd of every month. Every new release includes an upgrade guide.
-
-* [Upgrade guides](doc/update)
+Since 2011 GitLab is released on the 22nd of every month. Every new release includes an [upgrade guide](doc/update) and new features are detailed in the [Changelog](CHANGELOG).

-* [Changelog](CHANGELOG)
+It is recommended to follow a monthly upgrade schedule. Security releases come out when needed. For more information about the release process see the documentation for [monthly](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/release/monthly.md) and [security](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/release/security.md) releases.

 * Features that will be in the next releases are listed on [the feedback and suggestions 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).


--- a/VERSION
+++ b/VERSION
-6.5.0-ee
+6.6.0.pre-ee
--- a/app/assets/images/ajax_loader.gif
+++ b/app/assets/images/ajax_loader.gif
--- a/app/assets/images/ajax_loader_gray.gif
+++ b/app/assets/images/ajax_loader_gray.gif
--- a/app/assets/images/ajax_loader_tree.gif
+++ b/app/assets/images/ajax_loader_tree.gif
--- a/app/assets/images/bg-header.png
+++ b/app/assets/images/bg-header.png
--- a/app/assets/images/dark-scheme-preview.png
+++ b/app/assets/images/dark-scheme-preview.png
--- a/app/assets/images/file_txt.png
+++ b/app/assets/images/file_txt.png
--- a/app/assets/images/icon-search.png
+++ b/app/assets/images/icon-search.png
--- a/app/assets/images/images.png
+++ b/app/assets/images/images.png
--- a/app/assets/images/logo-black.png
+++ b/app/assets/images/logo-black.png
--- a/app/assets/images/logo-white.png
+++ b/app/assets/images/logo-white.png
--- a/app/assets/images/monokai-scheme-preview.png
+++ b/app/assets/images/monokai-scheme-preview.png
--- a/app/assets/images/no_avatar.png
+++ b/app/assets/images/no_avatar.png
--- a/app/assets/images/no_group_avatar.png
+++ b/app/assets/images/no_group_avatar.png
--- a/app/assets/images/onion_skin_sprites.gif
+++ b/app/assets/images/onion_skin_sprites.gif
--- a/app/assets/images/solarized-dark-scheme-preview.png
+++ b/app/assets/images/solarized-dark-scheme-preview.png
--- a/app/assets/images/swipemode_sprites.gif
+++ b/app/assets/images/swipemode_sprites.gif
--- a/app/assets/images/switch_icon.png
+++ b/app/assets/images/switch_icon.png
--- a/app/assets/images/trans_bg.gif
+++ b/app/assets/images/trans_bg.gif
--- a/app/assets/images/white-scheme-preview.png
+++ b/app/assets/images/white-scheme-preview.png
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -24,7 +24,8 @@
 //= require g.raphael-min
 //= require g.bar-min
 //= require branch-graph
-//= require ace-src-noconflict/ace
+//= require highlightjs.min
+//= require ace/ace
 //= require_tree .
 //= require d3
 //= require underscore
--- a/app/assets/javascripts/blob.js.coffee
+++ b/app/assets/javascripts/blob.js.coffee
@@ -64,7 +64,7 @@ class BlobView
        nodes.attr("id", hash)

    # initialize multi-line select
-    $("#tree-content-holder .line_numbers a[id^=L]").on("click", handleMultiSelect)
+    $("#tree-content-holder .line-numbers a[id^=L]").on("click", handleMultiSelect)

    # Highlight the correct lines on load
    highlightBlobLines()

--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -4,6 +4,7 @@ $ ->
 class Dispatcher
  constructor: () ->
    @initSearch()
+    @initHighlight()
    @initPageScripts()

  initPageScripts: ->
@@ -53,3 +54,10 @@ class Dispatcher
    project_ref = opts.data('autocomplete-project-ref')

    new SearchAutocomplete(path, project_id, project_ref)
+
+  initHighlight: ->
+    $('.highlight pre code').each (i, e) ->
+      hljs.highlightBlock(e)
+      $(e).html($.map($(e).html().split("\n"), (line, i) ->
+        "<div class='line' id='LC" + (i + 1) + "'>" + line + "</div>"
+      ).join("\n"))
--- a/app/assets/javascripts/groups.js.coffee
+++ b/app/assets/javascripts/groups.js.coffee
@@ -4,3 +4,14 @@ class GroupMembers
      $(this).fadeOut()

 @GroupMembers = GroupMembers
+
+$ ->
+  # avatar
+  $('.js-choose-group-avatar-button').bind "click", ->
+    form = $(this).closest("form")
+    form.find(".js-group-avatar-input").click()
+
+  $('.js-group-avatar-input').bind "change", ->
+    form = $(this).closest("form")
+    filename = $(this).val().replace(/^.*[\\\/]/, '')
+    form.find(".js-avatar-filename").text(filename)
\ No newline at end of file
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -94,6 +94,9 @@ class Notes
    if @isNewNote(note)
      @note_ids.push(note.id)
      $('ul.main-notes-list').append(note.html)
+      code = "#note_" + note.id + " .highlight pre code"
+      $(code).each (i, e) ->
+        hljs.highlightBlock(e)


  ###
@@ -253,6 +256,9 @@ class Notes
  updateNote: (xhr, note, status) =>
    note_li = $("#note_" + note.id)
    note_li.replaceWith(note.html)
+    code = "#note_" + note.id + " .highlight pre code"
+    $(code).each (i, e) ->
+      hljs.highlightBlock(e)

  ###
  Called in response to clicking the edit note link

--- a/app/assets/javascripts/profile.js.coffee
+++ b/app/assets/javascripts/profile.js.coffee
@@ -26,3 +26,5 @@ $ ->
    form = $(this).closest("form")
    filename = $(this).val().replace(/^.*[\\\/]/, '')
    form.find(".js-avatar-filename").text(filename)
+
+  $('.profile-groups-avatars').tooltip("placement": "top")
\ No newline at end of file
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -5,6 +5,7 @@
 *= require jquery.ui.gitlab
 *= require jquery.atwho
 *= require select2
+ *= require highlightjs.min
 *= require_self
 */

@@ -38,6 +39,7 @@
 @import "generic/lists.scss";
 @import "generic/forms.scss";
 @import "generic/selects.scss";
+@import "generic/highlight.scss";

 /**
 * Page specific styles (issues, projects etc):

--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -173,12 +173,10 @@ table a code {

 .loading {
  margin: 20px auto;
-  background: url(ajax_loader.gif) no-repeat center center;
-  width: 40px;
  height: 40px;
-  &.loading-gray {
-    background: url(ajax_loader_gray.gif) no-repeat center center;
-  }
+  color: #555;
+  font-size: 32px;
+  text-align: center;
 }

 span.update-author {
@@ -327,6 +325,12 @@ li.note {
    color: #fff;
    text-decoration: underline;
  }
+
+  .links-xs {
+    text-align: center;
+    font-size: 16px;
+    padding: 5px;
+  }
 }

 .warning_message {
@@ -494,3 +498,7 @@ table {
    margin-bottom: 15px;
  }
 }
+
+@media (max-width: $screen-xs-max) {
+  .container .content { margin-top: 20px; }
+}
--- a/app/assets/stylesheets/generic/files.scss
+++ b/app/assets/stylesheets/generic/files.scss
@@ -143,75 +143,6 @@
     */
    &.code {
      padding: 0;
-
-      table.lines {
-        border: none;
-        box-shadow: none;
-        margin: 0px;
-        padding: 0px;
-        table-layout: fixed;
-
-        pre {
-          border: none;
-          border-radius: 0;
-          font-family: $monospace_font;
-          font-size: 12px !important;
-          line-height: 16px !important;
-          margin: 0;
-          padding: 10px 0;
-        }
-        td {
-          border: none;
-          margin: 0;
-          padding: 0;
-          vertical-align: top;
-
-          &:first-child {
-            background: #eee;
-            width: 50px;
-          }
-          &:last-child {
-          }
-        }
-        tr:hover {
-          background: none;
-        }
-
-        pre.line_numbers {
-          color: #666;
-          padding: 10px 6px 10px 0;
-          text-align: right;
-          background: #EEE;
-
-          a {
-            color: #666;
-
-            i {
-              display: none;
-              font-size: 14px;
-              line-height: 14px;
-            }
-            &:hover i {
-              display: inherit;
-            }
-          }
-        }
-
-        .highlight {
-          border-left: 1px solid #DEE2E3;
-          overflow: auto;
-          overflow-y: hidden;
-
-          pre {
-            white-space: pre;
-            word-wrap: normal;
-
-            .line {
-              padding: 0 10px;
-            }
-          }
-        }
-      }
    }
  }
 }

--- a/app/assets/stylesheets/generic/highlight.scss
+++ b/app/assets/stylesheets/generic/highlight.scss
+.highlighted-data {
+  border: none;
+  box-shadow: none;
+  margin: 0px;
+  padding: 0px;
+  table-layout: fixed;
+
+  pre {
+    padding: 10px;
+    border: none;
+    border-radius: 0;
+    font-family: $monospace_font;
+    font-size: 12px !important;
+    line-height: 16px !important;
+    margin: 0;
+
+    code {
+      white-space: pre;
+      word-wrap: normal;
+      padding: 0;
+
+      .line {
+        display: inline;
+      }
+    }
+  }
+
+  .hljs {
+    padding: 0;
+  }
+
+  .line-numbers {
+    padding: 10px;
+    text-align: right;
+    float: left;
+
+    a {
+      font-family: $monospace_font;
+      display: block;
+      font-size: 12px !important;
+      line-height: 16px !important;
+      white-space: nowrap;
+
+      i {
+        visibility: hidden;
+        @extend .pull-left;
+      }
+
+      &:hover i {
+        visibility: visible;
+      }
+    }
+  }
+
+  .highlight {
+    overflow: auto;
+    overflow-y: hidden;
+
+    pre {
+      white-space: pre;
+      word-wrap: normal;
+    }
+  }
+}
--- a/app/assets/stylesheets/generic/issue_box.scss
+++ b/app/assets/stylesheets/generic/issue_box.scss
@@ -11,7 +11,7 @@
  color: #666;
  margin:20px 0;
  background: #FAFAFA;
-  border: 1px solid #DDD;
+  border: 1px solid #EEE;

  .control-group {
    margin-bottom: 0;
@@ -26,8 +26,6 @@
  }

  .context {
-    border: none;
-    background-color: #f5f5f5;
    border: none;
    border-top: 1px solid #eee;
  }

--- a/app/assets/stylesheets/generic/lists.scss
+++ b/app/assets/stylesheets/generic/lists.scss
@@ -23,6 +23,12 @@
      }
    }

+    &.warning-row {
+      background-color: #fcf8e3;
+      border-color: #faebcc;
+      color: #8a6d3b;
+    }
+
    &.smoke { background-color: #f5f5f5; }

    &:hover {

--- a/app/assets/stylesheets/generic/typography.scss
+++ b/app/assets/stylesheets/generic/typography.scss
@@ -90,9 +90,6 @@ a:focus {

  font-size: 14px;
  line-height: 1.6;
-  .white .highlight pre {
-    background: #f5f5f5;
-  }
  ul {
    padding: 0;
    margin: 0 0 9px 25px !important;

--- a/app/assets/stylesheets/highlight/dark.scss
+++ b/app/assets/stylesheets/highlight/dark.scss
-.dark .highlight {
+.dark {
+  background-color: #232323;

-  background-color: #333;
+  .line.hll {
+    background: #558;
+  }
+
+  .highlight{
+    border-left: 1px solid #444;
+  }
+
+  .no-highlight {
+    color: #DDD;
+  }
+
+  .line-numbers a {
+    color: #666;
+  }

  pre {
-    background-color: #333;
-    color: #eee;
-  }
-
-  .hll { display: block; background-color: darken($hover, 65%) }
-  .c { color: #888888; font-style: italic } /* Comment */
-  .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-  .k { color: #CDA869; font-weight: bold } /* Keyword */
-  .kp { color: #CDA869; font-weight: bold } /* Keyword */
-  .cm { color: #888888 } /* Comment.Multiline */
-  .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
-  .c1 { color: #888888 } /* Comment.Single */
-  .cs { color: #cc0000; font-weight: bold; background-color: transparent } /* Comment.Special */
-  .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-  .ge { font-style: italic } /* Generic.Emph */
-  .gr { color: #aa0000 } /* Generic.Error */
-  .gh { color: #303030 } /* Generic.Heading */
-  .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-  .go { color: #888888 } /* Generic.Output */
-  .gp { color: #555555 } /* Generic.Prompt */
-  .gs { font-weight: bold } /* Generic.Strong */
-  .gu { color: #606060 } /* Generic.Subheading */
-  .gt { color: #aa0000 } /* Generic.Traceback */
-  .kc{font-weight: bold;} /* Keyword.Constant */
-  .kd{font-weight: bold;} /* Keyword.Declaration */
-  .kn{font-weight: bold;} /* Keyword.Namespace */
-  .kp{font-weight: bold;} /* Keyword.Pseudo */
-  .kr{font-weight: bold;} /* Keyword.Reserved */
-  .kt{color: #458;font-weight: bold;} /* Keyword.Type */
-  .m { color: #0000DD; font-weight: bold } /* Literal.Number */
-  .p { color: #eee;  }
-  .s { color: #0AD; background-color: transparent } /* Literal.String */
-  .na{color: #008080;} /* Name.Attribute */
-  .nb{color: #0086B3;} /* Name.Builtin */
-  .nc{color: #ccc;font-weight: bold;} /* Name.Class */
-  .no{color: turquoise;} /* Name.Constant */
-  .ni{color: #800080;}
-  .ne{color: #900;font-weight: bold;} /* Name.Exception */
-  .nf{color: #ccc;font-weight: bold;} /* Name.Function */
-  .nn{color: #79C3E0;font-weight: bold;} /* Name.Namespace */
-  .nt{color: #fc5;} /* Name.Tag */
-  .nv{color: #FA4;} /* Name.Variable */
-  .py { color: #336699; font-weight: bold } /* Name.Property */
-  .ow { color: #008800 } /* Operator.Word */
-  .w { color: #bbbbbb } /* Text.Whitespace */
-  .mf { color: #7AC; font-weight: bold } /* Literal.Number.Float */
-  .mh { color: #7AC; font-weight: bold } /* Literal.Number.Hex */
-  .mi {color: #099;} /* Literal.Number.Integer */
-  .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
-  .sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */
-  .sc{color: #d14;} /* Literal.String.Char */
-  .sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */
-  .s2{color: orange;} /* Literal.String.Double */
-  .se{color: orange;} /* Literal.String.Escape */
-  .sh{color: orange;} /* Literal.String.Heredoc */
-  .si{color: orange;} /* Literal.String.Interpol */
-  .sx{color: orange;} /* Literal.String.Other */
-  .sr{color: orange;} /* Literal.String.Regex */
-  .s1{color: orange;} /* Literal.String.Single */
-  .ss{color: orange;} /* Literal.String.Symbol */
-  .bp { color: #D58 } /* Name.Builtin.Pseudo */
-  .vc { color: #336699 } /* Name.Variable.Class */
-  .vg { color: #dd7700 } /* Name.Variable.Global */
-  .vi { color: cyan }
-}
+    background-color: #232323;
+  }
+
+  .hljs {
+    display: block;
+    background: #232323;
+    color: #E6E1DC;
+  }
+
+  .hljs-comment,
+  .hljs-template_comment,
+  .hljs-javadoc,
+  .hljs-shebang {
+    color: #BC9458;
+    font-style: italic;
+  }
+
+  .hljs-keyword,
+  .ruby .hljs-function .hljs-keyword,
+  .hljs-request,
+  .hljs-status,
+  .nginx .hljs-title,
+  .method,
+  .hljs-list .hljs-title {
+    color: #C26230;
+  }
+
+  .hljs-string,
+  .hljs-number,
+  .hljs-regexp,
+  .hljs-tag .hljs-value,
+  .hljs-cdata,
+  .hljs-filter .hljs-argument,
+  .hljs-attr_selector,
+  .apache .hljs-cbracket,
+  .hljs-date,
+  .tex .hljs-command,
+  .markdown .hljs-link_label {
+    color: #A5C261;
+  }
+
+  .hljs-subst {
+    color: #519F50;
+  }
+
+  .hljs-tag,
+  .hljs-tag .hljs-keyword,
+  .hljs-tag .hljs-title,
+  .hljs-doctype,
+  .hljs-sub .hljs-identifier,
+  .hljs-pi,
+  .input_number {
+    color: #E8BF6A;
+  }
+
+  .hljs-identifier {
+    color: #D0D0FF;
+  }
+
+  .hljs-class .hljs-title,
+  .haskell .hljs-type,
+  .smalltalk .hljs-class,
+  .hljs-javadoctag,
+  .hljs-yardoctag,
+  .hljs-phpdoc {
+    text-decoration: none;
+  }
+
+  .hljs-constant {
+    color: #DA4939;
+  }
+
+
+  .hljs-symbol,
+  .hljs-built_in,
+  .ruby .hljs-symbol .hljs-string,
+  .ruby .hljs-symbol .hljs-identifier,
+  .markdown .hljs-link_url,
+  .hljs-attribute {
+    color: #6D9CBE;
+  }
+
+  .markdown .hljs-link_url {
+    text-decoration: underline;
+  }

+
+
+  .hljs-params,
+  .hljs-variable,
+  .clojure .hljs-attribute {
+    color: #D0D0FF;
+  }
+
+  .css .hljs-tag,
+  .hljs-rules .hljs-property,
+  .hljs-pseudo,
+  .tex .hljs-special {
+    color: #CDA869;
+  }
+
+  .css .hljs-class {
+    color: #9B703F;
+  }
+
+  .hljs-rules .hljs-keyword {
+    color: #C5AF75;
+  }
+
+  .hljs-rules .hljs-value {
+    color: #CF6A4C;
+  }
+
+  .css .hljs-id {
+    color: #8B98AB;
+  }
+
+  .hljs-annotation,
+  .apache .hljs-sqbracket,
+  .nginx .hljs-built_in {
+    color: #9B859D;
+  }
+
+  .hljs-preprocessor,
+  .hljs-preprocessor *,
+  .hljs-pragma {
+    color: #8996A8 !important;
+  }
+
+  .hljs-hexcolor,
+  .css .hljs-value .hljs-number {
+    color: #A5C261;
+  }
+
+  .hljs-title,
+  .hljs-decorator,
+  .css .hljs-function {
+    color: #FFC66D;
+  }
+
+  .diff .hljs-header,
+  .hljs-chunk {
+    background-color: #2F33AB;
+    color: #E6E1DC;
+    display: inline-block;
+    width: 100%;
+  }
+
+  .diff .hljs-change {
+    background-color: #4A410D;
+    color: #F8F8F8;
+    display: inline-block;
+    width: 100%;
+  }
+
+  .hljs-addition {
+    background-color: #144212;
+    color: #E6E1DC;
+    display: inline-block;
+    width: 100%;
+  }
+
+  .hljs-deletion {
+    background-color: #600;
+    color: #E6E1DC;
+    display: inline-block;
+    width: 100%;
+  }
+
+  .coffeescript .javascript,
+  .javascript .xml,
+  .tex .hljs-formula,
+  .xml .javascript,
+  .xml .vbscript,
+  .xml .css,
+  .xml .hljs-cdata {
+    opacity: 0.7;
+  }
+}
--- a/app/assets/stylesheets/highlight/monokai.scss
+++ b/app/assets/stylesheets/highlight/monokai.scss
-$monokai-fg: #f8f8f2;
-$monokai-comment: #75715e;
-$monokai-pink: #f92672;
-$monokai-blue: #66d9ef;
-$monokai-green: #a6e22e;
-$monokai-gold: #e6db74;
-$monokai-dark: #3b3a32;
-$monokai-purple: #ae81ff;
+.monokai {
+  background-color: #272822;

-.monokai .highlight {
+  .highlight{
+    border-left: 1px solid #444;
+  }

-  background-color: #272822;
+  .line.hll {
+    background: #558;
+  }
+
+  .no-highlight {
+    color: #DDD;
+  }
+
+  .line-numbers a {
+    color: #666;
+  }

  pre {
    background-color: #272822;
-    color: $monokai-fg;
+    color: #f8f8f2;
  }

-  .hll { background-color: darken($hover, 65%) }
-  .c  { color: $monokai-comment } /* Comment */
-  .err { color: $monokai-fg } /* Error */
-  .g  { color: $monokai-fg } /* Generic */
-  .k  { color: $monokai-pink } /* Keyword */
-  .l  { color: $monokai-fg } /* Literal */
-  .n  { color: $monokai-blue } /* Name */
-  .o  { color: $monokai-fg } /* Operator */
-  .x  { color: $monokai-fg } /* Other */
-  .p  { color: $monokai-fg } /* Punctuation */
-  .cm { color: $monokai-comment } /* Comment.Multiline */
-  .cp { color: $monokai-comment } /* Comment.Preproc */
-  .c1 { color: $monokai-comment } /* Comment.Single */
-  .cs { color: $monokai-comment } /* Comment.Special */
-  .gd { color: #8b0807 } /* Generic.Deleted */
-  .ge { color: $monokai-fg; text-decoration: underline } /* Generic.Emph */
-  .gr { color: $monokai-fg } /* Generic.Error */
-  .gh { color: $monokai-fg; font-weight: bold } /* Generic.Heading */
-  .gi { color: $monokai-fg; font-weight: bold; background-color: #46830c } /* Generic.Inserted */
-  .go { color: $monokai-dark; background-color: #31322c } /* Generic.Output */
-  .gp { color: $monokai-fg } /* Generic.Prompt */
-  .gs { color: $monokai-fg } /* Generic.Strong */
-  .gu { color: $monokai-fg; font-weight: bold } /* Generic.Subheading */
-  .gt { color: #f8f8f0; background-color: $monokai-pink } /* Generic.Traceback */
-  .kc { color: $monokai-purple } /* Keyword.Constant */
-  .kd { color: $monokai-pink } /* Keyword.Declaration */
-  .kn { color: $monokai-pink } /* Keyword.Namespace */
-  .kp { color: $monokai-pink } /* Keyword.Pseudo */
-  .kr { color: $monokai-pink } /* Keyword.Reserved */
-  .kt { color: $monokai-fg } /* Keyword.Type */
-  .ld { color: $monokai-fg } /* Literal.Date */
-  .m  { color: $monokai-purple } /* Literal.Number */
-  .s  { color: $monokai-gold } /* Literal.String */
-  .na { color: $monokai-purple } /* Name.Attribute */
-  .nb { color: $monokai-blue } /* Name.Builtin */
-  .nc { color: $monokai-fg } /* Name.Class */
-  .no { color: $monokai-fg } /* Name.Constant */
-  .nd { color: $monokai-fg } /* Name.Decorator */
-  .ni { color: $monokai-fg } /* Name.Entity */
-  .ne { color: $monokai-fg } /* Name.Exception */
-  .nf { color: $monokai-green } /* Name.Function */
-  .nl { color: $monokai-gold } /* Name.Label */
-  .nn { color: $monokai-fg } /* Name.Namespace */
-  .nx { color: $monokai-fg } /* Name.Other */
-  .nt { color: $monokai-pink } /* Name.Tag */
-  .nv { color: $monokai-blue; font-style: italic } /* Name.Variable */
-  .py { color: $monokai-fg } /* Name.Property */
-  .ow { color: $monokai-pink } /* Operator.Word */
-  .w  { color: $monokai-fg } /* Text.Whitespace */
-  .mf { color: $monokai-purple } /* Literal.Number.Float */
-  .mh { color: $monokai-purple } /* Literal.Number.Hex */
-  .mi { color: $monokai-purple } /* Literal.Number.Integer */
-  .mo { color: $monokai-purple } /* Literal.Number.Oct */
-  .sb { color: $monokai-gold } /* Literal.String.Backtick */
-  .sc { color: $monokai-gold } /* Literal.String.Char */
-  .sd { color: $monokai-gold } /* Literal.String.Doc */
-  .s2 { color: $monokai-gold } /* Literal.String.Double */
-  .se { color: $monokai-gold } /* Literal.String.Escape */
-  .sh { color: $monokai-gold } /* Literal.String.Heredoc */
-  .si { color: $monokai-gold } /* Literal.String.Interpol */
-  .sx { color: $monokai-gold } /* Literal.String.Other */
-  .sr { color: $monokai-gold } /* Literal.String.Regex */
-  .s1 { color: $monokai-gold } /* Literal.String.Single */
-  .ss { color: $monokai-gold } /* Literal.String.Symbol */
-  .bp { color: $monokai-fg } /* Name.Builtin.Pseudo */
-  .vc { color: $monokai-blue; font-style: italic } /* Name.Variable.Class */
-  .vg { color: $monokai-blue; font-style: italic } /* Name.Variable.Global */
-  .vi { color: $monokai-blue; font-style: italic } /* Name.Variable.Instance */
-  .il { color: $monokai-purple } /* Literal.Number.Integer.Long */
-}
+  .hljs {
+    display: block;
+    background: #272822;
+  }
+
+  .hljs-tag,
+  .hljs-tag .hljs-title,
+  .hljs-keyword,
+  .hljs-literal,
+  .hljs-strong,
+  .hljs-change,
+  .hljs-winutils,
+  .hljs-flow,
+  .lisp .hljs-title,
+  .clojure .hljs-built_in,
+  .nginx .hljs-title,
+  .tex .hljs-special {
+    color: #F92672;
+  }
+
+  .hljs {
+    color: #DDD;
+  }

+  .hljs .hljs-constant,
+  .asciidoc .hljs-code {
+    color: #66D9EF;
+  }
+
+  .hljs-code,
+  .hljs-class .hljs-title,
+  .hljs-header {
+    color: white;
+  }
+
+  .hljs-link_label,
+  .hljs-attribute,
+  .hljs-symbol,
+  .hljs-symbol .hljs-string,
+  .hljs-value,
+  .hljs-regexp {
+    color: #BF79DB;
+  }
+
+  .hljs-link_url,
+  .hljs-tag .hljs-value,
+  .hljs-string,
+  .hljs-bullet,
+  .hljs-subst,
+  .hljs-title,
+  .hljs-emphasis,
+  .haskell .hljs-type,
+  .hljs-preprocessor,
+  .hljs-pragma,
+  .ruby .hljs-class .hljs-parent,
+  .hljs-built_in,
+  .sql .hljs-aggregate,
+  .django .hljs-template_tag,
+  .django .hljs-variable,
+  .smalltalk .hljs-class,
+  .hljs-javadoc,
+  .django .hljs-filter .hljs-argument,
+  .smalltalk .hljs-localvars,
+  .smalltalk .hljs-array,
+  .hljs-attr_selector,
+  .hljs-pseudo,
+  .hljs-addition,
+  .hljs-stream,
+  .hljs-envvar,
+  .apache .hljs-tag,
+  .apache .hljs-cbracket,
+  .tex .hljs-command,
+  .hljs-prompt {
+    color: #A6E22E;
+  }
+
+  .hljs-comment,
+  .java .hljs-annotation,
+  .smartquote,
+  .hljs-blockquote,
+  .hljs-horizontal_rule,
+  .python .hljs-decorator,
+  .hljs-template_comment,
+  .hljs-pi,
+  .hljs-doctype,
+  .hljs-deletion,
+  .hljs-shebang,
+  .apache .hljs-sqbracket,
+  .tex .hljs-formula {
+    color: #75715E;
+  }
+
+  .hljs-keyword,
+  .hljs-literal,
+  .css .hljs-id,
+  .hljs-phpdoc,
+  .hljs-title,
+  .hljs-header,
+  .haskell .hljs-type,
+  .vbscript .hljs-built_in,
+  .sql .hljs-aggregate,
+  .rsl .hljs-built_in,
+  .smalltalk .hljs-class,
+  .diff .hljs-header,
+  .hljs-chunk,
+  .hljs-winutils,
+  .bash .hljs-variable,
+  .apache .hljs-tag,
+  .tex .hljs-special,
+  .hljs-request,
+  .hljs-status {
+    font-weight: bold;
+  }
+
+  .coffeescript .javascript,
+  .javascript .xml,
+  .tex .hljs-formula,
+  .xml .javascript,
+  .xml .vbscript,
+  .xml .css,
+  .xml .hljs-cdata {
+    opacity: 0.5;
+  }
+}
--- a/app/assets/stylesheets/highlight/solarized_dark.scss
+++ b/app/assets/stylesheets/highlight/solarized_dark.scss
-.solarized-dark .highlight {
-  
+.solarized-dark {
  background-color: #002B36;

+  .highlight{
+    border-left: 1px solid #113b46;
+  }
+
+  .line.hll {
+    background: #000;
+  }
+
+  .no-highlight {
+    color: #DDD;
+  }
+
  pre {
    background-color: #002B36;
    color: #eee;
  }

-  .hll { background-color: #073642 }
-  .c { color: #586E75 } /* Comment */
-  .err { color: #93A1A1 } /* Error */
-  .g { color: #93A1A1 } /* Generic */
-  .k { color: #859900 } /* Keyword */
-  .l { color: #93A1A1 } /* Literal */
-  .n { color: #93A1A1 } /* Name */
-  .o { color: #859900 } /* Operator */
-  .x { color: #CB4B16 } /* Other */
-  .p { color: #93A1A1 } /* Punctuation */
-  .cm { color: #586E75 } /* Comment.Multiline */
-  .cp { color: #859900 } /* Comment.Preproc */
-  .c1 { color: #586E75 } /* Comment.Single */
-  .cs { color: #859900 } /* Comment.Special */
-  .gd { color: #2AA198 } /* Generic.Deleted */
-  .ge { color: #93A1A1; font-style: italic } /* Generic.Emph */
-  .gr { color: #DC322F } /* Generic.Error */
-  .gh { color: #CB4B16 } /* Generic.Heading */
-  .gi { color: #859900 } /* Generic.Inserted */
-  .go { color: #93A1A1 } /* Generic.Output */
-  .gp { color: #93A1A1 } /* Generic.Prompt */
-  .gs { color: #93A1A1; font-weight: bold } /* Generic.Strong */
-  .gu { color: #CB4B16 } /* Generic.Subheading */
-  .gt { color: #93A1A1 } /* Generic.Traceback */
-  .kc { color: #CB4B16 } /* Keyword.Constant */
-  .kd { color: #268BD2 } /* Keyword.Declaration */
-  .kn { color: #859900 } /* Keyword.Namespace */
-  .kp { color: #859900 } /* Keyword.Pseudo */
-  .kr { color: #268BD2 } /* Keyword.Reserved */
-  .kt { color: #DC322F } /* Keyword.Type */
-  .ld { color: #93A1A1 } /* Literal.Date */
-  .m { color: #2AA198 } /* Literal.Number */
-  .s { color: #2AA198 } /* Literal.String */
-  .na { color: #93A1A1 } /* Name.Attribute */
-  .nb { color: #B58900 } /* Name.Builtin */
-  .nc { color: #268BD2 } /* Name.Class */
-  .no { color: #CB4B16 } /* Name.Constant */
-  .nd { color: #268BD2 } /* Name.Decorator */
-  .ni { color: #CB4B16 } /* Name.Entity */
-  .ne { color: #CB4B16 } /* Name.Exception */
-  .nf { color: #268BD2 } /* Name.Function */
-  .nl { color: #93A1A1 } /* Name.Label */
-  .nn { color: #93A1A1 } /* Name.Namespace */
-  .nx { color: #93A1A1 } /* Name.Other */
-  .py { color: #93A1A1 } /* Name.Property */
-  .nt { color: #268BD2 } /* Name.Tag */
-  .nv { color: #268BD2 } /* Name.Variable */
-  .ow { color: #859900 } /* Operator.Word */
-  .w { color: #93A1A1 } /* Text.Whitespace */
-  .mf { color: #2AA198 } /* Literal.Number.Float */
-  .mh { color: #2AA198 } /* Literal.Number.Hex */
-  .mi { color: #2AA198 } /* Literal.Number.Integer */
-  .mo { color: #2AA198 } /* Literal.Number.Oct */
-  .sb { color: #586E75 } /* Literal.String.Backtick */
-  .sc { color: #2AA198 } /* Literal.String.Char */
-  .sd { color: #93A1A1 } /* Literal.String.Doc */
-  .s2 { color: #2AA198 } /* Literal.String.Double */
-  .se { color: #CB4B16 } /* Literal.String.Escape */
-  .sh { color: #93A1A1 } /* Literal.String.Heredoc */
-  .si { color: #2AA198 } /* Literal.String.Interpol */
-  .sx { color: #2AA198 } /* Literal.String.Other */
-  .sr { color: #DC322F } /* Literal.String.Regex */
-  .s1 { color: #2AA198 } /* Literal.String.Single */
-  .ss { color: #2AA198 } /* Literal.String.Symbol */
-  .bp { color: #268BD2 } /* Name.Builtin.Pseudo */
-  .vc { color: #268BD2 } /* Name.Variable.Class */
-  .vg { color: #268BD2 } /* Name.Variable.Global */
-  .vi { color: #268BD2 } /* Name.Variable.Instance */
-  .il { color: #2AA198 } /* Literal.Number.Integer.Long */
-}
+  .line-numbers a {
+    color: #666;
+  }
+
+  .hljs {
+    display: block;
+    background: #002b36;
+    color: #839496;
+  }
+
+  .hljs-comment,
+  .hljs-template_comment,
+  .diff .hljs-header,
+  .hljs-doctype,
+  .hljs-pi,
+  .lisp .hljs-string,
+  .hljs-javadoc {
+    color: #586e75;
+  }
+
+  /* Solarized Green */
+  .hljs-keyword,
+  .hljs-winutils,
+  .method,
+  .hljs-addition,
+  .css .hljs-tag,
+  .hljs-request,
+  .hljs-status,
+  .nginx .hljs-title {
+    color: #859900;
+  }

+  /* Solarized Cyan */
+  .hljs-number,
+  .hljs-command,
+  .hljs-string,
+  .hljs-tag .hljs-value,
+  .hljs-rules .hljs-value,
+  .hljs-phpdoc,
+  .tex .hljs-formula,
+  .hljs-regexp,
+  .hljs-hexcolor,
+  .hljs-link_url {
+    color: #2aa198;
+  }
+
+  /* Solarized Blue */
+  .hljs-title,
+  .hljs-localvars,
+  .hljs-chunk,
+  .hljs-decorator,
+  .hljs-built_in,
+  .hljs-identifier,
+  .vhdl .hljs-literal,
+  .hljs-id,
+  .css .hljs-function {
+    color: #268bd2;
+  }
+
+  /* Solarized Yellow */
+  .hljs-attribute,
+  .hljs-variable,
+  .lisp .hljs-body,
+  .smalltalk .hljs-number,
+  .hljs-constant,
+  .hljs-class .hljs-title,
+  .hljs-parent,
+  .haskell .hljs-type,
+  .hljs-link_reference {
+    color: #b58900;
+  }
+
+  /* Solarized Orange */
+  .hljs-preprocessor,
+  .hljs-preprocessor .hljs-keyword,
+  .hljs-pragma,
+  .hljs-shebang,
+  .hljs-symbol,
+  .hljs-symbol .hljs-string,
+  .diff .hljs-change,
+  .hljs-special,
+  .hljs-attr_selector,
+  .hljs-subst,
+  .hljs-cdata,
+  .clojure .hljs-title,
+  .css .hljs-pseudo,
+  .hljs-header {
+    color: #cb4b16;
+  }
+
+  /* Solarized Red */
+  .hljs-deletion,
+  .hljs-important {
+    color: #dc322f;
+  }
+
+  /* Solarized Violet */
+  .hljs-link_label {
+    color: #6c71c4;
+  }
+
+  .tex .hljs-formula {
+    background: #073642;
+  }
+}
--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
-.white .highlight {
-  
+.white {
  background-color: #fff;

+  .line.hll {
+    background: #FFA;
+  }
+
+  .highlight{
+    border-left: 1px solid #eee;
+  }
+
  pre {
    background-color: #fff;
    color: #333;
  }

-  .hll { display: block; background-color: $hover }
-  .c { color: #888888; font-style: italic } /* Comment */
-  .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-  .k { color: #000000; font-weight: bold } /* Keyword */
-  .cm { color: #888888 } /* Comment.Multiline */
-  .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
-  .c1 { color: #888888 } /* Comment.Single */
-  .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
-  .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-  .ge { font-style: italic } /* Generic.Emph */
-  .gr { color: #aa0000 } /* Generic.Error */
-  .gh { color: #303030 } /* Generic.Heading */
-  .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-  .go { color: #888888 } /* Generic.Output */
-  .gp { color: #555555 } /* Generic.Prompt */
-  .gs { font-weight: bold } /* Generic.Strong */
-  .gu { color: #606060 } /* Generic.Subheading */
-  .gt { color: #aa0000 } /* Generic.Traceback */
-  .kc{font-weight: bold;} /* Keyword.Constant */
-  .kd{font-weight: bold;} /* Keyword.Declaration */
-  .kn{font-weight: bold;} /* Keyword.Namespace */
-  .kp{font-weight: bold;} /* Keyword.Pseudo */
-  .kr{font-weight: bold;} /* Keyword.Reserved */
-  .kt{color: #458;font-weight: bold;} /* Keyword.Type */
-  .m { color: #0000DD; font-weight: bold } /* Literal.Number */
-  .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
-  .na{color: #008080;} /* Name.Attribute */
-  .nb{color: #0086B3;} /* Name.Builtin */
-  .nc{color: #458;font-weight: bold;} /* Name.Class */
-  .no{color: #008080;} /* Name.Constant */
-  .ni{color: #800080;}
-  .ne{color: #900;font-weight: bold;} /* Name.Exception */
-  .nf{color: #900;font-weight: bold;} /* Name.Function */
-  .nn{color: #005;font-weight: bold;} /* Name.Namespace */
-  .nt{color: #000080;} /* Name.Tag */
-  .nv{color: #008080;} /* Name.Variable */
-  .py { color: #336699; font-weight: bold } /* Name.Property */
-  .ow { color: #008800 } /* Operator.Word */
-  .w { color: #bbbbbb } /* Text.Whitespace */
-  .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
-  .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
-  .mi {color: #099;} /* Literal.Number.Integer */
-  .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
-  .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
-  .sc{color: #d14;} /* Literal.String.Char */
-  .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
-  .s2{color: #d14;} /* Literal.String.Double */
-  .se{color: #d14;} /* Literal.String.Escape */
-  .sh{color: #d14;} /* Literal.String.Heredoc */
-  .si{color: #d14;} /* Literal.String.Interpol */
-  .sx{color: #d14;} /* Literal.String.Other */
-  .sr{color: #d14;} /* Literal.String.Regex */
-  .s1{color: #d14;} /* Literal.String.Single */
-  .ss{color: #d14;} /* Literal.String.Symbol */
-  .bp { color: #003388 } /* Name.Builtin.Pseudo */
-  .vc { color: #336699 } /* Name.Variable.Class */
-  .vg { color: #dd7700 } /* Name.Variable.Global */
-  .vi { color: #3333bb }
+  .hljs {
+    background: #FFF;
+  }
+
+  .line-numbers a {
+    color: #999;
+  }
+
+  .hljs {
+    display: block;
+    background: #fff; color: black;
+  }
+
+  .hljs-comment,
+  .hljs-template_comment,
+  .hljs-javadoc,
+  .hljs-comment * {
+    color: #006a00;
+  }
+
+  .hljs-keyword,
+  .hljs-literal,
+  .nginx .hljs-title {
+    color: #aa0d91;
+  }
+  .method,
+  .hljs-list .hljs-title,
+  .hljs-tag .hljs-title,
+  .setting .hljs-value,
+  .hljs-winutils,
+  .tex .hljs-command,
+  .http .hljs-title,
+  .hljs-request,
+  .hljs-status {
+    color: #008;
+  }
+
+  .hljs-envvar,
+  .tex .hljs-special {
+    color: #660;
+  }
+
+  .hljs-string {
+    color: #c41a16;
+  }
+  .hljs-tag .hljs-value,
+  .hljs-cdata,
+  .hljs-filter .hljs-argument,
+  .hljs-attr_selector,
+  .apache .hljs-cbracket,
+  .hljs-date,
+  .hljs-regexp {
+    color: #080;
+  }
+
+  .hljs-sub .hljs-identifier,
+  .hljs-pi,
+  .hljs-tag,
+  .hljs-tag .hljs-keyword,
+  .hljs-decorator,
+  .ini .hljs-title,
+  .hljs-shebang,
+  .hljs-prompt,
+  .hljs-hexcolor,
+  .hljs-rules .hljs-value,
+  .hljs-symbol,
+  .hljs-symbol .hljs-string,
+  .hljs-number,
+  .css .hljs-function,
+  .clojure .hljs-title,
+  .clojure .hljs-built_in,
+  .hljs-function .hljs-title,
+  .coffeescript .hljs-attribute {
+    color: #1c00cf;
+  }
+
+  .hljs-class .hljs-title,
+  .haskell .hljs-type,
+  .smalltalk .hljs-class,
+  .hljs-javadoctag,
+  .hljs-yardoctag,
+  .hljs-phpdoc,
+  .hljs-typename,
+  .hljs-tag .hljs-attribute,
+  .hljs-doctype,
+  .hljs-class .hljs-id,
+  .hljs-built_in,
+  .setting,
+  .hljs-params,
+  .clojure .hljs-attribute {
+    color: #5c2699;
+  }
+
+  .hljs-variable {
+   color: #3f6e74;
+  }
+  .css .hljs-tag,
+  .hljs-rules .hljs-property,
+  .hljs-pseudo,
+  .hljs-subst {
+    color: #000;
+  }
+
+  .css .hljs-class,
+  .css .hljs-id {
+    color: #9B703F;
+  }
+
+  .hljs-value .hljs-important {
+    color: #ff7700;
+    font-weight: bold;
+  }
+
+  .hljs-rules .hljs-keyword {
+    color: #C5AF75;
+  }
+
+  .hljs-annotation,
+  .apache .hljs-sqbracket,
+  .nginx .hljs-built_in {
+    color: #9B859D;
+  }
+
+  .hljs-preprocessor,
+  .hljs-preprocessor *,
+  .hljs-pragma {
+    color: #643820;
+  }
+
+  .tex .hljs-formula {
+    background-color: #EEE;
+    font-style: italic;
+  }
+
+  .diff .hljs-header,
+  .hljs-chunk {
+    color: #808080;
+    font-weight: bold;
+  }
+
+  .diff .hljs-change {
+    background-color: #BCCFF9;
+  }
+
+  .hljs-addition {
+    background-color: #BAEEBA;
+  }
+
+  .hljs-deletion {
+    background-color: #FFC8BD;
+  }
+
+  .hljs-comment .hljs-yardoctag {
+    font-weight: bold;
+  }
+
+  .method .hljs-id {
+    color: #000;
+  }
 }

 .shadow {

--- a/app/assets/stylesheets/main/layout.scss
+++ b/app/assets/stylesheets/main/layout.scss
 html {
  overflow-y: scroll;
+
+  &.touch .tooltip { display: none !important; }
 }

 body {

--- a/app/assets/stylesheets/main/mixins.scss
+++ b/app/assets/stylesheets/main/mixins.scss
@@ -106,12 +106,12 @@

  h3 {
    margin-top: 35px;
-    font-size: 2em;
+    font-size: 1.5em;
  }

  h4 {
    margin-top: 30px;
-    font-size: 1.5em;
+    font-size: 1.2em;
  }

  blockquote p {
@@ -128,7 +128,7 @@
    }
  }

-  code {
+  p > code {
    font-size: inherit;
    font-weight: inherit;
    color: #555;

--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -113,6 +113,7 @@
      &.commit {
        background: transparent;
        padding: 3px;
+        padding-left: 0;
        border: none;
        color: #666;
        .commit-row-title {
@@ -122,6 +123,7 @@
      &.commits-stat {
        display: block;
        padding: 3px;
+        padding-left: 0;

        &:hover {
          background: none;

--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -29,6 +29,64 @@ header {
        float: right;
        margin-right: 0;
      }
+
+      .navbar-toggle {
+        color: $style_color;
+        margin: 0 -15px 0 0;
+        padding: 10px;
+        border-radius: 0;
+
+        button i { font-size: 22px; }
+
+        &.collapsed { background-color: transparent !important;}
+
+        &:hover {
+          background-color: #EEE;
+        }
+      }
+    }
+
+    .turbolink-spinner {
+      font-size: 20px;
+      margin-right: 10px;
+    }
+
+    @media (max-width: $screen-xs-max) {
+      border-width: 0;
+      font-size: 18px;
+
+      .app_logo { margin-left: -15px; }
+      .project_name {
+        display: inline-block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        vertical-align: top;
+        white-space: nowrap;
+        max-width: 70%;
+      }
+
+      .navbar-collapse {
+        padding-right: 0;
+        padding-left: 0;
+      }
+
+      .navbar-nav {
+        margin: 5px 0;
+
+        .visible-xs, .visable-sm {
+          display: table-cell !important;
+        }
+      }
+
+      li {
+        display: table-cell;
+        width: 1%;
+
+        a {
+          text-align: center;
+          font-size: 18px !important;
+        }
+      }
    }
  }

@@ -128,6 +186,8 @@ header {
        background: #708090;
        border-bottom: 1px solid #AAA;

+        .navbar-toggle { color: #fff; }
+
        .nav > li > a {
          color: #AAA;
          text-shadow: 0 1px 0 #444;

--- a/app/assets/stylesheets/sections/issues.scss
+++ b/app/assets/stylesheets/sections/issues.scss
@@ -60,7 +60,6 @@ input.check_all_issues {
 .btn.close_issue {
  color: #B94A48;
  font-weight: bold;
-  @include shade;
  &:hover {
    color: #B94A48;
  }
@@ -68,7 +67,6 @@ input.check_all_issues {
 .btn.reopen_issue {
  color: #468847;
  font-weight: bold;
-  @include shade;
  &:hover {
    color: #468847;
  }

--- a/app/assets/stylesheets/sections/login.scss
+++ b/app/assets/stylesheets/sections/login.scss
@@ -6,11 +6,10 @@
  }

  .login-box{
-    width: 304px;
+    max-width: 304px;
    position: relative;
    @include border-radius(5px);
    margin: auto;
-    padding: 20px;
    background: white;
  }

@@ -23,7 +22,7 @@
    background-color: #f1f1f1;
    font-size: 16px;
    padding: 14px 10px;
-    width: 280px;
+    width: 100%;
    height: auto;

    &.top {

--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -89,16 +89,3 @@
 .merge-request-form-info {
  padding-top: 15px;
 }
-
-.merge-request-branches {
-  .commit-row-message {
-    font-weight: normal !important;
-  }
-
-  .select2-container .select2-single {
-    span {
-      font-weight: bold;
-      color: #555;
-    }
-  }
-}
--- a/app/assets/stylesheets/sections/nav.scss
+++ b/app/assets/stylesheets/sections/nav.scss
@@ -35,7 +35,7 @@
      width: 1%;
      &.active {
        a {
-          color: $style_color;
+          color: #333;
          font-weight: bolder;

          &:after {
@@ -46,7 +46,7 @@
            left: 50%;
            width: 0;
            height: 0;
-            border-color: transparent transparent #777 transparent;
+            border-color: transparent transparent #333 transparent;
            border-style: solid;
            border-width: 6px;
            margin-left: -6px;
@@ -83,4 +83,38 @@
      padding-top: 2px;
    }
  }
+
+  @media (max-width: $screen-xs-max) {
+    font-size: 18px;
+    margin: 0;
+
+    max-height: none;
+
+    &, .container {
+      padding: 0;
+      border-top: 0;
+    }
+
+    ul {
+      height: auto;
+
+      li {
+        display: list-item;
+        width: auto;
+        padding: 5px 0;
+
+        &.active {
+          background-color: $primary_color;
+
+          a {
+            color: #fff;
+            font-weight: normal;
+            text-shadow: none;
+
+            &:after { display: none; }
+          }
+        }
+      }
+    }
+  }
 }
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -92,10 +92,6 @@ ul.notes {
    .note-body {
      @include md-typography;
      margin-left: 45px;
-
-      .highlight {
-        @include border-radius(4px);
-      }
    }
    .note-header {
      padding-bottom: 5px;
@@ -292,7 +288,7 @@ ul.notes {
      box-shadow: none;
      font-size: 14px;
      height: 80px;
-      width: 98.6%;
+      width: 100%;
    }
  }
 }
@@ -341,7 +337,7 @@ ul.notes {
    box-shadow: none;
    font-size: 14px;
    height: 80px;
-    width: 98.6%;
+    width: 100%;
  }

  .form-actions {

--- a/app/assets/stylesheets/sections/profile.scss
+++ b/app/assets/stylesheets/sections/profile.scss
@@ -105,3 +105,12 @@
    }
  }
 }
+
+.profile-groups-avatars {
+  margin: 0 5px 10px 0;
+
+  img {
+    width: 50px;
+    height: 50px;
+  }
+}
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -123,14 +123,9 @@
 }

 .save-project-loader {
-  img {
  margin-top: 50px;
  margin-bottom: 50px;
-  }
-  h3 {
-    @extend .page-title;
-  }
-
+  color: #555;
 }

 ul.nav.nav-projects-tabs {

--- a/app/assets/stylesheets/sections/tree.scss
+++ b/app/assets/stylesheets/sections/tree.scss
@@ -133,3 +133,21 @@
    color: #777;
  }
 }
+
+.blob-commit-info {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  margin-bottom: 10px;
+
+  .commit {
+    .commit-row-title {
+      font-size: 13px;
+
+      .commit-row-message {
+        font-weight: normal;
+        color: #555;
+      }
+    }
+  }
+}
--- a/app/assets/stylesheets/themes/ui_color.scss
+++ b/app/assets/stylesheets/themes/ui_color.scss
@@ -18,7 +18,7 @@
      .navbar-inner {
        background: #547;
        border-bottom: 1px solid #435;
-        .app_logo {
+        .app_logo, .navbar-toggle {
          &:hover {
            background-color: #435;
          }

--- a/app/assets/stylesheets/themes/ui_gray.scss
+++ b/app/assets/stylesheets/themes/ui_gray.scss
@@ -18,7 +18,7 @@
      .navbar-inner {
        background: #373737;
        border-bottom: 1px solid #272727;
-        .app_logo {
+        .app_logo, .navbar-toggle {
          &:hover {
            background-color: #272727;
          }

--- a/app/assets/stylesheets/themes/ui_mars.scss
+++ b/app/assets/stylesheets/themes/ui_mars.scss
@@ -18,7 +18,7 @@
      .navbar-inner {
        background: #474D57;
        border-bottom: 1px solid #373D47;
-        .app_logo {
+        .app_logo, .navbar-toggle {
          &:hover {
            background-color: #373D47;
          }

--- a/app/assets/stylesheets/themes/ui_modern.scss
+++ b/app/assets/stylesheets/themes/ui_modern.scss
@@ -18,7 +18,7 @@
      .navbar-inner {
        background: #345;
        border-bottom: 1px solid #234;
-        .app_logo {
+        .app_logo, .navbar-toggle {
          &:hover {
            background-color: #234;
          }

--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -52,6 +52,6 @@ class Admin::GroupsController < Admin::ApplicationController
  private

  def group
-    @group = Group.find_by_path(params[:id])
+    @group = Group.find_by(path: params[:id])
  end
 end
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -5,7 +5,7 @@ class Admin::ProjectsController < Admin::ApplicationController

  def index
    owner_id = params[:owner_id]
-    user = User.find_by_id(owner_id)
+    user = User.find_by(id: owner_id)

    @projects = user ? user.owned_projects : Project.all
    @projects = @projects.where("visibility_level IN (?)", params[:visibility_levels]) if params[:visibility_levels].present?

--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -100,6 +100,6 @@ class Admin::UsersController < Admin::ApplicationController
  protected

  def user
-    @user ||= User.find_by_username!(params[:id])
+    @user ||= User.find_by!(username: params[:id])
  end
 end
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -41,7 +41,7 @@ class DashboardController < ApplicationController
                  current_user.authorized_projects
                end

-    @projects = @projects.where(namespace_id: Group.find_by_name(params[:group])) if params[:group].present?
+    @projects = @projects.where(namespace_id: Group.find_by(name: params[:group])) if params[:group].present?
    @projects = @projects.where(visibility_level: params[:visibility_level]) if params[:visibility_level].present?
    @projects = @projects.includes(:namespace)
    @projects = @projects.tagged_with(params[:label]) if params[:label].present?
@@ -54,12 +54,12 @@ class DashboardController < ApplicationController

  def merge_requests
    @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params)
-    @merge_requests = @merge_requests.recent.page(params[:page]).per(20)
+    @merge_requests = @merge_requests.page(params[:page]).per(20)
  end

  def issues
    @issues = FilteringService.new.execute(Issue, current_user, params)
-    @issues = @issues.recent.page(params[:page]).per(20)
+    @issues = @issues.page(params[:page]).per(20)
    @issues = @issues.includes(:author, :project)

    respond_to do |format|

--- a/app/controllers/errors_controller.rb
+++ b/app/controllers/errors_controller.rb
-class ErrorsController < ApplicationController
-end
--- a/app/controllers/groups/avatars_controller.rb
+++ b/app/controllers/groups/avatars_controller.rb
+class Groups::AvatarsController < ApplicationController
+  layout "profile"
+
+  def destroy
+    @group = Group.find_by(path: params[:group_id])
+    @group.remove_avatar!
+
+    @group.save
+
+    redirect_to edit_group_path(@group)
+  end
+end
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -89,7 +89,7 @@ class GroupsController < ApplicationController
  protected

  def group
-    @group ||= Group.find_by_path(params[:id])
+    @group ||= Group.find_by(path: params[:id])
  end

  def projects

--- a/app/controllers/profiles/groups_controller.rb
+++ b/app/controllers/profiles/groups_controller.rb
@@ -19,6 +19,6 @@ class Profiles::GroupsController < ApplicationController
  private

  def group
-    @group ||= Group.find_by_path(params[:id])
+    @group ||= Group.find_by(path: params[:id])
  end
 end
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -6,6 +6,7 @@ class Projects::BlobController < Projects::ApplicationController
  before_filter :authorize_read_project!
  before_filter :authorize_code_access!
  before_filter :require_non_empty_project
+  before_filter :authorize_push!, only: [:destroy]

  before_filter :blob


--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -8,7 +8,7 @@ class Projects::CompareController < Projects::ApplicationController
  end

  def show
-    compare = Gitlab::Git::Compare.new(@repository.raw_repository, params[:from], params[:to])
+    compare = Gitlab::Git::Compare.new(@repository.raw_repository, params[:from], params[:to], MergeRequestDiff::COMMITS_SAFE_SIZE)

    @commits       = compare.commits
    @commit        = compare.commit
@@ -16,6 +16,11 @@ class Projects::CompareController < Projects::ApplicationController
    @refs_are_same = compare.same
    @line_notes    = []

+    if @diffs == [Gitlab::Git::Diff::BROKEN_DIFF]
+      @diffs = []
+      @timeout = true
+    end
+
    diff_line_count = Commit::diff_line_count(@diffs)
    @suppress_diff = Commit::diff_suppress?(@diffs, diff_line_count) && !params[:force_show_diff]
    @force_suppress_diff = Commit::diff_force_suppress?(@diffs, diff_line_count)

--- a/app/controllers/projects/edit_tree_controller.rb
+++ b/app/controllers/projects/edit_tree_controller.rb
 class Projects::EditTreeController < Projects::BaseTreeController
  before_filter :require_branch_head
  before_filter :blob
+  before_filter :authorize_push!

  def show
    @last_commit = Gitlab::Git::Commit.last_for_path(@repository, @ref, @path).sha

--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -11,6 +11,9 @@ class Projects::IssuesController < Projects::ApplicationController
  # Allow modify issue
  before_filter :authorize_modify_issue!, only: [:edit, :update]

+  # Allow issues bulk update
+  before_filter :authorize_admin_issues!, only: [:bulk_update]
+
  respond_to :html

  def index
@@ -97,7 +100,7 @@ class Projects::IssuesController < Projects::ApplicationController

  def issue
    @issue ||= begin
-                 @project.issues.find_by_iid!(params[:id])
+                 @project.issues.find_by!(iid: params[:id])
               rescue ActiveRecord::RecordNotFound
                 redirect_old
               end
@@ -107,8 +110,8 @@ class Projects::IssuesController < Projects::ApplicationController
    return render_404 unless can?(current_user, :modify_issue, @issue)
  end

-  def authorize_admin_issue!
-    return render_404 unless can?(current_user, :admin_issue, @issue)
+  def authorize_admin_issues!
+    return render_404 unless can?(current_user, :admin_issue, @project)
  end

  def module_enabled
@@ -127,7 +130,7 @@ class Projects::IssuesController < Projects::ApplicationController
  # To prevent 404 errors we provide a redirect to correct iids until 7.0 release
  #
  def redirect_old
-    issue = @project.issues.find_by_id(params[:id])
+    issue = @project.issues.find_by(id: params[:id])

    if issue
      redirect_to project_issue_path(@project, issue)

--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -60,7 +60,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
    @merge_request = MergeRequest.new(params[:merge_request])
    @merge_request.source_project = @project unless @merge_request.source_project
    @merge_request.target_project = @project unless @merge_request.target_project
-    @target_branches = @merge_request.target_project.nil? ? [] : @merge_request.target_project.repository.branch_names
    @source_project = @merge_request.source_project
    @merge_request
  end
@@ -76,7 +75,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
    @merge_request.author = current_user
    @target_branches ||= []
    if @merge_request.save
-      @merge_request.reload_code
      redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully created.'
    else
      @source_project = @merge_request.source_project
@@ -168,11 +166,15 @@ class Projects::MergeRequestsController < Projects::ApplicationController
  protected

  def selected_target_project
-    ((@project.id.to_s == params[:target_project_id]) || @project.forked_project_link.nil?) ? @project : @project.forked_project_link.forked_from_project
+    if @project.id.to_s == params[:target_project_id] || @project.forked_project_link.nil?
+      @project
+    else
+      @project.forked_project_link.forked_from_project
+    end
  end

  def merge_request
-    @merge_request ||= @project.merge_requests.find_by_iid!(params[:id])
+    @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
  end

  def closes_issues
@@ -217,6 +219,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
    # or from cache if already merged
    @commits = @merge_request.commits

+    @merge_request_diff = @merge_request.merge_request_diff
    @allowed_to_merge = allowed_to_merge?
    @show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
  end

--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -76,7 +76,7 @@ class Projects::MilestonesController < Projects::ApplicationController
  protected

  def milestone
-    @milestone ||= @project.milestones.find_by_iid!(params[:id])
+    @milestone ||= @project.milestones.find_by!(iid: params[:id])
  end

  def authorize_admin_milestone!

--- a/app/controllers/projects/new_tree_controller.rb
+++ b/app/controllers/projects/new_tree_controller.rb
 class Projects::NewTreeController < Projects::BaseTreeController
  before_filter :require_branch_head
+  before_filter :authorize_push!

  def show
  end

--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -34,7 +34,7 @@ class Projects::RefsController < Projects::ApplicationController
    contents = tree.entries
    @logs = contents.map do |content|
      file = params[:path] ? File.join(params[:path], content.name) : content.name
-      last_commit = @repo.commits(@commit.id, file, 1).last
+      last_commit = @repo.last_commit_for_path(@commit.id, file)
      {
        file_name: content.name,
        commit: last_commit

--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -8,7 +8,7 @@ class Projects::TagsController < Projects::ApplicationController
  before_filter :authorize_admin_project!, only: [:destroy]

  def index
-    @tags = Kaminari.paginate_array(@repository.tags).page(params[:page]).per(30)
+    @tags = Kaminari.paginate_array(@repository.tags.reverse).page(params[:page]).per(30)
  end

  def create

--- a/app/controllers/projects/team_members_controller.rb
+++ b/app/controllers/projects/team_members_controller.rb
@@ -26,7 +26,7 @@ class Projects::TeamMembersController < Projects::ApplicationController
  end

  def update
-    @user_project_relation = project.users_projects.find_by_user_id(member)
+    @user_project_relation = project.users_projects.find_by(user_id: member)
    @user_project_relation.update_attributes(params[:team_member])

    unless @user_project_relation.valid?
@@ -36,7 +36,7 @@ class Projects::TeamMembersController < Projects::ApplicationController
  end

  def destroy
-    @user_project_relation = project.users_projects.find_by_user_id(member)
+    @user_project_relation = project.users_projects.find_by(user_id: member)
    @user_project_relation.destroy

    respond_to do |format|
@@ -46,7 +46,7 @@ class Projects::TeamMembersController < Projects::ApplicationController
  end

  def leave
-    project.users_projects.find_by_user_id(current_user).destroy
+    project.users_projects.find_by(user_id: current_user).destroy

    respond_to do |format|
      format.html { redirect_to :back }
@@ -65,6 +65,6 @@ class Projects::TeamMembersController < Projects::ApplicationController
  protected

  def member
-    @member ||= User.find_by_username(params[:id])
+    @member ||= User.find_by(username: params[:id])
  end
 end
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -2,8 +2,8 @@ class SearchController < ApplicationController
  include SearchHelper

  def show
-    @project = Project.find_by_id(params[:project_id]) if params[:project_id].present?
-    @group = Group.find_by_id(params[:group_id]) if params[:group_id].present?
+    @project = Project.find_by(id: params[:project_id]) if params[:project_id].present?
+    @group = Group.find_by(id: params[:group_id]) if params[:group_id].present?

    if @project
      return access_denied! unless can?(current_user, :download_code, @project)

--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -18,7 +18,7 @@ class SnippetsController < ApplicationController
  end

  def user_index
-    @user = User.find_by_username(params[:username])
+    @user = User.find_by(username: params[:username])
    @snippets = @user.snippets.fresh.non_expired

    if @user == current_user

--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2,7 +2,7 @@ class UsersController < ApplicationController
  layout 'navless'

  def show
-    @user = User.find_by_username!(params[:username])
+    @user = User.find_by!(username: params[:username])
    @projects = @user.authorized_projects.where(id: current_user.authorized_projects.pluck(:id)).includes(:namespace)
    @events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20)


--- a/app/controllers/users_groups_controller.rb
+++ b/app/controllers/users_groups_controller.rb
@@ -30,7 +30,7 @@ class UsersGroupsController < ApplicationController
  protected

  def group
-    @group ||= Group.find_by_path(params[:group_id])
+    @group ||= Group.find_by(path: params[:group_id])
  end

  def authorize_admin_group!

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -49,8 +49,17 @@ module ApplicationHelper
    args.any? { |v| v.to_s.downcase == action_name }
  end

+  def group_icon(group_path)
+    group = Group.find_by(path: group_path)
+    if group && group.avatar.present?
+      group.avatar.url
+    else
+      '/assets/no_group_avatar.png'
+    end
+  end
+
  def avatar_icon(user_email = '', size = nil)
-    user = User.find_by_email(user_email)
+    user = User.find_by(email: user_email)
    if user && user.avatar.present?
      user.avatar.url
    else
@@ -203,8 +212,14 @@ module ApplicationHelper
  def highlight_js(&block)
    string = capture(&block)

-    content_tag :div, class: user_color_scheme_class do
-      Pygments::Lexer[:js].highlight(string).html_safe
+    content_tag :div, class: "highlighted-data #{user_color_scheme_class}" do
+      content_tag :div, class: 'highlight' do
+        content_tag :pre do
+          content_tag :code do
+            string.html_safe
+          end
+        end
+      end
    end
  end

@@ -221,4 +236,10 @@ module ApplicationHelper
  def render_markup(file_name, file_content)
    GitHub::Markup.render(file_name, file_content).html_safe
  end
+
+  def spinner(text = nil)
+    content_tag :div, class: 'loading hide' do
+      content_tag(:i, nil, class: 'icon-spinner icon-spin') + text
+    end
+  end
 end
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -69,11 +69,18 @@ module GitlabMarkdownHelper
    project_path_with_namespace = project.path_with_namespace
    paths = extract_paths(text)
    paths.each do |file_path|
-      new_path = rebuild_path(project_path_with_namespace, file_path, requested_path, ref)
+      original_file_path = extract(file_path)
+      new_path = rebuild_path(project_path_with_namespace, original_file_path, requested_path, ref)
+      if reference_path?(file_path)
+        # Replacing old string with a new one that contains updated path
+        # eg. [some document]: document.md will be replaced with [some document] /namespace/project/master/blob/document.md
+        text.gsub!(file_path, file_path.gsub(original_file_path, "/#{new_path}"))
+      else
        # Replacing old string with a new one with brackets ]() to prevent replacing occurence of a word
        # e.g. If we have a markdown like [test](test) this will replace ](test) and not the word test
        text.gsub!("](#{file_path})", "](/#{new_path})")
      end
+    end
    text
  end

@@ -83,9 +90,11 @@ module GitlabMarkdownHelper
    select_relative(paths)
  end

-  # Split the markdown text to each line and find all paths, this will match anything with - ]("some_text")
+  # Split the markdown text to each line and find all paths, this will match anything with - ]("some_text") and [some text]: file.md
  def pick_out_paths(markdown_text)
-    markdown_text.split("\n").map { |text| text.scan(/\]\(([^(]+)\)/) }
+    inline_paths = markdown_text.split("\n").map { |text| text.scan(/\]\(([^(]+)\)/) }
+    reference_paths = markdown_text.split("\n").map { |text| text.scan(/\[.*\]:.*/) }
+    inline_paths + reference_paths
  end

  # Removes any empty result produced by not matching the regexp
@@ -93,12 +102,22 @@ module GitlabMarkdownHelper
    paths.reject{|l| l.empty? }.flatten
  end

+  # If a path is a reference style link we need to omit ]:
+  def extract(path)
+    path.split("]: ").last
+  end
+
  # Reject any path that contains ignored protocol
  # eg. reject "https://gitlab.org} but accept "doc/api/README.md"
  def select_relative(paths)
    paths.reject{|path| ignored_protocols.map{|protocol| path.include?(protocol)}.any?}
  end

+  # Check whether a path is a reference-style link
+  def reference_path?(path)
+    path.include?("]: ")
+  end
+
  def ignored_protocols
    ["http://","https://", "ftp://", "mailto:"]
  end
@@ -147,18 +166,27 @@ module GitlabMarkdownHelper

  def file_exists?(path)
    return false if path.nil? || path.empty?
-    File.exists?(path_on_fs(path))
+    return @repository.blob_at(current_sha, path).present? || @repository.tree(current_sha, path).entries.any?
  end

  # Check if the path is pointing to a directory(tree) or a file(blob)
  # eg. doc/api is directory and doc/README.md is file
  def local_path(path)
-    File.directory?(path_on_fs(path)) ? "tree" : "blob"
+    return "tree" if @repository.tree(current_sha, path).entries.any?
+    return "raw" if @repository.blob_at(current_sha, path).image?
+    return "blob"
+  end
+
+  def current_ref
+    @commit.nil? ? "master" : @commit.id
  end

-  # Path to the file in the satellites repository on the filesystem
-  def path_on_fs(path)
-    [@path_to_satellite, path].join("/")
+  def current_sha
+    if @commit
+      @commit.id
+    else
+      @repository.head_commit.sha
+    end
  end

  # We will assume that if no ref exists we can point to master

--- a/app/helpers/submodule_helper.rb
+++ b/app/helpers/submodule_helper.rb
+module SubmoduleHelper
+  include Gitlab::ShellAdapter
+
+  # links to files listing for submodule if submodule is a project on this server
+  def submodule_links(submodule_item)
+    url = @repository.submodule_url_for(@ref, submodule_item.path)
+
+    return url, nil unless url =~ /([^\/:]+\/[^\/]+\.git)\Z/
+
+    project = $1
+    project.chomp!('.git')
+
+    if self_url?(url, project)
+      return project_path(project), project_tree_path(project, submodule_item.id)
+    elsif github_dot_com_url?(url)
+      standard_links('github.com', project, submodule_item.id)
+    elsif gitlab_dot_com_url?(url)
+      standard_links('gitlab.com', project, submodule_item.id)
+    else
+      return url, nil
+    end
+  end
+
+  protected
+
+  def github_dot_com_url?(url)
+    url =~ /github\.com[\/:][^\/]+\/[^\/]+\Z/
+  end
+
+  def gitlab_dot_com_url?(url)
+    url =~ /gitlab\.com[\/:][^\/]+\/[^\/]+\Z/
+  end
+
+  def self_url?(url, project)
+    return true if url == [ Gitlab.config.gitlab.url, '/', project, '.git' ].join('')
+    url == gitlab_shell.url_to_repo(project)
+  end
+
+  def standard_links(host, project, commit)
+    base = [ 'https://', host, '/', project ].join('')
+    return base, [ base, '/tree/', commit ].join('')
+  end
+end
--- a/app/mailers/emails/issues.rb
+++ b/app/mailers/emails/issues.rb
@@ -8,7 +8,7 @@ module Emails

    def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id)
      @issue = Issue.find(issue_id)
-      @previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id
+      @previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
      @project = @issue.project
      mail(to: recipient(recipient_id), subject: subject("Changed issue ##{@issue.iid}", @issue.title))
    end

--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -8,7 +8,7 @@ module Emails

    def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id)
      @merge_request = MergeRequest.find(merge_request_id)
-      @previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id
+      @previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
      @project = @merge_request.project
      mail(to: recipient(recipient_id), subject: subject("Changed merge request ##{@merge_request.iid}", @merge_request.title))
    end

--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -12,7 +12,7 @@ class Notify < ActionMailer::Base

  default_url_options[:host]     = Gitlab.config.gitlab.host
  default_url_options[:protocol] = Gitlab.config.gitlab.protocol
-  default_url_options[:port]     = Gitlab.config.gitlab.port if Gitlab.config.gitlab_on_non_standard_port?
+  default_url_options[:port]     = Gitlab.config.gitlab.port unless Gitlab.config.gitlab_on_standard_port?
  default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root

  default from: Gitlab.config.gitlab.email_from

--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -125,6 +125,8 @@ class Ability
      project_report_rules + [
        :write_merge_request,
        :write_wiki,
+        :modify_issue,
+        :admin_issue,
        :push_code
      ]
    end

--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -16,16 +16,17 @@ class Commit
  DIFF_HARD_LIMIT_FILES = 500
  DIFF_HARD_LIMIT_LINES = 10000

-  def self.decorate(commits)
+  class << self
+    def decorate(commits)
      commits.map { |c| self.new(c) }
    end

    # Calculate number of lines to render for diffs
-  def self.diff_line_count(diffs)
+    def diff_line_count(diffs)
      diffs.reduce(0){|sum, d| sum + d.diff.lines.count}
    end

-  def self.diff_suppress?(diffs, line_count = nil)
+    def diff_suppress?(diffs, line_count = nil)
      # optimize - check file count first
      return true if diffs.size > DIFF_SAFE_FILES

@@ -33,13 +34,14 @@ class Commit
      line_count > DIFF_SAFE_LINES
    end

-  def self.diff_force_suppress?(diffs, line_count = nil)
+    def diff_force_suppress?(diffs, line_count = nil)
      # optimize - check file count first
      return true if diffs.size > DIFF_HARD_LIMIT_FILES

      line_count ||= Commit::diff_line_count(diffs)
      line_count > DIFF_HARD_LIMIT_LINES
    end
+  end

  attr_accessor :raw


--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -48,13 +48,13 @@ module Issuable

    def sort(method)
      case method.to_s
-      when 'newest' then reorder('created_at DESC')
-      when 'oldest' then reorder('created_at ASC')
-      when 'recently_updated' then reorder('updated_at DESC')
-      when 'last_updated' then reorder('updated_at ASC')
+      when 'newest' then reorder("#{table_name}.created_at DESC")
+      when 'oldest' then reorder("#{table_name}.created_at ASC")
+      when 'recently_updated' then reorder("#{table_name}.updated_at DESC")
+      when 'last_updated' then reorder("#{table_name}.updated_at ASC")
      when 'milestone_due_soon' then joins(:milestone).reorder("milestones.due_date ASC")
      when 'milestone_due_later' then joins(:milestone).reorder("milestones.due_date DESC")
-      else reorder('created_at DESC')
+      else reorder("#{table_name}.created_at DESC")
      end
    end
  end

--- a/app/models/gollum_wiki.rb
+++ b/app/models/gollum_wiki.rb
 class GollumWiki
+  include Gitlab::ShellAdapter

  MARKUPS = {
    "Markdown" => :markdown,
@@ -113,10 +114,6 @@ class GollumWiki
    "#{@user.username} #{action} page: #{title}"
  end

-  def gitlab_shell
-    @gitlab_shell ||= Gitlab::Shell.new
-  end
-
  def path_to_repo
    @path_to_repo ||= File.join(Gitlab.config.gitlab_shell.repos_path, "#{path_with_namespace}.git")
  end

--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -12,6 +12,9 @@
 #  description :string(255)      default(""), not null
 #

+require 'carrierwave/orm/activerecord'
+require 'file_size_validator'
+
 class Group < Namespace
  has_many :users_groups, dependent: :destroy
  has_many :users, through: :users_groups
@@ -26,6 +29,13 @@ class Group < Namespace
    presence: true,
    if: ->(group) { group.ldap_cn.present? }

+  attr_accessible :avatar
+
+  validate :avatar_type, if: ->(user) { user.avatar_changed? }
+  validates :avatar, file_size: { maximum: 100.kilobytes.to_i }
+
+  mount_uploader :avatar, AttachmentUploader
+
  def human_name
    name
  end
@@ -60,4 +70,10 @@ class Group < Namespace
  def members
    users_groups
  end
+
+  def avatar_type
+    unless self.avatar.image?
+      self.errors.add :avatar, "only images allowed"
+    end
+  end
 end
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -31,6 +31,11 @@ class MergeRequest < ActiveRecord::Base
  belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
  belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"

+  has_one :merge_request_diff, dependent: :destroy
+  after_create :create_merge_request_diff
+
+  delegate :commits, :diffs, :last_commit, :last_commit_short_sha, to: :merge_request_diff, prefix: nil
+
  attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :author_id_of_changes, :state_event, :description

  attr_accessor :should_remove_source_branch
@@ -45,20 +50,26 @@ class MergeRequest < ActiveRecord::Base
    end

    event :merge do
-      transition [:reopened, :opened] => :merged
+      transition [:reopened, :opened, :locked] => :merged
    end

    event :reopen do
      transition closed: :reopened
    end

-    state :opened
+    event :lock do
+      transition [:reopened, :opened] => :locked
+    end

-    state :reopened
+    event :unlock do
+      transition locked: :reopened
+    end

+    state :opened
+    state :reopened
    state :closed
-
    state :merged
+    state :locked
  end

  state_machine :merge_status, initial: :unchecked do
@@ -75,15 +86,10 @@ class MergeRequest < ActiveRecord::Base
    end

    state :unchecked
-
    state :can_be_merged
-
    state :cannot_be_merged
  end

-  serialize :st_commits
-  serialize :st_diffs
-
  validates :source_project, presence: true, unless: :allow_broken
  validates :source_branch, presence: true
  validates :target_project, presence: true
@@ -105,7 +111,7 @@ class MergeRequest < ActiveRecord::Base
  scope :closed, -> { with_states(:closed, :merged) }

  def validate_branches
-    if target_project==source_project && target_branch == source_branch
+    if target_project == source_project && target_branch == source_branch
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
    end

@@ -120,8 +126,9 @@ class MergeRequest < ActiveRecord::Base
  end

  def reload_code
-    self.reloaded_commits
-    self.reloaded_diffs
+    if merge_request_diff && opened?
+      merge_request_diff.reload_content
+    end
  end

  def check_if_can_be_merged
@@ -132,42 +139,6 @@ class MergeRequest < ActiveRecord::Base
    end
  end

-  def diffs
-    @diffs ||= (load_diffs(st_diffs) || [])
-  end
-
-  def reloaded_diffs
-    if opened? && unmerged_diffs.any?
-      self.st_diffs = dump_diffs(unmerged_diffs)
-      self.save
-    end
-  end
-
-  def broken_diffs?
-    diffs == broken_diffs
-  rescue
-    true
-  end
-
-  def valid_diffs?
-    !broken_diffs?
-  end
-
-  def unmerged_diffs
-    diffs = if for_fork?
-              Gitlab::Satellite::MergeAction.new(author, self).diffs_between_satellite
-            else
-              Gitlab::Git::Diff.between(target_project.repository, source_branch, target_branch)
-            end
-
-    diffs ||= []
-    diffs
-  end
-
-  def last_commit
-    commits.first
-  end
-
  def merge_event
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
  end
@@ -176,56 +147,15 @@ class MergeRequest < ActiveRecord::Base
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
  end

-  def commits
-    load_commits(st_commits || [])
-  end
-
-  def probably_merged?
-    unmerged_commits.empty? &&
-      commits.any? && opened?
-  end
-
-  def reloaded_commits
-    if opened? && unmerged_commits.any?
-      self.st_commits = dump_commits(unmerged_commits)
-      save
-
-    end
-    commits
-  end
-
-  def unmerged_commits
-    if for_fork?
-      commits = Gitlab::Satellite::MergeAction.new(self.author, self).commits_between
-    else
-      commits = target_project.repository.commits_between(self.target_branch, self.source_branch)
-    end
-
-    if commits.present?
-      commits = Commit.decorate(commits).
-      sort_by(&:created_at).
-      reverse
-    end
-    commits
-  end
-
-  def merge!(user_id)
-    self.author_id_of_changes = user_id
-    self.merge
-  end
-
  def automerge!(current_user, commit_message = nil)
-    if Gitlab::Satellite::MergeAction.new(current_user, self).merge!(commit_message) && self.unmerged_commits.empty?
-      self.merge!(current_user.id)
-      true
-    end
-  rescue
-    mark_as_unmergeable
-    false
+    MergeRequests::AutoMergeService.new.execute(self, current_user, commit_message)
  end

  def mr_and_commit_notes
-    commit_ids = commits.map(&:id)
+    # Fetch comments only from last 100 commits
+    commits_for_notes_limit = 100
+    commit_ids = commits.last(commits_for_notes_limit).map(&:id)
+
    project.notes.where(
      "(noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR (noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
      mr_id: id,
@@ -247,10 +177,6 @@ class MergeRequest < ActiveRecord::Base
    Gitlab::Satellite::MergeAction.new(current_user, self).format_patch
  end

-  def last_commit_short_sha
-    @last_commit_short_sha ||= last_commit.sha[0..10]
-  end
-
  def for_fork?
    target_project != source_project
  end
@@ -328,33 +254,23 @@ class MergeRequest < ActiveRecord::Base
    message
  end

-  private
-
-  def dump_commits(commits)
-    commits.map(&:to_hash)
-  end
-
-  def load_commits(array)
-    array.map { |hash| Commit.new(Gitlab::Git::Commit.new(hash)) }
-  end
-
-  def dump_diffs(diffs)
-    if diffs == broken_diffs
-      broken_diffs
-    elsif diffs.respond_to?(:map)
-      diffs.map(&:to_hash)
+  # Return array of possible target branches
+  # dependes on target project of MR
+  def target_branches
+    if target_project.nil?
+      []
+    else
+      target_project.repository.branch_names
    end
  end

-  def load_diffs(raw)
-    if raw == broken_diffs
-      broken_diffs
-    elsif raw.respond_to?(:map)
-      raw.map { |hash| Gitlab::Git::Diff.new(hash) }
-    end
+  # Return array of possible source branches
+  # dependes on source project of MR
+  def source_branches
+    if source_project.nil?
+      []
+    else
+      source_project.repository.branch_names
    end
-
-  def broken_diffs
-    [Gitlab::Git::Diff::BROKEN_DIFF]
  end
 end
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
+require Rails.root.join("app/models/commit")
+
+class MergeRequestDiff < ActiveRecord::Base
+  # Prevent store of diff
+  # if commits amount more then 200
+  COMMITS_SAFE_SIZE = 200
+
+  attr_reader :commits, :diffs
+
+  belongs_to :merge_request
+
+  attr_accessible :state, :st_commits, :st_diffs
+
+  delegate :target_branch, :source_branch, to: :merge_request, prefix: nil
+
+  state_machine :state, initial: :empty do
+    state :collected
+    state :timeout
+    state :overflow_commits_safe_size
+    state :overflow_diff_files_limit
+    state :overflow_diff_lines_limit
+  end
+
+  serialize :st_commits
+  serialize :st_diffs
+
+  after_create :reload_content
+
+  def reload_content
+    reload_commits
+    reload_diffs
+  end
+
+  def diffs
+    @diffs ||= (load_diffs(st_diffs) || [])
+  end
+
+  def commits
+    @commits ||= load_commits(st_commits || [])
+  end
+
+  def last_commit
+    commits.first
+  end
+
+  def last_commit_short_sha
+    @last_commit_short_sha ||= last_commit.sha[0..10]
+  end
+
+  private
+
+  def dump_commits(commits)
+    commits.map(&:to_hash)
+  end
+
+  def load_commits(array)
+    array.map { |hash| Commit.new(Gitlab::Git::Commit.new(hash)) }
+  end
+
+  def dump_diffs(diffs)
+    if diffs.respond_to?(:map)
+      diffs.map(&:to_hash)
+    end
+  end
+
+  def load_diffs(raw)
+    if raw.respond_to?(:map)
+      raw.map { |hash| Gitlab::Git::Diff.new(hash) }
+    end
+  end
+
+  # When Git::Diff is not able to get diff
+  # because of git timeout it return this value
+  def broken_diffs
+    [Gitlab::Git::Diff::BROKEN_DIFF]
+  end
+
+  # Collect array of Git::Commit objects
+  # between target and source branches
+  def unmerged_commits
+    commits = if merge_request.for_fork?
+                Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).commits_between
+              else
+                repository.commits_between(target_branch, source_branch)
+              end
+
+    if commits.present?
+      commits = Commit.decorate(commits).
+        sort_by(&:created_at).
+        reverse
+    end
+
+    commits
+  end
+
+  # Reload all commits related to current merge request from repo
+  # and save it as array of hashes in st_commits db field
+  def reload_commits
+    commit_objects = unmerged_commits
+
+    if commit_objects.present?
+      self.st_commits = dump_commits(commit_objects)
+    end
+
+    save
+  end
+
+  # Reload diffs between branches related to current merge request from repo
+  # and save it as array of hashes in st_diffs db field
+  def reload_diffs
+    new_diffs = []
+
+    if commits.size.zero?
+      self.state = :empty
+    elsif commits.size > COMMITS_SAFE_SIZE
+      self.state = :overflow_commits_safe_size
+    else
+      new_diffs = unmerged_diffs
+    end
+
+    if new_diffs.any?
+      if new_diffs.size > Commit::DIFF_HARD_LIMIT_FILES
+        self.state = :overflow_diff_files_limit
+        new_diffs = []
+      end
+
+      if new_diffs.sum { |diff| diff.diff.lines.count } > Commit::DIFF_HARD_LIMIT_LINES
+        self.state = :overflow_diff_lines_limit
+        new_diffs = []
+      end
+    end
+
+    if new_diffs.present?
+      new_diffs = dump_commits(new_diffs)
+      self.state = :collected
+    end
+
+    self.st_diffs = new_diffs
+    self.save
+  end
+
+  # Collect array of Git::Diff objects
+  # between target and source branches
+  def unmerged_diffs
+    diffs = if merge_request.for_fork?
+              Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).diffs_between_satellite
+            else
+              Gitlab::Git::Diff.between(repository, source_branch, target_branch)
+            end
+
+    if diffs == broken_diffs
+      self.state = :timeout
+      diffs = []
+    end
+
+    diffs ||= []
+    diffs
+  end
+
+  def repository
+    merge_request.target_project.repository
+  end
+end
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -10,6 +10,7 @@
 #  updated_at  :datetime         not null
 #  type        :string(255)
 #  description :string(255)      default(""), not null
+#  avatar      :string(255)
 #

 class Namespace < ActiveRecord::Base

--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -72,14 +72,20 @@ class Note < ActiveRecord::Base
    # +noteable+ was referenced from +mentioner+, by including GFM in either +mentioner+'s description or an associated Note.
    # Create a system Note associated with +noteable+ with a GFM back-reference to +mentioner+.
    def create_cross_reference_note(noteable, mentioner, author, project)
-      create({
-        noteable: noteable,
-        commit_id: (noteable.sha if noteable.respond_to? :sha),
+      note_options = {
        project: project,
        author: author,
        note: "_mentioned in #{mentioner.gfm_reference}_",
        system: true
-      }, without_protection: true)
+      }
+
+      if noteable.kind_of?(Commit)
+        note_options.merge!(noteable_type: 'Commit', commit_id: noteable.id)
+      else
+        note_options.merge!(noteable: noteable)
+      end
+
+      create(note_options, without_protection: true)
    end

    def create_assignee_change_note(noteable, project, author, assignee)
@@ -123,8 +129,8 @@ class Note < ActiveRecord::Base

  def commit_author
    @commit_author ||=
-      project.users.find_by_email(noteable.author_email) ||
-      project.users.find_by_name(noteable.author_name)
+      project.users.find_by(email: noteable.author_email) ||
+      project.users.find_by(name: noteable.author_name)
  rescue
    nil
  end

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -148,10 +148,10 @@ class Project < ActiveRecord::Base
    def find_with_namespace(id)
      if id.include?("/")
        id = id.split("/")
-        namespace = Namespace.find_by_path(id.first)
+        namespace = Namespace.find_by(path: id.first)
        return nil unless namespace

-        where(namespace_id: namespace.id).find_by_path(id.second)
+        where(namespace_id: namespace.id).find_by(path: id.second)
      else
        where(path: id, namespace_id: nil).last
      end
@@ -299,7 +299,7 @@ class Project < ActiveRecord::Base

  # Get Team Member record by user id
  def team_member_by_id(user_id)
-    users_projects.find_by_user_id(user_id)
+    users_projects.find_by(user_id: user_id)
  end

  def name_with_namespace
@@ -353,7 +353,7 @@ class Project < ActiveRecord::Base
    # Close merge requests
    mrs = self.merge_requests.opened.where(target_branch: branch_name).to_a
    mrs = mrs.select(&:last_commit).select { |mr| c_ids.include?(mr.last_commit.id) }
-    mrs.each { |merge_request| merge_request.merge!(user.id) }
+    mrs.each { |merge_request| MergeRequests::MergeService.new.execute(merge_request, user, nil) }

    true
  end

--- a/app/models/project_services/assembla_service.rb
+++ b/app/models/project_services/assembla_service.rb
@@ -16,6 +16,8 @@
 #

 class AssemblaService < Service
+  attr_accessible :subdomain
+
  include HTTParty

  validates :token, presence: true, if: :activated?
@@ -34,12 +36,13 @@ class AssemblaService < Service

  def fields
    [
-      { type: 'text', name: 'token', placeholder: '' }
+      { type: 'text', name: 'token', placeholder: '' },
+      { type: 'text', name: 'subdomain', placeholder: '' }
    ]
  end

  def execute(push)
-    url = "https://atlas.assembla.com/spaces/ouposp/github_tool?secret_key=#{token}"
+    url = "https://atlas.assembla.com/spaces/#{subdomain}/github_tool?secret_key=#{token}"
    AssemblaService.post(url, body: { payload: push }.to_json, headers: { 'Content-Type' => 'application/json' })
  end
 end
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -61,7 +61,7 @@ class HipchatService < Service
    elsif after =~ /000000/
      message << "removed branch #{ref} from <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> \n"
    else
-      message << "#pushed to branch <a href=\"#{project.web_url}/commits/#{ref}\">#{ref}</a> "
+      message << "pushed to branch <a href=\"#{project.web_url}/commits/#{ref}\">#{ref}</a> "
      message << "of <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> "
      message << "(<a href=\"#{project.web_url}/compare/#{before}...#{after}\">Compare changes</a>)"
      for commit in push[:commits] do

--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
--- a/app/models/tree.rb
+++ b/app/models/tree.rb
--- a/app/models/user.rb
+++ b/app/models/user.rb
--- a/app/observers/merge_request_observer.rb
+++ b/app/observers/merge_request_observer.rb
--- a/app/services/files/create_service.rb
+++ b/app/services/files/create_service.rb
--- a/app/services/files/delete_service.rb
+++ b/app/services/files/delete_service.rb
--- a/app/services/files/update_service.rb
+++ b/app/services/files/update_service.rb
--- a/app/services/filtering_service.rb
+++ b/app/services/filtering_service.rb
--- a/app/services/merge_requests/auto_merge_service.rb
+++ b/app/services/merge_requests/auto_merge_service.rb
--- a/app/services/merge_requests/base_merge_service.rb
+++ b/app/services/merge_requests/base_merge_service.rb
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_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/search/global_service.rb
+++ b/app/services/search/global_service.rb
--- a/app/views/admin/hooks/_data_ex.html.erb
+++ b/app/views/admin/hooks/_data_ex.html.erb
--- a/app/views/admin/hooks/_data_ex.html.haml
+++ b/app/views/admin/hooks/_data_ex.html.haml
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
--- a/app/views/dashboard/_activities.html.haml
+++ b/app/views/dashboard/_activities.html.haml
--- a/app/views/dashboard/_groups.html.haml
+++ b/app/views/dashboard/_groups.html.haml
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
--- a/app/views/help/_layout.html.haml
+++ b/app/views/help/_layout.html.haml
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
--- a/app/views/help/permissions.html.haml
+++ b/app/views/help/permissions.html.haml
--- a/app/views/help/ssh.html.haml
+++ b/app/views/help/ssh.html.haml
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
--- a/app/views/layouts/_public_head_panel.html.haml
+++ b/app/views/layouts/_public_head_panel.html.haml
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
--- a/app/views/layouts/group.html.haml
+++ b/app/views/layouts/group.html.haml
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
--- a/app/views/layouts/project_settings.html.haml
+++ b/app/views/layouts/project_settings.html.haml
--- a/app/views/layouts/projects.html.haml
+++ b/app/views/layouts/projects.html.haml
--- a/app/views/layouts/public_projects.html.haml
+++ b/app/views/layouts/public_projects.html.haml
--- a/app/views/layouts/user_team.html.haml
+++ b/app/views/layouts/user_team.html.haml
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
--- a/app/views/profiles/passwords/new.html.haml
+++ b/app/views/profiles/passwords/new.html.haml
--- a/app/views/projects/_settings_nav.html.haml
+++ b/app/views/projects/_settings_nav.html.haml
--- a/app/views/projects/blob/_blob.html.haml
+++ b/app/views/projects/blob/_blob.html.haml
--- a/app/views/projects/blob/_text.html.haml
+++ b/app/views/projects/blob/_text.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/commits/_inline_commit.html.haml
+++ b/app/views/projects/commits/_inline_commit.html.haml
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
--- a/app/views/projects/compare/_form.html.haml
+++ b/app/views/projects/compare/_form.html.haml
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
--- a/app/views/projects/edit_tree/show.html.haml
+++ b/app/views/projects/edit_tree/show.html.haml
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.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/show/_commits.html.haml
+++ b/app/views/projects/merge_requests/show/_commits.html.haml
--- a/app/views/projects/merge_requests/show/_diffs.html.haml
+++ b/app/views/projects/merge_requests/show/_diffs.html.haml
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
--- a/app/views/projects/merge_requests/show/_mr_ci.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_ci.html.haml
--- a/app/views/projects/milestones/_issues.html.haml
+++ b/app/views/projects/milestones/_issues.html.haml
--- a/app/views/projects/milestones/_merge_request.html.haml
+++ b/app/views/projects/milestones/_merge_request.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/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
--- a/app/views/projects/snippets/_blob.html.haml
+++ b/app/views/projects/snippets/_blob.html.haml
--- a/app/views/projects/snippets/_snippet.html.haml
+++ b/app/views/projects/snippets/_snippet.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/tree/_blob_item.html.haml
+++ b/app/views/projects/tree/_blob_item.html.haml
--- a/app/views/projects/tree/_spinner.html.haml
+++ b/app/views/projects/tree/_spinner.html.haml
--- a/app/views/projects/tree/_submodule_item.html.haml
+++ b/app/views/projects/tree/_submodule_item.html.haml
--- a/app/views/projects/tree/_tree.html.haml
+++ b/app/views/projects/tree/_tree.html.haml
--- a/app/views/projects/tree/_tree_item.html.haml
+++ b/app/views/projects/tree/_tree_item.html.haml
--- a/app/views/search/results/_blob.html.haml
+++ b/app/views/search/results/_blob.html.haml
--- a/app/views/shared/_file_hljs.html.haml
+++ b/app/views/shared/_file_hljs.html.haml
--- a/app/views/shared/_no_ssh.html.haml
+++ b/app/views/shared/_no_ssh.html.haml
--- a/app/views/snippets/_blob.html.haml
+++ b/app/views/snippets/_blob.html.haml
--- a/app/views/snippets/_blob_content.html.haml
+++ b/app/views/snippets/_blob_content.html.haml
--- a/app/views/users/_groups.html.haml
+++ b/app/views/users/_groups.html.haml
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
--- a/config.ru
+++ b/config.ru
--- 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/3_grit_ext.rb
+++ b/config/initializers/3_grit_ext.rb
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
--- a/config/routes.rb
+++ b/config/routes.rb
--- a/db/fixtures/development/04_project.rb
+++ b/db/fixtures/development/04_project.rb
--- a/db/migrate/20110913200833_devise_create_users.rb
+++ b/db/migrate/20110913200833_devise_create_users.rb
--- a/db/migrate/20110913204141_create_projects.rb
+++ b/db/migrate/20110913204141_create_projects.rb
--- a/db/migrate/20110914221600_create_users_projects.rb
+++ b/db/migrate/20110914221600_create_users_projects.rb
--- a/db/migrate/20110915205627_add_private_flag_to_project.rb
+++ b/db/migrate/20110915205627_add_private_flag_to_project.rb
--- a/db/migrate/20110915213352_create_keys.rb
+++ b/db/migrate/20110915213352_create_keys.rb
--- a/db/migrate/20110916123731_add_name_to_user.rb
+++ b/db/migrate/20110916123731_add_name_to_user.rb
--- a/db/migrate/20110916162511_add_key_title_to_key.rb
+++ b/db/migrate/20110916162511_add_key_title_to_key.rb
--- a/db/migrate/20110917212932_add_identifier_to_key.rb
+++ b/db/migrate/20110917212932_add_identifier_to_key.rb
--- a/db/migrate/20110921192501_create_issues.rb
+++ b/db/migrate/20110921192501_create_issues.rb
--- a/db/migrate/20110922110156_add_code_to_project.rb
+++ b/db/migrate/20110922110156_add_code_to_project.rb
--- a/db/migrate/20110923211333_add_status_to_issue.rb
+++ b/db/migrate/20110923211333_add_status_to_issue.rb
--- a/db/migrate/20110924214549_create_rails_admin_histories_table.rb
+++ b/db/migrate/20110924214549_create_rails_admin_histories_table.rb
--- a/db/migrate/20110924215658_add_admin_field_to_user.rb
+++ b/db/migrate/20110924215658_add_admin_field_to_user.rb
--- a/db/migrate/20110926082616_remove_admin.rb
+++ b/db/migrate/20110926082616_remove_admin.rb
--- a/db/migrate/20110927130352_create_notes.rb
+++ b/db/migrate/20110927130352_create_notes.rb
--- a/db/migrate/20110928140106_add_project_id_for_note.rb
+++ b/db/migrate/20110928140106_add_project_id_for_note.rb
--- a/db/migrate/20110928142747_change_noteable_id_for_note.rb
+++ b/db/migrate/20110928142747_change_noteable_id_for_note.rb
--- a/db/migrate/20110928161328_add_attachment_to_note.rb
+++ b/db/migrate/20110928161328_add_attachment_to_note.rb
--- a/db/migrate/20111005193700_add_allow_repo_creation_for_user.rb
+++ b/db/migrate/20111005193700_add_allow_repo_creation_for_user.rb
--- a/db/migrate/20111009101738_add_ownerto_project.rb
+++ b/db/migrate/20111009101738_add_ownerto_project.rb
--- a/db/migrate/20111009110913_add_projects_limit_to_user.rb
+++ b/db/migrate/20111009110913_add_projects_limit_to_user.rb
--- a/db/migrate/20111009111204_remove_allow_create_repo_from_user.rb
+++ b/db/migrate/20111009111204_remove_allow_create_repo_from_user.rb
--- a/db/migrate/20111015154310_add_position_to_issues.rb
+++ b/db/migrate/20111015154310_add_position_to_issues.rb
--- a/db/migrate/20111016183422_create_snippets.rb
+++ b/db/migrate/20111016183422_create_snippets.rb
--- a/db/migrate/20111016193417_add_content_type_to_snippets.rb
+++ b/db/migrate/20111016193417_add_content_type_to_snippets.rb
--- a/db/migrate/20111016195506_add_file_name_to_snippets.rb
+++ b/db/migrate/20111016195506_add_file_name_to_snippets.rb
--- a/db/migrate/20111019212429_add_social_to_user.rb
+++ b/db/migrate/20111019212429_add_social_to_user.rb
--- a/db/migrate/20111021101550_change_social_fields_in_users.rb
+++ b/db/migrate/20111021101550_change_social_fields_in_users.rb
--- a/db/migrate/20111025134235_add_high_label_to_issue.rb
+++ b/db/migrate/20111025134235_add_high_label_to_issue.rb
--- a/db/migrate/20111027051828_add_expires_at_to_snippets.rb
+++ b/db/migrate/20111027051828_add_expires_at_to_snippets.rb
--- a/db/migrate/20111027142641_change_note_note_to_text.rb
+++ b/db/migrate/20111027142641_change_note_note_to_text.rb
--- a/db/migrate/20111027152724_issue_conten_to_note.rb
+++ b/db/migrate/20111027152724_issue_conten_to_note.rb
--- a/db/migrate/20111101222453_acts_as_taggable_on_migration.rb
+++ b/db/migrate/20111101222453_acts_as_taggable_on_migration.rb
--- a/db/migrate/20111111093150_remove_content_from_issues.rb
+++ b/db/migrate/20111111093150_remove_content_from_issues.rb
--- a/db/migrate/20111115063954_add_authentication_token_to_users.rb
+++ b/db/migrate/20111115063954_add_authentication_token_to_users.rb
--- a/db/migrate/20111124115339_add_extra_field_to_issue.rb
+++ b/db/migrate/20111124115339_add_extra_field_to_issue.rb
--- a/db/migrate/20111127155345_create_merge_requests.rb
+++ b/db/migrate/20111127155345_create_merge_requests.rb
--- a/db/migrate/20111206213842_add_advanced_rights_to_team_member.rb
+++ b/db/migrate/20111206213842_add_advanced_rights_to_team_member.rb
--- a/db/migrate/20111206222316_migrate_to_new_rights.rb
+++ b/db/migrate/20111206222316_migrate_to_new_rights.rb
--- a/db/migrate/20111207211728_add_default_branch_to_project.rb
+++ b/db/migrate/20111207211728_add_default_branch_to_project.rb
--- a/db/migrate/20111214091851_create_web_hooks.rb
+++ b/db/migrate/20111214091851_create_web_hooks.rb
--- a/db/migrate/20111220190817_add_coloscheme_option_to_user.rb
+++ b/db/migrate/20111220190817_add_coloscheme_option_to_user.rb
--- a/db/migrate/20111231111825_add_project_id_to_key.rb
+++ b/db/migrate/20111231111825_add_project_id_to_key.rb
--- a/db/migrate/20120110180749_add_line_number_to_note.rb
+++ b/db/migrate/20120110180749_add_line_number_to_note.rb
--- a/db/migrate/20120119202326_add_indexes.rb
+++ b/db/migrate/20120119202326_add_indexes.rb
--- a/db/migrate/20120121122616_fix_noteable_id.rb
+++ b/db/migrate/20120121122616_fix_noteable_id.rb
--- a/db/migrate/20120206170141_add_modularity_fields_to_project.rb
+++ b/db/migrate/20120206170141_add_modularity_fields_to_project.rb
--- a/db/migrate/20120215182305_create_protected_branches.rb
+++ b/db/migrate/20120215182305_create_protected_branches.rb
--- a/db/migrate/20120216085842_move_to_roles_permissions.rb
+++ b/db/migrate/20120216085842_move_to_roles_permissions.rb
--- a/db/migrate/20120216215008_create_wikis.rb
+++ b/db/migrate/20120216215008_create_wikis.rb
--- a/db/migrate/20120219130957_add_slug_to_wiki.rb
+++ b/db/migrate/20120219130957_add_slug_to_wiki.rb
--- a/db/migrate/20120219140810_add_wiki_enabled_to_project.rb
+++ b/db/migrate/20120219140810_add_wiki_enabled_to_project.rb
--- a/db/migrate/20120219193300_add_user_to_wiki.rb
+++ b/db/migrate/20120219193300_add_user_to_wiki.rb
--- a/db/migrate/20120228130210_create_events.rb
+++ b/db/migrate/20120228130210_create_events.rb
--- a/db/migrate/20120228134252_add_action_to_event.rb
+++ b/db/migrate/20120228134252_add_action_to_event.rb
--- a/db/migrate/20120301185805_add_theme_to_user.rb
+++ b/db/migrate/20120301185805_add_theme_to_user.rb
--- a/db/migrate/20120307095918_add_author_id_to_event.rb
+++ b/db/migrate/20120307095918_add_author_id_to_event.rb
--- a/db/migrate/20120315111711_add_commits_diff_store_to_merge_request.rb
+++ b/db/migrate/20120315111711_add_commits_diff_store_to_merge_request.rb
--- a/db/migrate/20120315132931_add_merged_to_merge_request.rb
+++ b/db/migrate/20120315132931_add_merged_to_merge_request.rb
--- a/db/migrate/20120317095543_add_description_to_issues.rb
+++ b/db/migrate/20120317095543_add_description_to_issues.rb
--- a/db/migrate/20120323221339_add_bio_field_to_user.rb
+++ b/db/migrate/20120323221339_add_bio_field_to_user.rb
--- a/db/migrate/20120329170745_add_automerge_to_merge_request.rb
+++ b/db/migrate/20120329170745_add_automerge_to_merge_request.rb
--- a/db/migrate/20120405211750_increase_mr_text_column_size.rb
+++ b/db/migrate/20120405211750_increase_mr_text_column_size.rb
--- a/db/migrate/20120408180246_create_milestones.rb
+++ b/db/migrate/20120408180246_create_milestones.rb
--- a/db/migrate/20120408181910_add_milestone_id_to_issue.rb
+++ b/db/migrate/20120408181910_add_milestone_id_to_issue.rb
--- a/db/migrate/20120413135904_add_blocked_field_to_user.rb
+++ b/db/migrate/20120413135904_add_blocked_field_to_user.rb
--- a/db/migrate/20120627145613_remove_critical_from_issue.rb
+++ b/db/migrate/20120627145613_remove_critical_from_issue.rb
--- a/db/migrate/20120706065612_add_lockable_to_users.rb
+++ b/db/migrate/20120706065612_add_lockable_to_users.rb
--- a/db/migrate/20120712080407_add_type_to_web_hook.rb
+++ b/db/migrate/20120712080407_add_type_to_web_hook.rb
--- a/db/migrate/20120729131232_add_extern_auth_provider_to_users.rb
+++ b/db/migrate/20120729131232_add_extern_auth_provider_to_users.rb
--- a/db/migrate/20120905043334_set_default_branch_default_to_nil.rb
+++ b/db/migrate/20120905043334_set_default_branch_default_to_nil.rb
--- a/db/migrate/20121002150926_create_groups.rb
+++ b/db/migrate/20121002150926_create_groups.rb
--- a/db/migrate/20121002151033_add_group_id_to_project.rb
+++ b/db/migrate/20121002151033_add_group_id_to_project.rb
--- a/db/migrate/20121009205010_postgres_create_integer_cast.rb
+++ b/db/migrate/20121009205010_postgres_create_integer_cast.rb
--- a/db/migrate/20121026114600_add_milestone_id_to_merge_requests.rb
+++ b/db/migrate/20121026114600_add_milestone_id_to_merge_requests.rb
--- a/db/migrate/20121119170638_create_services.rb
+++ b/db/migrate/20121119170638_create_services.rb
--- a/db/migrate/20121120051432_add_service_id_to_web_hook.rb
+++ b/db/migrate/20121120051432_add_service_id_to_web_hook.rb
--- a/db/migrate/20121120103700_add_active_to_service.rb
+++ b/db/migrate/20121120103700_add_active_to_service.rb
--- a/db/migrate/20121120113838_add_project_url_to_service.rb
+++ b/db/migrate/20121120113838_add_project_url_to_service.rb
--- a/db/migrate/20121122145155_convert_group_to_namespace.rb
+++ b/db/migrate/20121122145155_convert_group_to_namespace.rb
--- a/db/migrate/20121122150932_add_namespace_id_to_project.rb
+++ b/db/migrate/20121122150932_add_namespace_id_to_project.rb
--- a/db/migrate/20121123104937_add_username_to_user.rb
+++ b/db/migrate/20121123104937_add_username_to_user.rb
--- a/db/migrate/20121123164910_rename_code_to_path.rb
+++ b/db/migrate/20121123164910_rename_code_to_path.rb
--- a/db/migrate/20121203154450_add_events_indices.rb
+++ b/db/migrate/20121203154450_add_events_indices.rb
--- a/db/migrate/20121203160507_more_indices.rb
+++ b/db/migrate/20121203160507_more_indices.rb
--- a/db/migrate/20121205201726_add_more_indexes.rb
+++ b/db/migrate/20121205201726_add_more_indexes.rb
--- a/db/migrate/20121218164840_move_noteable_commit_to_own_field.rb
+++ b/db/migrate/20121218164840_move_noteable_commit_to_own_field.rb
--- a/db/migrate/20121219095402_indices_for_notes.rb
+++ b/db/migrate/20121219095402_indices_for_notes.rb
--- a/db/migrate/20121219183753_create_user_teams.rb
+++ b/db/migrate/20121219183753_create_user_teams.rb
--- a/db/migrate/20121220064104_create_user_team_project_relationships.rb
+++ b/db/migrate/20121220064104_create_user_team_project_relationships.rb
--- a/db/migrate/20121220064453_create_user_team_user_relationships.rb
+++ b/db/migrate/20121220064453_create_user_team_user_relationships.rb
--- a/db/migrate/20121220064453_init_schema.rb
+++ b/db/migrate/20121220064453_init_schema.rb
--- a/db/migrate/20130506095501_remove_project_id_from_key.rb
+++ b/db/migrate/20130506095501_remove_project_id_from_key.rb
--- a/db/migrate/20140122112253_create_merge_request_diffs.rb
+++ b/db/migrate/20140122112253_create_merge_request_diffs.rb
--- a/db/migrate/20140122114406_migrate_mr_diffs.rb
+++ b/db/migrate/20140122114406_migrate_mr_diffs.rb
--- a/db/migrate/20140122122549_remove_m_rdiff_fields.rb
+++ b/db/migrate/20140122122549_remove_m_rdiff_fields.rb
--- a/db/migrate/20140127170938_add_group_avatars.rb
+++ b/db/migrate/20140127170938_add_group_avatars.rb
--- a/db/schema.rb
+++ b/db/schema.rb
--- a/doc/development/architecture.md
+++ b/doc/development/architecture.md
--- a/doc/development/resources/gitlab_diagram_overview.odg
+++ b/doc/development/resources/gitlab_diagram_overview.odg
--- a/doc/development/resources/gitlab_diagram_overview.png
+++ b/doc/development/resources/gitlab_diagram_overview.png
--- a/doc/install/databases.md
+++ b/doc/install/databases.md
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
--- a/doc/install/structure.md
+++ b/doc/install/structure.md
--- a/doc/integration/external-issue-tracker.md
+++ b/doc/integration/external-issue-tracker.md
--- a/doc/integration/jira-integration-points.png
+++ b/doc/integration/jira-integration-points.png
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
--- a/doc/raketasks/user_management.md
+++ b/doc/raketasks/user_management.md
--- a/doc/release/monthly.md
+++ b/doc/release/monthly.md
--- a/doc/update/6.0-to-6.4.md
+++ b/doc/update/6.0-to-6.4.md
--- a/doc/update/6.4-to-6.5.md
+++ b/doc/update/6.4-to-6.5.md
--- a/doc/update/upgrader.md
+++ b/doc/update/upgrader.md
--- a/features/group/group.feature
+++ b/features/group/group.feature
--- a/features/profile/profile.feature
+++ b/features/profile/profile.feature
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
--- a/features/project/source/markdown_render.feature
+++ b/features/project/source/markdown_render.feature
--- a/features/public/public_projects.feature
+++ b/features/public/public_projects.feature
--- a/features/steps/admin/admin_groups.rb
+++ b/features/steps/admin/admin_groups.rb
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
--- a/features/steps/dashboard/dashboard_issues.rb
+++ b/features/steps/dashboard/dashboard_issues.rb
--- a/features/steps/dashboard/dashboard_merge_requests.rb
+++ b/features/steps/dashboard/dashboard_merge_requests.rb
--- a/features/steps/dashboard/dashboard_with_archived_projects.rb
+++ b/features/steps/dashboard/dashboard_with_archived_projects.rb
--- a/features/steps/group/group.rb
+++ b/features/steps/group/group.rb
--- a/features/steps/profile/profile.rb
+++ b/features/steps/profile/profile.rb
--- a/features/steps/profile/profile_ssh_keys.rb
+++ b/features/steps/profile/profile_ssh_keys.rb
--- a/features/steps/project/deploy_keys.rb
+++ b/features/steps/project/deploy_keys.rb
--- a/features/steps/project/project_active_tab.rb
+++ b/features/steps/project/project_active_tab.rb
--- a/features/steps/project/project_archived.rb
+++ b/features/steps/project/project_archived.rb
--- a/features/steps/project/project_browse_branches.rb
+++ b/features/steps/project/project_browse_branches.rb
--- a/features/steps/project/project_fork.rb
+++ b/features/steps/project/project_fork.rb
--- a/features/steps/project/project_forked_merge_requests.rb
+++ b/features/steps/project/project_forked_merge_requests.rb
--- a/features/steps/project/project_graph.rb
+++ b/features/steps/project/project_graph.rb
--- a/features/steps/project/project_issue_tracker.rb
+++ b/features/steps/project/project_issue_tracker.rb
--- a/features/steps/project/project_issues.rb
+++ b/features/steps/project/project_issues.rb
--- a/features/steps/project/project_labels.rb
+++ b/features/steps/project/project_labels.rb
--- a/features/steps/project/project_markdown_render.rb
+++ b/features/steps/project/project_markdown_render.rb
--- a/features/steps/project/project_merge_requests.rb
+++ b/features/steps/project/project_merge_requests.rb
--- a/features/steps/project/project_milestones.rb
+++ b/features/steps/project/project_milestones.rb
--- a/features/steps/project/project_network_graph.rb
+++ b/features/steps/project/project_network_graph.rb
--- a/features/steps/project/project_snippets.rb
+++ b/features/steps/project/project_snippets.rb
--- a/features/steps/project/project_team_management.rb
+++ b/features/steps/project/project_team_management.rb
--- a/features/steps/project/redirects.rb
+++ b/features/steps/project/redirects.rb
--- a/features/steps/public/projects_feature.rb
+++ b/features/steps/public/projects_feature.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/snippets/discover_snippets.rb
+++ b/features/steps/snippets/discover_snippets.rb
--- a/features/steps/snippets/snippets.rb
+++ b/features/steps/snippets/snippets.rb
--- a/features/steps/snippets/user_snippets.rb
+++ b/features/steps/snippets/user_snippets.rb
--- a/lib/api/deploy_keys.rb
+++ b/lib/api/deploy_keys.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/projects.rb
+++ b/lib/api/projects.rb
--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
--- a/lib/backup/database.rb
+++ b/lib/backup/database.rb
--- a/lib/extracts_path.rb
+++ b/lib/extracts_path.rb
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
--- a/lib/gitlab/blacklist.rb
+++ b/lib/gitlab/blacklist.rb
--- a/lib/gitlab/identifier.rb
+++ b/lib/gitlab/identifier.rb
--- a/lib/gitlab/ldap/user.rb
+++ b/lib/gitlab/ldap/user.rb
--- a/lib/gitlab/popen.rb
+++ b/lib/gitlab/popen.rb
--- a/lib/gitlab/upgrader.rb
+++ b/lib/gitlab/upgrader.rb
--- a/lib/redcarpet/render/gitlab_html.rb
+++ b/lib/redcarpet/render/gitlab_html.rb
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
--- a/lib/tasks/gitlab/bulk_add_permission.rake
+++ b/lib/tasks/gitlab/bulk_add_permission.rake
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
--- a/lib/tasks/gitlab/enable_namespaces.rake
+++ b/lib/tasks/gitlab/enable_namespaces.rake
--- a/lib/tasks/gitlab/import.rake
+++ b/lib/tasks/gitlab/import.rake
--- a/public/500.html
+++ b/public/500.html
--- a/public/502.html
+++ b/public/502.html
--- a/public/gitlab_logo.png
+++ b/public/gitlab_logo.png
--- a/spec/controllers/blob_controller_spec.rb
+++ b/spec/controllers/blob_controller_spec.rb
--- a/spec/controllers/commit_controller_spec.rb
+++ b/spec/controllers/commit_controller_spec.rb
--- a/spec/controllers/commits_controller_spec.rb
+++ b/spec/controllers/commits_controller_spec.rb
--- a/spec/controllers/merge_requests_controller_spec.rb
+++ b/spec/controllers/merge_requests_controller_spec.rb
--- a/spec/controllers/tree_controller_spec.rb
+++ b/spec/controllers/tree_controller_spec.rb
--- a/spec/factories.rb
+++ b/spec/factories.rb
--- a/spec/features/atom/dashboard_issues_spec.rb
+++ b/spec/features/atom/dashboard_issues_spec.rb
--- a/spec/features/gitlab_flavored_markdown_spec.rb
+++ b/spec/features/gitlab_flavored_markdown_spec.rb
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
--- a/spec/features/security/project/internal_access_spec.rb
+++ b/spec/features/security/project/internal_access_spec.rb
--- a/spec/features/security/project/private_access_spec.rb
+++ b/spec/features/security/project/private_access_spec.rb
--- a/spec/features/security/project/public_access_spec.rb
+++ b/spec/features/security/project/public_access_spec.rb
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
--- a/spec/helpers/search_helper_spec.rb
+++ b/spec/helpers/search_helper_spec.rb
--- a/spec/helpers/submodule_helper_spec.rb
+++ b/spec/helpers/submodule_helper_spec.rb
--- a/spec/lib/gitlab/ldap/ldap_user_auth_spec.rb
+++ b/spec/lib/gitlab/ldap/ldap_user_auth_spec.rb
--- a/spec/lib/gitlab/reference_extractor_spec.rb
+++ b/spec/lib/gitlab/reference_extractor_spec.rb
--- a/spec/lib/gitlab/satellite/action_spec.rb
+++ b/spec/lib/gitlab/satellite/action_spec.rb
--- a/spec/lib/gitlab/satellite/merge_action_spec.rb
+++ b/spec/lib/gitlab/satellite/merge_action_spec.rb
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
--- a/spec/models/assembla_service_spec.rb
+++ b/spec/models/assembla_service_spec.rb
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
--- a/spec/models/flowdock_service_spec.rb
+++ b/spec/models/flowdock_service_spec.rb
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
--- a/spec/observers/merge_request_observer_spec.rb
+++ b/spec/observers/merge_request_observer_spec.rb
--- a/spec/requests/api/files_spec.rb
+++ b/spec/requests/api/files_spec.rb
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
--- a/spec/requests/api/project_hooks_spec.rb
+++ b/spec/requests/api/project_hooks_spec.rb
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
--- a/spec/requests/api/repositories_spec.rb
+++ b/spec/requests/api/repositories_spec.rb
--- a/spec/requests/api/services_spec.rb
+++ b/spec/requests/api/services_spec.rb
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
--- a/spec/seed_project.tar.gz
+++ b/spec/seed_project.tar.gz
--- a/spec/services/filtering_service_spec.rb
+++ b/spec/services/filtering_service_spec.rb
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
--- a/spec/services/test_hook_service_spec.rb
+++ b/spec/services/test_hook_service_spec.rb
--- a/spec/support/mentionable_shared_examples.rb
+++ b/spec/support/mentionable_shared_examples.rb
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
--- a/vendor/assets/images/authbuttons/github_32.png
+++ b/vendor/assets/images/authbuttons/github_32.png
--- a/vendor/assets/images/authbuttons/github_64.png
+++ b/vendor/assets/images/authbuttons/github_64.png
--- a/vendor/assets/images/authbuttons/google_32.png
+++ b/vendor/assets/images/authbuttons/google_32.png
--- a/vendor/assets/images/authbuttons/google_64.png
+++ b/vendor/assets/images/authbuttons/google_64.png
--- a/vendor/assets/images/authbuttons/twitter_32.png
+++ b/vendor/assets/images/authbuttons/twitter_32.png
--- a/vendor/assets/images/authbuttons/twitter_64.png
+++ b/vendor/assets/images/authbuttons/twitter_64.png
--- a/vendor/assets/images/bg_fallback.png
+++ b/vendor/assets/images/bg_fallback.png
--- a/vendor/assets/images/icon_sprite.png
+++ b/vendor/assets/images/icon_sprite.png
--- a/vendor/assets/images/progress_bar.gif
+++ b/vendor/assets/images/progress_bar.gif
--- a/vendor/assets/images/slider_handles.png
+++ b/vendor/assets/images/slider_handles.png
--- a/vendor/assets/images/ui-icons_222222_256x240.png
+++ b/vendor/assets/images/ui-icons_222222_256x240.png
--- a/vendor/assets/images/ui-icons_454545_256x240.png
+++ b/vendor/assets/images/ui-icons_454545_256x240.png
--- a/vendor/assets/javascripts/ace-src-noconflict/ace.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/ace.js
--- a/vendor/assets/javascripts/ace-src-noconflict/keybinding-emacs.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/keybinding-emacs.js
--- a/vendor/assets/javascripts/ace-src-noconflict/keybinding-vim.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/keybinding-vim.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-c9search.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-c9search.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-c_cpp.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-c_cpp.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-clojure.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-clojure.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-coffee.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-coffee.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-coldfusion.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-coldfusion.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-csharp.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-csharp.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-css.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-css.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-diff.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-diff.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-glsl.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-glsl.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-golang.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-golang.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-groovy.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-groovy.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-haxe.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-haxe.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-html.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-html.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-jade.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-jade.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-java.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-java.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-javascript.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-javascript.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-json.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-json.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-jsp.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-jsp.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-jsx.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-jsx.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-latex.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-latex.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-less.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-less.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-liquid.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-liquid.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-lua.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-lua.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-luahtml.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-luahtml.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-luapage.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-luapage.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-markdown.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-markdown.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-ocaml.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-ocaml.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-perl.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-perl.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-pgsql.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-pgsql.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-php.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-php.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-powershell.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-powershell.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-python.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-python.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-ruby.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-ruby.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-scad.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-scad.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-scala.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-scala.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-scss.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-scss.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-sh.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-sh.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-sql.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-sql.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-svg.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-svg.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-tcl.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-tcl.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-text.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-text.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-textile.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-textile.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-xml.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-xml.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-xquery.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-xquery.js
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-yaml.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-yaml.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-ambiance.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-ambiance.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-chrome.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-chrome.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-clouds.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-clouds.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-clouds_midnight.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-clouds_midnight.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-cobalt.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-cobalt.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-crimson_editor.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-crimson_editor.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-dawn.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-dawn.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-dreamweaver.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-dreamweaver.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-eclipse.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-eclipse.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-github.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-github.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-idle_fingers.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-idle_fingers.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-kr_theme.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-kr_theme.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-merbivore.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-merbivore.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-merbivore_soft.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-merbivore_soft.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-mono_industrial.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-mono_industrial.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-monokai.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-monokai.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-pastel_on_dark.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-pastel_on_dark.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-solarized_dark.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-solarized_dark.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-solarized_light.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-solarized_light.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-textmate.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-textmate.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-tomorrow.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-tomorrow.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-tomorrow_night.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-tomorrow_night.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-tomorrow_night_blue.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-tomorrow_night_blue.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-tomorrow_night_bright.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-tomorrow_night_bright.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-tomorrow_night_eighties.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-tomorrow_night_eighties.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-twilight.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-twilight.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-vibrant_ink.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-vibrant_ink.js
--- a/vendor/assets/javascripts/ace-src-noconflict/theme-xcode.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/theme-xcode.js
--- a/vendor/assets/javascripts/ace-src-noconflict/worker-coffee.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/worker-coffee.js
--- a/vendor/assets/javascripts/ace-src-noconflict/worker-css.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/worker-css.js
--- a/vendor/assets/javascripts/ace-src-noconflict/worker-javascript.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/worker-javascript.js
--- a/vendor/assets/javascripts/ace-src-noconflict/worker-json.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/worker-json.js
--- a/vendor/assets/javascripts/ace-src-noconflict/worker-xquery.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/worker-xquery.js
--- a/vendor/assets/javascripts/highlightjs.min.js
+++ b/vendor/assets/javascripts/highlightjs.min.js
--- a/vendor/assets/stylesheets/highlightjs.min.css
+++ b/vendor/assets/stylesheets/highlightjs.min.css