Merge branch 'master' into styleguide

Conflicts: CONTRIBUTING.md

Merge branch 'master' into styleguide
Conflicts: CONTRIBUTING.md
dosire
2 parents 77dc5de9 bbd92f55
Showing 507 changed files with 5713 additions and 165556 deletions Show diff stats
CHANGELOG
Gemfile
Gemfile.lock
LICENSE
MAINTENANCE.md
README.md
VERSION
app/assets/images/ajax_loader.gif
app/assets/images/ajax_loader_gray.gif
app/assets/images/ajax_loader_tree.gif
app/assets/images/icon-link.png
app/assets/images/no_group_avatar.png
app/assets/javascripts/api.js.coffee
app/assets/javascripts/application.js
app/assets/javascripts/blob.js.coffee
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/groups.js.coffee
app/assets/javascripts/issue.js.coffee
app/assets/javascripts/issues.js.coffee
app/assets/javascripts/merge_request.js.coffee
 v 6.6.0
+  - Retrieving user ssh keys publically(github style): http://__HOST__/__USERNAME__.keys
   - 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
+  - User pages are visible without login if user is authorized to a public project
+  - Markdown rendered headers have id derived from their name and link to their id
+  - Improve application to work faster with large groups (100+ members)
+  - Multiple emails per user
+  - Show last commit for file when view file source
+  - Restyle Issue#show page and MR#show page
+  - Ability to filter by multiple labels for Issues page
+  - Rails version to 4.0.3
 v 6.5.1
   - Fix branch selectbox when create merge request from fork
@@ -33,7 +54,7 @@ v6.4.3
 v6.4.2
   - Fixed wrong behaviour of script/upgrade.rb
-v6.4.1 
+v6.4.1
   - Fixed bug with repository rename
   - Fixed bug with project transfer
@@ -29,22 +29,19 @@ gem &#39;omniauth-github&#39;
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", "~> 4.0.0"
+gem "gitlab_git", '~> 5.4.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"
-
-# Syntax highlighter
-gem "gitlab-pygments.rb", '~> 0.5.4', require: 'pygments.rb'
+gem 'gitlab_omniauth-ldap', '1.0.4', require: "omniauth-ldap"
 # 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"
@@ -139,6 +136,9 @@ gem &quot;sanitize&quot;
 # Protect against bruteforcing
 gem "rack-attack"
+# Ace editor
+gem 'ace-rails-ap'
+
 gem "sass-rails"
 gem "coffee-rails"
 gem "uglifier"
@@ -208,6 +208,10 @@ group :development, :test do
   gem 'spork', '~> 1.0rc'
   gem 'jasmine', '2.0.0.rc5'
+
+  gem "spring", '1.1.1'
+  gem "spring-commands-rspec", '1.0.1'
+  gem "spring-commands-spinach", '1.0.0'
 end
 group :test do
@@ -8,11 +8,12 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.2)
-      actionpack (= 4.0.2)
+    ace-rails-ap (2.0.1)
+    actionmailer (4.0.3)
+      actionpack (= 4.0.3)
       mail (~> 2.5.4)
-    actionpack (4.0.2)
-      activesupport (= 4.0.2)
+    actionpack (4.0.3)
+      activesupport (= 4.0.3)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
@@ -21,16 +22,16 @@ GEM
       actionpack (>= 4.0.0, < 5.0)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)
       builder (~> 3.1.0)
-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
+    activerecord (4.0.3)
+      activemodel (= 4.0.3)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.2)
+      activesupport (= 4.0.3)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.2)
+    activesupport (4.0.3)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -42,7 +43,7 @@ GEM
     annotate (2.6.0)
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
-    arel (4.0.1)
+    arel (4.0.2)
     asciidoctor (0.1.4)
     atomic (1.1.14)
     awesome_print (1.2.0)
@@ -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.4.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)
@@ -323,8 +320,8 @@ GEM
       cliver (~> 0.2.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    polyglot (0.3.3)
-    posix-spawn (0.3.6)
+    polyglot (0.3.4)
+    posix-spawn (0.3.8)
     protected_attributes (1.0.5)
       activemodel (>= 4.0.1, < 5.0)
     pry (0.9.12.4)
@@ -349,13 +346,13 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.2)
-      actionmailer (= 4.0.2)
-      actionpack (= 4.0.2)
-      activerecord (= 4.0.2)
-      activesupport (= 4.0.2)
+    rails (4.0.3)
+      actionmailer (= 4.0.3)
+      actionpack (= 4.0.3)
+      activerecord (= 4.0.3)
+      activesupport (= 4.0.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.2)
+      railties (= 4.0.3)
       sprockets-rails (~> 2.0.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
@@ -368,13 +365,13 @@ GEM
       i18n
       require_all
       ruby-progressbar
-    railties (4.0.2)
-      actionpack (= 4.0.2)
-      activesupport (= 4.0.2)
+    railties (4.0.3)
+      actionpack (= 4.0.3)
+      activesupport (= 4.0.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.12.0)
-    rake (10.1.0)
+    rake (10.1.1)
     raphael-rails (2.1.2)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)
@@ -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)
@@ -472,6 +470,11 @@ GEM
       railties (>= 3)
       spinach (>= 0.4)
     spork (1.0.0rc4)
+    spring (1.1.1)
+    spring-commands-rspec (1.0.1)
+      spring (>= 0.9.1)
+    spring-commands-spinach (1.0.0)
+      spring (>= 0.9.1)
     sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -543,12 +546,12 @@ 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
   acts-as-taggable-on
@@ -578,13 +581,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.4.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)
@@ -640,6 +642,9 @@ DEPENDENCIES
   slim
   spinach-rails
   spork (~> 1.0rc)
+  spring (= 1.1.1)
+  spring-commands-rspec (= 1.0.1)
+  spring-commands-spinach (= 1.0.0)
   stamp
   state_machine
   test_after_commit
-Copyright (c) 2011 Dmitriy Zaporozhets
+Copyright (c) 2011-2014 Dmitriy Zaporozhets
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21,3 +21,5 @@ release where the minor version is increased numerically by increments of one
 (eg. `5.0 -> 5.1`).
 We encourage everyone to run the latest stable release to ensure that you can easily upgrade to the most secure and feature rich GitLab experience. In order to make sure you can easily run the most recent stable release, we are working hard to keep the update process simple and reliable.
+
+More information about the release procedures can be found in the doc/release directory.
@@ -4,26 +4,21 @@
 ![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
-* [![build status](http://ci.gitlab.org/projects/1/status.png?ref=master)](http://ci.gitlab.org/projects/1?ref=master) on ci.gitlab.org (master branch)
+* [![build status](https://ci.gitlab.org/projects/1/status.png?ref=master)](https://ci.gitlab.org/projects/1?ref=master) on ci.gitlab.org (master branch)
 * [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.png)](https://codeclimate.com/github/gitlabhq/gitlabhq)
-* [![Dependency Status](https://gemnasium.com/gitlabhq/gitlabhq.png)](https://gemnasium.com/gitlabhq/gitlabhq) this button can be yellow (small updates are available) but must not be red (a security fix or an important update is available), gems are updated in major releases of GitLab.
-
 * [![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq)
 ### Resources
@@ -36,6 +31,8 @@
 * [GitLab CI](https://gitlab.com/gitlab-org/gitlab-ci/blob/master/README.md) is a continuous integration (CI) server that is easy to integrate with GitLab.
+* Unofficial third-party [iPhone app](http://gitlabcontrol.com/) and [Android app](https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en) for GitLab
+
 ### Requirements
 * Ubuntu/Debian**
@@ -50,13 +47,17 @@
 #### Official installation methods
-* [Manual installation guide for a production server](doc/install/installation.md)
+* [GitLab packages (beta)](https://www.gitlab.com/downloads/) These packages contain GitLab and all its depencies (PostgreSQL, Redis, Nginx, Unicorn, etc.). They are made with [omnibus-gitlab](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md) that also contains the installation instructions. These packages currently support a reduced selection of GitLab's normal features. For instance, it is not yet possible to create/restore application backups or to use HTTPS.
+
+* [GitLab virtual machine images](https://www.gitlab.com/downloads/) contain an operating system and a preinstalled GitLab. They are made with [GitLab Packer](https://gitlab.com/gitlab-org/gitlab-packer/blob/master/README.md) that also contains the installation instructions.
 * [GitLab Chef Cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md) This cookbook can be used both for development installations and production installations. If you want to [contribute](CONTRIBUTE.md) to GitLab we suggest you follow the [development installation on a virtual machine with Vagrant](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/doc/development.md) instructions to install all testing dependencies.
+* [Manual installation guide](doc/install/installation.md) This guide to set up a production server offers detailed and complete step-by-step instructions.
+
 #### Third party one-click installers
-* [Digital Ocean 1-Click Application Install](https://www.digitalocean.com/blog_posts/host-your-git-repositories-in-55-seconds-with-gitlab) Have a new server up in 55 seconds. Digital Ocean uses SSD disks which is great for an IO intensive app such as GitLab.
+* [Digital Ocean 1-Click Application Install](https://www.digitalocean.com/blog_posts/host-your-git-repositories-in-55-seconds-with-gitlab) Have a new server up in 55 seconds. Digital Ocean uses SSD disks which is great for an IO intensive app such as GitLab. We recommend selecting a droplet with [1GB of memory](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/requirements.md).
 * [BitNami one-click installers](http://bitnami.com/stack/gitlab) This package contains both GitLab and GitLab CI. It is available as installer, virtual machine or for cloud hosting providers (Amazon Web Services/Azure/etc.).
@@ -68,11 +69,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).
@@ -155,6 +154,8 @@ or start each component separately
 * [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthusiast Jonathan M. Hethey is unofficial but it offers a good overview.
+* [Gitter chat room](https://gitter.im/gitlabhq/gitlabhq#) here you can ask questions when you need help.
+
 ### Getting in touch
-6.6.0.pre
+6.6.0.rc1
@@ -3,6 +3,7 @@
   user_path: "/api/:version/users/:id.json"
   notes_path: "/api/:version/projects/:id/notes.json"
   namespaces_path: "/api/:version/namespaces.json"
+  project_users_path: "/api/:version/projects/:id/users.json"
   # Get 20 (depends on api) recent notes
   # and sort the ascending from oldest to newest
@@ -50,6 +51,23 @@
     ).done (users) ->
       callback(users)
+  # Return project users list. Filtered by query
+  # Only active users retrieved
+  projectUsers: (project_id, query, callback) ->
+    url = Api.buildUrl(Api.project_users_path)
+    url = url.replace(':id', project_id)
+
+    $.ajax(
+      url: url
+      data:
+        private_token: gon.api_token
+        search: query
+        per_page: 20
+        active: true
+      dataType: "json"
+    ).done (users) ->
+      callback(users)
+
   # Return namespaces list. Filtered by query
   namespaces: (query, callback) ->
     url = Api.buildUrl(Api.namespaces_path)
@@ -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
@@ -17,7 +17,7 @@ class BlobView
       setHash(hash)
       e.preventDefault()
- 
+
     # See if there are lines selected
     # "#L12" and "#L34-56" supported
     highlightBlobLines = (e) ->
@@ -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()
@@ -4,6 +4,7 @@ $ -&gt;
 class Dispatcher
   constructor: () ->
     @initSearch()
+    @initHighlight()
     @initPageScripts()
   initPageScripts: ->
@@ -18,6 +19,8 @@ class Dispatcher
     switch page
       when 'projects:issues:index'
         Issues.init()
+      when 'projects:issues:show'
+        new Issue()
       when 'projects:issues:new', 'projects:merge_requests:new'
         GitLab.GfmAutoComplete.setup()
       when 'dashboard:show'
@@ -53,3 +56,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"))
@@ -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
@@ -0,0 +1,9 @@
+class Issue
+  constructor: ->
+    $('.edit-issue.inline-update input[type="submit"]').hide()
+    $(".issue-box .inline-update").on "change", "select", ->
+      $(this).submit()
+    $(".issue-box .inline-update").on "change", "#issue_assignee_id", ->
+      $(this).submit()
+
+@Issue = Issue
@@ -77,9 +77,3 @@
       $("#update_issues_ids").val []
       $(".issues_bulk_update").hide()
       $(".issues-filters").show()
-
-$ ->
-  $('.edit-issue.inline-update input[type="submit"]').hide();
-  $("body").on "change", ".edit-issue.inline-update select", ->
-      $(this).submit()
-
@@ -0,0 +1,103 @@
+class MergeRequest
+  constructor: (@opts) ->
+    @initContextWidget()
+    this.$el = $('.merge-request')
+    @diffs_loaded = if @opts.action == 'diffs' then true else false
+    @commits_loaded = false
+
+    this.activateTab(@opts.action)
+
+    this.bindEvents()
+
+    this.initMergeWidget()
+    this.$('.show-all-commits').on 'click', =>
+      this.showAllCommits()
+
+    modal = $('#modal_merge_info').modal(show: false)
+
+    disableButtonIfEmptyField '#merge_commit_message', '.accept_merge_request'
+
+
+  # Local jQuery finder
+  $: (selector) ->
+    this.$el.find(selector)
+
+  initContextWidget: ->
+    $('.edit-merge_request.inline-update input[type="submit"]').hide()
+    $(".issue-box .inline-update").on "change", "select", ->
+      $(this).submit()
+    $(".issue-box .inline-update").on "change", "#merge_request_assignee_id", ->
+      $(this).submit()
+
+  initMergeWidget: ->
+    this.showState( @opts.current_status )
+
+    if this.$('.automerge_widget').length and @opts.check_enable
+      $.get @opts.url_to_automerge_check, (data) =>
+        this.showState( data.merge_status )
+      , 'json'
+
+    if @opts.ci_enable
+      $.get @opts.url_to_ci_check, (data) =>
+        this.showCiState data.status
+      , 'json'
+
+  bindEvents: ->
+    this.$('.nav-tabs').on 'click', 'a', (event) =>
+      a = $(event.currentTarget)
+
+      href = a.attr('href')
+      History.replaceState {path: href}, document.title, href
+
+      event.preventDefault()
+
+    this.$('.nav-tabs').on 'click', 'li', (event) =>
+      this.activateTab($(event.currentTarget).data('action'))
+
+    this.$('.accept_merge_request').on 'click', ->
+      $('.automerge_widget.can_be_merged').hide()
+      $('.merge-in-progress').show()
+
+  activateTab: (action) ->
+    this.$('.nav-tabs li').removeClass 'active'
+    this.$('.tab-content').hide()
+    switch action
+      when 'diffs'
+        this.$('.nav-tabs .diffs-tab').addClass 'active'
+        this.loadDiff() unless @diffs_loaded
+        this.$('.diffs').show()
+      else
+        this.$('.nav-tabs .notes-tab').addClass 'active'
+        this.$('.notes').show()
+
+  showState: (state) ->
+    $('.automerge_widget').hide()
+    $('.automerge_widget.' + state).show()
+
+  showCiState: (state) ->
+    $('.ci_widget').hide()
+    $('.ci_widget.ci-' + state).show()
+
+  loadDiff: (event) ->
+    $.ajax
+      type: 'GET'
+      url: this.$('.nav-tabs .diffs-tab a').attr('href')
+      beforeSend: =>
+        this.$('.status').addClass 'loading'
+      complete: =>
+        @diffs_loaded = true
+        this.$('.status').removeClass 'loading'
+      success: (data) =>
+        this.$(".diffs").html(data.html)
+      dataType: 'json'
+
+  showAllCommits: ->
+    this.$('.first-commits').remove()
+    this.$('.all-commits').removeClass 'hide'
+
+  alreadyOrCannotBeMerged: ->
+    this.$('.automerge_widget').hide()
+    this.$('.merge-in-progress').hide()
+    this.$('.automerge_widget.already_cannot_be_merged').show()
+
+this.MergeRequest = MergeRequest
@@ -6,99 +6,3 @@
   $('#milestone_id').select2()
   $('#milestone_id, #assignee_id').on 'change', ->
     $(this).closest('form').submit()
-
-class MergeRequest
-
-  constructor: (@opts) ->
-    this.$el = $('.merge-request')
-    @diffs_loaded = if @opts.action == 'diffs' then true else false
-    @commits_loaded = false
-
-    this.activateTab(@opts.action)
-
-    this.bindEvents()
-
-    this.initMergeWidget()
-    this.$('.show-all-commits').on 'click', =>
-      this.showAllCommits()
-
-    modal = $('#modal_merge_info').modal(show: false)
-
-    disableButtonIfEmptyField '#merge_commit_message', '.accept_merge_request'
-
-  # Local jQuery finder
-  $: (selector) ->
-    this.$el.find(selector)
-
-  initMergeWidget: ->
-    this.showState( @opts.current_status )
-
-    if this.$('.automerge_widget').length and @opts.check_enable
-      $.get @opts.url_to_automerge_check, (data) =>
-        this.showState( data.merge_status )
-      , 'json'
-
-    if @opts.ci_enable
-      $.get @opts.url_to_ci_check, (data) =>
-        this.showCiState data.status
-      , 'json'
-
-  bindEvents: ->
-    this.$('.nav-tabs').on 'click', 'a', (event) =>
-      a = $(event.currentTarget)
-
-      href = a.attr('href')
-      History.replaceState {path: href}, document.title, href
-
-      event.preventDefault()
-
-    this.$('.nav-tabs').on 'click', 'li', (event) =>
-      this.activateTab($(event.currentTarget).data('action'))
-
-    this.$('.accept_merge_request').on 'click', ->
-      $('.automerge_widget.can_be_merged').hide()
-      $('.merge-in-progress').show()
-
-  activateTab: (action) ->
-    this.$('.nav-tabs li').removeClass 'active'
-    this.$('.tab-content').hide()
-    switch action
-      when 'diffs'
-        this.$('.nav-tabs .diffs-tab').addClass 'active'
-        this.loadDiff() unless @diffs_loaded
-        this.$('.diffs').show()
-      else
-        this.$('.nav-tabs .notes-tab').addClass 'active'
-        this.$('.notes').show()
-
-  showState: (state) ->
-    $('.automerge_widget').hide()
-    $('.automerge_widget.' + state).show()
-
-  showCiState: (state) ->
-    $('.ci_widget').hide()
-    $('.ci_widget.ci-' + state).show()
-
-  loadDiff: (event) ->
-    $.ajax
-      type: 'GET'
-      url: this.$('.nav-tabs .diffs-tab a').attr('href')
-      beforeSend: =>
-        this.$('.status').addClass 'loading'
-      complete: =>
-        @diffs_loaded = true
-        this.$('.status').removeClass 'loading'
-      success: (data) =>
-        this.$(".diffs").html(data.html)
-      dataType: 'json'
-
-  showAllCommits: ->
-    this.$('.first-commits').remove()
-    this.$('.all-commits').removeClass 'hide'
-
-  alreadyOrCannotBeMerged: ->
-    this.$('.automerge_widget').hide()
-    this.$('.merge-in-progress').hide()
-    this.$('.automerge_widget.already_cannot_be_merged').show()
-
-this.MergeRequest = MergeRequest
@@ -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
@@ -26,3 +26,5 @@ $ -&gt;
     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
@@ -0,0 +1,48 @@
+@projectUsersSelect =
+  init: ->
+    $('.ajax-project-users-select').each (i, select) ->
+      project_id = $('body').data('project-id')
+
+      $(select).select2
+        placeholder: $(select).data('placeholder') || "Search for a user"
+        multiple: $(select).hasClass('multiselect')
+        minimumInputLength: 0
+        query: (query) ->
+          Api.projectUsers project_id, query.term, (users) ->
+            data = { results: users }
+            query.callback(data)
+
+        initSelection: (element, callback) ->
+          id = $(element).val()
+          if id isnt ""
+            Api.user(id, callback)
+
+
+        formatResult: projectUsersSelect.projectUserFormatResult
+        formatSelection: projectUsersSelect.projectUserFormatSelection
+        dropdownCssClass: "ajax-project-users-dropdown"
+        dropdownAutoWidth: true
+        escapeMarkup: (m) -> # we do not want to escape markup since we are displaying html in results
+          m
+
+  projectUserFormatResult: (user) ->
+    if user.avatar_url
+      avatar = user.avatar_url
+    else if gon.gravatar_enabled
+      avatar = gon.gravatar_url
+      avatar = avatar.replace('%{hash}', md5(user.email))
+      avatar = avatar.replace('%{size}', '24')
+    else
+      avatar = gon.relative_url_root + "/assets/no_avatar.png"
+
+    "<div class='user-result'>
+       <div class='user-image'><img class='avatar s24' src='#{avatar}'></div>
+       <div class='user-name'>#{user.name}</div>
+       <div class='user-username'>#{user.username}</div>
+     </div>"
+
+  projectUserFormatSelection: (user) ->
+    user.name
+
+$ ->
+  projectUsersSelect.init()
 $ ->
   userFormatResult = (user) ->
-    if user.avatar
-      avatar = user.avatar.url
-    else
+    if user.avatar_url
+      avatar = user.avatar_url
+    else if gon.gravatar_enabled
       avatar = gon.gravatar_url
       avatar = avatar.replace('%{hash}', md5(user.email))
       avatar = avatar.replace('%{size}', '24')
+    else
+      avatar = gon.relative_url_root + "/assets/no_avatar.png"
     "<div class='user-result'>
        <div class='user-image'><img class='avatar s24' src='#{avatar}'></div>
@@ -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):
@@ -63,6 +65,7 @@
 @import "sections/wall.scss";
 @import "sections/dashboard.scss";
 @import "sections/stat_graph.scss";
+@import "sections/groups.scss";
 /**
  * Code ighlight
@@ -118,7 +118,6 @@
     @extend .btn-primary;
   }
-  &.btn-close,
   &.btn-remove {
     @extend .btn-danger;
   }
@@ -143,6 +142,22 @@
     line-height: 16px;
     margin: 2px;
   }
+
+  &.btn-close {
+    color: #B94A48;
+    font-weight: bold;
+    &:hover {
+      color: #B94A48;
+    }
+  }
+
+  &.btn-reopen {
+    color: #468847;
+    font-weight: bold;
+    &:hover {
+      color: #468847;
+    }
+  }
 }
 .btn-block {
@@ -88,11 +88,15 @@ pre.well-pre {
 /** Big Labels **/
 .state-label {
   font-size: 14px;
-  padding: 6px 25px;
+  padding: 9px 25px;
   text-align: center;
-  @include border-radius(4px);
   text-shadow: none;
-  margin-left: 10px;
+  margin-right: 20px;
+
+  &.state-label-blue {
+    background: #31708f;
+    color: #FFF;
+  }
   &.state-label-green {
     background: #4A4;
@@ -112,6 +116,7 @@ pre.well-pre {
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus {
   background: #29b;
+  color: #FFF
 }
 .breadcrumb > li + li:before {
@@ -173,12 +178,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 {
@@ -50,9 +50,9 @@
     }
     &.wiki {
-      padding: 20px;
       font-size: 14px;
       line-height: 1.6;
+      padding: 25px;
       .highlight {
         margin-bottom: 9px;
@@ -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;
-            }
-          }
-        }
-      }
     }
   }
 }
@@ -51,3 +51,27 @@ label {
 .input-mn-300 {
   min-width: 300px;
 }
+
+.custom-form-control {
+  width: 150px;
+}
+
+@media (min-width: $screen-sm-min) {
+  .custom-form-control {
+    width: 150px;
+  }
+}
+
+/* Medium devices (desktops, 992px and up) */
+@media (min-width: $screen-md-min) {
+  .custom-form-control {
+    width: 170px;
+  }
+}
+
+/* Large devices (large desktops, 1200px and up) */
+@media (min-width: $screen-lg-min) {
+  .custom-form-control {
+    width: 200px;
+  }
+}
@@ -0,0 +1,64 @@
+.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;
+    }
+  }
+}
@@ -11,34 +11,39 @@
   color: #666;
   margin:20px 0;
   background: #FAFAFA;
-  border: 1px solid #DDD;
+  border: 1px solid #EEE;
   .control-group {
     margin-bottom: 0;
   }
+  .state {
+    height: 34px;
+    border-bottom: 1px solid #DDD;
+    line-height: 32px;
+  }
+
   .title {
-    font-size: 20px;
+    font-size: 22px;
     font-weight: 500;
-    line-height: 28px;
+    line-height: 1.5;
     margin: 0;
-    color: #444;
+    color: #333;
+    padding-bottom: 0;
+    padding: 15px 25px;
   }
   .context {
     border: none;
-    background-color: #f5f5f5;
-    border: none;
     border-top: 1px solid #eee;
+    padding: 15px 25px;
   }
   .description {
-    border-top: 1px solid #eee;
+    padding: 0 25px 15px 25px;
   }
   .title, .context, .description {
-    padding: 15px;
-
     .clearfix {
       margin: 0;
     }
@@ -23,6 +23,12 @@
       }
     }
+    &.warning-row {
+      background-color: #fcf8e3;
+      border-color: #faebcc;
+      color: #8a6d3b;
+    }
+
     &.smoke { background-color: #f5f5f5; }
     &:hover {
 /** Select2 selectbox style override **/
-
 .select2-container, .select2-container.select2-drop-above {
   .select2-choice {
     background: #FFF;
@@ -12,9 +11,13 @@
 }
 .select2-drop-active {
-  border: 1px solid #BBB;
+  border: 1px solid #BBB !important;
   margin-top: 4px;
+  &.select2-drop-above {
+    margin-bottom: 8px;
+  }
+
   .select2-search input {
     background: #fafafa;
     border-color: #DDD;
@@ -78,3 +81,9 @@ select {
 .project-refs-form .select2-container {
   margin-right: 10px;
 }
+
+.ajax-users-dropdown, .ajax-project-users-dropdown {
+  .select2-search {
+    padding-top: 4px;
+  }
+}
@@ -90,9 +90,27 @@ a:focus {
   font-size: 14px;
   line-height: 1.6;
-  .white .highlight pre {
-    background: #f5f5f5;
+
+  /* Link to current header. */
+  h1, h2, h3, h4, h5, h6 {
+    position: relative;
+    &:hover > :last-child {
+      $size: 16px;
+      position: absolute;
+      right: 100%;
+      top: 50%;
+      margin-top: -$size/2;
+      margin-right: 0px;
+      padding-right: 20px;
+      display: inline-block;
+      width: $size;
+      height: $size;
+      background-image: url("icon-link.png");
+      background-size: contain;
+      background-repeat: no-repeat;
+    }
   }
+
   ul {
     padding: 0;
     margin: 0 0 9px 25px !important;
@@ -108,6 +108,8 @@ $pagination-active-bg: $bg_style_color;
 // Nav tabs
 .nav.nav-tabs {
+  margin-bottom: 15px;
+
   li {
     > a {
       padding: 8px 20px;
-.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;
+  }
+}
-$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;
+  }
+}
-.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;
+  }
+}
-.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 {
@@ -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;
@@ -5,6 +5,7 @@ $primary_color: #2FA0BB;
 $link_color: #3A89A3;
 $style_color: #474D57;
 $bg_style_color: #2299BB;
+$list-group-active-bg: $bg_style_color;
 $hover: #D9EDF7;
 /**
@@ -2,7 +2,7 @@
  * Admin area
  *
  */
-.admin_dash {
+.admin-dashboard {
   .data {
     a {
       h1 {
@@ -14,6 +14,10 @@
       }
     }
   }
+
+  .str-truncated {
+    max-width: 60%;
+  }
 }
 .admin-filter form {
@@ -153,6 +153,7 @@
       img{
         border: 1px solid #FFF;
         background: url('trans_bg.gif');
+        max-width: 100%;
       }
       &.deleted {
         border: 1px solid $deleted;
@@ -41,7 +41,7 @@
 .dash-sidebar-tabs {
   margin-bottom: 2px;
   border: none;
-  margin: 0;
+  margin: 0 !important;
   li {
     &.active {
@@ -37,8 +37,8 @@
   &.event-inline {
     .avatar {
-      width: 16px;
-      height: 16px;
+      position: relative;
+      top: -2px;
     }
   }
@@ -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;
@@ -0,0 +1,9 @@
+.new-group-member-holder {
+  margin-top: 50px;
+  background: #f9f9f9;
+  padding-top: 20px;
+}
+
+.member-search-form {
+  float: left;
+}
@@ -46,12 +46,17 @@ header {
       }
     }
+    .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 {
+      .title {
         display: inline-block;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -103,7 +108,7 @@ header {
       h1 {
         margin: 0;
-        background: url('logo-black.png') no-repeat center center;
+        background: image-url('logo-black.png') no-repeat center center;
         background-size: 32px;
         float: left;
         height: 46px;
@@ -122,7 +127,7 @@ header {
    * Project / Area name
    *
    */
-  .project_name {
+  .title {
     position: relative;
     float: left;
     margin: 0;
@@ -215,18 +220,18 @@ header {
     .app_logo {
       a {
         h1 {
-          background: url('logo-white.png') no-repeat center center;
+          background: image-url('logo-white.png') no-repeat center center;
           background-size: 32px;
           color: #fff;
           text-shadow: 0 1px 1px #444;
         }
       }
     }
-    .project_name {
+    .title {
       a {
-        color: #BBB;
+        color: #FFF;
         &:hover {
-          color: #FFF;
+          text-decoration: underline;
         }
       }
       color: #fff;
@@ -14,8 +14,8 @@
     .issue-check {
       float: left;
-      padding: 8px 0;
       padding-right: 8px;
+      margin-bottom: 10px;
       min-width: 15px;
     }
@@ -38,13 +38,21 @@
   }
 }
-input.check_all_issues {
+.check-all-holder {
+  height: 32px;
   float: left;
-  padding: 0;
-  margin: 0;
-  margin-right: 10px;
-  position: relative;
-  top: 13px;
+  margin-right: 12px;
+  padding: 6px 10px;
+  border: 1px solid #ccc;
+  @include border-radius(4px);
+
+
+  input.check_all_issues {
+    padding: 0;
+    margin: 0;
+    position: relative;
+    top: 3px;
+  }
 }
 .issues_content {
@@ -57,23 +65,6 @@ input.check_all_issues {
   }
 }
-.btn.close_issue {
-  color: #B94A48;
-  font-weight: bold;
-  @include shade;
-  &:hover {
-    color: #B94A48;
-  }
-}
-.btn.reopen_issue {
-  color: #468847;
-  font-weight: bold;
-  @include shade;
-  &:hover {
-    color: #468847;
-  }
-}
-
 @media (min-width: 800px)  { .issues_filters select { width: 160px; }  }
 @media (min-width: 1200px) { .issues_filters select { width: 220px; }  }
@@ -93,6 +84,13 @@ input.check_all_issues {
     .update_selected_issues {
       margin-left: 4px;
     }
+
+    .select2-container .select2-choice {
+      height: 32px;
+      line-height: 28px;
+      color: #444 !important;
+      font-weight: 500;
+    }
   }
 }
@@ -31,10 +31,10 @@
 .mr_source_commit,
 .mr_target_commit {
+  margin-top: 10px;
   .commit {
     margin: 0;
-    padding: 0;
-    padding: 5px 0;
+    padding: 2px 0;
     list-style: none;
     &:hover {
       background: none;
@@ -35,9 +35,8 @@
       width: 1%;
       &.active {
         a {
-          color: $style_color;
-          font-weight: bolder;
-
+          color: #333;
+          font-weight: bold;
           &:after {
             content: '';
             display: block;
@@ -46,7 +45,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;
@@ -56,7 +55,20 @@
       &:hover {
         a {
-         color: $style_color;
+          color: $link_color;
+          &:after {
+            content: '';
+            display: block;
+            position: relative;
+            bottom: 8px;
+            left: 50%;
+            width: 0;
+            height: 0;
+            border-color: transparent transparent #29b transparent;
+            border-style: solid;
+            border-width: 6px;
+            margin-left: -6px;
+          }
         }
       }
@@ -73,7 +85,7 @@
     a {
       display: block;
       text-align: center;
-      font-weight: normal;
+      font-weight: 500;
       height: 38px;
       line-height: 34px;
       color: #777;
@@ -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 {
@@ -105,3 +105,23 @@
     }
   }
 }
+
+.profile-groups-avatars {
+  margin: 0 5px 10px 0;
+
+  img {
+    width: 50px;
+    height: 50px;
+  }
+}
+
+.global-notifications-form .level-title {
+  font-size: 15px;
+  color: #333;
+  font-weight: bold;
+}
+
+.notification-icon-holder {
+  width: 20px;
+  float: left;
+}
@@ -123,14 +123,9 @@
 }
 .save-project-loader {
-  img {
-    margin-top: 50px;
-    margin-bottom: 50px;
-  }
-  h3 {
-    @extend .page-title;
-  }
-
+  margin-top: 50px;
+  margin-bottom: 50px;
+  color: #555;
 }
 ul.nav.nav-projects-tabs {
@@ -127,9 +127,27 @@
   border-top: 1px dashed #CCC;
   padding-top: 10px;
-  h4 {
+  .readme-file-title {
     font-size: 14px;
     margin-bottom: 20px;
     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;
+      }
+    }
+  }
+}
@@ -36,4 +36,8 @@
       }
     }
   }
+
+  .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus {
+    background: #769;
+  }
 }
@@ -135,12 +135,12 @@ class ApplicationController &lt; ActionController::Base
     end
   end
-  def render_404
-    render file: Rails.root.join("public", "404"), layout: false, status: "404"
+  def render_403
+    head :forbidden
   end
-  def render_403
-    render file: Rails.root.join("public", "403"), layout: false, status: "403"
+  def render_404
+    render file: Rails.root.join("public", "404"), layout: false, status: "404"
   end
   def require_non_empty_project
@@ -171,6 +171,7 @@ class ApplicationController &lt; ActionController::Base
     gon.api_token = current_user.private_token if current_user
     gon.gravatar_url = request.ssl? || Gitlab.config.gitlab.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
     gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
+    gon.gravatar_enabled = Gitlab.config.gravatar.enabled
   end
   def check_password_expiration
@@ -54,12 +54,12 @@ class DashboardController &lt; 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|
@@ -0,0 +1,12 @@
+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
@@ -63,7 +63,14 @@ class GroupsController &lt; ApplicationController
   def members
     @project = group.projects.find(params[:project_id]) if params[:project_id]
-    @members = group.users_groups.order('group_access DESC')
+    @members = group.users_groups
+
+    if params[:search].present?
+      users = group.users.search(params[:search])
+      @members = @members.where(user_id: users)
+    end
+
+    @members = @members.order('group_access DESC').page(params[:page]).per(50)
     @users_group = UsersGroup.new
   end
@@ -0,0 +1,26 @@
+class Profiles::EmailsController < ApplicationController
+  layout "profile"
+
+  def index
+    @primary = current_user.email
+    @emails = current_user.emails
+  end
+
+  def create
+    @email = current_user.emails.new(params[:email])
+    
+    flash[:alert] = @email.errors.full_messages.first unless @email.save
+
+    redirect_to profile_emails_url
+  end
+
+  def destroy
+    @email = current_user.emails.find(params[:id])
+    @email.destroy
+
+    respond_to do |format|
+      format.html { redirect_to profile_emails_url }
+      format.js { render nothing: true }
+    end
+  end
+end
@@ -7,12 +7,11 @@ class Profiles::GroupsController &lt; ApplicationController
   def leave
     @users_group = group.users_groups.where(user_id: current_user.id).first
-
-    if group.last_owner?(current_user)
-      redirect_to(profile_groups_path, alert: "You can't leave group. You must add at least one more owner to it.")
-    else
+    if can?(current_user, :destroy, @users_group)
       @users_group.destroy
       redirect_to(profile_groups_path, info: "You left #{group.name} group.")
+    else
+      return render_403
     end
   end
 class Profiles::KeysController < ApplicationController
   layout "profile"
+  skip_before_filter :authenticate_user!, only: [:get_keys]
   def index
     @keys = current_user.keys.order('id DESC')
@@ -32,4 +33,24 @@ class Profiles::KeysController &lt; ApplicationController
       format.js { render nothing: true }
     end
   end
+
+  # Get all keys of a user(params[:username]) in a text format
+  # Helpful for sysadmins to put in respective servers
+  def get_keys
+    if params[:username].present?
+      begin
+        user = User.find_by_username(params[:username])
+        if user.present?
+          render text: user.all_ssh_keys.join("\n")
+        else
+          render_404 and return
+        end
+      rescue => e
+        render text: e.message
+      end
+    else
+      render_404 and return
+    end
+  end
+
 end
@@ -8,13 +8,14 @@ class Projects::CompareController &lt; 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
     @diffs         = compare.diffs
     @refs_are_same = compare.same
     @line_notes    = []
+    @timeout       = compare.timeout
     diff_line_count = Commit::diff_line_count(@diffs)
     @suppress_diff = Commit::diff_suppress?(@diffs, diff_line_count) && !params[:force_show_diff]
@@ -9,7 +9,10 @@ class Projects::IssuesController &lt; Projects::ApplicationController
   before_filter :authorize_write_issue!, only: [:new, :create]
   # Allow modify issue
-  before_filter :authorize_modify_issue!, only: [:edit, :update, :bulk_update]
+  before_filter :authorize_modify_issue!, only: [:edit, :update]
+
+  # Allow issues bulk update
+  before_filter :authorize_admin_issues!, only: [:bulk_update]
   respond_to :html
@@ -25,7 +28,7 @@ class Projects::IssuesController &lt; Projects::ApplicationController
     @milestone = @project.milestones.find(milestone_id) if milestone_id.present? && !milestone_id.to_i.zero?
     sort_param = params[:sort] || 'newest'
     @sort = sort_param.humanize unless sort_param.empty?
-
+    @assignees = User.where(id: @project.issues.pluck(:assignee_id))
     respond_to do |format|
       format.html
@@ -107,8 +110,8 @@ class Projects::IssuesController &lt; 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
@@ -28,6 +28,7 @@ class Projects::MergeRequestsController &lt; Projects::ApplicationController
     assignee_id, milestone_id = params[:assignee_id], params[:milestone_id]
     @assignee = @project.team.find(assignee_id) if assignee_id.present? && !assignee_id.to_i.zero?
     @milestone = @project.milestones.find(milestone_id) if milestone_id.present? && !milestone_id.to_i.zero?
+    @assignees = User.where(id: @project.merge_requests.pluck(:assignee_id))
   end
   def show
@@ -60,7 +61,6 @@ class Projects::MergeRequestsController &lt; 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
@@ -106,10 +106,14 @@ class Projects::MergeRequestsController &lt; Projects::ApplicationController
     params[:merge_request].delete(:target_project_id)
     if @merge_request.update_attributes(params[:merge_request].merge(author_id_of_changes: current_user.id))
-      @merge_request.reload_code
-      @merge_request.mark_as_unchecked
       @merge_request.reset_events_cache
-      redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully updated.'
+
+      respond_to do |format|
+        format.js
+        format.html do
+          redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully updated.'
+        end
+      end
     else
       render "edit"
     end
@@ -167,7 +171,11 @@ class Projects::MergeRequestsController &lt; 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
@@ -11,11 +11,7 @@ class Projects::RawController &lt; Projects::ApplicationController
     @blob = @repository.blob_at(@commit.id, @path)
     if @blob
-      type = if @blob.mime_type =~ /html|javascript/
-               'text/plain; charset=utf-8'
-             else
-               @blob.mime_type
-             end
+      type = get_blob_type
       headers['X-Content-Type-Options'] = 'nosniff'
@@ -29,5 +25,17 @@ class Projects::RawController &lt; Projects::ApplicationController
       not_found!
     end
   end
+
+  private
+
+  def get_blob_type
+    if @blob.mime_type =~ /html|javascript/
+      'text/plain; charset=utf-8'
+    elsif @blob.name =~ /(?:msi|exe|rar|r0\d|7z|7zip|zip)$/
+      'application/octet-stream'
+    else
+      @blob.mime_type
+    end
+  end
 end
@@ -34,7 +34,7 @@ class Projects::RefsController &lt; 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
@@ -8,7 +8,7 @@ class Projects::TagsController &lt; 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
 class UsersController < ApplicationController
-  layout 'navless'
+
+  skip_before_filter :authenticate_user!, only: [:show]
+  layout :determine_layout
   def show
-    @user = User.find_by!(username: params[:username])
-    @projects = @user.authorized_projects.where(id: current_user.authorized_projects.pluck(:id)).includes(:namespace)
+    @user = User.find_by_username!(params[:username])
+    @projects = @user.authorized_projects.includes(:namespace).select {|project| can?(current_user, :read_project, project)}
+    if !current_user && @projects.empty?
+      return authenticate_user!
+    end
     @events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20)
-
     @title = @user.name
   end
+
+  def determine_layout
+    if current_user
+      'navless'
+    else
+      'public_users'
+    end
+  end
 end
@@ -19,11 +19,14 @@ class UsersGroupsController &lt; ApplicationController
   def destroy
     @users_group = @group.users_groups.find(params[:id])
-    @users_group.destroy
-
-    respond_to do |format|
-      format.html { redirect_to members_group_path(@group), notice: 'User was  successfully removed from group.' }
-      format.js { render nothing: true }
+    if can?(current_user, :destroy, @users_group)  # May fail if last owner.
+      @users_group.destroy
+      respond_to do |format|
+        format.html { redirect_to members_group_path(@group), notice: 'User was  successfully removed from group.' }
+        format.js { render nothing: true }
+      end
+    else
+      return render_403
     end
   end
@@ -49,6 +49,15 @@ 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)
     if user && user.avatar.present?
@@ -153,15 +162,6 @@ module ApplicationHelper
   alias_method :url_to_image, :image_url
-  def users_select_tag(id, opts = {})
-    css_class = "ajax-users-select "
-    css_class << "multiselect " if opts[:multiple]
-    css_class << (opts[:class] || '')
-    value = opts[:selected] || ''
-
-    hidden_field_tag(id, value, class: css_class)
-  end
-
   def body_data_page
     path = controller.controller_path.split('/')
     namespace = path.first if path.second
@@ -203,8 +203,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 +227,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
@@ -122,17 +122,18 @@ module CommitsHelper
   def commit_person_link(commit, options = {})
     source_name = commit.send "#{options[:source]}_name".to_sym
     source_email = commit.send "#{options[:source]}_email".to_sym
+    
+    user = User.find_for_commit(source_email, source_name)
+    person_name = user.nil? ? source_name : user.name
+    person_email = user.nil? ? source_email : user.email
+    
     text = if options[:avatar]
-            avatar = image_tag(avatar_icon(source_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: "")
-            %Q{#{avatar} <span class="commit-#{options[:source]}-name">#{source_name}</span>}
+            avatar = image_tag(avatar_icon(person_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: "")
+            %Q{#{avatar} <span class="commit-#{options[:source]}-name">#{person_name}</span>}
           else
-            source_name
+            person_name
           end
-    # Prefer email match over name match
-    user = User.where(email: source_email).first
-    user ||= User.where(name: source_name).first
-
     options = {
       class: "commit-#{options[:source]}-link has_tooltip",
       data: { :'original-title' => sanitize(source_email) }
@@ -28,14 +28,16 @@ module GitlabMarkdownHelper
     link_to(gfm_body.html_safe, url, html_options)
   end
-  def markdown(text)
-    unless @markdown
-      gitlab_renderer = Redcarpet::Render::GitlabHTML.new(self,
-                          # see https://github.com/vmg/redcarpet#darling-i-packed-you-a-couple-renderers-for-lunch-
-                          filter_html: true,
-                          with_toc_data: true,
-                          hard_wrap: true,
-                          safe_links_only: true)
+  def markdown(text, options={})
+    unless (@markdown and options == @options)
+      @options = options
+      gitlab_renderer = Redcarpet::Render::GitlabHTML.new(self, {
+                            # see https://github.com/vmg/redcarpet#darling-i-packed-you-a-couple-renderers-for-lunch-
+                            filter_html: true,
+                            with_toc_data: true,
+                            hard_wrap: true,
+                            safe_links_only: true
+                          }.merge(options))
       @markdown = Redcarpet::Markdown.new(gitlab_renderer,
                       # see https://github.com/vmg/redcarpet#and-its-like-really-simple-to-use
                       no_intra_emphasis: true,
@@ -47,7 +49,6 @@ module GitlabMarkdownHelper
                       space_after_headers: true,
                       superscript: true)
     end
-
     @markdown.render(text).html_safe
   end
@@ -166,18 +167,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
 module GroupsHelper
   def remove_user_from_group_message(group, user)
-    "You are going to remove #{user.name} from #{group.name} Group. Are you sure?"
+    "Are you sure you want to remove \"#{user.name}\" from \"#{group.name}\"?"
+  end
+
+  def leave_group_message(group)
+    "Are you sure you want to leave \"#{group}\" group?"
   end
   def group_head_title
@@ -70,11 +70,11 @@ module IssuesHelper
   end
   def bulk_update_milestone_options
-    options_for_select(["None (backlog)", nil]) + options_from_collection_for_select(project_active_milestones, "id", "title", params[:milestone_id])
+    options_for_select(["None (backlog)"]) + options_from_collection_for_select(project_active_milestones, "id", "title", params[:milestone_id])
   end
   def bulk_update_assignee_options
-    options_for_select(["None (unassigned)", nil]) + options_from_collection_for_select(@project.team.members, "id", "name", params[:assignee_id])
+    options_for_select(["None (unassigned)"]) + options_from_collection_for_select(@project.team.members, "id", "name", params[:assignee_id])
   end
   def assignee_options object
@@ -84,4 +84,12 @@ module IssuesHelper
   def milestone_options object
     options_from_collection_for_select(@project.milestones.active, 'id', 'title', object.milestone_id)
   end
+
+  def issue_alert_class(issue)
+    if issue.closed?
+      'alert-danger'
+    else
+      'alert-success'
+    end
+  end
 end
@@ -41,4 +41,14 @@ module MergeRequestsHelper
       "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}"
     end
   end
+
+  def merge_request_alert_class(merge_request)
+    if merge_request.merged?
+      'alert-info'
+    elsif merge_request.closed?
+      'alert-danger'
+    else
+      'alert-success'
+    end
+  end
 end
@@ -17,7 +17,7 @@ module NotesHelper
   def link_to_merge_request_diff_line_note(note)
     if note.for_merge_request_diff_line? and note.diff
-      link_to "#{note.diff_file_name}:L#{note.diff_new_line}", diffs_project_merge_request_path(note.project, note.noteable_id, anchor: note.line_code)
+      link_to "#{note.diff_file_name}:L#{note.diff_new_line}", diffs_project_merge_request_path(note.project, note.noteable, anchor: note.line_code)
     end
   end
 module NotificationsHelper
   def notification_icon(notification)
     if notification.disabled?
-      content_tag :i, nil, class: 'icon-circle cred'
+      content_tag :i, nil, class: 'icon-volume-off cred'
     elsif notification.participating?
-      content_tag :i, nil, class: 'icon-circle cblue'
+      content_tag :i, nil, class: 'icon-volume-down cblue'
     elsif notification.watch?
-      content_tag :i, nil, class: 'icon-circle cgreen'
+      content_tag :i, nil, class: 'icon-volume-up cgreen'
     else
       content_tag :i, nil, class: 'icon-circle-blank cblue'
     end
@@ -64,6 +64,31 @@ module ProjectsHelper
     project_nav_tabs.include? name
   end
+  def selected_label?(label_name)
+    params[:label_name].to_s.split(',').include?(label_name)
+  end
+
+  def labels_filter_path(label_name)
+    label_name =
+      if selected_label?(label_name)
+        params[:label_name].split(',').reject { |l| l == label_name }.join(',')
+      elsif params[:label_name].present?
+        "#{params[:label_name]},#{label_name}"
+      else
+        label_name
+      end
+
+    project_filter_path(label_name: label_name)
+  end
+
+  def label_filter_class(label_name)
+    if selected_label?(label_name)
+      'label-filter-item active'
+    else
+      'label-filter-item light'
+    end
+  end
+
   def project_filter_path(options={})
     exist_opts = {
       state: params[:state],
@@ -0,0 +1,20 @@
+module SelectsHelper
+  def users_select_tag(id, opts = {})
+    css_class = "ajax-users-select "
+    css_class << "multiselect " if opts[:multiple]
+    css_class << (opts[:class] || '')
+    value = opts[:selected] || ''
+
+    hidden_field_tag(id, value, class: css_class)
+  end
+
+  def project_users_select_tag(id, opts = {})
+    css_class = "ajax-project-users-select "
+    css_class << "multiselect " if opts[:multiple]
+    css_class << (opts[:class] || '')
+    value = opts[:selected] || ''
+    placeholder = opts[:placeholder] || 'Select user'
+
+    hidden_field_tag(id, value, class: css_class, 'data-placeholder' => placeholder)
+  end
+end
@@ -0,0 +1,43 @@
+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
@@ -6,6 +6,12 @@ module Emails
       mail(to: @user.email, subject: subject("Account was created for you"))
     end
+    def new_email_email(email_id)
+      @email = Email.find(email_id)
+      @user = @email.user
+      mail(to: @user.email, subject: subject("Email was added to your account"))
+    end
+
     def new_ssh_key_email(key_id)
       @key = Key.find(key_id)
       @user = @key.user
@@ -17,6 +17,7 @@ module Emails
     def repository_push_email(project_id, recipient, author_id, branch, compare)
       @project = Project.find(project_id)
       @author  = User.find(author_id)
+      @compare = compare
       @commits = Commit.decorate(compare.commits)
       @diffs   = compare.diffs
       @branch  = branch
@@ -14,6 +14,7 @@ class Ability
       when "MergeRequest" then merge_request_abilities(user, subject)
       when "Group" then group_abilities(user, subject)
       when "Namespace" then namespace_abilities(user, subject)
+      when "UsersGroup" then users_group_abilities(user, subject)
       else []
       end.concat(global_abilities(user))
     end
@@ -126,6 +127,7 @@ class Ability
         :write_merge_request,
         :write_wiki,
         :modify_issue,
+        :admin_issue,
         :push_code
       ]
     end
@@ -218,5 +220,19 @@ class Ability
         end
       end
     end
+
+    def users_group_abilities(user, subject)
+      rules = []
+      target_user = subject.user
+      group = subject.group
+      can_manage = group_abilities(user, group).include?(:manage_group)
+      if can_manage && (user != target_user)
+        rules << :modify
+      end
+      if !group.last_owner?(user) && (can_manage || (user == target_user))
+        rules << :destroy
+      end
+      rules
+    end
   end
 end
@@ -16,29 +16,31 @@ class Commit
   DIFF_HARD_LIMIT_FILES = 500
   DIFF_HARD_LIMIT_LINES = 10000
-  def self.decorate(commits)
-    commits.map { |c| self.new(c) }
-  end
+  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)
-    diffs.reduce(0){|sum, d| sum + d.diff.lines.count}
-  end
+    # Calculate number of lines to render for 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)
-    # optimize - check file count first
-    return true if diffs.size > DIFF_SAFE_FILES
+    def diff_suppress?(diffs, line_count = nil)
+      # optimize - check file count first
+      return true if diffs.size > DIFF_SAFE_FILES
-    line_count ||= Commit::diff_line_count(diffs)
-    line_count > DIFF_SAFE_LINES
-  end
+      line_count ||= Commit::diff_line_count(diffs)
+      line_count > DIFF_SAFE_LINES
+    end
-  def self.diff_force_suppress?(diffs, line_count = nil)
-    # optimize - check file count first
-    return true if diffs.size > DIFF_HARD_LIMIT_FILES
+    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
+      line_count ||= Commit::diff_line_count(diffs)
+      line_count > DIFF_HARD_LIMIT_LINES
+    end
   end
   attr_accessor :raw
@@ -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
@@ -0,0 +1,33 @@
+# == Schema Information
+#
+# Table name: emails
+#
+#  id          :integer          not null, primary key
+#  user_id     :integer          not null
+#  email       :string           not null
+#  created_at  :datetime         not null
+class Email < ActiveRecord::Base
+  attr_accessible :email, :user_id
+
+  #
+  # Relations
+  #
+  belongs_to :user
+  
+  #
+  # Validations
+  #
+  validates :user_id, presence: true
+  validates :email, presence: true, email: { strict_mode: true }, uniqueness: true
+  validate :unique_email, if: ->(email) { email.email_changed? }
+  
+  before_validation :cleanup_email
+
+  def cleanup_email
+    self.email = self.email.downcase.strip
+  end
+
+  def unique_email
+    self.errors.add(:email, 'has already been taken') if User.exists?(email: self.email)
+  end
+end
 \ No newline at end of file
 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
@@ -12,10 +12,20 @@
 #  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
+  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
@@ -50,4 +60,10 @@ class Group &lt; Namespace
   def members
     users_groups
   end
+
+  def avatar_type
+    unless self.avatar.image?
+      self.errors.add :avatar, "only images allowed"
+    end
+  end
 end
@@ -32,7 +32,9 @@ class MergeRequest &lt; ActiveRecord::Base
   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
+  after_update :update_merge_request_diff
   delegate :commits, :diffs, :last_commit, :last_commit_short_sha, to: :merge_request_diff, prefix: nil
@@ -125,6 +127,13 @@ class MergeRequest &lt; ActiveRecord::Base
     end
   end
+  def update_merge_request_diff
+    if source_branch_changed? || target_branch_changed?
+      reload_code
+      mark_as_unchecked
+    end
+  end
+
   def reload_code
     if merge_request_diff && opened?
       merge_request_diff.reload_content
@@ -219,6 +228,14 @@ class MergeRequest &lt; ActiveRecord::Base
     end
   end
+  def source_project_namespace
+    if source_project && source_project.namespace
+      source_project.namespace.path
+    else
+      "(removed)"
+    end
+  end
+
   def source_branch_exists?
     return false unless self.source_project
@@ -253,4 +270,24 @@ class MergeRequest &lt; ActiveRecord::Base
     message << description.to_s
     message
   end
+
+  # 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
+
+  # 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
+  end
 end
@@ -148,13 +148,11 @@ class MergeRequestDiff &lt; ActiveRecord::Base
               Gitlab::Git::Diff.between(repository, source_branch, target_branch)
             end
-    if diffs == broken_diffs
-      self.state = :timeout
-      diffs = []
-    end
-
     diffs ||= []
     diffs
+  rescue Gitlab::Git::Diff::TimeoutError => ex
+    self.state = :timeout
+    diffs = []
   end
   def repository
@@ -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
@@ -26,7 +27,7 @@ class Namespace &lt; ActiveRecord::Base
             format: { with: Gitlab::Regex.name_regex,
                       message: "only letters, digits, spaces & '_' '-' '.' allowed." }
   validates :description, length: { within: 0..255 }
-  validates :path, uniqueness: true, presence: true, length: { within: 1..255 },
+  validates :path, uniqueness: { case_sensitive: false }, presence: true, length: { within: 1..255 },
             exclusion: { in: Gitlab::Blacklist.path },
             format: { with: Gitlab::Regex.path_regex,
                       message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
@@ -72,14 +72,20 @@ class Note &lt; 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)
@@ -9,12 +9,23 @@ class Notification
   attr_accessor :target
-  def self.notification_levels
-    [N_DISABLED, N_PARTICIPATING, N_WATCH]
-  end
-
-  def self.project_notification_levels
-    [N_DISABLED, N_PARTICIPATING, N_WATCH, N_GLOBAL]
+  class << self
+    def notification_levels
+      [N_DISABLED, N_PARTICIPATING, N_WATCH]
+    end
+
+    def options_with_labels
+      {
+        disabled: N_DISABLED,
+        participating: N_PARTICIPATING,
+        watch: N_WATCH,
+        global: N_GLOBAL
+      }
+    end
+
+    def project_notification_levels
+      [N_DISABLED, N_PARTICIPATING, N_WATCH, N_GLOBAL]
+    end
   end
   def initialize(target)
@@ -36,4 +47,8 @@ class Notification
   def global?
     target.notification_level == N_GLOBAL
   end
+
+  def level
+    target.notification_level
+  end
 end
@@ -40,7 +40,7 @@ class HipchatService &lt; Service
   end
   def execute(push_data)
-    gate[room].send('Gitlab', create_message(push_data))
+    gate[room].send('GitLab', create_message(push_data))
   end
   private
@@ -57,7 +57,7 @@ class Repository
   def recent_branches(limit = 20)
     branches.sort do |a, b|
-      b.commit.committed_date <=> a.commit.committed_date
+      commit(b.target).committed_date <=> commit(a.target).committed_date
     end[0..limit]
   end
@@ -163,7 +163,49 @@ class Repository
   def readme
     Rails.cache.fetch(cache_key(:readme)) do
-      Tree.new(self, self.root_ref).readme
+      tree(:head).readme
     end
   end
+
+  def head_commit
+    commit(self.root_ref)
+  end
+
+  def tree(sha = :head, path = nil)
+    if sha == :head
+      sha = head_commit.sha
+    end
+
+    Tree.new(self, sha, path)
+  end
+
+  def blob_at_branch(branch_name, path)
+    last_commit = commit(branch_name)
+
+    if last_commit
+      blob_at(last_commit.sha, path)
+    else
+      nil
+    end
+  end
+
+  # Returns url for submodule
+  #
+  # Ex.
+  #   @repository.submodule_url_for('master', 'rack')
+  #   # => git@localhost:rack.git
+  #
+  def submodule_url_for(ref, path)
+    if submodules.any?
+      submodule = submodules(ref)[path]
+
+      if submodule
+        submodule['url']
+      end
+    end
+  end
+
+  def last_commit_for_path(sha, path)
+    commits(sha, path, 1).last
+  end
 end
@@ -23,4 +23,8 @@ class Tree
   def submodules
     @entries.select(&:submodule?)
   end
+
+  def sorted_entries
+    trees + blobs + submodules
+  end
 end
@@ -78,6 +78,7 @@ class User &lt; ActiveRecord::Base
   # Profile
   has_many :keys, dependent: :destroy
+  has_many :emails, dependent: :destroy
   # Groups
   has_many :users_groups, dependent: :destroy
@@ -108,7 +109,7 @@ class User &lt; ActiveRecord::Base
   validates :bio, length: { maximum: 255 }, allow_blank: true
   validates :extern_uid, allow_blank: true, uniqueness: {scope: :provider}
   validates :projects_limit, presence: true, numericality: {greater_than_or_equal_to: 0}
-  validates :username, presence: true, uniqueness: true,
+  validates :username, presence: true, uniqueness: { case_sensitive: false },
             exclusion: { in: Gitlab::Blacklist.path },
             format: { with: Gitlab::Regex.username_regex,
                       message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
@@ -116,6 +117,7 @@ class User &lt; ActiveRecord::Base
   validates :notification_level, inclusion: { in: Notification.notification_levels }, presence: true
   validate :namespace_uniq, if: ->(user) { user.username_changed? }
   validate :avatar_type, if: ->(user) { user.avatar_changed? }
+  validate :unique_email, if: ->(user) { user.email_changed? }
   validates :avatar, file_size: { maximum: 100.kilobytes.to_i }
   before_validation :generate_password, on: :create
@@ -183,6 +185,13 @@ class User &lt; ActiveRecord::Base
         where(conditions).first
       end
     end
+    
+    def find_for_commit(email, name)
+      # Prefer email match over name match
+      User.where(email: email).first ||
+        User.joins(:emails).where(emails: { email: email }).first ||
+        User.where(name: name).first
+    end
     def filter filter_name
       case filter_name
@@ -250,6 +259,10 @@ class User &lt; ActiveRecord::Base
     end
   end
+  def unique_email
+    self.errors.add(:email, 'has already been taken') if Email.exists?(email: self.email)
+  end
+
   # Groups user has access to
   def authorized_groups
     @authorized_groups ||= begin
@@ -435,4 +448,8 @@ class User &lt; ActiveRecord::Base
   def short_website_url
     website_url.gsub(/https?:\/\//, '')
   end
+
+  def all_ssh_keys
+    keys.map(&:key)
+  end
 end
@@ -0,0 +1,5 @@
+class EmailObserver < BaseObserver
+  def after_create(email)
+    notification.new_email(email)
+  end
+end
1	v 6.6.0	1	v 6.6.0
		2	+ - Retrieving user ssh keys publically(github style): http://__HOST__/__USERNAME__.keys
2	- Permissions: Developer now can manage issue tracker (modify any issue)	3	- Permissions: Developer now can manage issue tracker (modify any issue)
		4	+ - Improve Code Compare page performance
		5	+ - Group avatar
		6	+ - Pygments.rb replaced with highlight.js
		7	+ - Improve Merge request diff store logic
		8	+ - Improve render performnace for MR show page
		9	+ - Fixed Assembla hardcoded project name
		10	+ - Jira integration documentation
		11	+ - Refactored app/services
		12	+ - Remove snippet expiration
		13	+ - Mobile UI improvements (Drew Blessing)
		14	+ - Fix block/remove UI for admin::users#show page
		15	+ - Show users' group membership on users' activity page
		16	+ - User pages are visible without login if user is authorized to a public project
		17	+ - Markdown rendered headers have id derived from their name and link to their id
		18	+ - Improve application to work faster with large groups (100+ members)
		19	+ - Multiple emails per user
		20	+ - Show last commit for file when view file source
		21	+ - Restyle Issue#show page and MR#show page
		22	+ - Ability to filter by multiple labels for Issues page
		23	+ - Rails version to 4.0.3
3		24
4	v 6.5.1	25	v 6.5.1
5	- Fix branch selectbox when create merge request from fork	26	- Fix branch selectbox when create merge request from fork
	@@ -33,7 +54,7 @@ v6.4.3		@@ -33,7 +54,7 @@ v6.4.3
33	v6.4.2	54	v6.4.2
34	- Fixed wrong behaviour of script/upgrade.rb	55	- Fixed wrong behaviour of script/upgrade.rb
35		56
36	-v6.4.1	57	+v6.4.1
37	- Fixed bug with repository rename	58	- Fixed bug with repository rename
38	- Fixed bug with project transfer	59	- Fixed bug with project transfer
39		60
	@@ -8,11 +8,12 @@ GIT		@@ -8,11 +8,12 @@ GIT
8	GEM	8	GEM
9	remote: https://rubygems.org/	9	remote: https://rubygems.org/
10	specs:	10	specs:
11	- actionmailer (4.0.2)
12	- actionpack (= 4.0.2)	11	+ ace-rails-ap (2.0.1)
		12	+ actionmailer (4.0.3)
		13	+ actionpack (= 4.0.3)
13	mail (~> 2.5.4)	14	mail (~> 2.5.4)
14	- actionpack (4.0.2)
15	- activesupport (= 4.0.2)	15	+ actionpack (4.0.3)
		16	+ activesupport (= 4.0.3)
16	builder (~> 3.1.0)	17	builder (~> 3.1.0)
17	erubis (~> 2.7.0)	18	erubis (~> 2.7.0)
18	rack (~> 1.5.2)	19	rack (~> 1.5.2)
	@@ -21,16 +22,16 @@ GEM		@@ -21,16 +22,16 @@ GEM
21	actionpack (>= 4.0.0, < 5.0)	22	actionpack (>= 4.0.0, < 5.0)
22	actionpack-page_caching (1.0.2)	23	actionpack-page_caching (1.0.2)
23	actionpack (>= 4.0.0, < 5)	24	actionpack (>= 4.0.0, < 5)
24	- activemodel (4.0.2)
25	- activesupport (= 4.0.2)	25	+ activemodel (4.0.3)
		26	+ activesupport (= 4.0.3)
26	builder (~> 3.1.0)	27	builder (~> 3.1.0)
27	- activerecord (4.0.2)
28	- activemodel (= 4.0.2)	28	+ activerecord (4.0.3)
		29	+ activemodel (= 4.0.3)
29	activerecord-deprecated_finders (~> 1.0.2)	30	activerecord-deprecated_finders (~> 1.0.2)
30	- activesupport (= 4.0.2)	31	+ activesupport (= 4.0.3)
31	arel (~> 4.0.0)	32	arel (~> 4.0.0)
32	activerecord-deprecated_finders (1.0.3)	33	activerecord-deprecated_finders (1.0.3)
33	- activesupport (4.0.2)	34	+ activesupport (4.0.3)
34	i18n (~> 0.6, >= 0.6.4)	35	i18n (~> 0.6, >= 0.6.4)
35	minitest (~> 4.2)	36	minitest (~> 4.2)
36	multi_json (~> 1.3)	37	multi_json (~> 1.3)
	@@ -42,7 +43,7 @@ GEM		@@ -42,7 +43,7 @@ GEM
42	annotate (2.6.0)	43	annotate (2.6.0)
43	activerecord (>= 2.3.0)	44	activerecord (>= 2.3.0)
44	rake (>= 0.8.7)	45	rake (>= 0.8.7)
45	- arel (4.0.1)	46	+ arel (4.0.2)
46	asciidoctor (0.1.4)	47	asciidoctor (0.1.4)
47	atomic (1.1.14)	48	atomic (1.1.14)
48	awesome_print (1.2.0)	49	awesome_print (1.2.0)
	@@ -158,36 +159,32 @@ GEM		@@ -158,36 +159,32 @@ GEM
158	gitlab-flowdock-git-hook (0.4.2.2)	159	gitlab-flowdock-git-hook (0.4.2.2)
159	gitlab-grit (>= 2.4.1)	160	gitlab-grit (>= 2.4.1)
160	multi_json	161	multi_json
161	- gitlab-gollum-lib (1.0.2)	162	+ gitlab-gollum-lib (1.1.0)
162	github-markdown (~> 0.5.3)	163	github-markdown (~> 0.5.3)
163	github-markup (>= 0.7.5, < 1.0.0)	164	github-markup (>= 0.7.5, < 1.0.0)
164	gitlab-grit (~> 2.6.1)	165	gitlab-grit (~> 2.6.1)
165	- gitlab-pygments.rb (~> 0.5.4)
166	nokogiri (~> 1.5.9)	166	nokogiri (~> 1.5.9)
167	sanitize (~> 2.0.3)	167	sanitize (~> 2.0.3)
168	stringex (~> 1.5.1)	168	stringex (~> 1.5.1)
169	gitlab-grack (2.0.0.pre)	169	gitlab-grack (2.0.0.pre)
170	rack (~> 1.5.1)	170	rack (~> 1.5.1)
171	- gitlab-grit (2.6.3)	171	+ gitlab-grit (2.6.4)
172	charlock_holmes (~> 0.6.9)	172	charlock_holmes (~> 0.6.9)
173	diff-lcs (~> 1.1)	173	diff-lcs (~> 1.1)
174	mime-types (~> 1.15)	174	mime-types (~> 1.15)
175	posix-spawn (~> 0.3.6)	175	posix-spawn (~> 0.3.6)
176	- gitlab-linguist (2.9.6)	176	+ gitlab-linguist (3.0.0)
177	charlock_holmes (~> 0.6.6)	177	charlock_holmes (~> 0.6.6)
178	escape_utils (~> 0.2.4)	178	escape_utils (~> 0.2.4)
179	- gitlab-pygments.rb (~> 0.5.4)
180	mime-types (~> 1.19)	179	mime-types (~> 1.19)
181	- gitlab-pygments.rb (0.5.4)
182	- posix-spawn (~> 0.3.6)
183	- yajl-ruby (~> 1.1.0)
184	- gitlab_git (4.0.0)	180	+ gitlab_git (5.4.0)
185	activesupport (~> 4.0.0)	181	activesupport (~> 4.0.0)
		182	+ charlock_holmes (~> 0.6.9)
186	gitlab-grit (~> 2.6.1)	183	gitlab-grit (~> 2.6.1)
187	- gitlab-linguist (~> 2.9.5)
188	- gitlab-pygments.rb (~> 0.5.4)	184	+ gitlab-linguist (~> 3.0.0)
		185	+ rugged (~> 0.19.0)
189	gitlab_meta (6.0)	186	gitlab_meta (6.0)
190	- gitlab_omniauth-ldap (1.0.3)	187	+ gitlab_omniauth-ldap (1.0.4)
191	net-ldap (~> 0.3.1)	188	net-ldap (~> 0.3.1)
192	omniauth (~> 1.0)	189	omniauth (~> 1.0)
193	pyu-ruby-sasl (~> 0.0.3.1)	190	pyu-ruby-sasl (~> 0.0.3.1)
	@@ -323,8 +320,8 @@ GEM		@@ -323,8 +320,8 @@ GEM
323	cliver (~> 0.2.1)	320	cliver (~> 0.2.1)
324	multi_json (~> 1.0)	321	multi_json (~> 1.0)
325	websocket-driver (>= 0.2.0)	322	websocket-driver (>= 0.2.0)
326	- polyglot (0.3.3)
327	- posix-spawn (0.3.6)	323	+ polyglot (0.3.4)
		324	+ posix-spawn (0.3.8)
328	protected_attributes (1.0.5)	325	protected_attributes (1.0.5)
329	activemodel (>= 4.0.1, < 5.0)	326	activemodel (>= 4.0.1, < 5.0)
330	pry (0.9.12.4)	327	pry (0.9.12.4)
	@@ -349,13 +346,13 @@ GEM		@@ -349,13 +346,13 @@ GEM
349	rack	346	rack
350	rack-test (0.6.2)	347	rack-test (0.6.2)
351	rack (>= 1.0)	348	rack (>= 1.0)
352	- rails (4.0.2)
353	- actionmailer (= 4.0.2)
354	- actionpack (= 4.0.2)
355	- activerecord (= 4.0.2)
356	- activesupport (= 4.0.2)	349	+ rails (4.0.3)
		350	+ actionmailer (= 4.0.3)
		351	+ actionpack (= 4.0.3)
		352	+ activerecord (= 4.0.3)
		353	+ activesupport (= 4.0.3)
357	bundler (>= 1.3.0, < 2.0)	354	bundler (>= 1.3.0, < 2.0)
358	- railties (= 4.0.2)	355	+ railties (= 4.0.3)
359	sprockets-rails (~> 2.0.0)	356	sprockets-rails (~> 2.0.0)
360	rails-observers (0.1.2)	357	rails-observers (0.1.2)
361	activemodel (~> 4.0)	358	activemodel (~> 4.0)
	@@ -368,13 +365,13 @@ GEM		@@ -368,13 +365,13 @@ GEM
368	i18n	365	i18n
369	require_all	366	require_all
370	ruby-progressbar	367	ruby-progressbar
371	- railties (4.0.2)
372	- actionpack (= 4.0.2)
373	- activesupport (= 4.0.2)	368	+ railties (4.0.3)
		369	+ actionpack (= 4.0.3)
		370	+ activesupport (= 4.0.3)
374	rake (>= 0.8.7)	371	rake (>= 0.8.7)
375	thor (>= 0.18.1, < 2.0)	372	thor (>= 0.18.1, < 2.0)
376	raindrops (0.12.0)	373	raindrops (0.12.0)
377	- rake (10.1.0)	374	+ rake (10.1.1)
378	raphael-rails (2.1.2)	375	raphael-rails (2.1.2)
379	rb-fsevent (0.9.3)	376	rb-fsevent (0.9.3)
380	rb-inotify (0.9.2)	377	rb-inotify (0.9.2)
	@@ -423,6 +420,7 @@ GEM		@@ -423,6 +420,7 @@ GEM
423	ruby-hmac (0.4.0)	420	ruby-hmac (0.4.0)
424	ruby-progressbar (1.2.0)	421	ruby-progressbar (1.2.0)
425	rubyntlm (0.1.1)	422	rubyntlm (0.1.1)
		423	+ rugged (0.19.0)
426	safe_yaml (0.9.7)	424	safe_yaml (0.9.7)
427	sanitize (2.0.6)	425	sanitize (2.0.6)
428	nokogiri (>= 1.4.4)	426	nokogiri (>= 1.4.4)
	@@ -472,6 +470,11 @@ GEM		@@ -472,6 +470,11 @@ GEM
472	railties (>= 3)	470	railties (>= 3)
473	spinach (>= 0.4)	471	spinach (>= 0.4)
474	spork (1.0.0rc4)	472	spork (1.0.0rc4)
		473	+ spring (1.1.1)
		474	+ spring-commands-rspec (1.0.1)
		475	+ spring (>= 0.9.1)
		476	+ spring-commands-spinach (1.0.0)
		477	+ spring (>= 0.9.1)
475	sprockets (2.10.1)	478	sprockets (2.10.1)
476	hike (~> 1.2)	479	hike (~> 1.2)
477	multi_json (~> 1.0)	480	multi_json (~> 1.0)
	@@ -543,12 +546,12 @@ GEM		@@ -543,12 +546,12 @@ GEM
543	websocket-driver (0.3.1)	546	websocket-driver (0.3.1)
544	xpath (2.0.0)	547	xpath (2.0.0)
545	nokogiri (~> 1.3)	548	nokogiri (~> 1.3)
546	- yajl-ruby (1.1.0)
547		549
548	PLATFORMS	550	PLATFORMS
549	ruby	551	ruby
550		552
551	DEPENDENCIES	553	DEPENDENCIES
		554	+ ace-rails-ap
552	actionpack-action_caching	555	actionpack-action_caching
553	actionpack-page_caching	556	actionpack-page_caching
554	acts-as-taggable-on	557	acts-as-taggable-on
	@@ -578,13 +581,12 @@ DEPENDENCIES		@@ -578,13 +581,12 @@ DEPENDENCIES
578	gemoji (~> 1.3.0)	581	gemoji (~> 1.3.0)
579	github-markup (~> 0.7.4)!	582	github-markup (~> 0.7.4)!
580	gitlab-flowdock-git-hook (~> 0.4.2)	583	gitlab-flowdock-git-hook (~> 0.4.2)
581	- gitlab-gollum-lib (~> 1.0.2)	584	+ gitlab-gollum-lib (~> 1.1.0)
582	gitlab-grack (~> 2.0.0.pre)	585	gitlab-grack (~> 2.0.0.pre)
583	- gitlab-linguist (~> 2.9.6)
584	- gitlab-pygments.rb (~> 0.5.4)
585	- gitlab_git (~> 4.0.0)	586	+ gitlab-linguist (~> 3.0.0)
		587	+ gitlab_git (~> 5.4.0)
586	gitlab_meta (= 6.0)	588	gitlab_meta (= 6.0)
587	- gitlab_omniauth-ldap (= 1.0.3)	589	+ gitlab_omniauth-ldap (= 1.0.4)
588	gon (~> 5.0.0)	590	gon (~> 5.0.0)
589	grape (~> 0.6.1)	591	grape (~> 0.6.1)
590	grape-entity (~> 0.3.0)	592	grape-entity (~> 0.3.0)
	@@ -640,6 +642,9 @@ DEPENDENCIES		@@ -640,6 +642,9 @@ DEPENDENCIES
640	slim	642	slim
641	spinach-rails	643	spinach-rails
642	spork (~> 1.0rc)	644	spork (~> 1.0rc)
		645	+ spring (= 1.1.1)
		646	+ spring-commands-rspec (= 1.0.1)
		647	+ spring-commands-spinach (= 1.0.0)
643	stamp	648	stamp
644	state_machine	649	state_machine
645	test_after_commit	650	test_after_commit
1	-Copyright (c) 2011 Dmitriy Zaporozhets	1	+Copyright (c) 2011-2014 Dmitriy Zaporozhets
2		2
3	Permission is hereby granted, free of charge, to any person obtaining a copy	3	Permission is hereby granted, free of charge, to any person obtaining a copy
4	of this software and associated documentation files (the "Software"), to deal	4	of this software and associated documentation files (the "Software"), to deal
	@@ -21,3 +21,5 @@ release where the minor version is increased numerically by increments of one		@@ -21,3 +21,5 @@ release where the minor version is increased numerically by increments of one
21	(eg. `5.0 -> 5.1`).	21	(eg. `5.0 -> 5.1`).
22		22
23	We encourage everyone to run the latest stable release to ensure that you can easily upgrade to the most secure and feature rich GitLab experience. In order to make sure you can easily run the most recent stable release, we are working hard to keep the update process simple and reliable.	23	We encourage everyone to run the latest stable release to ensure that you can easily upgrade to the most secure and feature rich GitLab experience. In order to make sure you can easily run the most recent stable release, we are working hard to keep the update process simple and reliable.
		24	+
		25	+More information about the release procedures can be found in the doc/release directory.
	@@ -3,6 +3,7 @@		@@ -3,6 +3,7 @@
3	user_path: "/api/:version/users/:id.json"	3	user_path: "/api/:version/users/:id.json"
4	notes_path: "/api/:version/projects/:id/notes.json"	4	notes_path: "/api/:version/projects/:id/notes.json"
5	namespaces_path: "/api/:version/namespaces.json"	5	namespaces_path: "/api/:version/namespaces.json"
		6	+ project_users_path: "/api/:version/projects/:id/users.json"
6		7
7	# Get 20 (depends on api) recent notes	8	# Get 20 (depends on api) recent notes
8	# and sort the ascending from oldest to newest	9	# and sort the ascending from oldest to newest
	@@ -50,6 +51,23 @@		@@ -50,6 +51,23 @@
50	).done (users) ->	51	).done (users) ->
51	callback(users)	52	callback(users)
52		53
		54	+ # Return project users list. Filtered by query
		55	+ # Only active users retrieved
		56	+ projectUsers: (project_id, query, callback) ->
		57	+ url = Api.buildUrl(Api.project_users_path)
		58	+ url = url.replace(':id', project_id)
		59	+
		60	+ $.ajax(
		61	+ url: url
		62	+ data:
		63	+ private_token: gon.api_token
		64	+ search: query
		65	+ per_page: 20
		66	+ active: true
		67	+ dataType: "json"
		68	+ ).done (users) ->
		69	+ callback(users)
		70	+
53	# Return namespaces list. Filtered by query	71	# Return namespaces list. Filtered by query
54	namespaces: (query, callback) ->	72	namespaces: (query, callback) ->
55	url = Api.buildUrl(Api.namespaces_path)	73	url = Api.buildUrl(Api.namespaces_path)
	@@ -17,7 +17,7 @@ class BlobView		@@ -17,7 +17,7 @@ class BlobView
17		17
18	setHash(hash)	18	setHash(hash)
19	e.preventDefault()	19	e.preventDefault()
20	-	20	+
21	# See if there are lines selected	21	# See if there are lines selected
22	# "#L12" and "#L34-56" supported	22	# "#L12" and "#L34-56" supported
23	highlightBlobLines = (e) ->	23	highlightBlobLines = (e) ->
	@@ -64,7 +64,7 @@ class BlobView		@@ -64,7 +64,7 @@ class BlobView
64	nodes.attr("id", hash)	64	nodes.attr("id", hash)
65		65
66	# initialize multi-line select	66	# initialize multi-line select
67	- $("#tree-content-holder .line_numbers a[id^=L]").on("click", handleMultiSelect)	67	+ $("#tree-content-holder .line-numbers a[id^=L]").on("click", handleMultiSelect)
68		68
69	# Highlight the correct lines on load	69	# Highlight the correct lines on load
70	highlightBlobLines()	70	highlightBlobLines()
	@@ -4,6 +4,7 @@ $ ->		@@ -4,6 +4,7 @@ $ ->
4	class Dispatcher	4	class Dispatcher
5	constructor: () ->	5	constructor: () ->
6	@initSearch()	6	@initSearch()
		7	+ @initHighlight()
7	@initPageScripts()	8	@initPageScripts()
8		9
9	initPageScripts: ->	10	initPageScripts: ->
	@@ -18,6 +19,8 @@ class Dispatcher		@@ -18,6 +19,8 @@ class Dispatcher
18	switch page	19	switch page
19	when 'projects:issues:index'	20	when 'projects:issues:index'
20	Issues.init()	21	Issues.init()
		22	+ when 'projects:issues:show'
		23	+ new Issue()
21	when 'projects:issues:new', 'projects:merge_requests:new'	24	when 'projects:issues:new', 'projects:merge_requests:new'
22	GitLab.GfmAutoComplete.setup()	25	GitLab.GfmAutoComplete.setup()
23	when 'dashboard:show'	26	when 'dashboard:show'
	@@ -53,3 +56,10 @@ class Dispatcher		@@ -53,3 +56,10 @@ class Dispatcher
53	project_ref = opts.data('autocomplete-project-ref')	56	project_ref = opts.data('autocomplete-project-ref')
54		57
55	new SearchAutocomplete(path, project_id, project_ref)	58	new SearchAutocomplete(path, project_id, project_ref)
		59	+
		60	+ initHighlight: ->
		61	+ $('.highlight pre code').each (i, e) ->
		62	+ hljs.highlightBlock(e)
		63	+ $(e).html($.map($(e).html().split("\n"), (line, i) ->
		64	+ "<div class='line' id='LC" + (i + 1) + "'>" + line + "</div>"
		65	+ ).join("\n"))
	@@ -4,3 +4,14 @@ class GroupMembers		@@ -4,3 +4,14 @@ class GroupMembers
4	$(this).fadeOut()	4	$(this).fadeOut()
5		5
6	@GroupMembers = GroupMembers	6	@GroupMembers = GroupMembers
		7	+
		8	+$ ->
		9	+ # avatar
		10	+ $('.js-choose-group-avatar-button').bind "click", ->
		11	+ form = $(this).closest("form")
		12	+ form.find(".js-group-avatar-input").click()
		13	+
		14	+ $('.js-group-avatar-input').bind "change", ->
		15	+ form = $(this).closest("form")
		16	+ filename = $(this).val().replace(/^.*[\\\/]/, '')
		17	+ form.find(".js-avatar-filename").text(filename)
7	\ No newline at end of file	18	\ No newline at end of file
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class Issue
	2	+ constructor: ->
	3	+ $('.edit-issue.inline-update input[type="submit"]').hide()
	4	+ $(".issue-box .inline-update").on "change", "select", ->
	5	+ $(this).submit()
	6	+ $(".issue-box .inline-update").on "change", "#issue_assignee_id", ->
	7	+ $(this).submit()
	8	+
	9	+@Issue = Issue
	@@ -77,9 +77,3 @@		@@ -77,9 +77,3 @@
77	$("#update_issues_ids").val []	77	$("#update_issues_ids").val []
78	$(".issues_bulk_update").hide()	78	$(".issues_bulk_update").hide()
79	$(".issues-filters").show()	79	$(".issues-filters").show()
80	-
81	-$ ->
82	- $('.edit-issue.inline-update input[type="submit"]').hide();
83	- $("body").on "change", ".edit-issue.inline-update select", ->
84	- $(this).submit()
85	-