sync with upstream for ease to merge

GitLab
2 parents 1c9a41e0 319f355a
Showing 944 changed files with 19326 additions and 10426 deletions Show diff stats
.gitignore
.travis.yml
CHANGELOG
CONTRIBUTING.md
Gemfile
Gemfile.lock
PROCESS.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/bg-header.png
app/assets/images/dark-scheme-preview.png
app/assets/images/favicon.ico
app/assets/images/file_txt.png
app/assets/images/icon-search.png
app/assets/images/images.png
app/assets/images/logo-black.png
app/assets/images/logo-white.png
@@ -34,3 +34,4 @@ doc/code/*
 .secret
 *.log
 public/uploads.*
+public/assets/
 language: ruby
 env:
-  - DB=mysql TRAVIS=true
+  global:
+    - DB=mysql
+    - TRAVIS=true
+  matrix:
+    - TASK=spinach
+    - TASK=spec
+    - TASK=jasmine:ci
 before_install:
   - sudo apt-get install libicu-dev -y
-  - gem install charlock_holmes -v="0.6.9"
 branches:
   only:
     - 'master'
@@ -11,8 +16,12 @@ rvm:
   - 2.0.0
 services:
   - mysql
-  - postgresql
+  - redis-server
 before_script:
   - "cp config/database.yml.$DB config/database.yml"
   - "cp config/gitlab.yml.example config/gitlab.yml"
-script: "bundle exec rake gitlab:test --trace"
+  - "bundle exec rake db:setup"
+  - "bundle exec rake db:seed_fu"
+script: "bundle exec rake $TASK --trace"
+notifications:
+  email: false
-v 6.2.0
+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
+
+v 6.5.1
+  - Fix branch selectbox when create merge request from fork
+
+v 6.5.0
+  - Dropdown menus on issue#show page for assignee and milestone (Jason Blanchard)
+  - Add color custimization and previewing to broadcast messages
+  - Fixed notes anchors
+  - Load new comments in issues dynamically
+  - Added sort options to Public page
+  - New filters (assigned/authored/all) for Dashboard#issues/merge_requests (sponsored by Say Media)
+  - Add project visibility icons to dashboard
+  - Enable secure cookies if https used
+  - Protect users/confirmation with rack_attack
+  - Default HTTP headers to protect against MIME-sniffing, force https if enabled
+  - Bootstrap 3 with responsive UI
+  - New repository download formats: tar.bz2, zip, tar (Jason Hollingsworth)
+  - Restyled accept widgets for MR
+  - SCSS refactored
+  - Use jquery timeago plugin
+  - Fix 500 error for rdoc files
+  - Ability to customize merge commit message (sponsored by Say Media)
+  - Search autocomplete via ajax
+  - Add website url to user profile
+  - Files API supports base64 encoded content (sponsored by O'Reilly Media)
+  - Added support for Go's repository retrieval (Bruno Albuquerque)
+
+v6.4.3
+  - Don't use unicorn worker killer if PhusionPassenger is defined
+
+v6.4.2
+  - Fixed wrong behaviour of script/upgrade.rb
+
+v6.4.1 
+  - Fixed bug with repository rename
+  - Fixed bug with project transfer
+
+v 6.4.0
+  - Added sorting to project issues page (Jason Blanchard)
+  - Assembla integration (Carlos Paramio)
+  - Fixed another 500 error with submodules
+  - UI: More compact issues page
+  - Minimal password length increased to 8 symbols
+  - Side-by-side diff view (Steven Thonus)
+  - Internal projects (Jason Hollingsworth)
+  - Allow removal of avatar (Drew Blessing)
+  - Project web hooks now support issues and merge request events
+  - Visiting project page while not logged in will redirect to sign-in instead of 404 (Jason Hollingsworth)
+  - Expire event cache on avatar creation/removal (Drew Blessing)
+  - Archiving old projects (Steven Thonus)
+  - Rails 4
+  - Add time ago tooltips to show actual date/time
+  - UI: Fixed UI for admin system hooks
+  - Ruby script for easier GitLab upgrade
+  - Do not remove Merge requests if fork project was removed
+  - Improve sign-in/signup UX
+  - Add resend confirmation link to sign-in page
+  - Set noreply@HOSTNAME for reply_to field in all emails
+  - Show GitLab API version on Admin#dashboard
+  - API Cross-origin resource sharing
+  - Show READMe link at project home page
+  - Show repo size for projects in Admin area
+
+v 6.3.0
+  - API for adding gitlab-ci service
+  - Init script now waits for pids to appear after (re)starting before reporting status (Rovanion Luckey)
+  - Restyle project home page
+  - Grammar fixes
+  - Show branches list (which branches contains commit) on commit page (Andrew Kumanyaev)
+  - Security improvements
+  - Added support for GitLab CI 4.0
+  - Fixed issue with 500 error when group did not exist
+  - Ability to leave project
+  - You can create file in repo using UI
+  - You can remove file from repo using UI
+  - API: dropped default_branch attribute from project during creation
+  - Project default_branch is not stored in db any more. It takes from repo now.
+  - Admin broadcast messages
+  - UI improvements
+  - Dont show last push widget if user removed this branch
+  - Fix 500 error for repos with newline in file name
+  - Extended html titles
+  - API: create/update/delete repo files
+  - Admin can transfer project to any namespace
+  - API: projects/all for admin users
+  - Fix recent branches order
+
+v 6.2.4
+  - Security: Cast API private_token to string (CVE-2013-4580)
+  - Security: Require gitlab-shell 1.7.8 (CVE-2013-4581, CVE-2013-4582, CVE-2013-4583)
+  - Fix for Git SSH access for LDAP users
+
+v 6.2.3
+  - Security: More protection against CVE-2013-4489
+  - Security: Require gitlab-shell 1.7.4 (CVE-2013-4490, CVE-2013-4546)
+  - Fix sidekiq rake tasks
+
+v 6.2.2
+  - Security: Update gitlab_git (CVE-2013-4489)
+
+v 6.2.1
+  - Security: Fix issue with generated passwords for new users
+
+v 6.2.0
   - Public projects are visible from the outside
+  - Public project pages are now visible to everyone (files, issues, wik, etc.)
+    THIS MEANS YOUR ISSUES AND WIKI FOR PUBLIC PROJECTS ARE PUBLICLY VISIBLE AFTER THE UPGRADE
   - Add group access to permissions page
   - Require current password to change one
   - Group owner or admin can remove other group owners
@@ -13,6 +121,13 @@ v 6.2.0
   - Update logic for validates_merge_request for tree of MR (Andrew Kumanyaev)
   - Rake tasks for web hooks management (Jonhnny Weslley)
   - Extended User API to expose admin and can_create_group for user creation/updating (Boyan Tabakov)
+  - API: Remove group
+  - API: Remove project
+  - Avatar upload on profile page with a maximum of 100KB (Steven Thonus)
+  - Store the sessions in Redis instead of the cookie store
+  - Fixed relative links in markdown
+  - User must confirm their email if signup enabled
+  - User must confirm changed email 
 v 6.1.0
   - Project specific IDs for issues, mr, milestones
@@ -33,7 +148,7 @@ v 6.1.0
   - Add links to create branch/tag from project home page
   - Add public-project? checkbox to new-project view
   - Improved compare page. Added link to proceed into Merge Request
-  - Send email to user when he was added to group
+  - Send an email to a user when they are added to group
   - New landing page when you have 0 projects
 v 6.0.0
@@ -76,6 +191,14 @@ v 6.0.0
   - Improved MR comments logic
   - Render readme file for projects in public area
+v 5.4.2
+  - Security: Cast API private_token to string (CVE-2013-4580)
+  - Security: Require gitlab-shell 1.7.8 (CVE-2013-4581, CVE-2013-4582, CVE-2013-4583)
+
+v 5.4.1
+  - Security: Fixes for CVE-2013-4489
+  - Security: Require gitlab-shell 1.7.4 (CVE-2013-4490, CVE-2013-4546)
+
 v 5.4.0
   - Ability to edit own comments
   - Documentation improvements
 # Contribute to GitLab
-This guide details how to use issues and pull requests to improve GitLab.
-
--  [Closing policy for issues and pull requests](#closing-policy-for-issues-and-pull-requests)
--  [Issue tracker](#issue-tracker)
--  [Pull requests](#pull-requests)
+This guide details how contribute to GitLab.
 If you want to know how the GitLab team handles contributions have a look at [the GitLab contributing process](PROCESS.md).
-## Closing policy for issues and pull requests
+## Contributor license agreement
+
+By submitting code as an individual you agree to the [individual contributor license agreement](doc/legal/individual_contributor_license_agreement.md). By submitting code as an entity you agree to the [corporate contributor license agreement](doc/legal/corporate_contributor_license_agreement.md).
+
+## Security vulnerability disclosure
+
+Please report suspected security vulnerabilities in private to support@gitlab.com, also see the [disclosure section on the GitLab.com website](http://www.gitlab.com/disclosure/). Please do NOT create publicly viewable issues for suspected security vulnerabilities.
+
+## Closing policy for issues and merge requests
-GitLab is a popular open source project and the capacity to deal with issues and pull requests is limited. Out of respect for our volunteers, issues and pull requests not in line with the guidelines listed in this document may be closed without notice.
+GitLab is a popular open source project and the capacity to deal with issues and merge requests is limited. Out of respect for our volunteers, issues and merge requests not in line with the guidelines listed in this document may be closed without notice.
 Please treat our volunteers with courtesy and respect, it will go a long way towards getting your issue resolved.
-Issues and pull requests should be in English and contain appropriate language for audiences of all ages.
+Issues and merge requests should be in English and contain appropriate language for audiences of all ages.
 ## Issue tracker
-To get support for your particular problem please use the channels as detailed in [the getting help section of the readme](https://github.com/gitlabhq/gitlabhq#getting-help). Professional [support subscriptions](http://www.gitlab.com/subscription/) and [consulting services](http://www.gitlab.com/consultancy/) are available from [GitLab.com](http://www.gitlab.com/).
+To get support for your particular problem please use the channels as detailed in the getting help section of [the readme](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/README.md). Professional [support subscriptions](http://www.gitlab.com/subscription/) and [consulting services](http://www.gitlab.com/consultancy/) are available from [GitLab.com](http://www.gitlab.com/).
-The [issue tracker](https://github.com/gitlabhq/gitlabhq/issues) is only for obvious bugs or misbehavior in the latest [stable or development release of GitLab](MAINTENANCE.md). When submitting an issue please conform to the issue submission guidelines listed below. Not all issues will be addressed and your issue is more likely to be addressed if you submit a pull request which partially or fully addresses the issue.
+The [issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues) is only for obvious bugs or misbehavior in the latest [stable or development release of GitLab](MAINTENANCE.md). When submitting an issue please conform to the issue submission guidelines listed below. Not all issues will be addressed and your issue is more likely to be addressed if you submit a merge request which partially or fully addresses the issue.
 Do not use the issue tracker for feature requests. We have a specific [feedback and suggestions forum](http://feedback.gitlab.com) for this purpose.
-Please send a pull request with a tested solution or a pull request with a failing test instead of opening an issue if you can. If you're unsure where to post, post to the [mailing list](https://groups.google.com/forum/#!forum/gitlabhq) or [Stack Overflow](http://stackoverflow.com/questions/tagged/gitlab) first. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there.
+Please send a merge request with a tested solution or a merge request with a failing test instead of opening an issue if you can. If you're unsure where to post, post to the [mailing list](https://groups.google.com/forum/#!forum/gitlabhq) or [Stack Overflow](http://stackoverflow.com/questions/tagged/gitlab) first. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there.
 ### Issue tracker guidelines
-**[Search](https://github.com/gitlabhq/gitlabhq/search?q=&ref=cmdform&type=Issues)** for similar entries before submitting your own, there's a good chance somebody else had the same issue. Show your support with `:+1:` and/or join the discussion. Please submit issues in the following format (as the first post):
+**[Search the issues](https://gitlab.com/gitlab-org/gitlab-ce/issues)** for similar entries before submitting your own, there's a good chance somebody else had the same issue. Show your support with `:+1:` and/or join the discussion. Please submit issues in the following format (as the first post):
 1. **Summary:** Summarize your issue in one sentence (what goes wrong, what did you expect to happen)
-2. **Steps to reproduce:** How can we reproduce the issue, preferably on the [GitLab Vagrant virtual machine](https://github.com/gitlabhq/gitlab-vagrant-vm) (start with: `vagrant destroy && vagrant up && vagrant ssh`)
+2. **Steps to reproduce:** How can we reproduce the issue, preferably on the [GitLab development virtual machine with vagrant](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/doc/development.md) (start your issue with: `vagrant destroy && vagrant up && vagrant ssh`)
 3. **Expected behavior:** Describe your issue in detail
 4. **Observed behavior**
 5. **Relevant logs and/or screenshots:** Please use code blocks (\`\`\`) to format console output, logs, and code as it's very hard to read otherwise.
@@ -42,34 +46,45 @@ Please send a pull request with a tested solution or a pull request with a faili
     * Describe your setup (use relevant parts from `sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production`)
 7. **Possible fixes**: If you can, link to the line of code that might be responsible for the problem
-## Pull requests
+## Merge requests
-We welcome pull requests with fixes and improvements to GitLab code, tests, and/or documentation. The features we would really like a pull request for are listed with the [status 'accepting merge/pull requests' on our feedback forum](http://feedback.gitlab.com/forums/176466-general/status/796455) but other improvements are also welcome.
+We welcome merge requests with fixes and improvements to GitLab code, tests, and/or documentation. The features we would really like a merge request for are listed with the [status 'accepting merge/merge requests' on our feedback forum](http://feedback.gitlab.com/forums/176466-general/status/796455) but other improvements are also welcome.
-### Pull request guidelines
+### Merge request guidelines
-If you can, please submit a pull request with the fix or improvements including tests. If you don't know how to fix the issue but can write a test that exposes the issue we will accept that as well. In general bug fixes that include a regression test are merged quickly while new features without proper tests are least likely to receive timely feedback. The workflow to make a pull request is as follows:
+If you can, please submit a merge request with the fix or improvements including tests. If you don't know how to fix the issue but can write a test that exposes the issue we will accept that as well. In general bug fixes that include a regression test are merged quickly while new features without proper tests are least likely to receive timely feedback. The workflow to make a merge request is as follows:
-1. Fork the project on GitHub
+1. Fork the project on GitLab Cloud
 1. Create a feature branch
 1. Write [tests](README.md#run-the-tests) and code
 1. Add your changes to the [CHANGELOG](CHANGELOG)
 1. If you have multiple commits please combine them into one commit by [squashing them](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
 1. Push the commit to your fork
-1. Submit a pull request
-2. [Search for issues](https://github.com/gitlabhq/gitlabhq/search?q=&ref=cmdform&type=Issues) related to your pull request and mention them in the pull request description
-
-We will accept pull requests if:
-
-* The code has proper tests and all tests pass (or it is a test exposing a failure in existing code)
-* It can be merged without problems (if not please use: `git rebase master`)
-* It does not break any existing functionality
-* It's quality code that conforms to the [Ruby](https://github.com/bbatsov/ruby-style-guide) and [Rails](https://github.com/bbatsov/rails-style-guide) style guides and best practices
-* The description includes a motive for your change and the method you used to achieve it
-* It is not a catch all pull request but rather fixes a specific issue or implements a specific feature
-* It keeps the GitLab code base clean and well structured
-* We think other users will benefit from the same functionality
-* If it makes changes to the UI the pull request should include screenshots
-* It is a single commit (please use `git rebase -i` to squash commits)
-
-For examples of feedback on pull requests please look at already [closed pull requests](https://github.com/gitlabhq/gitlabhq/pulls?direction=desc&page=1&sort=created&state=closed).
+1. Submit a merge request (MR)
+1. The MR title should describes the change you want to make
+1. The MR description should give a motive for your change and the method you used to achieve it
+1. If the MR changes the UI it should include before and after screenshots
+1. Link relevant [issues](https://gitlab.com/gitlab-org/gitlab-ce/issues) and/or [feedback items](http://feedback.gitlab.com/) from the merge request description and leave a comment on them with a link back to the MR
+1. Be prepared to answer questions and incorporate feedback even if requests for this arrive weeks or months after your MR submittion
+
+Please keep the change in a single MR **as small as possible**. If you want to contribute a large feature think very hard what the minimum viable change is. Can you split functionality? Can you only submit the backend/API code? Can you start with a very simple UI? The smaller a MR is the more likely it is it will be merged, after that you can send more MR's to enhance it.
+
+The **official merge window** is in the beginning of the month from the 1st to the 7th day of the month.
+The best time to submit a MR and get feedback fast.
+Before this time the GitLab.com team is still dealing with work that is created by the monthly release such as assisting subscribers with upgrade issues, the release of Enterprise Edition and the upgrade of GitLab Cloud.
+After the 7th it is already getting closer to the release date of the next version.
+This means there is less time to fix the issues created by merging large new features.
+
+We will accept a merge requests if it:
+
+* Includes proper tests and all tests pass (unless it contains a test exposing a bug in existing code)
+* Can be merged without problems (if not please use: `git rebase master`)
+* Do not break any existing functionality
+* Conforms to the [Ruby](https://github.com/bbatsov/ruby-style-guide) and [Rails](https://github.com/bbatsov/rails-style-guide) style guides and best practices
+* Fixes one specific issue or implements one specific feature (do not combine things, send separate merge requests if needed)
+* Keeps the GitLab code base clean and well structured
+* Contains functionality we think other users will benefit from too
+* Doesn't add avoidable configuration options since these complicate future changes
+* Contains a single commit (please use `git rebase -i` to squash commits)
+
+For examples of feedback on merge requests please look at already [closed merge requests](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests?assignee_id=&label_name=&milestone_id=&scope=&sort=&state=closed).
@@ -8,14 +8,20 @@ def linux_only(require_as)
   RUBY_PLATFORM.include?('linux') && require_as
 end
-gem "rails", "3.2.13"
+gem "rails", "~> 4.0.0"
+
+gem "protected_attributes"
+gem 'rails-observers'
+gem 'actionpack-page_caching'
+gem 'actionpack-action_caching'
 # Supported DBs
 gem "mysql2", group: :mysql
-gem "pg", group: :postgres
+#gem "pg", group: :postgres
 # Auth
-gem "devise", '~> 2.2'
+gem "devise", '3.0.4'
+gem "devise-async", '0.8.0'
 gem 'omniauth', "~> 1.1.3"
 gem 'omniauth-google-oauth2'
 gem 'omniauth-twitter'
@@ -23,26 +29,27 @@ gem &#39;omniauth-github&#39;
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '2.3.1'
+gem "gitlab_git", '~> 5.1.0'
 # Ruby/Rack Git Smart-HTTP Server Handler
-gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
+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.3.2', require: 'pygments.rb'
+gem 'gitlab_omniauth-ldap', '1.0.4', require: "omniauth-ldap"
 # Git Wiki
-gem "gitlab-gollum-lib", "~> 1.0.1", require: 'gollum-lib'
+gem "gitlab-gollum-lib", "~> 1.1.0", require: 'gollum-lib'
 # Language detection
-gem "github-linguist", require: "linguist"
+gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
 # API
-gem "grape", "~> 0.4.1"
+gem "grape", "~> 0.6.1"
 gem "grape-entity", "~> 0.3.0"
+gem 'rack-cors', require: 'rack/cors'
+
+# Email validation
+gem "email_validator", "~> 1.4.0", :require => 'email_validator/strict'
 # Format dates and times
 # based on human-friendly examples
@@ -52,7 +59,7 @@ gem &quot;stamp&quot;
 gem 'enumerize'
 # Pagination
-gem "kaminari", "~> 0.14.1"
+gem "kaminari", "~> 0.15.1"
 # HAML
 gem "haml-rails"
@@ -71,13 +78,16 @@ gem &quot;seed-fu&quot;
 # Markdown to HTML
 gem "redcarpet",     "~> 2.2.2"
-gem "github-markup", "~> 0.7.4", require: 'github/markup'
+gem "github-markup", "~> 0.7.4", require: 'github/markup', git: 'https://github.com/gitlabhq/markup.git', ref: '61ade389c1e1c159359338f570d18464a44ddbc4' 
 # Asciidoc to HTML
 gem  "asciidoctor"
 # Application server
-gem "unicorn", '~> 4.6.3', group: :unicorn
+group :unicorn do
+  gem "unicorn", '~> 4.6.3'
+  gem 'unicorn-worker-killer'
+end
 # State machine
 gem "state_machine"
@@ -109,7 +119,10 @@ gem &quot;redis-rails&quot;
 gem 'tinder', '~> 1.9.2'
 # HipChat integration
-gem "hipchat", "~> 0.9.0"
+gem "hipchat", "~> 0.14.0"
+
+# Flowdock integration
+gem "gitlab-flowdock-git-hook", "~> 0.4.2"
 # d3
 gem "d3_rails", "~> 3.1.4"
@@ -123,26 +136,23 @@ gem &quot;sanitize&quot;
 # Protect against bruteforcing
 gem "rack-attack"
-group :assets do
-  gem "sass-rails"
-  gem "coffee-rails"
-  gem "uglifier"
-  gem "therubyracer"
-  gem 'turbolinks'
-  gem 'jquery-turbolinks'
-
-  gem 'chosen-rails',     "1.0.0"
-  gem 'select2-rails'
-  gem 'jquery-atwho-rails', "0.3.0"
-  gem "jquery-rails",     "2.1.3"
-  gem "jquery-ui-rails",  "2.0.2"
-  gem "modernizr",        "2.6.2"
-  gem "raphael-rails", "~> 2.1.2"
-  gem 'bootstrap-sass'
-  gem "font-awesome-rails"
-  gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
-  gem "gon"
-end
+gem "sass-rails"
+gem "coffee-rails"
+gem "uglifier"
+gem "therubyracer"
+gem 'turbolinks'
+gem 'jquery-turbolinks'
+
+gem 'select2-rails'
+gem 'jquery-atwho-rails', "~> 0.3.3"
+gem "jquery-rails",     "2.1.3"
+gem "jquery-ui-rails",  "2.0.2"
+gem "modernizr",        "2.6.2"
+gem "raphael-rails", "~> 2.1.2"
+gem 'bootstrap-sass', '~> 3.0'
+gem "font-awesome-rails", '~> 3.2'
+gem "gemoji", "~> 1.3.0"
+gem "gon", '~> 5.0.0'
 group :development do
   gem "annotate", "~> 2.6.0.beta2"
@@ -165,7 +175,7 @@ end
 group :development, :test do
   gem 'coveralls', require: false
-  gem 'rails-dev-tweaks'
+  # gem 'rails-dev-tweaks'
   gem 'spinach-rails'
   gem "rspec-rails"
   gem "capybara"
@@ -194,7 +204,7 @@ group :development, :test do
   gem 'poltergeist', '~> 1.4.1'
   gem 'spork', '~> 1.0rc'
-  gem 'jasmine'
+  gem 'jasmine', '2.0.0.rc5'
 end
 group :test do
+GIT
+  remote: https://github.com/gitlabhq/markup.git
+  revision: 61ade389c1e1c159359338f570d18464a44ddbc4
+  ref: 61ade389c1e1c159359338f570d18464a44ddbc4
+  specs:
+    github-markup (0.7.6)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)
+      mail (~> 2.5.4)
+    actionpack (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionpack-action_caching (1.1.0)
+      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)
+      builder (~> 3.1.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.2)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.2)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     acts-as-taggable-on (2.4.1)
       rails (>= 3, < 5)
-    addressable (2.3.4)
-    annotate (2.6.0.beta2)
+    addressable (2.3.5)
+    annotate (2.6.0)
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
-    arel (3.0.2)
-    asciidoctor (0.1.3)
+    arel (4.0.1)
+    asciidoctor (0.1.4)
+    atomic (1.1.14)
     awesome_print (1.2.0)
-    backports (3.3.2)
-    bcrypt-ruby (3.1.1)
+    axiom-types (0.0.5)
+      descendants_tracker (~> 0.0.1)
+      ice_nine (~> 0.9)
+    bcrypt-ruby (3.1.2)
     better_errors (1.0.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (2.3.2.2)
+    bootstrap-sass (3.0.3.0)
       sass (~> 3.2)
-    builder (3.0.4)
+    builder (3.1.4)
     capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    carrierwave (0.8.0)
+    carrierwave (0.9.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
-    celluloid (0.14.1)
-      timers (>= 1.0.0)
+      json (>= 1.7)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     charlock_holmes (0.6.9.4)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
-    chosen-rails (1.0.0)
-      coffee-rails (>= 3.2)
-      compass-rails (>= 1.0)
-      railties (>= 3.0)
-      sass-rails (>= 3.2)
-    chunky_png (1.2.8)
-    cliver (0.2.1)
+    cliver (0.2.2)
     code_analyzer (0.4.3)
       sexp_processor
-    coderay (1.0.9)
-    coffee-rails (3.2.2)
+    coderay (1.1.0)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
+      railties (>= 4.0.0, < 5.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
+    coffee-script-source (1.6.3)
     colored (1.2)
     colorize (0.5.8)
-    compass (0.12.2)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-    compass-rails (1.0.3)
-      compass (>= 0.12.2, < 0.14)
-    connection_pool (1.1.0)
+    connection_pool (1.2.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    crack (0.4.0)
+    crack (0.4.1)
       safe_yaml (~> 0.9.0)
     d3_rails (3.1.10)
       railties (>= 3.1.0)
     daemons (1.1.9)
-    database_cleaner (1.1.1)
+    database_cleaner (1.2.0)
     debug_inspector (0.0.2)
-    descendants_tracker (0.0.1)
-    devise (2.2.5)
+    descendants_tracker (0.0.3)
+    devise (3.0.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (~> 3.1)
-      warden (~> 1.2.1)
-    diff-lcs (1.2.4)
-    dotenv (0.8.0)
-    email_spec (1.4.0)
+      railties (>= 3.2.6, < 5)
+      warden (~> 1.2.3)
+    devise-async (0.8.0)
+      devise (>= 2.2, < 3.2)
+    diff-lcs (1.2.5)
+    docile (1.1.1)
+    dotenv (0.9.0)
+    email_spec (1.5.0)
       launchy (~> 2.1)
       mail (~> 2.2)
-    enumerize (0.6.1)
+    email_validator (1.4.0)
+      activemodel
+    enumerize (0.7.0)
       activesupport (>= 3.2)
+    equalizer (0.0.8)
     erubis (2.7.0)
     escape_utils (0.2.4)
     eventmachine (1.0.3)
     excon (0.13.4)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    factory_girl (4.2.0)
+    execjs (2.0.2)
+    factory_girl (4.3.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_girl_rails (4.3.0)
+      factory_girl (~> 4.3.0)
       railties (>= 3.0.0)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
-    ffaker (1.18.0)
-    ffi (1.9.0)
+    ffaker (1.22.1)
+    ffi (1.9.3)
     fog (1.3.1)
       builder
       excon (~> 0.13.0)
@@ -146,48 +151,46 @@ GEM
       dotenv (>= 0.7)
       thor (>= 0.13.6)
     formatador (0.2.4)
-    fssm (0.2.10)
-    gemoji (1.2.1)
-    gherkin-ruby (0.3.0)
-    github-linguist (2.3.4)
-      charlock_holmes (~> 0.6.6)
-      escape_utils (~> 0.2.3)
-      mime-types (~> 1.19)
-      pygments.rb (>= 0.2.13)
-    github-markdown (0.5.3)
-    github-markup (0.7.5)
-    gitlab-gollum-lib (1.0.1)
+    gemoji (1.3.1)
+    gherkin-ruby (0.3.1)
+      racc
+    github-markdown (0.5.5)
+    gitlab-flowdock-git-hook (0.4.2.2)
+      gitlab-grit (>= 2.4.1)
+      multi_json
+    gitlab-gollum-lib (1.1.0)
       github-markdown (~> 0.5.3)
       github-markup (>= 0.7.5, < 1.0.0)
-      gitlab-grit (>= 2.5.1)
+      gitlab-grit (~> 2.6.1)
       nokogiri (~> 1.5.9)
-      pygments.rb (~> 0.4.2)
       sanitize (~> 2.0.3)
       stringex (~> 1.5.1)
-    gitlab-grack (1.0.1)
-      rack (~> 1.4.1)
-    gitlab-grit (2.6.0)
+    gitlab-grack (2.0.0.pre)
+      rack (~> 1.5.1)
+    gitlab-grit (2.6.4)
       charlock_holmes (~> 0.6.9)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
       posix-spawn (~> 0.3.6)
-    gitlab-pygments.rb (0.3.2)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    gitlab_git (2.3.1)
-      activesupport (~> 3.2.13)
-      github-linguist (~> 2.3.4)
-      gitlab-grit (~> 2.6.0)
+    gitlab-linguist (3.0.0)
+      charlock_holmes (~> 0.6.6)
+      escape_utils (~> 0.2.4)
+      mime-types (~> 1.19)
+    gitlab_git (5.1.0)
+      activesupport (~> 4.0.0)
+      gitlab-grit (~> 2.6.1)
+      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)
       rubyntlm (~> 0.1.1)
-    gon (4.1.1)
+    gon (5.0.1)
       actionpack (>= 2.3.0)
       json
-    grape (0.4.1)
+    grape (0.6.1)
       activesupport
       builder
       hashie (>= 1.2.0)
@@ -196,91 +199,91 @@ GEM
       rack (>= 1.3.0)
       rack-accept
       rack-mount
-      virtus
+      virtus (>= 1.0.0)
     grape-entity (0.3.0)
       activesupport
       multi_json (>= 1.3.2)
     growl (1.0.3)
-    guard (1.8.1)
+    guard (2.2.4)
       formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-rspec (3.0.2)
-      guard (>= 1.8)
-      rspec (~> 2.13)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (4.2.0)
+      guard (>= 2.1.1)
+      rspec (>= 2.14, < 4.0)
     guard-spinach (0.0.2)
       guard (>= 1.1)
       spinach
-    haml (4.0.3)
+    haml (4.0.4)
       tilt
-    haml-rails (0.4)
-      actionpack (>= 3.1, < 4.1)
-      activesupport (>= 3.1, < 4.1)
-      haml (>= 3.1, < 4.1)
-      railties (>= 3.1, < 4.1)
-    hashie (1.2.0)
+    haml-rails (0.5.1)
+      actionpack (~> 4.0.0)
+      activesupport (~> 4.0.0)
+      haml (>= 3.1, < 5.0)
+      railties (~> 4.0.0)
+    hashie (2.0.5)
     hike (1.2.3)
-    hipchat (0.9.0)
+    hipchat (0.14.0)
       httparty
       httparty
     http_parser.rb (0.5.3)
-    httparty (0.11.0)
-      multi_json (~> 1.0)
+    httparty (0.12.0)
+      json (~> 1.8)
       multi_xml (>= 0.5.2)
     httpauth (0.2.0)
-    i18n (0.6.1)
-    jasmine (1.3.2)
-      jasmine-core (~> 1.3.1)
-      rack (~> 1.0)
-      rspec (>= 1.3.1)
-      selenium-webdriver (>= 0.1.3)
-    jasmine-core (1.3.1)
-    journey (1.0.4)
-    jquery-atwho-rails (0.3.0)
+    i18n (0.6.9)
+    ice_nine (0.10.0)
+    jasmine (2.0.0.rc5)
+      jasmine-core (~> 2.0.0.rc5)
+      phantomjs
+      rack (>= 1.2.1)
+      rake
+    jasmine-core (2.0.0.rc5)
+    jquery-atwho-rails (0.3.3)
     jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    jquery-turbolinks (1.0.0)
+    jquery-turbolinks (2.0.1)
       railties (>= 3.1.0)
       turbolinks
     jquery-ui-rails (2.0.2)
       jquery-rails
       railties (>= 3.1.0)
-    json (1.7.7)
+    json (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
-    kaminari (0.14.1)
+    kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.8.0)
-    launchy (2.3.0)
+    kgio (2.8.1)
+    launchy (2.4.2)
       addressable (~> 2.3)
-    letter_opener (1.1.1)
+    letter_opener (1.1.2)
       launchy (~> 2.2)
-    libv8 (3.11.8.17)
-    listen (1.2.2)
+    libv8 (3.16.14.3)
+    listen (2.3.1)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.3)
+    lumberjack (1.0.4)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.8.1)
-    mime-types (1.25)
-    minitest (4.7.4)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    minitest (4.7.5)
     modernizr (2.6.2)
       sprockets (~> 2.0)
-    multi_json (1.8.0)
-    multi_xml (0.5.4)
+    multi_json (1.8.4)
+    multi_xml (0.5.5)
     multipart-post (1.2.0)
     mysql2 (0.3.11)
     net-ldap (0.3.1)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.6.8)
+    net-ssh (2.7.0)
     nokogiri (1.5.10)
     oauth (0.4.7)
     oauth2 (0.8.1)
@@ -292,10 +295,10 @@ GEM
     omniauth (1.1.4)
       hashie (>= 1.2, < 3)
       rack
-    omniauth-github (1.1.0)
+    omniauth-github (1.1.1)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
-    omniauth-google-oauth2 (0.1.19)
+    omniauth-google-oauth2 (0.2.1)
       omniauth (~> 1.0)
       omniauth-oauth2
     omniauth-oauth (1.0.1)
@@ -304,56 +307,52 @@ GEM
     omniauth-oauth2 (1.1.1)
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
-    omniauth-twitter (0.0.17)
+    omniauth-twitter (1.0.1)
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
-    orm_adapter (0.4.0)
-    pg (0.15.1)
+    orm_adapter (0.5.0)
+    phantomjs (1.9.2.0)
     poltergeist (1.4.1)
       capybara (~> 2.1.0)
       cliver (~> 0.2.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     polyglot (0.3.3)
-    posix-spawn (0.3.6)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    posix-spawn (0.3.8)
+    protected_attributes (1.0.5)
+      activemodel (>= 4.0.1, < 5.0)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pygments.rb (0.4.2)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
     pyu-ruby-sasl (0.0.3.3)
     quiet_assets (1.0.2)
       railties (>= 3.1, < 5.0)
-    rack (1.4.5)
+    racc (1.4.10)
+    rack (1.5.2)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-attack (2.2.1)
+    rack-attack (2.3.0)
       rack
-    rack-cache (1.2)
-      rack (>= 0.4)
+    rack-cors (0.2.9)
     rack-mini-profiler (0.1.31)
       rack (>= 1.1.3)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-protection (1.5.0)
-      rack
-    rack-ssl (1.3.3)
+    rack-protection (1.5.1)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    rails-dev-tweaks (0.6.1)
-      actionpack (~> 3.1)
-      railties (~> 3.1)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.2)
+      sprockets-rails (~> 2.0.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
     rails_best_practices (1.14.4)
       activesupport
       awesome_print
@@ -363,235 +362,237 @@ GEM
       i18n
       require_all
       ruby-progressbar
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    raindrops (0.11.0)
+      thor (>= 0.18.1, < 2.0)
+    raindrops (0.12.0)
     rake (10.1.0)
     raphael-rails (2.1.2)
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
+    rb-inotify (0.9.2)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (2.2.2)
-    redis (3.0.4)
-    redis-actionpack (3.2.4)
-      actionpack (~> 3.2.0)
-      redis-rack (~> 1.4.4)
-      redis-store (~> 1.1.4)
-    redis-activesupport (3.2.4)
-      activesupport (~> 3.2.0)
+    redis (3.0.6)
+    redis-actionpack (4.0.0)
+      actionpack (~> 4)
+      redis-rack (~> 1.5.0)
+      redis-store (~> 1.1.0)
+    redis-activesupport (4.0.0)
+      activesupport (~> 4)
+      redis-store (~> 1.1.0)
+    redis-namespace (1.4.1)
+      redis (~> 3.0.4)
+    redis-rack (1.5.0)
+      rack (~> 1.5)
+      redis-store (~> 1.1.0)
+    redis-rails (4.0.0)
+      redis-actionpack (~> 4)
+      redis-activesupport (~> 4)
       redis-store (~> 1.1.0)
-    redis-namespace (1.3.1)
-      redis (~> 3.0.0)
-    redis-rack (1.4.4)
-      rack (~> 1.4.0)
-      redis-store (~> 1.1.4)
-    redis-rails (3.2.4)
-      redis-actionpack (~> 3.2.4)
-      redis-activesupport (~> 3.2.4)
-      redis-store (~> 1.1.4)
     redis-store (1.1.4)
       redis (>= 2.2)
     ref (1.0.5)
-    require_all (1.3.1)
+    require_all (1.3.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rspec-rails (2.13.2)
+    rspec-mocks (2.14.4)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
     ruby-hmac (0.4.0)
     ruby-progressbar (1.2.0)
     rubyntlm (0.1.1)
-    rubyzip (0.9.9)
-    safe_yaml (0.9.3)
-    sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
-    sass (3.2.11)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
+    rugged (0.19.0)
+    safe_yaml (0.9.7)
+    sanitize (2.0.6)
+      nokogiri (>= 1.4.4)
+    sass (3.2.12)
+    sass-rails (4.0.1)
+      railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
-      tilt (~> 1.3)
+      sprockets-rails (~> 2.0.0)
     sdoc (0.3.20)
       json (>= 1.1.3)
       rdoc (~> 3.10)
-    seed-fu (2.2.0)
-      activerecord (~> 3.1)
-      activesupport (~> 3.1)
-    select2-rails (3.4.2)
-      sass-rails
+    seed-fu (2.3.0)
+      activerecord (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
+    select2-rails (3.5.2)
       thor (~> 0.14)
-    selenium-webdriver (2.33.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip
-      websocket (~> 1.0.4)
     settingslogic (2.0.9)
-    sexp_processor (4.3.0)
+    sexp_processor (4.4.0)
     shoulda-matchers (2.1.0)
       activesupport (>= 3.0.0)
-    sidekiq (2.14.0)
-      celluloid (>= 0.14.1)
+    sidekiq (2.17.0)
+      celluloid (>= 0.15.2)
       connection_pool (>= 1.0.0)
       json
       redis (>= 3.0.4)
-      redis-namespace
+      redis-namespace (>= 1.3.1)
     simple_oauth (0.1.9)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sinatra (1.4.3)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    sinatra (1.4.4)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     six (0.2.0)
-    slim (2.0.0)
-      temple (~> 0.6.5)
-      tilt (~> 1.3, >= 1.3.3)
-    slop (3.4.5)
-    spinach (0.8.3)
+    slim (2.0.2)
+      temple (~> 0.6.6)
+      tilt (>= 1.3.3, < 2.1)
+    slop (3.4.7)
+    spinach (0.8.7)
       colorize (= 0.5.8)
-      gherkin-ruby (~> 0.3.0)
+      gherkin-ruby (>= 0.3.1)
     spinach-rails (0.2.1)
       capybara (>= 2.0.0)
       railties (>= 3)
       spinach (>= 0.4)
-    spork (1.0.0rc2)
-    sprockets (2.2.2)
+    spork (1.0.0rc4)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     stamp (0.5.0)
     state_machine (1.2.0)
     stringex (1.5.1)
-    temple (0.6.5)
+    temple (0.6.7)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
-    test_after_commit (0.2.1)
-    therubyracer (0.11.4)
-      libv8 (~> 3.11.8.12)
+    test_after_commit (0.2.2)
+    therubyracer (0.12.0)
+      libv8 (~> 3.16.14.0)
       ref
-    thin (1.5.1)
+    thin (1.6.1)
       daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
+      eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
     thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
     tilt (1.4.1)
     timers (1.1.0)
-    tinder (1.9.2)
+    tinder (1.9.3)
       eventmachine (~> 1.0)
       faraday (~> 0.8)
       faraday_middleware (~> 0.9)
-      hashie (~> 1.0)
-      json (~> 1.7.5)
+      hashie (>= 1.0, < 3)
+      json (~> 1.8.0)
       mime-types (~> 1.19)
-      multi_json (~> 1.5)
+      multi_json (~> 1.7)
       twitter-stream (~> 0.1)
-    tins (0.11.0)
-    treetop (1.4.14)
+    tins (0.13.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (1.2.0)
+    turbolinks (2.0.0)
       coffee-rails
     twitter-stream (0.1.16)
       eventmachine (>= 0.12.8)
       http_parser.rb (~> 0.5.1)
       simple_oauth (~> 0.1.4)
-    tzinfo (0.3.37)
-    uglifier (2.1.1)
+    tzinfo (0.3.38)
+    uglifier (2.3.2)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
     underscore-rails (1.4.4)
     unicorn (4.6.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    virtus (0.5.5)
-      backports (~> 3.3)
+    unicorn-worker-killer (0.4.2)
+      unicorn (~> 4)
+    virtus (1.0.1)
+      axiom-types (~> 0.0.5)
+      coercible (~> 1.0)
       descendants_tracker (~> 0.0.1)
+      equalizer (~> 0.0.7)
     warden (1.2.3)
       rack (>= 1.0)
-    webmock (1.11.0)
+    webmock (1.16.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket (1.0.7)
-    websocket-driver (0.3.0)
+    websocket-driver (0.3.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yajl-ruby (1.1.0)
 PLATFORMS
   ruby
 DEPENDENCIES
+  actionpack-action_caching
+  actionpack-page_caching
   acts-as-taggable-on
   annotate (~> 2.6.0.beta2)
   asciidoctor
   awesome_print
   better_errors
   binding_of_caller
-  bootstrap-sass
+  bootstrap-sass (~> 3.0)
   capybara
   carrierwave
-  chosen-rails (= 1.0.0)
   coffee-rails
   colored
   coveralls
   d3_rails (~> 3.1.4)
   database_cleaner
-  devise (~> 2.2)
+  devise (= 3.0.4)
+  devise-async (= 0.8.0)
   email_spec
+  email_validator (~> 1.4.0)
   enumerize
   factory_girl_rails
   ffaker
   fog (~> 1.3.1)
-  font-awesome-rails
+  font-awesome-rails (~> 3.2)
   foreman
-  gemoji (~> 1.2.1)
-  github-linguist
-  github-markup (~> 0.7.4)
-  gitlab-gollum-lib (~> 1.0.1)
-  gitlab-grack (~> 1.0.1)
-  gitlab-pygments.rb (~> 0.3.2)
-  gitlab_git (= 2.3.1)
+  gemoji (~> 1.3.0)
+  github-markup (~> 0.7.4)!
+  gitlab-flowdock-git-hook (~> 0.4.2)
+  gitlab-gollum-lib (~> 1.1.0)
+  gitlab-grack (~> 2.0.0.pre)
+  gitlab-linguist (~> 3.0.0)
+  gitlab_git (~> 5.1.0)
   gitlab_meta (= 6.0)
-  gitlab_omniauth-ldap (= 1.0.3)
-  gon
-  grape (~> 0.4.1)
+  gitlab_omniauth-ldap (= 1.0.4)
+  gon (~> 5.0.0)
+  grape (~> 0.6.1)
   grape-entity (~> 0.3.0)
   growl
   guard-rspec
   guard-spinach
   haml-rails
-  hipchat (~> 0.9.0)
+  hipchat (~> 0.14.0)
   httparty
-  jasmine
-  jquery-atwho-rails (= 0.3.0)
+  jasmine (= 2.0.0.rc5)
+  jquery-atwho-rails (~> 0.3.3)
   jquery-rails (= 2.1.3)
   jquery-turbolinks
   jquery-ui-rails (= 2.0.2)
-  kaminari (~> 0.14.1)
+  kaminari (~> 0.15.1)
   launchy
   letter_opener
   minitest (~> 4.7.0)
@@ -601,14 +602,15 @@ DEPENDENCIES
   omniauth-github
   omniauth-google-oauth2
   omniauth-twitter
-  pg
   poltergeist (~> 1.4.1)
+  protected_attributes
   pry
   quiet_assets (~> 1.0.1)
   rack-attack
+  rack-cors
   rack-mini-profiler
-  rails (= 3.2.13)
-  rails-dev-tweaks
+  rails (~> 4.0.0)
+  rails-observers
   rails_best_practices
   raphael-rails (~> 2.1.2)
   rb-fsevent
@@ -640,4 +642,5 @@ DEPENDENCIES
   uglifier
   underscore-rails (~> 1.4.4)
   unicorn (~> 4.6.3)
+  unicorn-worker-killer
   webmock
@@ -8,25 +8,25 @@ Below we describe the contributing process to GitLab for two reasons. So that co
 ### Issue team
 - Looks for issues without workflow labels and triages issue
-- Monitors pull requests
-- Closes invalid issues and pull requests with a comment (duplicates, [feature requests](#feature-requests), [fixed in newer version](#issue-fixed-in-newer-version), [issue report for old version](#issue-report-for-old-version), not a problem in GitLab, etc.)
+- Monitors merge requests
+- Closes invalid issues and merge requests with a comment (duplicates, [feature requests](#feature-requests), [fixed in newer version](#issue-fixed-in-newer-version), [issue report for old version](#issue-report-for-old-version), not a problem in GitLab, etc.)
 - Assigns appropriate [labels](#how-we-handle-issues)
-- Asks for feedback from issue reporter/pull request initiator ([invalid issue reports](#improperly-formatted-issue), [format code](#code-format), etc.)
+- Asks for feedback from issue reporter/merge request initiator ([invalid issue reports](#improperly-formatted-issue), [format code](#code-format), etc.)
 - Asks for feedback from the relevant developer(s) based on the [list of members and their specialities](http://gitlab.org/team/)
-- Monitors all issues/pull requests for feedback (but especially ones commented on since automatically watching them):
+- Monitors all issues/merge requests for feedback (but especially ones commented on since automatically watching them):
 - Closes issues with no feedback from the reporter for two weeks
-- Closes stale pull requests
+- Closes stale merge requests
 ### Development team
-- Responds to issues and pull requests the issue team mentions them in
+- Responds to issues and merge requests the issue team mentions them in
 - Monitors for new issues in _Awaiting developer action/feedback_ with no developer activity (once a week)
-- Monitors for new pull requests (at least once a week)
-- Manages their work queue by looking at issues and pull requests assigned to them
+- Monitors for new merge requests (at least once a week)
+- Manages their work queue by looking at issues and merge requests assigned to them
 - Close fixed issues (via commit messages or manually)
 - Codes [new features](http://feedback.gitlab.com/forums/176466-general/filters/top)!
 - Response guidelines
-- Be kind to people trying to contribute. Be aware that people can be a non-native or a native English speaker, they might not understand thing or they might be very sensitive to how your word things. Use emoji to express your feelings (heart, star, smile, etc.). Some good tips about giving feedback to pull requests is in the [Thoughtbot code review guide](https://github.com/thoughtbot/guides/tree/master/code-review).
+- Be kind to people trying to contribute. Be aware that people can be a non-native or a native English speaker, they might not understand thing or they might be very sensitive to how your word things. Use emoji to express your feelings (heart, star, smile, etc.). Some good tips about giving feedback to merge requests is in the [Thoughtbot code review guide](https://github.com/thoughtbot/guides/tree/master/code-review).
 ## Priorities of the issue team
@@ -45,8 +45,8 @@ Workflow labels are purposely not very detailed since that would be hard to keep
 - _Awaiting feedback_: Feedback pending from the reporter
 - _Awaiting confirmation of fix_: The issue should already be solved in **master** (generally you can avoid this workflow item and just close the issue right away)
-- _Attached PR_: There is a PR attached and the discussion should happen there
-  - We need to let issues stay in sync with the PR's. We can do this with a "Closing #XXXX" or "Fixes #XXXX" comment in the PR. We can't close the issue when there is a pull request because sometimes a PR is not good and we just close the PR, then the issue must stay.
+- _Attached MR_: There is a MR attached and the discussion should happen there
+  - We need to let issues stay in sync with the MR's. We can do this with a "Closing #XXXX" or "Fixes #XXXX" comment in the MR. We can't close the issue when there is a merge request because sometimes a MR is not good and we just close the MR, then the issue must stay.
 - _Awaiting developer action/feedback_: Issue needs to be fixed or clarified by a developer
 ## Functional labels
@@ -59,7 +59,7 @@ If an issue is complex and needs the attention of a specific person, assignment 
 ## Label colors
 - Light orange `#fef2c0`: workflow labels for issue team members (awaiting feedback, awaiting confirmation of fix)
-- Bright orange `#eb6420`: workflow labels for core team members (attached PR, awaiting developer action/feedback)
+- Bright orange `#eb6420`: workflow labels for core team members (attached MR, awaiting developer action/feedback)
 - Light blue `#82C5FF`: functional labels
 - Green labels `#009800`: issues that can generally be ignored. For example, issues given the following labels normally can be closed immediately:
   - Feature request (see copy & paste response: [Feature requests](#feature-requests))
@@ -69,19 +69,19 @@ If an issue is complex and needs the attention of a specific person, assignment 
 ### Improperly formatted issue
-Thanks for the issue report. Please reformat your issue to conform to the issue tracker guidelines found in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
+Thanks for the issue report. Please reformat your issue to conform to the issue tracker guidelines found in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
 ### Feature requests
-Thanks for your interest in GitLab. We don't use the GitHub issue tracker for feature requests. Please use http://feedback.gitlab.com/ for this purpose or create a pull request implementing this feature. Have a look at the \[contribution guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) for more information.
+Thanks for your interest in GitLab. We don't use the issue tracker for feature requests. Please use http://feedback.gitlab.com/ for this purpose or create a merge request implementing this feature. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) for more information.
 ### Issue report for old version
-Thanks for the issue report but we only support issues for the latest stable version of GitLab. I'm closing this issue but if you still experience this problem in the latest stable version, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
+Thanks for the issue report but we only support issues for the latest stable version of GitLab. I'm closing this issue but if you still experience this problem in the latest stable version, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
 ### Support requests and configuration questions
-Thanks for your interest in GitLab. We don't use the GitHub issue tracker for support requests and configuration questions. Please use the \[support forum\]\(https://groups.google.com/forum/#!forum/gitlabhq), \[Stack Overflow\]\(http://stackoverflow.com/questions/tagged/gitlab), the unofficial #gitlab IRC channel on Freenode or the http://www.gitlab.com paid services for this purpose. Have a look at the \[contribution guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) for more information.
+Thanks for your interest in GitLab. We don't use the issue tracker for support requests and configuration questions. Please use the \[support forum\]\(https://groups.google.com/forum/#!forum/gitlabhq), \[Stack Overflow\]\(http://stackoverflow.com/questions/tagged/gitlab), the unofficial #gitlab IRC channel on Freenode or the http://www.gitlab.com paid services for this purpose. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) for more information.
 ### Code format
@@ -89,17 +89,17 @@ Please use ``` to format console output, logs, and code as it&#39;s very hard to rea
 ### Issue fixed in newer version
-Thanks for the issue report. This issue has already been fixed in newer versions of GitLab. Due to the size of this project and our limited resources we are only able to support the latest stable release as outlined in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker). In order to get this bug fix and enjoy many new features please \[upgrade\]\(http://blog.gitlab.org/). If you still experience issues at that time please open a new issue following our issue tracker guidelines found in the \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
+Thanks for the issue report. This issue has already been fixed in newer versions of GitLab. Due to the size of this project and our limited resources we are only able to support the latest stable release as outlined in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker). In order to get this bug fix and enjoy many new features please \[upgrade\]\(http://blog.gitlab.org/). If you still experience issues at that time please open a new issue following our issue tracker guidelines found in the \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
-### Improperly formatted pull request
+### Improperly formatted merge request
-Thanks for your interest in improving the GitLab codebase! Please update your pull request according to the \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#pull-request-guidelines).
+Thanks for your interest in improving the GitLab codebase! Please update your merge request according to the \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#pull-request-guidelines).
 ### Inactivity close of an issue
-It's been at least 2 weeks (and a new release) since we heard from you. I'm closing this issue but if you still experience this problem, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
+It's been at least 2 weeks (and a new release) since we heard from you. I'm closing this issue but if you still experience this problem, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
-### Inactivity close of a pull request
+### Inactivity close of a merge request
-This pull request has been closed because a request for more information has not been reacted to for more than 2 weeks. If you respond and conform to the pull request guidelines in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#pull-requests) we will reopen this pull request.
+This merge request has been closed because a request for more information has not been reacted to for more than 2 weeks. If you respond and conform to the merge request guidelines in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#pull-requests) we will reopen this merge request.
 ## GitLab: self hosted Git management software
-![logo](https://raw.github.com/gitlabhq/gitlabhq/master/public/gitlab_logo.png)
+![logo](https://gitlab.com/gitlab-org/gitlab-ce/raw/master/public/gitlab_logo.png)
 ![animated-screenshots](https://gist.github.com/fnkr/2f9badd56bfe0ed04ee7/raw/4f48806fbae97f556c2f78d8c2d299c04500cb0d/compiled.gif)
@@ -32,7 +32,9 @@
 * GitLab.com commercial services: [Homepage](http://www.gitlab.com/) | [Subscription](http://www.gitlab.com/subscription/) | [Consultancy](http://www.gitlab.com/consultancy/) | [GitLab Cloud](http://www.gitlab.com/cloud/) | [Blog](http://blog.gitlab.com/)
-* GitLab CI: [Readme](https://github.com/gitlabhq/gitlab-ci/blob/master/README.md) of the GitLab open-source continuous integration server
+* [GitLab Enterprise Edition](https://www.gitlab.com/features/) offers additional features that are useful for larger organizations (100+ users).
+
+* [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.
 ### Requirements
@@ -46,40 +48,32 @@
 ### Installation
-#### Official production installation
-
-* [Installation guide for a production server](doc/install/installation.md)
+#### Official installation methods
+* [Manual installation guide for a production server](doc/install/installation.md)
-#### Official development installation
+* [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.
-If you want to contribute, please first read our [Contributing Guidelines](https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) and then we suggest you to use the Vagrant virtual machine project to get an environment working with all dependencies.
+#### Third party one-click installers
-* [Vagrant virtual machine for development](https://github.com/gitlabhq/gitlab-vagrant-vm)
+* [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.
+* [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.).
-#### Unofficial production installations
+#### Unofficial installation methods
-* [GitLab recipes](https://github.com/gitlabhq/gitlab-recipes) repository with unofficial guides for using GitLab with different software (operating systems, webservers, etc.) than the official version.
+* [GitLab recipes](https://gitlab.com/gitlab-org/gitlab-recipes/) repository with unofficial guides for using GitLab with different software (operating systems, webservers, etc.) than the official version.
 * [Installation guides](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Unofficial-Installation-Guides) public wiki with unofficial guides to install GitLab on different operating systems.
-* [BitNami one-click installers](http://bitnami.com/stack/gitlab)
-
-* [TurnKey Linux virtual appliance](http://www.turnkeylinux.org/gitlab)
-
-
 ### 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).
-
 ### Run in production mode
 The Installation guide contains instructions on how to download an init script and run it automatically on boot. You can also start the init script manually:
@@ -99,7 +93,7 @@ Start it with [Foreman](https://github.com/ddollar/foreman)
 or start each component separately
     bundle exec rails s
-    bundle exec rake sidekiq:start
+    script/background_jobs start
 ### Run the tests
@@ -110,7 +104,7 @@ or start each component separately
 * Run all tests
-        bundle exec rake gitlab:test
+        bundle exec rake gitlab:test RAILS_ENV=test
 * [RSpec](http://rspec.info/) unit and functional tests
@@ -127,14 +121,17 @@ or start each component separately
 ### GitLab interfaces
-* [GitLab API](doc/api/README.md)
+* [GitLab API doc](doc/api/README.md) or see the [GitLab API website](http://api.gitlab.org/)
-* [Rake tasks](doc/raketasks)
+* [Rake tasks](doc/raketasks) including a [backup and restore procedure](doc/raketasks/backup_restore.md)
 * [Directory structure](doc/install/structure.md)
-* [Databases](doc/install/databases.md)
+* [Database installation](doc/install/databases.md)
+
+* [Markdown specification](doc/markdown/markdown.md)
+* [Security guide](doc/security/rack_attack.md) to throttle abusive requests
 ### Getting help
@@ -144,23 +141,23 @@ or start each component separately
 * [Mailing list](https://groups.google.com/forum/#!forum/gitlabhq) and [Stack Overflow](http://stackoverflow.com/questions/tagged/gitlab) are the best places to ask questions. For example you can use it if you have questions about: permission denied errors, invisible repos, can't clone/pull/push or with web hooks that don't fire. Please search for similar issues before posting your own, there's a good chance somebody else had the same issue you have now and has resolved it. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there to a fix.
-* [Unofficial #gitlab IRC on Freenode](http://www.freenode.net/) is another way to get in touch with other GitLab users who may be able to help you.
-
 * [Feedback and suggestions forum](http://feedback.gitlab.com) is the place to propose and discuss new features for GitLab.
-* [Contributing guide](https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) describes how to submit pull requests and issues. Pull requests and issues not in line with the guidelines in this document will be closed.
+* [Contributing guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) describes how to submit merge requests and issues. Pull requests and issues not in line with the guidelines in this document will be closed.
 * [Support subscription](http://www.gitlab.com/subscription/) connects you to the knowledge of GitLab experts that will resolve your issues and answer your questions.
-* [Consultancy](http://www.gitlab.com/consultancy/) allows you hire GitLab experts for installations, upgrades and customizations.
+* [Consultancy](http://www.gitlab.com/consultancy/) from the GitLab experts for installations, upgrades and customizations.
+* [#gitlab IRC channel](http://www.freenode.net/) on Freenode to get in touch with other GitLab users and get help, it's managed by James Newton (newton), Drew Blessing (dblessing), and Sam Gleske (sag47).
+
+* [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthusiast Jonathan M. Hethey is unofficial but it offers a good overview.
-### Getting in touch
-* [Core team](https://github.com/gitlabhq?tab=members)
+### Getting in touch
-* [Contributors](https://github.com/gitlabhq/gitlabhq/graphs/contributors)
+* [Core team](http://gitlab.org/team/)
-* [Leader](https://github.com/randx)
+* [Contributors](http://contributors.gitlab.org/)
-* [Contact page](http://gitlab.org/contact/)
+* [Community](http://gitlab.org/community/)
-6.2.0.pre
+6.6.0.pre
@@ -8,6 +8,23 @@ class Admin
       else
         elems.removeAttr 'disabled'
+    $('body').on 'click', '.js-toggle-colors-link', (e) ->
+      e.preventDefault()
+      $('.js-toggle-colors-link').hide()
+      $('.js-toggle-colors-container').show()
+
+    $('input#broadcast_message_color').on 'input', ->
+      previewColor = $('input#broadcast_message_color').val()
+      $('div.broadcast-message-preview').css('background-color', previewColor)
+
+    $('input#broadcast_message_font').on 'input', ->
+      previewColor = $('input#broadcast_message_font').val()
+      $('div.broadcast-message-preview').css('color', previewColor)
+
+    $('textarea#broadcast_message_message').on 'input', ->
+      previewMessage = $('textarea#broadcast_message_message').val()
+      $('div.broadcast-message-preview span').text(previewMessage)
+
     $('.log-tabs a').click (e) ->
       e.preventDefault()
       $(this).tab('show')
@@ -2,6 +2,7 @@
   users_path: "/api/:version/users.json"
   user_path: "/api/:version/users/:id.json"
   notes_path: "/api/:version/projects/:id/notes.json"
+  namespaces_path: "/api/:version/namespaces.json"
   # Get 20 (depends on api) recent notes
   # and sort the ascending from oldest to newest
@@ -49,6 +50,20 @@
     ).done (users) ->
       callback(users)
+  # Return namespaces list. Filtered by query
+  namespaces: (query, callback) ->
+    url = Api.buildUrl(Api.namespaces_path)
+
+    $.ajax(
+      url: url
+      data:
+        private_token: gon.api_token
+        search: query
+        per_page: 20
+      dataType: "json"
+    ).done (namespaces) ->
+      callback(namespaces)
+
   buildUrl: (url) ->
     url = gon.relative_url_root + url if gon.relative_url_root?
     return url.replace(':version', gon.api_version)
@@ -19,12 +19,12 @@
 //= require jquery.turbolinks
 //= require bootstrap
 //= require modernizr
-//= require chosen-jquery
 //= require select2
 //= require raphael
 //= require g.raphael-min
 //= require g.bar-min
 //= require branch-graph
+//= require highlightjs.min
 //= require ace-src-noconflict/ace
 //= require_tree .
 //= require d3
@@ -3,7 +3,7 @@ $ -&gt;
     container = $(@).closest(".js-toggler-container")
     container.toggleClass("on")
-  
+
   $("body").on "click", ".js-toggle-visibility-link", (e) ->
     $(@).find('i').
       toggleClass('icon-chevron-down').
@@ -11,7 +11,7 @@ $ -&gt;
     container = $(".js-toggle-visibility-container")
     container.toggleClass("hide")
     e.preventDefault()
-  
+
   $("body").on "click", ".js-toggle-button", (e) ->
     $(@).closest(".js-toggle-container").find(".js-toggle-content").toggle()
     e.preventDefault()
 class BlobView
   constructor: ->
+    # handle multi-line select
+    handleMultiSelect = (e) ->
+      [ first_line, last_line ] = parseSelectedLines()
+      [ line_number ] = parseSelectedLines($(this).attr("id"))
+      hash = "L#{line_number}"
+
+      if e.shiftKey and not isNaN(first_line) and not isNaN(line_number)
+        if line_number < first_line
+          last_line = first_line
+          first_line = line_number
+        else
+          last_line = line_number
+
+        hash = if first_line == last_line then "L#{first_line}" else "L#{first_line}-#{last_line}"
+
+      setHash(hash)
+      e.preventDefault()
+
     # See if there are lines selected
     # "#L12" and "#L34-56" supported
-    highlightBlobLines = ->
-      if window.location.hash isnt ""
-        matches = window.location.hash.match(/\#L(\d+)(\-(\d+))?/)
+    highlightBlobLines = (e) ->
+      [ first_line, last_line ] = parseSelectedLines()
+
+      unless isNaN first_line
+        $("#tree-content-holder .highlight .line").removeClass("hll")
+        $("#LC#{line}").addClass("hll") for line in [first_line..last_line]
+        $("#L#{first_line}").ScrollTo() unless e?
+
+    # parse selected lines from hash
+    # always return first and last line (initialized to NaN)
+    parseSelectedLines = (str) ->
+      first_line = NaN
+      last_line = NaN
+      hash = str || window.location.hash
+
+      if hash isnt ""
+        matches = hash.match(/\#?L(\d+)(\-(\d+))?/)
         first_line = parseInt(matches?[1])
         last_line = parseInt(matches?[3])
+        last_line = first_line if isNaN(last_line)
+
+      [ first_line, last_line ]
+
+    setHash = (hash) ->
+      hash = hash.replace(/^\#/, "")
+      nodes = $("#" + hash)
+      # if any nodes are using this id, they must be temporarily changed
+      # also, add a temporary div at the top of the screen to prevent scrolling
+      if nodes.length > 0
+        scroll_top = $(document).scrollTop()
+        nodes.attr("id", "")
+        tmp = $("<div></div>")
+          .css({ position: "absolute", visibility: "hidden", top: scroll_top + "px" })
+          .attr("id", hash)
+          .appendTo(document.body)
+
+      window.location.hash = hash
+
+      # restore the nodes
+      if nodes.length > 0
+        tmp.remove()
+        nodes.attr("id", hash)
-        unless isNaN first_line
-          last_line = first_line if isNaN(last_line)
-          $("#tree-content-holder .highlight .line").removeClass("hll")
-          $("#LC#{line}").addClass("hll") for line in [first_line..last_line]
-          $("#L#{first_line}").ScrollTo()
+    # initialize multi-line select
+    $("#tree-content-holder .line-numbers a[id^=L]").on("click", handleMultiSelect)
     # Highlight the correct lines on load
     highlightBlobLines()
     # Highlight the correct lines when the hash part of the URL changes
-    $(window).on 'hashchange', highlightBlobLines
+    $(window).on("hashchange", highlightBlobLines)
 @BlobView = BlobView
@@ -194,11 +194,14 @@ class BranchGraph
       fill: @colors[commit.space]
       stroke: "none"
     )
-    r.rect(@offsetX + @unitSpace * @mspace + 10, y - 10, 20, 20).attr(
-      fill: "url(#{commit.author.icon})"
+
+    avatar_box_x = @offsetX + @unitSpace * @mspace + 10
+    avatar_box_y = y - 10
+    r.rect(avatar_box_x, avatar_box_y, 20, 20).attr(
       stroke: @colors[commit.space]
       "stroke-width": 2
     )
+    r.image(commit.author.icon, avatar_box_x, avatar_box_y, 20, 20)
     r.text(@offsetX + @unitSpace * @mspace + 35, y, commit.message.split("\n")[0]).attr(
       "text-anchor": "start"
       font: "14px Monaco, monospace"
@@ -4,13 +4,13 @@ class CommitsList
     limit: 0
     offset: 0
   @disable = false
-  
+
   @showProgress: ->
     $('.loading').show()
-    
+
   @hideProgress: ->
     $('.loading').hide()
-  
+
   @init: (ref, limit) ->
     $(".day-commits-table li.commit").live 'click', (event) ->
       if event.target.nodeName != "A"
@@ -21,7 +21,7 @@ class CommitsList
     @data.ref = ref
     @data.limit = limit
     @data.offset = limit
-    
+
     this.initLoadMore()
     this.showProgress()
@@ -32,7 +32,9 @@ class CommitsList
       url: location.href
       data: @data
       complete: this.hideProgress
-      dataType: "script"
+      success: (data) ->
+        CommitsList.append(data.count, data.html)
+      dataType: "json"
   @append: (count, html) ->
     $("#commits-list").append(html)
@@ -40,7 +42,7 @@ class CommitsList
       @data.offset += count
     else
       @disable = true
-  
+
   @initLoadMore: ->
     $(document).unbind('scroll')
     $(document).endlessScroll
@@ -4,6 +4,7 @@ $ -&gt;
 class Dispatcher
   constructor: () ->
     @initSearch()
+    @initHighlight()
     @initPageScripts()
   initPageScripts: ->
@@ -47,5 +48,16 @@ class Dispatcher
   initSearch: ->
-    autocomplete_json = $('.search-autocomplete-json').data('autocomplete-opts')
-    new SearchAutocomplete(autocomplete_json)
+    opts = $('.search-autocomplete-opts')
+    path = opts.data('autocomplete-path')
+    project_id = opts.data('autocomplete-project-id')
+    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
@@ -22,19 +22,17 @@
           backgroundColor: '#DDD'
           opacity: .4
       )
-  
+
   reload: ->
     Issues.initSelects()
     Issues.initChecks()
     $('#filter_issue_search').val($('#issue_search').val())
   initSelects: ->
-    $("#update_status").chosen()
-    $("#update_assignee_id").chosen()
-    $("#update_milestone_id").chosen()
-    $("#label_name").chosen()
-    $("#assignee_id").chosen()
-    $("#milestone_id").chosen()
+    $("select#update_status").select2(width: 'resolve', dropdownAutoWidth: true)
+    $("select#update_assignee_id").select2(width: 'resolve', dropdownAutoWidth: true)
+    $("select#update_milestone_id").select2(width: 'resolve', dropdownAutoWidth: true)
+    $("select#label_name").select2(width: 'resolve', dropdownAutoWidth: true)
     $("#milestone_id, #assignee_id, #label_name").on "change", ->
       $(this).closest("form").submit()
@@ -54,7 +52,16 @@
       unless terms is last_terms
         last_terms = terms
         if terms.length >= 2 or terms.length is 0
-          form.submit()
+          $.ajax
+            type: "GET"
+            url: location.href
+            data: "issue_search=" + terms
+            complete: ->
+              $(".loading").hide()
+            success: (data) ->
+              $('.issues-holder').html(data.html)
+              Issues.reload()
+            dataType: "json"
   checkChanged: ->
     checked_issues = $(".selected_issue:checked")
@@ -70,3 +77,9 @@
       $("#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()
+
-window.updatePage = (data) ->
-  $.ajax({type: "GET", url: location.href, data: data, dataType: "script"})
-
 window.slugify = (text) ->
   text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase()
@@ -56,7 +53,7 @@ window.unbindEvents = -&gt;
 document.addEventListener("page:fetch", startSpinner)
 document.addEventListener("page:fetch", unbindEvents)
-document.addEventListener("page:receive", stopSpinner)
+document.addEventListener("page:change", stopSpinner)
 $ ->
   # Click a .one_click_select field, select the contents
@@ -70,8 +67,8 @@ $ -&gt;
     $('.appear-data').fadeIn()
     e.preventDefault()
-  # Initialize chosen selects
-  $('select.chosen').chosen()
+  # Initialize select2 selects
+  $('select.select2').select2(width: 'resolve', dropdownAutoWidth: true)
   # Initialize tooltips
   $('.has_tooltip').tooltip()
@@ -84,6 +81,7 @@ $ -&gt;
     $(@).parents('form').submit()
   $("abbr.timeago").timeago()
+  $('.js-timeago').timeago()
   # Flash
   if (flash = $(".flash-container")).length > 0
@@ -123,13 +121,11 @@ $ -&gt;
     $(@).next('table').show()
     $(@).remove()
-(($) ->
-  _chosen = $.fn.chosen
-  $.fn.extend chosen: (options) ->
-    default_options = search_contains: "true"
-    $.extend default_options, options
-    _chosen.apply @, [default_options]
+  $(".content").on "click", ".js-details-expand", ->
+    $(@).next('.js-details-contain').removeClass("hide")
+    $(@).remove()
+(($) ->
   # Disable an element and add the 'disabled' Bootstrap class
   $.fn.extend disable: ->
     $(@).attr('disabled', 'disabled').addClass('disabled')
@@ -2,8 +2,8 @@
 # * Filter merge requests
 #
 @merge_requestsPage = ->
-  $('#assignee_id').chosen()
-  $('#milestone_id').chosen()
+  $('#assignee_id').select2()
+  $('#milestone_id').select2()
   $('#milestone_id, #assignee_id').on 'change', ->
     $(this).closest('form').submit()
@@ -21,9 +21,11 @@ class MergeRequest
     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)
@@ -83,12 +85,12 @@ class MergeRequest
       url: this.$('.nav-tabs .diffs-tab a').attr('href')
       beforeSend: =>
         this.$('.status').addClass 'loading'
-
       complete: =>
         @diffs_loaded = true
         this.$('.status').removeClass 'loading'
-
-      dataType: 'script'
+      success: (data) =>
+        this.$(".diffs").html(data.html)
+      dataType: 'json'
   showAllCommits: ->
     this.$('.first-commits').remove()
@@ -0,0 +1,24 @@
+$ ->
+  namespaceFormatResult = (namespace) ->
+    markup = "<div class='namespace-result'>"
+    markup += "<span class='namespace-kind'>" + namespace.kind + "</span>"
+    markup += "<span class='namespace-path'>" + namespace.path + "</span>"
+    markup += "</div>"
+    markup
+
+  formatSelection = (namespace) ->
+    namespace.kind + ": " + namespace.path
+
+  $('.ajax-namespace-select').each (i, select) ->
+    $(select).select2
+      placeholder: "Search for namespace"
+      multiple: $(select).hasClass('multiselect')
+      minimumInputLength: 0
+      query: (query) ->
+        Api.namespaces query.term, (namespaces) ->
+          data = { results: namespaces }
+          query.callback(data)
+
+      dropdownCssClass: "ajax-namespace-dropdown"
+      formatResult: namespaceFormatResult
+      formatSelection: formatSelection
@@ -1,580 +0,0 @@
-var NoteList = {
-  id: null,
-  notes_path: null,
-  target_params: null,
-  target_id: 0,
-  target_type: null,
-
-  init: function(tid, tt, path) {
-    NoteList.notes_path = path + ".js";
-    NoteList.target_id = tid;
-    NoteList.target_type = tt;
-    NoteList.target_params = "target_type=" + NoteList.target_type + "&target_id=" + NoteList.target_id;
-
-    NoteList.setupMainTargetNoteForm();
-
-    // get initial set of notes
-    NoteList.getContent();
-
-    // Unbind events to prevent firing twice
-    $(document).off("click", ".js-add-diff-note-button");
-    $(document).off("click", ".js-discussion-reply-button");
-    $(document).off("click", ".js-note-preview-button");
-    $(document).off("click", ".js-note-attachment-input");
-    $(document).off("click", ".js-close-discussion-note-form");
-    $(document).off("click", ".js-note-delete");
-    $(document).off("click", ".js-note-edit");
-    $(document).off("click", ".js-note-edit-cancel");
-    $(document).off("click", ".js-note-attachment-delete");
-    $(document).off("click", ".js-choose-note-attachment-button");
-    $(document).off("click", ".js-show-outdated-discussion");
-
-    $(document).off("ajax:complete", ".js-main-target-form");
-
-
-    // add a new diff note
-    $(document).on("click",
-                    ".js-add-diff-note-button",
-                    NoteList.addDiffNote);
-
-    // reply to diff/discussion notes
-    $(document).on("click",
-                    ".js-discussion-reply-button",
-                    NoteList.replyToDiscussionNote);
-
-    // setup note preview
-    $(document).on("click",
-                    ".js-note-preview-button",
-                    NoteList.previewNote);
-
-    // update the file name when an attachment is selected
-    $(document).on("change",
-                   ".js-note-attachment-input",
-                   NoteList.updateFormAttachment);
-
-    // hide diff note form
-    $(document).on("click",
-                    ".js-close-discussion-note-form",
-                    NoteList.removeDiscussionNoteForm);
-
-    // remove a note (in general)
-    $(document).on("click",
-                    ".js-note-delete",
-                    NoteList.removeNote);
-
-    // show the edit note form
-    $(document).on("click",
-                    ".js-note-edit",
-                    NoteList.showEditNoteForm);
-
-    // cancel note editing
-    $(document).on("click",
-                    ".note-edit-cancel",
-                    NoteList.cancelNoteEdit);
-
-    // delete note attachment
-    $(document).on("click",
-                    ".js-note-attachment-delete",
-                    NoteList.deleteNoteAttachment);
-
-    // update the note after editing
-    $(document).on("ajax:complete",
-                   "form.edit_note",
-                   NoteList.updateNote);
-
-    // reset main target form after submit
-    $(document).on("ajax:complete",
-                   ".js-main-target-form",
-                   NoteList.resetMainTargetForm);
-
-
-    $(document).on("click",
-                  ".js-choose-note-attachment-button",
-                  NoteList.chooseNoteAttachment);
-
-    $(document).on("click",
-                  ".js-show-outdated-discussion",
-                  function(e) { $(this).next('.outdated-discussion').show(); e.preventDefault() });
-  },
-
-
-  /**
-   * When clicking on buttons
-   */
-
-  /**
-   * Called when clicking on the "add a comment" button on the side of a diff line.
-   *
-   * Inserts a temporary row for the form below the line.
-   * Sets up the form and shows it.
-   */
-  addDiffNote: function(e) {
-    e.preventDefault();
-
-    // find the form
-    var form = $(".js-new-note-form");
-    var row = $(this).closest("tr");
-    var nextRow = row.next();
-
-    // does it already have notes?
-    if (nextRow.is(".notes_holder")) {
-      $.proxy(NoteList.replyToDiscussionNote,
-              nextRow.find(".js-discussion-reply-button")
-             ).call();
-    } else {
-      // add a notes row and insert the form
-      row.after('<tr class="notes_holder js-temp-notes-holder"><td class="notes_line" colspan="2"></td><td class="notes_content"></td></tr>');
-      form.clone().appendTo(row.next().find(".notes_content"));
-
-      // show the form
-      NoteList.setupDiscussionNoteForm($(this), row.next().find("form"));
-    }
-  },
-
-  /**
-   * Called when clicking the "Choose File" button.
-   *
-   * Opens the file selection dialog.
-   */
-  chooseNoteAttachment: function() {
-    var form = $(this).closest("form");
-
-    form.find(".js-note-attachment-input").click();
-  },
-
-  /**
-   * Shows the note preview.
-   *
-   * Lets the server render GFM into Html and displays it.
-   *
-   * Note: uses the Toggler behavior to toggle preview/edit views/buttons
-   */
-  previewNote: function(e) {
-    e.preventDefault();
-
-    var form = $(this).closest("form");
-    var preview = form.find('.js-note-preview');
-    var noteText = form.find('.js-note-text').val();
-
-    if(noteText.trim().length === 0) {
-      preview.text('Nothing to preview.');
-    } else {
-      preview.text('Loading...');
-      $.post($(this).data('url'), {note: noteText})
-        .success(function(previewData) {
-          preview.html(previewData);
-        });
-    }
-  },
-
-  /**
-   * Called in response to "cancel" on a diff note form.
-   *
-   * Shows the reply button again.
-   * Removes the form and if necessary it's temporary row.
-   */
-  removeDiscussionNoteForm: function() {
-    var form = $(this).closest("form");
-    var row = form.closest("tr");
-
-    // show the reply button (will only work for replies)
-    form.prev(".js-discussion-reply-button").show();
-
-    if (row.is(".js-temp-notes-holder")) {
-      // remove temporary row for diff lines
-      row.remove();
-    } else {
-      // only remove the form
-      form.remove();
-    }
-  },
-
-  /**
-   * Called in response to deleting a note of any kind.
-   *
-   * Removes the actual note from view.
-   * Removes the whole discussion if the last note is being removed.
-   */
-  removeNote: function() {
-    var note = $(this).closest(".note");
-    var notes = note.closest(".notes");
-
-    // check if this is the last note for this line
-    if (notes.find(".note").length === 1) {
-      // for discussions
-      notes.closest(".discussion").remove();
-
-      // for diff lines
-      notes.closest("tr").remove();
-    }
-
-    note.remove();
-    NoteList.updateVotes();
-  },
-
-  /**
-   * Called in response to clicking the edit note link
-   *
-   * Replaces the note text with the note edit form
-   * Adds a hidden div with the original content of the note to fill the edit note form with
-   * if the user cancels
-   */
-  showEditNoteForm: function(e) {
-    e.preventDefault();
-    var note = $(this).closest(".note");
-    note.find(".note-text").hide();
-
-    // Show the attachment delete link
-    note.find(".js-note-attachment-delete").show();
-
-    GitLab.GfmAutoComplete.setup();
-
-    var form = note.find(".note-edit-form");
-    form.show();
-
-    var textarea = form.find("textarea");
-    var p = $("<p></p>").text(textarea.val());
-    var hidden_div = $('<div class="note-original-content"></div>').append(p);
-    form.append(hidden_div);
-    hidden_div.hide();
-    textarea.focus();
-  },
-
-  /**
-   * Called in response to clicking the cancel button when editing a note
-   *
-   * Resets and hides the note editing form
-   */
-  cancelNoteEdit: function(e) {
-    e.preventDefault();
-    var note = $(this).closest(".note");
-    NoteList.resetNoteEditing(note);
-  },
-
-
-  /**
-   * Called in response to clicking the delete attachment link
-   *
-   * Removes the attachment wrapper view, including image tag if it exists
-   * Resets the note editing form
-   */
-  deleteNoteAttachment: function() {
-    var note = $(this).closest(".note");
-    note.find(".note-attachment").remove();
-    NoteList.resetNoteEditing(note);
-    NoteList.rewriteTimestamp(note.find(".note-last-update"));
-  },
-
-
-  /**
-   * Called when clicking on the "reply" button for a diff line.
-   *
-   * Shows the note form below the notes.
-   */
-  replyToDiscussionNote: function() {
-    // find the form
-    var form = $(".js-new-note-form");
-
-    // hide reply button
-    $(this).hide();
-    // insert the form after the button
-    form.clone().insertAfter($(this));
-
-    // show the form
-    NoteList.setupDiscussionNoteForm($(this), $(this).next("form"));
-  },
-
-
-  /**
-   * Helper for inserting and setting up note forms.
-   */
-
-
-  /**
-   * Called in response to creating a note failing validation.
-   *
-   * Adds the rendered errors to the respective form.
-   * If "discussionId" is null or undefined, the main target form is assumed.
-   */
-  errorsOnForm: function(errorsHtml, discussionId) {
-    // find the form
-    if (discussionId) {
-      var form = $("form[rel='"+discussionId+"']");
-    } else {
-      var form = $(".js-main-target-form");
-    }
-
-    form.find(".js-errors").remove();
-    form.prepend(errorsHtml);
-
-    form.find(".js-note-text").focus();
-  },
-
-
-  /**
-   * Shows the diff/discussion form and does some setup on it.
-   *
-   * Sets some hidden fields in the form.
-   *
-   * Note: dataHolder must have the "discussionId", "lineCode", "noteableType"
-   *       and "noteableId" data attributes set.
-   */
-  setupDiscussionNoteForm: function(dataHolder, form) {
-    // setup note target
-    form.attr("rel", dataHolder.data("discussionId"));
-    form.find("#note_commit_id").val(dataHolder.data("commitId"));
-    form.find("#note_line_code").val(dataHolder.data("lineCode"));
-    form.find("#note_noteable_type").val(dataHolder.data("noteableType"));
-    form.find("#note_noteable_id").val(dataHolder.data("noteableId"));
-
-    NoteList.setupNoteForm(form);
-
-    form.find(".js-note-text").focus();
-  },
-
-  /**
-   * Shows the main form and does some setup on it.
-   *
-   * Sets some hidden fields in the form.
-   */
-  setupMainTargetNoteForm: function() {
-    // find the form
-    var form = $(".js-new-note-form");
-    // insert the form after the button
-    form.clone().replaceAll($(".js-main-target-form"));
-
-    form = form.prev("form");
-
-    // show the form
-    NoteList.setupNoteForm(form);
-
-    // fix classes
-    form.removeClass("js-new-note-form");
-    form.addClass("js-main-target-form");
-
-    // remove unnecessary fields and buttons
-    form.find("#note_line_code").remove();
-    form.find(".js-close-discussion-note-form").remove();
-  },
-
-  /**
-   * General note form setup.
-   *
-   * * deactivates the submit button when text is empty
-   * * hides the preview button when text is empty
-   * * setup GFM auto complete
-   * * show the form
-   */
-  setupNoteForm: function(form) {
-    disableButtonIfEmptyField(form.find(".js-note-text"), form.find(".js-comment-button"));
-
-    form.removeClass("js-new-note-form");
-
-    // setup preview buttons
-    form.find(".js-note-edit-button, .js-note-preview-button")
-        .tooltip({ placement: 'left' });
-
-    previewButton = form.find(".js-note-preview-button");
-    form.find(".js-note-text").on("input", function() {
-      if ($(this).val().trim() !== "") {
-        previewButton.removeClass("turn-off").addClass("turn-on");
-      } else {
-        previewButton.removeClass("turn-on").addClass("turn-off");
-      }
-    });
-
-    // remove notify commit author checkbox for non-commit notes
-    if (form.find("#note_noteable_type").val() !== "Commit") {
-      form.find(".js-notify-commit-author").remove();
-    }
-
-    GitLab.GfmAutoComplete.setup();
-
-    form.show();
-  },
-
-
-  /**
-   * Handle loading the initial set of notes.
-   * And set up loading more notes when scrolling to the bottom of the page.
-   */
-
-
-  /**
-   * Gets an initial set of notes.
-   */
-  getContent: function() {
-    $.ajax({
-      url: NoteList.notes_path,
-      data: NoteList.target_params,
-      complete: function(){ $('.js-notes-busy').removeClass("loading")},
-      beforeSend: function() { $('.js-notes-busy').addClass("loading") },
-      dataType: "script"
-    });
-  },
-
-  /**
-   * Called in response to getContent().
-   * Replaces the content of #notes-list with the given html.
-   */
-  setContent: function(newNoteIds, html) {
-    $("#notes-list").html(html);
-  },
-
-
-  /**
-   * Adds a single common note to #notes-list.
-   */
-  appendNewNote: function(id, html) {
-    $("#notes-list").append(html);
-    NoteList.updateVotes();
-  },
-
-  /**
-   * Adds a single discussion note to #notes-list.
-   *
-   * Also removes the corresponding form.
-   */
-  appendNewDiscussionNote: function(discussionId, diffRowHtml, noteHtml) {
-    var form = $("form[rel='"+discussionId+"']");
-    var row = form.closest("tr");
-
-    // is this the first note of discussion?
-    if (row.is(".js-temp-notes-holder")) {
-      // insert the note and the reply button after the temp row
-      row.after(diffRowHtml);
-      // remove the note (will be added again below)
-      row.next().find(".note").remove();
-    }
-
-    // append new note to all matching discussions
-    $(".notes[rel='"+discussionId+"']").append(noteHtml);
-
-    // cleanup after successfully creating a diff/discussion note
-    $.proxy(NoteList.removeDiscussionNoteForm, form).call();
-  },
-
-  /**
-   * Called in response the main target form has been successfully submitted.
-   *
-   * Removes any errors.
-   * Resets text and preview.
-   * Resets buttons.
-   */
-  resetMainTargetForm: function(){
-    var form = $(this);
-
-    // remove validation errors
-    form.find(".js-errors").remove();
-
-    // reset text and preview
-    var previewContainer = form.find(".js-toggler-container.note_text_and_preview");
-    if (previewContainer.is(".on")) {
-      previewContainer.removeClass("on");
-    }
-    form.find(".js-note-text").val("").trigger("input");
-  },
-
-  /**
-   * Called after an attachment file has been selected.
-   *
-   * Updates the file name for the selected attachment.
-   */
-  updateFormAttachment: function() {
-    var form = $(this).closest("form");
-
-    // get only the basename
-    var filename = $(this).val().replace(/^.*[\\\/]/, '');
-
-    form.find(".js-attachment-filename").text(filename);
-  },
-
-  /**
-   * Recalculates the votes and updates them (if they are displayed at all).
-   *
-   * Assumes all relevant notes are displayed (i.e. there are no more notes to
-   * load via getMore()).
-   * Might produce inaccurate results when not all notes have been loaded and a
-   * recalculation is triggered (e.g. when deleting a note).
-   */
-  updateVotes: function() {
-    var votes = $("#votes .votes");
-    var notes = $("#notes-list .note .vote");
-
-    // only update if there is a vote display
-    if (votes.size()) {
-      var upvotes = notes.filter(".upvote").size();
-      var downvotes = notes.filter(".downvote").size();
-      var votesCount = upvotes + downvotes;
-      var upvotesPercent = votesCount ? (100.0 / votesCount * upvotes) : 0;
-      var downvotesPercent = votesCount ? (100.0 - upvotesPercent) : 0;
-
-      // change vote bar lengths
-      votes.find(".bar-success").css("width", upvotesPercent+"%");
-      votes.find(".bar-danger").css("width", downvotesPercent+"%");
-      // replace vote numbers
-      votes.find(".upvotes").text(votes.find(".upvotes").text().replace(/\d+/, upvotes));
-      votes.find(".downvotes").text(votes.find(".downvotes").text().replace(/\d+/, downvotes));
-    }
-  },
-
-  /**
-   * Called in response to the edit note form being submitted
-   *
-   * Updates the current note field.
-   * Hides the edit note form
-   */
-  updateNote: function(e, xhr, settings) {
-    response = JSON.parse(xhr.responseText);
-    if (response.success) {
-      var note_li = $("#note_" + response.id);
-      var note_text = note_li.find(".note-text");
-      note_text.html(response.note).show();
-
-      var note_form = note_li.find(".note-edit-form");
-      note_form.hide();
-      note_form.find(".btn-save").enableButton();
-
-      // Update the "Edited at xxx label" on the note to show it's just been updated
-      NoteList.rewriteTimestamp(note_li.find(".note-last-update"));
-    }
-  },
-
-  /**
-  * Called in response to the 'cancel note' link clicked, or after deleting a note attachment
-  *
-  * Hides the edit note form and shows the note
-  * Resets the edit note form textarea with the original content of the note
-  */
-  resetNoteEditing: function(note) {
-    note.find(".note-text").show();
-
-    // Hide the attachment delete link
-    note.find(".js-note-attachment-delete").hide();
-
-    // Put the original content of the note back into the edit form textarea
-    var form = note.find(".note-edit-form");
-    var original_content = form.find(".note-original-content");
-    form.find("textarea").val(original_content.text());
-    original_content.remove();
-
-    note.find(".note-edit-form").hide();
-  },
-
-  /**
-  * Utility function to generate new timestamp text for a note
-  *
-  */
-  rewriteTimestamp: function(element) {
-    // Strip all newlines from the existing timestamp
-    var ts = element.text().replace(/\n/g, ' ').trim();
-
-    // If the timestamp already has '(Edited xxx ago)' text, remove it
-    ts = ts.replace(new RegExp("\\(Edited [A-Za-z0-9 ]+\\)$", "gi"), "");
-
-    // Append "(Edited just now)"
-    ts = (ts + " <small>(Edited just now)</small>");
-
-    element.html(ts);
-  }
-};
@@ -0,0 +1,453 @@
+class Notes
+  @interval: null
+
+  constructor: (notes_url, note_ids) ->
+    @notes_url = notes_url
+    @notes_url = gon.relative_url_root + @notes_url if gon.relative_url_root?
+    @note_ids = note_ids
+    @initRefresh()
+    @setupMainTargetNoteForm()
+    @cleanBinding()
+    @addBinding()
+
+  addBinding: ->
+    # add note to UI after creation
+    $(document).on "ajax:success", ".js-main-target-form", @addNote
+    $(document).on "ajax:success", ".js-discussion-note-form", @addDiscussionNote
+
+        # change note in UI after update
+    $(document).on "ajax:success", "form.edit_note", @updateNote
+
+    # Edit note link
+    $(document).on "click", ".js-note-edit", @showEditForm
+    $(document).on "click", ".note-edit-cancel", @cancelEdit
+
+    # remove a note (in general)
+    $(document).on "click", ".js-note-delete", @removeNote
+
+    # delete note attachment
+    $(document).on "click", ".js-note-attachment-delete", @removeAttachment
+
+    # Preview button
+    $(document).on "click", ".js-note-preview-button", @previewNote
+
+    # reset main target form after submit
+    $(document).on "ajax:complete", ".js-main-target-form", @resetMainTargetForm
+
+    # attachment button
+    $(document).on "click", ".js-choose-note-attachment-button", @chooseNoteAttachment
+
+    # update the file name when an attachment is selected
+    $(document).on "change", ".js-note-attachment-input", @updateFormAttachment
+
+    # reply to diff/discussion notes
+    $(document).on "click", ".js-discussion-reply-button", @replyToDiscussionNote
+
+    # add diff note
+    $(document).on "click", ".js-add-diff-note-button", @addDiffNote
+
+    # hide diff note form
+    $(document).on "click", ".js-close-discussion-note-form", @cancelDiscussionForm
+
+  cleanBinding: ->
+    $(document).off "ajax:success", ".js-main-target-form"
+    $(document).off "ajax:success", ".js-discussion-note-form"
+    $(document).off "ajax:success", "form.edit_note"
+    $(document).off "click", ".js-note-edit"
+    $(document).off "click", ".note-edit-cancel"
+    $(document).off "click", ".js-note-delete"
+    $(document).off "click", ".js-note-attachment-delete"
+    $(document).off "click", ".js-note-preview-button"
+    $(document).off "ajax:complete", ".js-main-target-form"
+    $(document).off "click", ".js-choose-note-attachment-button"
+    $(document).off "click", ".js-discussion-reply-button"
+    $(document).off "click", ".js-add-diff-note-button"
+
+
+  initRefresh: ->
+    clearInterval(Notes.interval)
+    Notes.interval = setInterval =>
+      @refresh()
+    , 15000
+
+  refresh: ->
+    @getContent()
+
+  getContent: ->
+    $.ajax
+      url: @notes_url
+      dataType: "json"
+      success: (data) =>
+        notes = data.notes
+        $.each notes, (i, note) =>
+          @renderNote(note)
+
+
+  ###
+  Render note in main comments area.
+
+  Note: for rendering inline notes use renderDiscussionNote
+  ###
+  renderNote: (note) ->
+    # render note if it not present in loaded list
+    # or skip if rendered
+    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)
+
+
+  ###
+  Check if note does not exists on page
+  ###
+  isNewNote: (note) ->
+    $.inArray(note.id, @note_ids) == -1
+
+
+  ###
+  Render note in discussion area.
+
+  Note: for rendering inline notes use renderDiscussionNote
+  ###
+  renderDiscussionNote: (note) ->
+    @note_ids.push(note.id)
+    form = $("form[rel='" + note.discussion_id + "']")
+    row = form.closest("tr")
+
+    # is this the first note of discussion?
+    if row.is(".js-temp-notes-holder")
+      # insert the note and the reply button after the temp row
+      row.after note.discussion_html
+
+      # remove the note (will be added again below)
+      row.next().find(".note").remove()
+
+    # append new note to all matching discussions
+    $(".notes[rel='" + note.discussion_id + "']").append note.html
+
+    # cleanup after successfully creating a diff/discussion note
+    @removeDiscussionNoteForm(form)
+
+  ###
+  Shows the note preview.
+
+  Lets the server render GFM into Html and displays it.
+
+  Note: uses the Toggler behavior to toggle preview/edit views/buttons
+  ###
+  previewNote: (e) ->
+    e.preventDefault()
+    form = $(this).closest("form")
+    preview = form.find(".js-note-preview")
+    noteText = form.find(".js-note-text").val()
+    if noteText.trim().length is 0
+      preview.text "Nothing to preview."
+    else
+      preview.text "Loading..."
+      $.post($(this).data("url"),
+        note: noteText
+      ).success (previewData) ->
+        preview.html previewData
+
+  ###
+  Called in response the main target form has been successfully submitted.
+
+  Removes any errors.
+  Resets text and preview.
+  Resets buttons.
+  ###
+  resetMainTargetForm: ->
+    form = $(".js-main-target-form")
+
+    # remove validation errors
+    form.find(".js-errors").remove()
+
+    # reset text and preview
+    previewContainer = form.find(".js-toggler-container.note_text_and_preview")
+    previewContainer.removeClass "on"  if previewContainer.is(".on")
+    form.find(".js-note-text").val("").trigger "input"
+
+  ###
+  Called when clicking the "Choose File" button.
+
+  Opens the file selection dialog.
+  ###
+  chooseNoteAttachment: ->
+    form = $(this).closest("form")
+    form.find(".js-note-attachment-input").click()
+
+  ###
+  Shows the main form and does some setup on it.
+
+  Sets some hidden fields in the form.
+  ###
+  setupMainTargetNoteForm: ->
+
+    # find the form
+    form = $(".js-new-note-form")
+
+    # insert the form after the button
+    form.clone().replaceAll $(".js-main-target-form")
+    form = form.prev("form")
+
+    # show the form
+    @setupNoteForm(form)
+
+    # fix classes
+    form.removeClass "js-new-note-form"
+    form.addClass "js-main-target-form"
+
+    # remove unnecessary fields and buttons
+    form.find("#note_line_code").remove()
+    form.find(".js-close-discussion-note-form").remove()
+
+  ###
+  General note form setup.
+
+  deactivates the submit button when text is empty
+  hides the preview button when text is empty
+  setup GFM auto complete
+  show the form
+  ###
+  setupNoteForm: (form) ->
+    disableButtonIfEmptyField form.find(".js-note-text"), form.find(".js-comment-button")
+    form.removeClass "js-new-note-form"
+
+    # setup preview buttons
+    form.find(".js-note-edit-button, .js-note-preview-button").tooltip placement: "left"
+    previewButton = form.find(".js-note-preview-button")
+    form.find(".js-note-text").on "input", ->
+      if $(this).val().trim() isnt ""
+        previewButton.removeClass("turn-off").addClass "turn-on"
+      else
+        previewButton.removeClass("turn-on").addClass "turn-off"
+
+
+    # remove notify commit author checkbox for non-commit notes
+    form.find(".js-notify-commit-author").remove()  if form.find("#note_noteable_type").val() isnt "Commit"
+    GitLab.GfmAutoComplete.setup()
+    form.show()
+
+
+  ###
+  Called in response to the new note form being submitted
+
+  Adds new note to list.
+  ###
+  addNote: (xhr, note, status) =>
+    @renderNote(note)
+    @updateVotes()
+
+  ###
+  Called in response to the new note form being submitted
+
+  Adds new note to list.
+  ###
+  addDiscussionNote: (xhr, note, status) =>
+    @renderDiscussionNote(note)
+
+  ###
+  Called in response to the edit note form being submitted
+
+  Updates the current note field.
+  ###
+  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
+
+  Replaces the note text with the note edit form
+  Adds a hidden div with the original content of the note to fill the edit note form with
+  if the user cancels
+  ###
+  showEditForm: (e) ->
+    e.preventDefault()
+    note = $(this).closest(".note")
+    note.find(".note-text").hide()
+
+    # Show the attachment delete link
+    note.find(".js-note-attachment-delete").show()
+    GitLab.GfmAutoComplete.setup()
+    form = note.find(".note-edit-form")
+    form.show()
+    form.find("textarea").focus()
+
+  ###
+  Called in response to clicking the edit note link
+
+  Hides edit form
+  ###
+  cancelEdit: (e) ->
+    e.preventDefault()
+    note = $(this).closest(".note")
+    note.find(".note-text").show()
+    note.find(".js-note-attachment-delete").hide()
+    note.find(".note-edit-form").hide()
+
+  ###
+  Called in response to deleting a note of any kind.
+
+  Removes the actual note from view.
+  Removes the whole discussion if the last note is being removed.
+  ###
+  removeNote: ->
+    note = $(this).closest(".note")
+    notes = note.closest(".notes")
+
+    # check if this is the last note for this line
+    if notes.find(".note").length is 1
+
+      # for discussions
+      notes.closest(".discussion").remove()
+
+      # for diff lines
+      notes.closest("tr").remove()
+
+    note.remove()
+
+  ###
+  Called in response to clicking the delete attachment link
+
+  Removes the attachment wrapper view, including image tag if it exists
+  Resets the note editing form
+  ###
+  removeAttachment: ->
+    note = $(this).closest(".note")
+    note.find(".note-attachment").remove()
+    note.find(".note-text").show()
+    note.find(".js-note-attachment-delete").hide()
+    note.find(".note-edit-form").hide()
+
+  ###
+  Called when clicking on the "reply" button for a diff line.
+
+  Shows the note form below the notes.
+  ###
+  replyToDiscussionNote: (e) =>
+    form = $(".js-new-note-form")
+    replyLink = $(e.target)
+    replyLink.hide()
+
+    # insert the form after the button
+    form.clone().insertAfter replyLink
+
+    # show the form
+    @setupDiscussionNoteForm(replyLink, replyLink.next("form"))
+
+  ###
+  Shows the diff or discussion form and does some setup on it.
+
+  Sets some hidden fields in the form.
+
+  Note: dataHolder must have the "discussionId", "lineCode", "noteableType"
+  and "noteableId" data attributes set.
+  ###
+  setupDiscussionNoteForm: (dataHolder, form) =>
+    # setup note target
+    form.attr "rel", dataHolder.data("discussionId")
+    form.find("#note_commit_id").val dataHolder.data("commitId")
+    form.find("#note_line_code").val dataHolder.data("lineCode")
+    form.find("#note_noteable_type").val dataHolder.data("noteableType")
+    form.find("#note_noteable_id").val dataHolder.data("noteableId")
+    @setupNoteForm form
+    form.find(".js-note-text").focus()
+    form.addClass "js-discussion-note-form"
+
+  ###
+  General note form setup.
+
+  deactivates the submit button when text is empty
+  hides the preview button when text is empty
+  setup GFM auto complete
+  show the form
+  ###
+  setupNoteForm: (form) =>
+    disableButtonIfEmptyField form.find(".js-note-text"), form.find(".js-comment-button")
+    form.removeClass "js-new-note-form"
+    form.removeClass "js-new-note-form"
+    GitLab.GfmAutoComplete.setup()
+
+    # setup preview buttons
+    previewButton = form.find(".js-note-preview-button")
+    form.find(".js-note-text").on "input", ->
+      if $(this).val().trim() isnt ""
+        previewButton.removeClass("turn-off").addClass "turn-on"
+      else
+        previewButton.removeClass("turn-on").addClass "turn-off"
+
+    form.show()
+
+  ###
+  Called when clicking on the "add a comment" button on the side of a diff line.
+
+  Inserts a temporary row for the form below the line.
+  Sets up the form and shows it.
+  ###
+  addDiffNote: (e) =>
+    e.preventDefault()
+    link = e.target
+    form = $(".js-new-note-form")
+    row = $(link).closest("tr")
+    nextRow = row.next()
+
+    # does it already have notes?
+    if nextRow.is(".notes_holder")
+      replyButton = nextRow.find(".js-discussion-reply-button")
+      if replyButton.length > 0
+        $.proxy(@replyToDiscussionNote, replyButton).call()
+    else
+      # add a notes row and insert the form
+      row.after "<tr class=\"notes_holder js-temp-notes-holder\"><td class=\"notes_line\" colspan=\"2\"></td><td class=\"notes_content\"></td></tr>"
+      form.clone().appendTo row.next().find(".notes_content")
+
+      # show the form
+      @setupDiscussionNoteForm $(link), row.next().find("form")
+
+  ###
+  Called in response to "cancel" on a diff note form.
+
+  Shows the reply button again.
+  Removes the form and if necessary it's temporary row.
+  ###
+  removeDiscussionNoteForm: (form)->
+    row = form.closest("tr")
+
+    # show the reply button (will only work for replies)
+    form.prev(".js-discussion-reply-button").show()
+    if row.is(".js-temp-notes-holder")
+      # remove temporary row for diff lines
+      row.remove()
+    else
+      # only remove the form
+      form.remove()
+
+
+  cancelDiscussionForm: (e) =>
+    e.preventDefault()
+    form = $(".js-new-note-form")
+    form = $(e.target).closest(".js-discussion-note-form")
+    @removeDiscussionNoteForm(form)
+
+  updateVotes: ->
+    (new NotesVotes).updateVotes()
+
+  ###
+  Called after an attachment file has been selected.
+
+  Updates the file name for the selected attachment.
+  ###
+  updateFormAttachment: ->
+    form = $(this).closest("form")
+
+    # get only the basename
+    filename = $(this).val().replace(/^.*[\\\/]/, "")
+    form.find(".js-attachment-filename").text filename
+
+@Notes = Notes
@@ -0,0 +1,22 @@
+class NotesVotes
+  updateVotes: ->
+    votes = $("#votes .votes")
+    notes = $("#notes-list .note .vote")
+
+    # only update if there is a vote display
+    if votes.size()
+      upvotes = notes.filter(".upvote").size()
+      downvotes = notes.filter(".downvote").size()
+      votesCount = upvotes + downvotes
+      upvotesPercent = (if votesCount then (100.0 / votesCount * upvotes) else 0)
+      downvotesPercent = (if votesCount then (100.0 - upvotesPercent) else 0)
+
+      # change vote bar lengths
+      votes.find(".bar-success").css "width", upvotesPercent + "%"
+      votes.find(".bar-danger").css "width", downvotesPercent + "%"
+
+      # replace vote numbers
+      votes.find(".upvotes").text votes.find(".upvotes").text().replace(/\d+/, upvotes)
+      votes.find(".downvotes").text votes.find(".downvotes").text().replace(/\d+/, downvotes)
+
+@NotesVotes = NotesVotes
@@ -19,8 +19,9 @@
       data: "limit=" + @limit + "&offset=" + @offset
       complete: ->
         $(".loading").hide()
-
-      dataType: "script"
+      success: (data) ->
+        Pager.append(data.count, data.html)
+      dataType: "json"
   append: (count, html) ->
     $(".content_list").append html
@@ -16,3 +16,13 @@ $ -&gt;
   $('.update-notifications').on 'ajax:complete', ->
     $(this).find('.btn-save').enableButton()
+
+
+  $('.js-choose-user-avatar-button').bind "click", ->
+    form = $(this).closest("form")
+    form.find(".js-user-avatar-input").click()
+
+  $('.js-user-avatar-input').bind "change", ->
+    form = $(this).closest("form")
+    filename = $(this).val().replace(/^.*[\\\/]/, '')
+    form.find(".js-avatar-filename").text(filename)
@@ -6,10 +6,10 @@ class Project
     @initEvents()
- 
+
   initEvents: ->
     disableButtonIfEmptyField '#project_name', '.project-submit'
-    
+
     $('#project_issues_enabled').change ->
       if ($(this).is(':checked') == true)
         $('#project_issues_tracker').removeAttr('disabled')
@@ -29,14 +29,20 @@ class Project
 $ ->
   # Git clone panel switcher
-  scope = $ '.project_clone_holder'
+  scope = $ '.git-clone-holder'
   if scope.length > 0
     $('a, button', scope).click ->
       $('a, button', scope).removeClass 'active'
       $(@).addClass 'active'
       $('#project_clone', scope).val $(@).data 'clone'
-      $(".clone").text("").append 'git remote add origin ' + $(@).data 'clone'
+      $(".clone").text("").append $(@).data 'clone'
   # Ref switcher
   $('.project-refs-select').on 'change', ->
     $(@).parents('form').submit()
+
+  $('.hide-no-ssh-message').on 'click', (e) ->
+    path = '/'
+    $.cookie('hide_no_ssh_message', 'false', { path: path })
+    $(@).parents('.no-ssh-key-message').hide()
+    e.preventDefault()
 class SearchAutocomplete
-  constructor: (json) ->
+  constructor: (search_autocomplete_path, project_id, project_ref) ->
+    project_id = '' unless project_id
+    project_ref = '' unless project_ref
+    query = "?project_id=" + project_id + "&project_ref=" + project_ref
+
     $("#search").autocomplete
-      source: json
+      source: search_autocomplete_path + query
+      minLength: 1
       select: (event, ui) ->
         location.href = ui.item.url
@@ -46,11 +46,7 @@ class window.ContributorsGraph
 class window.ContributorsMasterGraph extends ContributorsGraph
   constructor: (@data) ->
-    if $(window).width() > 1214
-      @width = 1100
-    else
-      @width = 870
-
+    @width = $('.container').width() - 70
     @height = 200
     @x = null
     @y = null
@@ -88,7 +84,6 @@ class window.ContributorsMasterGraph extends ContributorsGraph
       x(d.date)
     ).y0(@height).y1((d) ->
       xa = d.commits = d.commits ? d.additions ? d.deletions
-      console.log(xa)
       y(xa)
     ).interpolate("basis")
   create_brush: ->
@@ -124,11 +119,7 @@ class window.ContributorsMasterGraph extends ContributorsGraph
 class window.ContributorsAuthorGraph extends ContributorsGraph
   constructor: (@data) ->
-    if $(window).width() > 1214
-      @width = 490
-    else
-      @width = 380
-
+    @width = $('.container').width()/2 - 100
     @height = 200
     @x = null
     @y = null
 $ ->
   userFormatResult = (user) ->
-    avatar = gon.gravatar_url
-    avatar = avatar.replace('%{hash}', md5(user.email))
-    avatar = avatar.replace('%{size}', '24')
+    if user.avatar
+      avatar = user.avatar.url
+    else
+      avatar = gon.gravatar_url
+      avatar = avatar.replace('%{hash}', md5(user.email))
+      avatar = avatar.replace('%{size}', '24')
-    markup = "<div class='user-result'>"
-    markup += "<div class='user-image'><img class='avatar s24' src='" + avatar + "'></div>"
-    markup += "<div class='user-name'>" + user.name + "</div>"
-    markup += "<div class='user-username'>" + user.username + "</div>"
-    markup += "</div>"
-    markup
+    "<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>"
   userFormatSelection = (user) ->
     user.name
@@ -4,19 +4,46 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require jquery.ui.gitlab
  *= require jquery.atwho
- *= require chosen
  *= require select2
+ *= require highlightjs.min
  *= require_self
 */
+@import "main/variables.scss";
+@import "main/mixins.scss";
+@import "main/fonts.scss";
+@import "main/layout.scss";
+
+/**
+ * Customized Twitter bootstrap
+ */
+@import 'gl_bootstrap';
+
 /**
- * GitLab bootstrap:
+ * Font icons
+ *
  */
-@import "gitlab_bootstrap.scss";
+@import "font-awesome";
-@import "common.scss";
-@import "selects.scss";
+/**
+ * Generic css (forms, nav etc):
+ */
+@import "generic/avatar.scss";
+@import "generic/common.scss";
+@import "generic/typography.scss";
+@import "generic/buttons.scss";
+@import "generic/blocks.scss";
+@import "generic/ui_box.scss";
+@import "generic/issue_box.scss";
+@import "generic/files.scss";
+@import "generic/lists.scss";
+@import "generic/forms.scss";
+@import "generic/selects.scss";
+@import "generic/highlight.scss";
+/**
+ * Page specific styles (issues, projects etc):
+ */
 @import "sections/header.scss";
 @import "sections/nav.scss";
 @import "sections/commits.scss";
@@ -39,6 +66,9 @@
 @import "sections/dashboard.scss";
 @import "sections/stat_graph.scss";
+/**
+ * Code ighlight
+ */
 @import "highlight/white.scss";
 @import "highlight/dark.scss";
 @import "highlight/solarized_dark.scss";
@@ -57,4 +87,3 @@
  * Styles for JS behaviors.
  */
 @import "behaviors.scss";
-
@@ -1,389 +0,0 @@
-html {
-  overflow-y: scroll;
-}
-
-/** LAYOUT **/
-
-body {
-  margin-bottom: 20px;
-}
-
-.container {
-  padding-top: 0;
-  z-index: 5;
-}
-
-.container .content {
-  margin: 0 0;
-}
-
-.author_link {
-  color: $link_color;
-}
-
-.help li { color:$style_color; }
-
-.back-link {
-  font-size: 14px;
-}
-
-table a code {
-  position: relative;
-  top: -2px;
-  margin-right: 3px;
-}
-
-.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;
-  }
-}
-
-/** FLASH message **/
-.flash-container {
-  display: none;
-  cursor: pointer;
-  margin: 0;
-  text-align: center;
-  color: #fff;
-  font-size: 14px;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  opacity: 0.8;
-  z-index: 100;
-
-  .flash-notice {
-    background: #49C;
-    padding: 10px;
-    text-shadow: 0 1px 1px #178;
-  }
-
-  .flash-alert {
-    background: #C67;
-    text-shadow: 0 1px 1px #945;
-    padding: 10px;
-  }
-}
-
-span.update-author {
-  display: block;
-  color: #999;
-  font-weight: normal;
-  font-style: italic;
-  strong {
-    font-weight: bold;
-    font-style: normal;
-  }
-}
-
-.user-mention {
-  color: #2FA0BB;
-  font-weight: bold;
-}
-
-.label {
-  padding: 1px 4px;
-  font-size: 12px;
-  font-style: normal;
-  font-weight: normal;
-}
-
-.field_with_errors {
-  display: inline;
-}
-
-ul.breadcrumb {
-  background: white;
-  border: none;
-  li {
-    display: inline;
-    text-shadow: 0 1px 0 white
-  }
-
-  a {
-    font-size: 16px;
-  }
-}
-
-.line_holder {
-  &:hover {
-    td {
-      background: #FFFFCF !important;
-    }
-  }
-}
-
-p.time {
-  color: #999;
-  font-size: 90%;
-  margin: 30px 3px 3px 2px;
-}
-
-.search-holder {
-  label, input {
-     height: 30px;
-     padding: 0;
-     font-size: 14px;
-  }
-  label {
-    line-height: 30px;
-    color: #666;
-  }
-}
-
-.highlight_word {
-  border-bottom: 2px solid #F90;
-}
-
-.status_info {
-  font-size: 14px;
-  padding: 5px 15px;
-  line-height: 26px;
-  text-align: center;
-  float: right;
-  position: relative;
-  top: -5px;
-  @include border-radius(4px);
-
-  &.success {
-    background: #4A4;
-    color: #FFF;
-  }
-
-  &.error {
-    background: #DA4E49;
-    color: #FFF;
-  }
-}
-
-.thin_area{
-  height: 150px;
-}
-
-// Fixes alignment on notes.
-.new_note {
-  label {
-    text-align: left;
-  }
-}
-
-// Fix issue with notes & lists creating a bunch of bottom borders.
-li.note {
-  img { max-width:100% }
-  .note-title {
-    li {
-      border-bottom:none !important;
-    }
-  }
-}
-
-.markdown {
-  img {
-    max-width: 100%;
-  }
-}
-
-.wiki_content code, .readme code{
-  background-color: inherit;
-}
-
-.team_member_show {
-  td:first-child {
-    color: #aaa;
-  }
-}
-
-.rss-icon {
-  img {
-    width: 24px;
-    vertical-align: top;
-  }
-
-  strong {
-    line-height: 24px;
-  }
-}
-
-.supp_diff_link,
-.show-all-commits {
-  cursor: pointer;
-}
-
-.merge-request,
-.issue {
-  &.today{
-    background: #EFE;
-    border-color: #CEC;
-  }
-  &.closed {
-    background: #F5f5f5;
-    border-color: #E5E5E5;
-  }
-  &.merged {
-    background: #F5f5f5;
-    border-color: #E5E5E5;
-  }
-}
-
-.git_error_tips {
-  @extend .span6;
-  text-align: left;
-  margin-top: 40px;
-  pre {
-    background: white;
-    border: none;
-    font-size: 12px;
-  }
-}
-
-.error-message {
-  padding: 10px;
-  background: #C67;
-  padding-left: 20px;
-  margin: 0;
-  color: #FFF;
-
-  a {
-    color: #fff;
-    text-decoration: underline;
-  }
-  &.centered {
-    text-align: center;
-  }
-}
-
-.warning_message {
-  border-left: 4px solid #ed9;
-  color: #b90;
-  padding: 10px;
-  margin-bottom: 10px;
-  background: #ffffe6;
-  padding-left: 20px;
-
-  &.centered {
-    text-align: center;
-  }
-}
-
-.oauth_select_holder {
-  padding: 20px;
-  img {
-    padding: 5px;
-    margin-right: 10px;
-  }
-  .active {
-    img {
-      border: 1px solid #ccc;
-      background: $hover;
-      @include border-radius(5px);
-    }
-  }
-}
-
-.btn-build-token {
-  float: left;
-  padding: 6px 20px;
-  margin-right: 12px;
-}
-
-.gitlab-promo {
-  a {
-    color: #aaa;
-    margin-right: 30px;
-  }
-}
-
-pre {
-  &.clean {
-    background: none;
-    border: none;
-    margin: 0;
-    padding: 0;
-  }
-}
-
-.milestone {
-  &.milestone-closed {
-    background: #eee;
-  }
-  .progress {
-    margin-bottom: 0;
-    margin-top: 4px;
-  }
-}
-
-h1.http_status_code {
-  font-size: 56px;
-  line-height: 100px;
-  font-weight: normal;
-  color: #456;
-}
-
-.control-group {
-  .controls {
-    span {
-      &.descr {
-        position: relative;
-        top: 2px;
-        left: 5px;
-        color: #666;
-      }
-    }
-  }
-}
-
-img.emoji {
-  height: 20px;
-  vertical-align: middle;
-  width: 20px;
-}
-
-.appear-data {
-  display: none;
-}
-
-.chart {
-  overflow: hidden;
-  height: 220px;
-}
-
-.navless-container {
-  margin-top: 20px;
-}
-
-.description-block {
-  @extend .light-well;
-  @extend .light;
-  margin-bottom: 10px;
-}
-
-.group-name {
-  font-size: 14px;
-  line-height: 24px;
-}
-
-table {
-  td.permission-x {
-    background: #D9EDF7 !important;
-    text-align: center;
-  }
-}
-
-.dashboard-intro-icon {
-  float: left;
-  font-size: 32px;
-  color: #AAA;
-  padding: 5px 0;
-  width: 50px;
-  min-height: 100px;
-}
-
-.navbar-gitlab .navbar-inner .nav > li .btn-sign-in {
-  @extend .btn-new;
-  padding: 5px 15px;
-}
@@ -0,0 +1,23 @@
+.avatar {
+  float: left;
+  margin-right: 12px;
+  width: 40px;
+  padding: 1px;
+  @include border-radius(4px);
+
+  &.avatar-inline {
+    float: none;
+    margin-left: 3px;
+
+    &.s16 { margin-right: 2px; }
+    &.s24 { margin-right: 2px; }
+  }
+
+  &.s16 { width: 16px; height: 16px; margin-right: 6px; }
+  &.s24 { width: 24px; height: 24px; margin-right: 8px; }
+  &.s26 { width: 26px; height: 26px; margin-right: 8px; }
+  &.s32 { width: 32px; height: 32px; margin-right: 10px; }
+  &.s60 { width: 60px; height: 60px; margin-right: 12px; }
+  &.s90 { width: 90px; height: 90px; margin-right: 15px; }
+  &.s160 { width: 160px; height: 160px; margin-right: 20px; }
+}
@@ -0,0 +1,4 @@
+.light-well {
+  background: #f9f9f9;
+  padding: 15px;
+}
@@ -0,0 +1,169 @@
+.btn {
+  display: inline-block;
+  margin-bottom: 0;
+  font-weight: normal;
+  text-align: center;
+  vertical-align: middle;
+  cursor: pointer;
+  background-image: none;
+  border: 1px solid transparent;
+  white-space: nowrap;
+  padding: 6px 12px;
+  font-size: 13px;
+  line-height: 18px;
+  border-radius: 4px;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -o-user-select: none;
+  user-select: none;
+  color: #444444;
+  background-color: #fff;
+  border-color: #ccc;
+  text-shadow: none;
+
+  &.hover,
+  &:hover {
+    color: #444444;
+    text-decoration: none;
+    background-color: #ebebeb;
+    border-color: #adadad;
+  }
+
+  &.focus,
+  &:focus {
+    color: #444444;
+    text-decoration: none;
+    outline: thin dotted #333;
+    outline: 5px auto -webkit-focus-ring-color;
+    outline-offset: -2px;
+  }
+
+  &.active,
+  &:active {
+    outline: 0;
+    background-image: none;
+    -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+    box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+  }
+
+  &.disabled,
+  &[disabled] {
+    cursor: not-allowed;
+    pointer-events: none;
+    opacity: 0.65;
+    filter: alpha(opacity=65);
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+
+  &.btn-primary {
+    color: #ffffff;
+    background-color: #429bca;
+    border-color: #358ebd;
+
+    &.hover,
+    &:hover,
+    &.disabled,
+    &[disabled] {
+      color: #ffffff;
+      background-color: #3286b1;
+      border-color: #286e8e;
+    }
+  }
+
+  &.btn-success {
+    color: #ffffff;
+    background-color: #5cb85c;
+    border-color: #4cae4c;
+
+
+    &.hover,
+    &:hover,
+    &.disabled,
+    &[disabled] {
+      color: #ffffff;
+      background-color: #47a447;
+      border-color: #398439;
+    }
+  }
+
+  &.btn-danger {
+    color: #ffffff;
+    background-color: #d9534f;
+    border-color: #d43f3a;
+
+
+    &.hover,
+    &:hover,
+    &.disabled,
+    &[disabled] {
+      color: #ffffff;
+      background-color: #d2322d;
+      border-color: #ac2925;
+    }
+  }
+
+  &.btn-new {
+    @extend .btn-success;
+  }
+
+  &.btn-create {
+    @extend .wide;
+    @extend .btn-success;
+  }
+
+  &.btn-save {
+    @extend .wide;
+    @extend .btn-primary;
+  }
+
+  &.btn-close,
+  &.btn-remove {
+    @extend .btn-danger;
+  }
+
+  &.btn-cancel {
+    float: right;
+  }
+
+  &.wide {
+    padding-left: 20px;
+    padding-right: 20px;
+  }
+
+  &.btn-small {
+    padding: 2px 10px;
+    font-size: 12px;
+  }
+
+  &.btn-tiny {
+    font-size: 11px;
+    padding: 2px 6px;
+    line-height: 16px;
+    margin: 2px;
+  }
+}
+
+.btn-block {
+  width: 100%;
+  margin: 0;
+  margin-bottom: 15px;
+  &.btn {
+    padding: 6px 0;
+  }
+}
+
+.btn,
+.btn-group {
+  &.grouped {
+    margin-right: 7px;
+    float: left;
+    &:last-child {
+      margin-right: 0px;
+    }
+  }
+}
+
+.btn-group-small > .btn { @extend .btn.btn-small; }
+.btn-group-tiny > .btn { @extend .btn.btn-tiny; }
@@ -0,0 +1,495 @@
+/** COLORS **/
+.cgray { color: gray }
+.clgray { color: #BBB }
+.cred { color: #D12F19 }
+.cgreen { color: #4a2 }
+.cblue { color: #29A }
+.cblack { color: #111 }
+.cdark { color: #444 }
+.camber { color: #ffc000 }
+.cwhite { color: #fff!important }
+.bgred { background: #F2DEDE!important }
+
+/** COMMON CLASSES **/
+.left { float:left }
+
+.prepend-top-10 { margin-top:10px }
+.prepend-top-20 { margin-top:20px }
+.prepend-left-10 { margin-left:10px }
+.prepend-left-20 { margin-left:20px }
+.append-right-10 { margin-right:10px }
+.append-right-20 { margin-right:20px }
+.append-bottom-10 { margin-bottom:10px }
+.append-bottom-15 { margin-bottom:15px }
+.append-bottom-20 { margin-bottom:20px }
+.inline { display: inline-block }
+
+.padded { padding:20px }
+.ipadded { padding:20px!important }
+.lborder { border-left:1px solid #eee }
+.underlined_link { text-decoration: underline; }
+.hint { font-style: italic; color: #999; }
+.light { color: #888 }
+.tiny { font-weight: normal }
+.vtop { vertical-align: top !important; }
+
+
+/** ALERT MESSAGES **/
+.alert.alert-disabled {
+  background: #EEE;
+  color: #777;
+  border-color: #DDD;
+}
+
+/** HELPERS **/
+.nothing_here_message {
+  text-align: center;
+  padding: 20px;
+  color: #666;
+  font-weight: normal;
+  font-size: 16px;
+  line-height: 36px;
+}
+
+.slead {
+  color: #666;
+  font-size: 14px;
+  margin-bottom: 12px;
+  font-weight: normal;
+  line-height: 24px;
+}
+
+
+.tab-content {
+  overflow: visible;
+}
+
+@media (max-width: 1200px) {
+  .only-wide {
+    display: none;
+  }
+}
+
+pre.well-pre {
+  border: 1px solid #EEE;
+  background: #f9f9f9;
+  border-radius: 0;
+  color: #555;
+}
+
+.input-append .btn.active, .input-prepend .btn.active {
+  background: #CCC;
+  border-color: #BBB;
+  text-shadow: 0 1px 1px #fff;
+  font-weight: bold;
+  @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
+}
+
+/** Big Labels **/
+.state-label {
+  font-size: 14px;
+  padding: 6px 25px;
+  text-align: center;
+  @include border-radius(4px);
+  text-shadow: none;
+  margin-left: 10px;
+
+  &.state-label-green {
+    background: #4A4;
+    color: #FFF;
+  }
+
+  &.state-label-red {
+    background: #DA4E49;
+    color: #FFF;
+  }
+}
+
+.dropdown-menu > li > a {
+  text-shadow: none;
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus {
+  background: #29b;
+}
+
+.breadcrumb > li + li:before {
+  content: "/";
+  padding: 0;
+  color: #666;
+}
+
+.str-truncated {
+  display: inline-block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  vertical-align: top;
+  white-space: nowrap;
+  max-width: 82%;
+}
+
+/** FLASH message **/
+.flash-container {
+  display: none;
+  cursor: pointer;
+  margin: 0;
+  text-align: center;
+  color: #fff;
+  font-size: 14px;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  opacity: 0.8;
+  z-index: 100;
+
+  .flash-notice {
+    background: #49C;
+    padding: 10px;
+    text-shadow: 0 1px 1px #178;
+  }
+
+  .flash-alert {
+    background: #C67;
+    text-shadow: 0 1px 1px #945;
+    padding: 10px;
+  }
+}
+.author_link {
+  color: $link_color;
+}
+
+.help li { color:$style_color; }
+
+.back-link {
+  font-size: 14px;
+}
+
+table a code {
+  position: relative;
+  top: -2px;
+  margin-right: 3px;
+}
+
+.loading {
+  margin: 20px auto;
+  height: 40px;
+  color: #555;
+  font-size: 32px;
+  text-align: center;
+}
+
+span.update-author {
+  display: block;
+  color: #999;
+  font-weight: normal;
+  font-style: italic;
+  strong {
+    font-weight: bold;
+    font-style: normal;
+  }
+}
+
+.user-mention {
+  color: #2FA0BB;
+  font-weight: bold;
+}
+
+.field_with_errors {
+  display: inline;
+}
+
+.line_holder {
+  &:hover {
+    td {
+      background: #FFFFCF !important;
+    }
+  }
+}
+
+p.time {
+  color: #999;
+  font-size: 90%;
+  margin: 30px 3px 3px 2px;
+}
+
+.highlight {
+  text-shadow: none;
+}
+
+.highlight_word {
+  border-bottom: 2px solid #F90;
+}
+
+.thin_area{
+  height: 150px;
+}
+
+// Fixes alignment on notes.
+.new_note {
+  label {
+    text-align: left;
+  }
+}
+
+// Fix issue with notes & lists creating a bunch of bottom borders.
+li.note {
+  img { max-width:100% }
+  .note-title {
+    li {
+      border-bottom:none !important;
+    }
+  }
+}
+
+.markdown {
+  img {
+    max-width: 100%;
+  }
+}
+
+.wiki_content code, .readme code{
+  background-color: inherit;
+}
+
+.team_member_show {
+  td:first-child {
+    color: #aaa;
+  }
+}
+
+.rss-icon {
+  img {
+    width: 24px;
+    vertical-align: top;
+  }
+
+  strong {
+    line-height: 24px;
+  }
+}
+
+.supp_diff_link,
+.show-all-commits {
+  cursor: pointer;
+}
+
+.merge-request,
+.issue {
+  &.today{
+    background: #EFE;
+    border-color: #CEC;
+  }
+  &.closed {
+    background: #F5f5f5;
+    border-color: #E5E5E5;
+  }
+  &.merged {
+    background: #F5f5f5;
+    border-color: #E5E5E5;
+  }
+}
+
+.git_error_tips {
+  @extend .col-md-6;
+  text-align: left;
+  margin-top: 40px;
+  pre {
+    background: white;
+    border: none;
+    font-size: 12px;
+  }
+}
+
+.error-message {
+  padding: 10px;
+  background: #C67;
+  margin: 0;
+  color: #FFF;
+
+  a {
+    color: #fff;
+    text-decoration: underline;
+  }
+}
+
+.no-ssh-key-message {
+  padding: 10px 0;
+  background: #C67;
+  margin: 0;
+  color: #FFF;
+  margin-top: -1px;
+  text-align: center;
+
+  a {
+    color: #fff;
+    text-decoration: underline;
+  }
+
+  .links-xs {
+    text-align: center;
+    font-size: 16px;
+    padding: 5px;
+  }
+}
+
+.warning_message {
+  border-left: 4px solid #ed9;
+  color: #b90;
+  padding: 10px;
+  margin-bottom: 10px;
+  background: #ffffe6;
+  padding-left: 20px;
+
+  &.centered {
+    text-align: center;
+  }
+}
+
+.gitlab-promo {
+  a {
+    color: #aaa;
+    margin-right: 30px;
+  }
+}
+
+pre {
+  &.clean {
+    background: none;
+    border: none;
+    margin: 0;
+    padding: 0;
+  }
+}
+
+.milestone {
+  &.milestone-closed {
+    background: #eee;
+  }
+  .progress {
+    margin-bottom: 0;
+    margin-top: 4px;
+  }
+}
+
+h1.http_status_code {
+  font-size: 56px;
+  line-height: 100px;
+  font-weight: normal;
+  color: #456;
+}
+
+.control-group {
+  .controls {
+    span {
+      &.descr {
+        position: relative;
+        top: 2px;
+        left: 5px;
+        color: #666;
+      }
+    }
+  }
+}
+
+img.emoji {
+  height: 20px;
+  vertical-align: middle;
+  width: 20px;
+}
+
+.appear-data {
+  display: none;
+}
+
+.chart {
+  overflow: hidden;
+  height: 220px;
+}
+
+.navless-container {
+  margin-top: 20px;
+}
+
+.description-block {
+  @extend .light-well;
+  @extend .light;
+  margin-bottom: 10px;
+}
+
+table {
+  td.permission-x {
+    background: #D9EDF7 !important;
+    text-align: center;
+  }
+}
+
+.dashboard-intro-icon {
+  float: left;
+  font-size: 32px;
+  color: #AAA;
+  padding: 5px 0;
+  width: 50px;
+  min-height: 100px;
+}
+
+.broadcast-message {
+  padding: 10px;
+  text-align: center;
+  background: #555;
+  color: #BBB;
+}
+
+.broadcast-message-preview {
+  @extend .broadcast-message;
+  margin-bottom: 20px;
+}
+
+.ajax-users-select {
+  width: 400px;
+
+  &.input-large {
+    width: 210px;
+  }
+
+  &.input-clamp {
+    max-width: 100%;
+  }
+}
+
+.user-result {
+  .user-image {
+    float: left;
+  }
+  .user-name {
+  }
+  .user-username {
+    color: #999;
+  }
+}
+
+.namespace-result {
+  .namespace-kind {
+    color: #AAA;
+    font-weight: normal;
+  }
+  .namespace-path {
+    margin-left: 10px;
+    font-weight: bolder;
+  }
+}
+
+.btn-sign-in {
+  margin-top: 7px;
+  text-shadow: none;
+}
+
+.side-filters {
+  fieldset {
+    margin-bottom: 15px;
+  }
+}
+
+@media (max-width: $screen-xs-max) {
+  .container .content { margin-top: 20px; }
+}
@@ -0,0 +1,149 @@
+/**
+ * File content holder
+ *
+ */
+.file-holder {
+  border: 1px solid #CCC;
+  margin-bottom: 1em;
+
+  table {
+    @extend .table;
+  }
+
+  .file-title {
+    background: #DDD;
+    border-bottom: 1px solid #CCC;
+    text-shadow: 0 1px 1px #fff;
+    margin: 0;
+    font-weight: normal;
+    font-weight: bold;
+    text-align: left;
+    color: $style_color;
+    padding: 9px 10px;
+
+    .options {
+      float: right;
+      margin-top: -5px;
+    }
+
+    .file_name {
+      color: $style_color;
+      font-size: 14px;
+      text-shadow: 0 1px 1px #fff;
+      small {
+        color: #999;
+        font-size: 13px;
+      }
+    }
+  }
+  .file-content {
+    background: #fff;
+    font-size: 11px;
+
+    &.image_file {
+      background: #eee;
+      text-align: center;
+      img {
+        padding: 100px;
+        max-width: 50%;
+      }
+    }
+
+    &.wiki {
+      padding: 20px;
+      font-size: 14px;
+      line-height: 1.6;
+
+      .highlight {
+        margin-bottom: 9px;
+        @include border-radius(4px);
+
+        > pre {
+          margin: 0;
+        }
+      }
+    }
+
+    &.blob_file {
+
+    }
+
+    &.blob-no-preview {
+      background: #eee;
+      text-shadow: 0 1px 2px #FFF;
+      padding: 100px 0;
+    }
+
+    /**
+     *  Blame file
+     */
+    &.blame {
+      table {
+        border: none;
+        box-shadow: none;
+        margin: 0;
+      }
+      tr {
+        border-bottom: 1px solid #eee;
+      }
+      td {
+        &:first-child {
+          border-left: none;
+        }
+        &:last-child {
+          border-right: none;
+        }
+        background: #fff;
+        padding: 5px;
+      }
+      .author,
+      .blame_commit {
+        background: #f5f5f5;
+        vertical-align: top;
+      }
+      .lines {
+        pre {
+          padding: 0;
+          margin: 0;
+          background: none;
+          border: none;
+        }
+      }
+    }
+
+    &.logs {
+      background: #eee;
+      max-height: 700px;
+      overflow-y: auto;
+
+      ol {
+        margin-left: 40px;
+        padding: 10px 0;
+        border-left: 1px solid #CCC;
+        margin-bottom: 0;
+        background: white;
+        li {
+          color: #888;
+          p {
+            margin: 0;
+            color: #333;
+            line-height: 24px;
+            padding-left: 10px;
+          }
+
+          &:hover {
+            background: $hover;
+          }
+        }
+      }
+    }
+
+    /**
+     *  Code file
+     */
+    &.code {
+      padding: 0;
+    }
+  }
+}
+
@@ -0,0 +1,53 @@
+input[type='search'].search-text-input {
+  background-image: url("icon-search.png");
+  background-repeat: no-repeat;
+  background-position: 10px;
+  padding-left: 25px;
+}
+
+input[type='text'].danger {
+  background: #F2DEDE!important;
+  border-color: #D66;
+  text-shadow: 0 1px 1px #fff
+}
+
+fieldset legend {
+  font-size: 16px;
+}
+
+.datetime-controls {
+  select {
+    width: 100px;
+  }
+}
+
+.form-actions {
+  padding: 17px 20px 18px;
+  margin-top: 18px;
+  margin-bottom: 18px;
+  background-color: whitesmoke;
+  border-top: 1px solid #e5e5e5;
+  padding-left: 17%;
+}
+
+label {
+  &.control-label {
+    @extend .col-sm-2;
+  }
+
+  &.inline-label {
+    margin: 0;
+  }
+}
+
+.inline-input-group {
+  width: 250px;
+}
+
+.input-mx-250 {
+  max-width: 250px;
+}
+
+.input-mn-300 {
+  min-width: 300px;
+}
@@ -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;
+    }
+  }
+}
@@ -0,0 +1,44 @@
+/**
+ * Issue box:
+ * Huge block (one per page) for storing title, descripion and other information.
+ * Used for Issue#show page, MergeRequest#show page etc
+ *
+ * CLasses:
+ *   .issue-box - Regular box
+ */
+
+.issue-box {
+  color: #666;
+  margin:20px 0;
+  background: #FAFAFA;
+  border: 1px solid #EEE;
+
+  .control-group {
+    margin-bottom: 0;
+  }
+
+  .title {
+    font-size: 20px;
+    font-weight: 500;
+    line-height: 28px;
+    margin: 0;
+    color: #444;
+  }
+
+  .context {
+    border: none;
+    border-top: 1px solid #eee;
+  }
+
+  .description {
+    border-top: 1px solid #eee;
+  }
+
+  .title, .context, .description {
+    padding: 15px;
+
+    .clearfix {
+      margin: 0;
+    }
+  }
+}
@@ -0,0 +1,103 @@
+/**
+ * Well styled list
+ *
+ */
+.well-list {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+
+  li {
+    padding: 10px;
+    min-height: 20px;
+    border-bottom: 1px solid #eee;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+
+    &.disabled {
+      color: #888;
+    }
+
+    &.unstyled {
+      &:hover {
+        background: none;
+      }
+    }
+
+    &.warning-row {
+      background-color: #fcf8e3;
+      border-color: #faebcc;
+      color: #8a6d3b;
+    }
+
+    &.smoke { background-color: #f5f5f5; }
+
+    &:hover {
+      background: $hover;
+      border-bottom: 1px solid #ADF;
+    }
+
+    &:last-child {
+      border-bottom: none;
+
+      &.bottom {
+        background: #f5f5f5;
+      }
+    }
+
+    .author { color: #999; }
+
+    p {
+      padding-top: 1px;
+      margin: 0;
+      color: #222;
+      img {
+        position: relative;
+        top: 3px;
+      }
+    }
+
+    .well-title {
+      font-size: 14px;
+      line-height: 18px;
+    }
+  }
+}
+
+ol, ul {
+  &.styled {
+    li {
+      padding: 2px;
+    }
+  }
+}
+
+/** light list with border-bottom between li **/
+ul.bordered-list {
+  margin: 5px 0px;
+  padding: 0px;
+  li {
+    padding: 5px 0;
+    border-bottom: 1px solid #EEE;
+    overflow: hidden;
+    display: block;
+    margin: 0px;
+    &:last-child { border:none }
+    &.active {
+      background: #f9f9f9;
+      a { font-weight: bold; }
+    }
+
+    &.light {
+      a { color: #777; }
+    }
+  }
+
+  &.top-list {
+    li:first-child {
+      padding-top: 0;
+      h4, h5 {
+        margin-top: 0;
+      }
+    }
+  }
+}
@@ -0,0 +1,80 @@
+/** Select2 selectbox style override **/
+
+.select2-container, .select2-container.select2-drop-above {
+  .select2-choice {
+    background: #FFF;
+    border-color: #BBB;
+
+    .select2-arrow {
+      background: #FFF;
+    }
+  }
+}
+
+.select2-drop-active {
+  border: 1px solid #BBB;
+  margin-top: 4px;
+
+  .select2-search input {
+    background: #fafafa;
+    border-color: #DDD;
+  }
+
+  .select2-results {
+    max-height: 350px;
+    .select2-highlighted {
+      background: $bg_style_color;
+    }
+  }
+}
+
+select {
+  &.select2 {
+    width: 100px;
+  }
+
+  &.select2-sm {
+    width: 100px;
+  }
+}
+
+@media (min-width: $screen-sm-min) {
+  select {
+    &.select2 {
+      width: 150px;
+    }
+    &.select2-sm {
+      width: 120px;
+    }
+  }
+}
+
+/* Medium devices (desktops, 992px and up) */
+@media (min-width: $screen-md-min) {
+  select {
+    &.select2 {
+      width: 170px;
+    }
+    &.select2-sm {
+      width: 140px;
+    }
+  }
+}
+
+/* Large devices (large desktops, 1200px and up) */
+@media (min-width: $screen-lg-min) {
+  select {
+    &.select2 {
+      width: 200px;
+    }
+    &.select2-sm {
+      width: 150px;
+    }
+  }
+}
+
+
+/** Branch/tag selector **/
+.project-refs-form .select2-container {
+  margin-right: 10px;
+}
@@ -0,0 +1,101 @@
+/**
+ * Headers
+ *
+ */
+h1.page-title {
+  @include page-title;
+  font-size: 28px;
+}
+
+h2.page-title {
+  @include page-title;
+  font-size: 24px;
+}
+
+h3.page-title {
+  @include page-title;
+}
+
+h6 {
+  color: #888;
+  text-transform: uppercase;
+}
+
+/** CODE **/
+pre {
+  font-family: $monospace_font;
+
+  &.dark {
+    background: #333;
+    color: #f5f5f5;
+  }
+}
+
+/**
+ * Links
+ *
+ */
+a {
+  outline: none;
+  color: $link_color;
+  &:hover {
+    text-decoration: none;
+    color: $primary_color;
+  }
+
+  &:focus {
+    text-decoration: underline;
+  }
+
+  &.dark {
+    color: $style_color;
+  }
+
+  &.lined {
+    text-decoration: underline;
+    &:hover { text-decoration: underline; }
+  }
+
+  &.gray {
+    color: gray;
+  }
+
+  &.supp_diff_link {
+    text-align: center;
+    padding: 20px 0;
+    background: #f1f1f1;
+    width: 100%;
+    float: left;
+  }
+
+  &.neib  {
+    margin-right: 15px;
+  }
+}
+
+a:focus {
+  outline: none;
+}
+
+.monospace {
+  font-family: $monospace_font;
+}
+
+/**
+ * Wiki typography
+ *
+ */
+.wiki {
+  @include md-typography;
+
+  font-size: 14px;
+  line-height: 1.6;
+  ul {
+    padding: 0;
+    margin: 0 0 9px 25px !important;
+  }
+}
+
+.md {
+  @include md-typography;
+}
@@ -0,0 +1,173 @@
+/**
+ * UI box:
+ * Block element for separating information on page.
+ * Used for storing issues lists, grouped data.
+ * You can have multiple ui boxes on one page
+ *
+ * Classes:
+ *   .ui-box   - for any block & widgets
+ *   .ui-box.ui-box-small - same but with smaller title
+ *   .ui-box.ui-box-danger - with red title
+ *
+ * Ex. 1: List
+ *   .ui-box
+ *     .title
+ *       # title here
+ *     %ul
+ *       # content here
+ *
+ * Ex. 2: Block data
+ *   .ui-box
+ *     .title
+ *       # title here
+ *     .body
+ *       # content here
+ *
+ */
+
+.ui-box {
+  background: #FFF;
+  margin-bottom: 20px;
+  border: 1px solid #DDD;
+  word-wrap: break-word;
+
+  img {
+    max-width: 100%;
+  }
+
+  pre {
+    code {
+      background: none !important;
+    }
+  }
+
+  ul {
+    margin: 0;
+    padding: 0;
+  }
+
+  .title {
+    background-color: #EEE;
+    border-bottom: 1px solid #DDD;
+    color: #666;
+    font-size: 16px;
+    text-shadow: 0 1px 1px #fff;
+    padding: 0 10px;
+    font-size: 14px;
+    line-height: 40px;
+    font-weight: normal;
+    margin: 0;
+
+    > a {
+      text-shadow: 0 1px 1px #fff;
+    }
+
+    form {
+      margin-bottom: 0;
+      margin-top: 0;
+    }
+
+    .btn {
+      vertical-align: middle;
+      padding: 4px 12px;
+      @include box-shadow(0 0px 1px 1px #f2f2f2);
+    }
+
+    .nav-pills {
+      > li {
+        > a {
+          padding: 13px;
+          margin: 0;
+          font-size: 13px;
+        }
+        &.active {
+          > a {
+            background: #D5D5D5;
+            color: $style_color;
+            @include border-radius(0);
+            border-radius: 0;
+            border-left: 1px solid #CCC;
+            border-right: 1px solid #CCC;
+          }
+        }
+      }
+    }
+  }
+
+  .body {
+    padding: 10px;
+  }
+
+  &.padded {
+    h5, .title {
+      margin: -20px;
+      margin-bottom: 0;
+      padding: 5px 20px;
+    }
+  }
+
+  .row_title {
+    font-weight: 500;
+    color: #444;
+    &:hover {
+      color: #444;
+      text-decoration: underline;
+    }
+  }
+
+  .form-holder {
+    padding-top: 20px;
+    form {
+      margin-bottom: 0;
+      legend {
+        text-indent: 10px;
+      }
+      .form-actions {
+        margin-bottom: 0;
+      }
+    }
+  }
+}
+
+/*
+ * Small box
+ */
+.ui-box.ui-box-small {
+  margin-bottom: 10px;
+
+  .title {
+    font-size: 13px;
+    line-height: 30px;
+
+    a {
+      color: #666;
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+  }
+}
+
+/*
+ * Danger box
+ */
+.ui-box.ui-box-danger {
+  background: #f7f7f7;
+  border: none;
+
+  .title {
+    background: #D65;
+    color: #fff;
+    text-shadow: none;
+    font-weight: 500;
+  }
+}
+
+/*
+ * Block under tw-bootstrap tabs
+ */
+.tab-pane {
+  .ui-box {
+    margin: 3px 3px 25px 3px;
+  }
+}
@@ -1,66 +0,0 @@
-/** Override bootstrap variables **/
-$baseFontSize: 13px !default;
-$baseLineHeight: 18px !default;
-
-/**
- * BOOTSTRAP
- */
-@import "bootstrap/variables";
-@import "bootstrap/mixins";
-@import "bootstrap/reset";
-@import "bootstrap/scaffolding";
-@import "bootstrap/grid";
-@import "bootstrap/layouts";
-@import "bootstrap/type";
-@import "bootstrap/code";
-@import "bootstrap/forms";
-@import "bootstrap/tables";
-@import "bootstrap/sprites";
-@import "bootstrap/dropdowns";
-@import "bootstrap/wells";
-@import "bootstrap/component-animations";
-@import "bootstrap/close";
-@import "bootstrap/button-groups";
-@import "bootstrap/alerts";
-@import "bootstrap/navs";
-@import "bootstrap/navbar";
-@import "bootstrap/breadcrumbs";
-@import "bootstrap/pagination";
-@import "bootstrap/pager";
-@import "bootstrap/modals";
-@import "bootstrap/tooltip";
-@import "bootstrap/popovers";
-@import "bootstrap/thumbnails";
-@import "bootstrap/media";
-@import "bootstrap/labels-badges";
-@import "bootstrap/progress-bars";
-@import "bootstrap/accordion";
-@import "bootstrap/carousel";
-@import "bootstrap/hero-unit";
-@import "bootstrap/utilities";
-@import "bootstrap/responsive-utilities";
-@import "bootstrap/responsive-1200px-min";
-
-/**
- * Font icons
- *
- */
-@import "font-awesome";
-
-/**
- * GitLab bootstrap.
- * Overrides some styles of twitter bootstrap.
- * Also give some common classes for GitLab app
- */
-@import "gitlab_bootstrap/variables.scss";
-@import "gitlab_bootstrap/fonts.scss";
-@import "gitlab_bootstrap/mixins.scss";
-@import "gitlab_bootstrap/avatar.scss";
-@import "gitlab_bootstrap/nav.scss";
-@import "gitlab_bootstrap/common.scss";
-@import "gitlab_bootstrap/typography.scss";
-@import "gitlab_bootstrap/buttons.scss";
-@import "gitlab_bootstrap/blocks.scss";
-@import "gitlab_bootstrap/files.scss";
-@import "gitlab_bootstrap/lists.scss";
-@import "gitlab_bootstrap/forms.scss";
@@ -1,22 +0,0 @@
-.avatar {
-  float: left;
-  margin-right: 12px;
-  width: 40px;
-  border: 1px solid #ddd;
-  padding: 1px;
-
-  &.avatar-inline {
-    float: none;
-    margin-left: 3px;
-
-    &.s16 { margin-right: 2px; }
-    &.s24 { margin-right: 2px; }
-  }
-
-  &.s16 { width: 16px; height: 16px; margin-right: 6px; }
-  &.s24 { width: 24px; height: 24px; margin-right: 8px; }
-  &.s26 { width: 26px; height: 26px; margin-right: 8px; }
-  &.s32 { width: 32px; height: 32px; margin-right: 10px; }
-  &.s60 { width: 60px; height: 60px; margin-right: 12px; }
-  &.s90 { width: 90px; height: 90px; margin-right: 15px; }
-}
@@ -1,186 +0,0 @@
-/**
- * ===================================
- * Contain UI block elements:
- *   .ui-box   - for any block & widgets
- * ===================================
- */
-
-/**
- * UI Block
- *
- */
-.ui-box {
-  background: #FFF;
-  margin-bottom: 20px;
-  border: 1px solid #CCC;
-  word-wrap: break-word;
-
-  &.small-box {
-    margin-bottom: 10px;
-
-    .title {
-      font-size: 13px;
-      line-height: 30px;
-
-      a {
-        color: #666;
-        &:hover {
-          text-decoration: underline;
-        }
-      }
-    }
-  }
-
-  &.ui-box-show {
-    margin:20px 0;
-    background: #FFF;
-
-    .control-group {
-      margin-bottom: 0;
-    }
-  }
-
-  &.ui-box-danger {
-    .title {
-      @include linear-gradient(#F26E5E, #bd362f);
-      color: #fff;
-      text-shadow: 0 1px 1px #900;
-      font-weight: bold;
-    }
-  }
-
-  img { max-width: 100%; }
-
-  pre {
-    code {
-      background: none !important;
-    }
-  }
-
-  .ui-box-head,
-  .ui-box-body,
-  .ui-box-bottom {
-    padding: 15px;
-
-    .clearfix {
-      margin: 0;
-    }
-  }
-
-  .ui-box-head {
-    .box-title {
-      color: $style_color;
-      font-size: 18px;
-      font-weight: normal;
-      line-height: 28px;
-      margin: 0;
-    }
-    h3 {
-      margin: 0;
-    }
-  }
-
-  .ui-box-body {
-    border: none;
-    background-color: #f5f5f5;
-    border: none;
-    border-top: 1px solid #eee;
-  }
-
-  .ui-box-bottom {
-    border-top: 1px solid #eee;
-  }
-
-  ul {
-    margin: 0;
-  }
-
-  .title {
-    @include bg-gray-gradient;
-    border-bottom: 1px solid #CCC;
-    color: #456;
-    font-size: 16px;
-    text-shadow: 0 1px 1px #fff;
-    padding: 0 10px;
-    font-size: 14px;
-    line-height: 40px;
-    font-weight: normal;
-    margin: 0;
-
-    > a {
-      text-shadow: 0 1px 1px #fff;
-    }
-
-    form {
-      margin-bottom: 0;
-      margin-top: 0;
-    }
-
-    .btn {
-      vertical-align: middle;
-      padding: 4px 12px;
-      @include box-shadow(0 0px 1px 1px #f2f2f2);
-    }
-
-    .nav-pills {
-      > li {
-        > a {
-          padding: 13px;
-          margin: 0;
-          font-size: 13px;
-        }
-        &.active {
-          > a {
-            background: #D5D5D5;
-            color: $style_color;
-            @include border-radius(0);
-            border-radius: 0;
-            border-left: 1px solid #CCC;
-            border-right: 1px solid #CCC;
-          }
-        }
-      }
-    }
-  }
-
-  &.padded {
-    h5, .title {
-      margin: -20px;
-      margin-bottom: 0;
-      padding: 5px 20px;
-    }
-  }
-
-  .row_title {
-    font-weight: bold;
-    color: #444;
-    &:hover {
-      color: #444;
-      text-decoration: underline;
-    }
-  }
-
-  .form-holder {
-    padding-top: 20px;
-    form {
-      margin-bottom: 0;
-      legend {
-        text-indent: 10px;
-      }
-      .form-actions {
-        margin-bottom: 0;
-      }
-    }
-  }
-}
-
-.tab-pane {
-  .ui-box {
-    margin: 3px 3px 25px 3px;
-  }
-}
-
-.light-well {
-  background: #f9f9f9;
-  padding: 15px;
-}
@@ -1,141 +0,0 @@
-.btn {
-  display: inline-block;
-  padding: 6px 12px;
-  margin-bottom: 0;
-  font-size: 13px;
-  line-height: $baseLineHeight;
-  text-align: center;
-  vertical-align: middle;
-  cursor: pointer;
-  border: 1px solid #BBB;
-  color: $style_color;
-  @include border-radius($baseBorderRadius);
-  @include box-shadow(inset 0 1px 0 rgba(255,255,255,.2));
-  @include linear-gradient(#f1f1f1, #e1e1e1);
-  text-shadow: 0 1px 1px #FFF;
-  text-decoration: none;
-
-  &.hover,
-  &:hover {
-    color: $style_color;
-    background: #f1f1f1;
-    border-color: #AAA;
-    text-decoration: none;
-    @include linear-gradient(#fAfAfA, #f1f1f1);
-  }
-
-  &.focus,
-  &:focus {
-    text-decoration: none;
-    @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
-  }
-
-  &.active,
-  &:active {
-    background-image: none;
-    outline: 0;
-    text-decoration: none;
-    @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
-  }
-
-  &.disabled,
-  &[disabled] {
-    cursor: default;
-    background-image: none;
-    @include opacity(65);
-    @include box-shadow(none);
-  }
-
-  &.btn-primary {
-    color: #FFF;
-    border-color: #189;
-    text-shadow: 0 1px 1px #189;
-    @include linear-gradient(#4AC, #289);
-
-    &.hover,
-    &:hover,
-    &.disabled,
-    &[disabled] {
-      color: #FFF;
-      background: #389;
-    }
-  }
-
-  &.btn-success {
-    color: #FFF;
-    border-color: #1A1;
-    text-shadow: 0 1px 1px #FFF;
-    text-shadow: 0 1px 1px #181;
-    @include linear-gradient(#62C452, #51a351);
-
-
-    &.hover,
-    &:hover,
-    &.disabled,
-    &[disabled] {
-      color: #FFF;
-      background: #2A2;
-    }
-  }
-
-  &.btn-danger {
-    color: #FFF;
-    text-shadow: 0 1px 1px #811;
-    border-color: #BD362F;
-    @include linear-gradient(#EE5F5B, #BD362F);
-
-
-    &.hover,
-    &:hover,
-    &.disabled,
-    &[disabled] {
-      color: #FFF;
-      background: #A22;
-    }
-  }
-
-  &.btn-new {
-    @extend .btn-success;
-  }
-
-  &.btn-create {
-    @extend .wide;
-    @extend .btn-success;
-  }
-
-  &.btn-save {
-    @extend .wide;
-    @extend .btn-primary;
-  }
-
-  &.btn-close,
-  &.btn-remove {
-    @extend .btn-danger;
-  }
-
-  &.btn-cancel {
-    float: right;
-  }
-
-  &.wide {
-    padding-left: 20px;
-    padding-right: 20px;
-  }
-
-  &.btn-small {
-    padding: 2px 10px;
-    font-size: 12px;
-  }
-
-  &.btn-tiny {
-    font-size: 11px;
-    padding: 2px 6px;
-    line-height: 16px;
-    margin: 2px;
-  }
-
-  &.grouped {
-    margin-right: 7px;
-    float: left;
-  }
-}
@@ -1,89 +0,0 @@
-/** COLORS **/
-.cgray { color: gray }
-.cred { color: #D12F19 }
-.cgreen { color: #4a2 }
-.cblue { color: #29A }
-.cblack { color: #111 }
-.cdark { color: #444 }
-.cwhite { color: #fff!important }
-.bgred { background: #F2DEDE!important }
-
-/** COMMON CLASSES **/
-.left { float:left }
-
-.prepend-top-10 { margin-top:10px }
-.prepend-top-20 { margin-top:20px }
-.prepend-left-10 { margin-left:10px }
-.prepend-left-20 { margin-left:20px }
-.append-right-10 { margin-right:10px }
-.append-right-20 { margin-right:20px }
-.append-bottom-10 { margin-bottom:10px }
-.append-bottom-20 { margin-bottom:20px }
-.inline { display: inline-block }
-
-.padded { padding:20px }
-.ipadded { padding:20px!important }
-.lborder { border-left:1px solid #eee }
-.underlined_link { text-decoration: underline; }
-.hint { font-style: italic; color: #999; }
-.light { color: #888 }
-.tiny { font-weight: normal }
-.vtop { vertical-align: top !important; }
-
-
-/** ALERT MESSAGES **/
-.alert.alert-disabled {
-  background: #EEE;
-  color: #777;
-  border-color: #DDD;
-}
-
-/** HELPERS **/
-.nothing_here_message {
-  text-align: center;
-  padding: 20px;
-  color: #666;
-  font-weight: normal;
-  font-size: 16px;
-  line-height: 36px;
-}
-
-.slead {
-  color: #666;
-  font-size: 14px;
-  margin-bottom: 12px;
-  font-weight: normal;
-  line-height: 24px;
-}
-
-
-.tab-content {
-  overflow: visible;
-}
-
-@media (max-width: 1200px) {
-  .only-wide {
-    display: none;
-  }
-}
-
-.pagination ul > li > a, .pagination ul > li >span {
-  @include linear-gradient(#f1f1f1, #e1e1e1);
-  color: #333;
-  text-shadow: 0 1px 1px #FFF;
-}
-
-pre.well-pre {
-  border: 1px solid #EEE;
-  background: #f9f9f9;
-  border-radius: 0;
-  color: #555;
-}
-
-.input-append .btn.active, .input-prepend .btn.active {
-  background: #CCC;
-  border-color: #BBB;
-  text-shadow: 0 1px 1px #fff;
-  font-weight: bold;
-  @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
-}
@@ -1,213 +0,0 @@
-/**
- * File content holder
- *
- */
-.file-holder {
-  border: 1px solid #CCC;
-  margin-bottom: 1em;
-
-  table {
-    @extend .table;
-  }
-
-  .file-title {
-    border-bottom: 1px solid #bbb;
-    @include bg-dark-gray-gradient;
-    text-shadow: 0 1px 1px #fff;
-    margin: 0;
-    font-weight: normal;
-    font-weight: bold;
-    text-align: left;
-    color: $style_color;
-    padding: 9px 10px;
-    height: 18px;
-
-    .options {
-      float: right;
-      margin-top: -5px;
-    }
-
-    .file_name {
-      color: $style_color;
-      font-size: 14px;
-      text-shadow: 0 1px 1px #fff;
-      small {
-        color: #999;
-        font-size: 13px;
-      }
-    }
-  }
-  .file-content {
-    background: #fff;
-    font-size: 11px;
-
-    &.image_file {
-      background: #eee;
-      text-align: center;
-      img {
-        padding: 100px;
-        max-width: 300px;
-      }
-    }
-
-    &.wiki {
-      padding: 20px;
-      font-size: 14px;
-      line-height: 1.6;
-
-      .highlight {
-        margin-bottom: 9px;
-        @include border-radius(4px);
-
-        > pre {
-          margin: 0;
-        }
-      }
-    }
-
-    &.blob_file {
-
-    }
-
-    /**
-     *  Blame file
-     */
-    &.blame {
-      table {
-        border: none;
-        box-shadow: none;
-        margin: 0;
-      }
-      tr {
-        border-bottom: 1px solid #eee;
-      }
-      td {
-        &:first-child {
-          border-left: none;
-        }
-        &:last-child {
-          border-right: none;
-        }
-        background: #fff;
-        padding: 5px;
-      }
-      .author,
-      .blame_commit {
-        background: #f5f5f5;
-        vertical-align: top;
-      }
-      .lines {
-        pre {
-          padding: 0;
-          margin: 0;
-          background: none;
-          border: none;
-        }
-      }
-    }
-
-    &.logs {
-      background: #eee;
-      max-height: 700px;
-      overflow-y: auto;
-
-      ol {
-        margin-left: 40px;
-        padding: 10px 0;
-        border-left: 1px solid #CCC;
-        margin-bottom: 0;
-        background: white;
-        li {
-          color: #888;
-          p {
-            margin: 0;
-            color: #333;
-            line-height: 24px;
-            padding-left: 10px;
-          }
-
-          &:hover {
-            background: $hover;
-          }
-        }
-      }
-    }
-
-    /**
-     *  Code file
-     */
-    &.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;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
@@ -1,2 +0,0 @@
-/** Typo **/
-$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace;
@@ -1,51 +0,0 @@
-form {
-  @extend .form-horizontal;
-
-  label {
-    @extend .control-label;
-  }
-}
-
-input.input-xpadding,
-.add-on.input-xpadding {
-  padding: 6px 10px;
-}
-
-.control-group {
-  .control-label {
-    padding-top: 6px;
-  }
-  .controls {
-    input, textarea {
-      padding: 6px 10px;
-    }
-
-    input[type="radio"], input[type="checkbox"] {
-      margin-top: 6px;
-    }
-
-    .add-on {
-      padding: 6px;
-    }
-  }
-}
-
-input[type='search'].search-text-input {
-  background-image: url("icon-search.png");
-  background-repeat: no-repeat;
-  background-position: 10px;
-  padding-left: 25px;
-  @include border-radius(4px);
-  border: 1px solid #ccc;
-}
-
-input[type='text'].danger {
-  background: #F2DEDE!important;
-  border-color: #D66;
-  text-shadow: 0 1px 1px #fff
-}
-
-fieldset legend {
-  font-size: 16px;
-  margin-bottom: 10px;
-}
@@ -1,95 +0,0 @@
-/**
- * Well styled list
- *
- */
-.well-list {
-  margin: 0;
-  list-style: none;
-  li {
-    padding: 10px;
-    min-height: 20px;
-    border-bottom: 1px solid #eee;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.05);
-
-    &.disabled {
-      color: #888;
-    }
-
-    &.unstyled {
-      &:hover {
-        background: none;
-      }
-    }
-
-    &.smoke { background-color: #f5f5f5; }
-
-    &:hover {
-      background: $hover;
-      border-bottom: 1px solid #ADF;
-    }
-
-    &:last-child {
-      border-bottom: none;
-
-      &.bottom {
-        background: #f5f5f5;
-      }
-    }
-
-    .author { color: #999; }
-
-    p {
-      padding-top: 1px;
-      margin: 0;
-      color: #222;
-      img {
-        position: relative;
-        top: 3px;
-      }
-    }
-
-    .well-title {
-      font-size: 14px;
-      line-height: 18px;
-    }
-  }
-}
-
-ol, ul {
-  &.styled {
-    li {
-      padding: 2px;
-    }
-  }
-}
-
-/** light list with border-bottom between li **/
-ul.bordered-list {
-  margin: 5px 0px;
-  padding: 0px;
-  li {
-    padding: 5px 0;
-    border-bottom: 1px solid #EEE;
-    overflow: hidden;
-    display: block;
-    margin: 0px;
-    &:last-child { border:none }
-    &.active {
-      background: #f9f9f9;
-      a { font-weight: bold; }
-    }
-
-    &.light {
-      a { color: #777; }
-    }
-  }
-
-  &.top-list {
-    li:first-child {
-      padding-top: 0;
-      h4, h5 {
-        margin-top: 0;
-      }
-    }
-  }
-}
@@ -1,114 +0,0 @@
-/**
- * Generic mixins
- */
- @mixin box-shadow($shadow) {
-  -webkit-box-shadow: $shadow;
-  -moz-box-shadow: $shadow;
-  -ms-box-shadow: $shadow;
-  -o-box-shadow: $shadow;
-  box-shadow: $shadow;
-}
-
-@mixin border-radius($radius) {
-  -webkit-border-radius: $radius;
-  -moz-border-radius: $radius;
-  -ms-border-radius: $radius;
-  -o-border-radius: $radius;
-  border-radius: $radius;
-}
-
-@mixin border-radius-left($radius) {
-  @include border-radius($radius 0 0 $radius)
-}
-
-@mixin linear-gradient($from, $to) {
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
-  background-image: -webkit-linear-gradient($from, $to);
-  background-image: -moz-linear-gradient($from, $to);
-  background-image: -o-linear-gradient($from, $to);
-}
-
-@mixin transition($transition) {
-  -webkit-transition: $transition;
-  -moz-transition: $transition;
-  -ms-transition: $transition;
-  -o-transition: $transition;
-  transition: $transition;
-}
-
-/**
- * Prefilled mixins
- * Mixins with fixed values
- */
-@mixin bg-light-gray-gradient {
-  background: #f1f1f1;
-  background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));
-  background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
-  background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
-  background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
-}
-
-@mixin bg-gray-gradient {
-  background: #eee;
-  background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
-  background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
-  background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
-  background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
-}
-
-@mixin bg-dark-gray-gradient {
-  background: #eee;
-  background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
-  background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
-  background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
-}
-
-@mixin shade {
-  @include box-shadow(0 0 3px #ddd);
-}
-
-@mixin solid-shade {
-  @include box-shadow(0 0 0 3px #f1f1f1);
-}
-
-@mixin header-font {
-  color: $style_color;
-  text-shadow: 0 1px 1px #FFF;
-  font-size: 16px;
-  line-height: 40px;
-  font-weight: normal;
-}
-
-@mixin md-typography {
-  *:first-child {
-    margin-top: 0;
-  }
-
-  code { padding: 0 4px; }
-  h1 { margin-top: 30px;}
-  h2 { margin-top: 25px;}
-  h3 { margin-top: 20px;}
-  h4 { margin-top: 15px;}
-
-  blockquote p {
-    color: #888;
-    font-size: 14px;
-    line-height: 1.5;
-  }
-
-  table {
-    @extend .table;
-    @extend .table-bordered;
-    th {
-      background: #EEE;
-    }
-  }
-}
-
-@mixin page-title {
-  color: $style_color;
-  font-size: 20px;
-  line-height: 1.5;
-  margin-top: 0px;
-  margin-bottom: 15px;
-}
@@ -1,92 +0,0 @@
-/**
- * nav-pills
- *
- */
-.nav-pills {
-  .active a {
-    background: $primary_color;
-  }
-
-  > li > a {
-    @include border-radius(0);
-  }
-
-  &.nav-stacked {
-    > li > a {
-      border-left: 4px solid #EEE;
-      padding: 12px;
-    }
-    > .active > a {
-      border-color: $primary_color;
-      border-radius: 0;
-      background: #F1F1F1;
-      color: $style_color;
-      font-weight: bold;
-      text-shadow: 0 1px 1px #fff;
-    }
-
-    &.nav-stacked-menu {
-      background: #FAFAFA;
-      li > a {
-        padding: 16px;
-      }
-    }
-  }
-
-  &.nav-pills-small {
-    > li > a {
-      padding: 8px 12px;
-    }
-  }
-}
-
-.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
-
-
-
-/**
- * nav-tabs
- *
- */
-.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
-.nav.nav-tabs {
-  li {
-    > a {
-      padding: 8px 20px;
-      margin-right: 7px;
-      line-height: 20px;
-      border-color: #EEE;
-      color: #888;
-      border-bottom: 1px solid #ddd;
-      .badge {
-        background-color: #eee;
-        color: #888;
-        text-shadow: 0 1px 1px #fff;
-      }
-      i[class^="icon-"] {
-        line-height: 14px;
-      }
-    }
-    &.active {
-      > a {
-        border-color: #CCC;
-        border-bottom: 1px solid #fff;
-        color: #333;
-        font-weight: bold;
-      }
-    }
-  }
-
-  &.nav-small-tabs > li > a { padding: 6px 9px; }
-}
-
-
-
-/**
- * fix to keep tooltips position in top navigation bar
- *
- */
-.navbar .nav > li {
-  position: relative;
-  white-space: nowrap;
-}
@@ -1,108 +0,0 @@
-/**
- * Headers
- *
- */
-h1, h2, h3, h4, h5, h6 {
-  font-weight: 500;
-  line-height: 1.1;
-}
-
-h1.page-title {
-  @include page-title;
-  font-size: 28px;
-}
-
-h2.page-title {
-  @include page-title;
-  font-size: 24px;
-}
-
-h3.page-title {
-  @include page-title;
-}
-
-h6 {
-  color: #888;
-  text-transform: uppercase;
-}
-
-/** CODE **/
-pre {
-  font-family: $monospace_font;
-
-  &.dark {
-    background: #333;
-    color: #f5f5f5;
-  }
-}
-
-/**
- * Links
- *
- */
-a {
-  outline: none;
-  color: $link_color;
-  &:hover {
-    text-decoration: none;
-    color: $primary_color;
-  }
-
-  &:focus {
-    text-decoration: underline;
-  }
-
-  &.dark {
-    color: $style_color;
-  }
-
-  &.lined {
-    text-decoration: underline;
-    &:hover { text-decoration: underline; }
-  }
-
-  &.gray {
-    color: gray;
-  }
-
-  &.supp_diff_link {
-    text-align: center;
-    padding: 20px 0;
-    background: #f1f1f1;
-    width: 100%;
-    float: left;
-  }
-
-  &.neib  {
-    margin-right: 15px;
-  }
-}
-
-a:focus {
-  outline: none;
-}
-
-.monospace {
-  font-family: $monospace_font;
-}
-
-/**
- * Wiki typography
- *
- */
-.wiki {
-  @include md-typography;
-
-  font-size: 14px;
-  line-height: 1.6;
-  .white .highlight pre {
-    background: #f5f5f5;
-  }
-  ul {
-    margin: 0 0 9px 25px !important;
-  }
-}
-
-.md {
-  @include md-typography;
-}
@@ -1,13 +0,0 @@
-/**
- * General Colors
- */
-$primary_color: #2FA0BB;
-$link_color: #3A89A3;
-$style_color: #474D57;
-$hover: #D9EDF7;
-
-/**
- * Commit Diff Colors
- */
-$added: #63c363;
-$deleted: #f77;
@@ -0,0 +1,220 @@
+/*
+ * Twitter bootstrap with GitLab customizations/additions
+ *
+ * Some unused bootstrap compontents like panels are not included.
+ * Other components like tabs are modified to GitLab style.
+ *
+ */
+
+$font-size-base: 13px !default;
+$nav-pills-active-link-hover-bg: $bg_style_color;
+$pagination-active-bg: $bg_style_color;
+
+// Core variables and mixins
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+
+// Reset
+@import "bootstrap/normalize";
+@import "bootstrap/print";
+
+// Core CSS
+@import "bootstrap/scaffolding";
+@import "bootstrap/type";
+@import "bootstrap/code";
+@import "bootstrap/grid";
+@import "bootstrap/tables";
+@import "bootstrap/forms";
+
+// Components
+@import "bootstrap/component-animations";
+@import "bootstrap/dropdowns";
+@import "bootstrap/button-groups";
+@import "bootstrap/input-groups";
+@import "bootstrap/navs";
+@import "bootstrap/navbar";
+@import "bootstrap/breadcrumbs";
+@import "bootstrap/pagination";
+@import "bootstrap/pager";
+@import "bootstrap/labels";
+@import "bootstrap/badges";
+@import "bootstrap/jumbotron";
+@import "bootstrap/thumbnails";
+@import "bootstrap/alerts";
+@import "bootstrap/progress-bars";
+@import "bootstrap/list-group";
+@import "bootstrap/wells";
+@import "bootstrap/close";
+
+// Components w/ JavaScript
+@import "bootstrap/modals";
+@import "bootstrap/tooltip";
+@import "bootstrap/popovers";
+@import "bootstrap/carousel";
+
+// Utility classes
+.clearfix {
+  @include clearfix();
+}
+.center-block {
+  @include center-block();
+}
+.pull-right {
+  float: right !important;
+}
+.pull-left {
+  float: left !important;
+}
+.hide {
+  display: none;
+}
+.show {
+  display: block !important;
+}
+.invisible {
+  visibility: hidden;
+}
+.text-hide {
+  @include text-hide();
+}
+.hidden {
+  display: none !important;
+  visibility: hidden !important;
+}
+.affix {
+  position: fixed;
+}
+
+@import "bootstrap/responsive-utilities";
+
+// Labels
+.label {
+  padding: 2px 4px;
+  font-size: 12px;
+  font-style: normal;
+  font-weight: normal;
+  display: inline-block;
+
+  &.label-gray {
+    background-color: #eee;
+    color: #999;
+    text-shadow: none;
+  }
+
+  &.label-inverse {
+    background-color: #333333;
+  }
+}
+
+// Nav tabs
+.nav.nav-tabs {
+  li {
+    > a {
+      padding: 8px 20px;
+      margin-right: 7px;
+      line-height: 20px;
+      border-color: #EEE;
+      color: #888;
+      border-bottom: 1px solid #ddd;
+      .badge {
+        background-color: #eee;
+        color: #888;
+        text-shadow: 0 1px 1px #fff;
+      }
+      i[class^="icon-"] {
+        line-height: 14px;
+      }
+    }
+    &.active {
+      > a {
+        border-color: #CCC;
+        border-bottom: 1px solid #fff;
+        color: #333;
+        font-weight: bold;
+      }
+    }
+  }
+
+  &.nav-small-tabs > li > a {
+    padding: 6px 9px;
+  }
+}
+
+.nav-tabs > li > a,
+.nav-pills > li > a {
+  color: #666;
+}
+
+.nav-small > li > a {
+  padding: 3px 5px;
+  font-size: 12px;
+}
+
+
+/*
+ * Callouts from Bootstrap3 docs
+ *
+ * Not quite alerts, but custom and helpful notes for folks reading the docs.
+ * Requires a base and modifier class.
+ */
+
+/* Common styles for all types */
+.bs-callout {
+  margin: 20px 0;
+  padding: 20px;
+  border-left: 3px solid #eee;
+  color: #666;
+  background: #f9f9f9;
+}
+.bs-callout h4 {
+  margin-top: 0;
+  margin-bottom: 5px;
+}
+.bs-callout p:last-child {
+  margin-bottom: 0;
+}
+
+/* Variations */
+.bs-callout-danger {
+  background-color: #fdf7f7;
+  border-color: #eed3d7;
+  color: #b94a48;
+}
+.bs-callout-warning {
+  background-color: #faf8f0;
+  border-color: #faebcc;
+  color: #8a6d3b;
+}
+.bs-callout-info {
+  background-color: #f4f8fa;
+  border-color: #bce8f1;
+  color: #34789a;
+}
+.bs-callout-success {
+  background-color: #dff0d8;
+  border-color: #5cA64d;
+  color: #3c763d;
+}
+
+// Breadcrumb
+ul.breadcrumb {
+  background: white;
+  border: none;
+  li {
+    display: inline;
+    text-shadow: 0 1px 0 white
+  }
+
+  a {
+    font-size: 16px;
+  }
+}
+
+/**
+ * fix to keep tooltips position in top navigation bar
+ *
+ */
+.navbar .nav > li {
+  position: relative;
+  white-space: nowrap;
+}
-.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 {
@@ -0,0 +1,2 @@
+/** Typo **/
+$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace;
@@ -0,0 +1,20 @@
+html {
+  overflow-y: scroll;
+
+  &.touch .tooltip { display: none !important; }
+}
+
+body {
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  margin-bottom: 20px;
+}
+
+.container {
+  padding-top: 0;
+  z-index: 5;
+}
+
+.container .content {
+  margin: 0 0;
+}
@@ -0,0 +1,148 @@
+/**
+ * Generic mixins
+ */
+ @mixin box-shadow($shadow) {
+  -webkit-box-shadow: $shadow;
+  -moz-box-shadow: $shadow;
+  -ms-box-shadow: $shadow;
+  -o-box-shadow: $shadow;
+  box-shadow: $shadow;
+}
+
+@mixin border-radius($radius) {
+  -webkit-border-radius: $radius;
+  -moz-border-radius: $radius;
+  -ms-border-radius: $radius;
+  -o-border-radius: $radius;
+  border-radius: $radius;
+}
+
+@mixin border-radius-left($radius) {
+  @include border-radius($radius 0 0 $radius)
+}
+
+@mixin linear-gradient($from, $to) {
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
+  background-image: -webkit-linear-gradient($from, $to);
+  background-image: -moz-linear-gradient($from, $to);
+  background-image: -ms-linear-gradient($from, $to);
+  background-image: -o-linear-gradient($from, $to);
+}
+
+@mixin transition($transition) {
+  -webkit-transition: $transition;
+  -moz-transition: $transition;
+  -ms-transition: $transition;
+  -o-transition: $transition;
+  transition: $transition;
+}
+
+/**
+ * Prefilled mixins
+ * Mixins with fixed values
+ */
+@mixin bg-light-gray-gradient {
+  background: #f1f1f1;
+  background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));
+  background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
+  background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
+  background-image: -ms-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
+  background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
+}
+
+@mixin bg-gray-gradient {
+  background: #eee;
+  background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
+  background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
+  background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
+  background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf);
+  background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
+}
+
+@mixin bg-dark-gray-gradient {
+  background: #eee;
+  background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
+  background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
+  background-image: -ms-linear-gradient(#e9e9e9, #d7d7d7);
+  background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
+}
+
+@mixin shade {
+  @include box-shadow(0 0 3px #ddd);
+}
+
+@mixin solid-shade {
+  @include box-shadow(0 0 0 3px #f1f1f1);
+}
+
+@mixin header-font {
+  color: $style_color;
+  text-shadow: 0 1px 1px #FFF;
+  font-size: 16px;
+  line-height: 44px;
+  font-weight: normal;
+}
+
+@mixin md-typography {
+  img {
+    max-width: 100%;
+  }
+
+  *:first-child {
+    margin-top: 0;
+  }
+
+  code { padding: 0 4px; }
+
+  h1 {
+    margin-top: 45px;
+    font-size: 2.5em;
+  }
+
+  h2 {
+    margin-top: 40px;
+    font-size: 2em;
+  }
+
+  h3 {
+    margin-top: 35px;
+    font-size: 1.5em;
+  }
+
+  h4 {
+    margin-top: 30px;
+    font-size: 1.2em;
+  }
+
+  blockquote p {
+    color: #888;
+    font-size: 14px;
+    line-height: 1.5;
+  }
+
+  table {
+    @extend .table;
+    @extend .table-bordered;
+    th {
+      background: #EEE;
+    }
+  }
+
+  p > code {
+    font-size: inherit;
+    font-weight: inherit;
+    color: #555;
+  }
+
+  li {
+    line-height: 1.5;
+  }
+}
+
+@mixin page-title {
+  color: #333;
+  font-size: 20px;
+  line-height: 1.5;
+  margin-top: 0px;
+  margin-bottom: 15px;
+}
@@ -0,0 +1,14 @@
+/**
+ * General Colors
+ */
+$primary_color: #2FA0BB;
+$link_color: #3A89A3;
+$style_color: #474D57;
+$bg_style_color: #2299BB;
+$hover: #D9EDF7;
+
+/**
+ * Commit Diff Colors
+ */
+$added: #63c363;
+$deleted: #f77;
@@ -20,4 +20,19 @@
   label { width: 110px; }
   .controls { margin-left: 130px; }
   .form-actions { padding-left: 130px; background: #fff }
+  .visibility-levels {
+    .controls {
+        margin-bottom: 9px;
+    }
+
+    i {
+      color: inherit;
+    }
+  }
+}
+
+.broadcast-messages {
+  .message {
+    line-height: 2;
+  }
 }
@@ -16,36 +16,29 @@
   .header {
     @extend .clearfix;
+    background: #DDD;
+    border-bottom: 1px solid #CCC;
     padding: 5px 5px 5px 10px;
     color: #555;
-    border-bottom: 1px solid #CCC;
-    background: #eee;
-    // TODO Replace with linear-gradient mixin
-    background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
-    background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
-    background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
-    background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
-
-    a{
-      color: $style_color;
-    }
     > span {
       font-family: $monospace_font;
       font-size: 14px;
-      line-height: 30px;
+      line-height: 2;
     }
-    a.view-file{
+    .view-file {
       font-weight: bold;
+      float: right;
+      background-color: #EEE;
     }
-    .commit-short-id{
+    .commit-short-id {
       font-family: $monospace_font;
       font-size: smaller;
     }
-    .file-mode{
+    .file-mode {
       font-family: $monospace_font;
     }
   }
@@ -55,13 +48,13 @@
     background: #FFF;
     color: #333;
     font-size: 12px;
-    .old{
-      span.idiff{
+    .old {
+      span.idiff {
         background-color: #FAA;
       }
     }
-    .new{
-      span.idiff{
+    .new {
+      span.idiff {
         background-color: #AFA;
       }
     }
@@ -77,7 +70,7 @@
         font-size: 12px;
       }
     }
-    .old_line, .new_line {
+    .old_line, .new_line, .diff_line {
       margin: 0px;
       padding: 0px;
       border: none;
@@ -87,7 +80,7 @@
       border-right: 1px solid #ccc;
       text-align: right;
       min-width: 35px;
-      max-width: 35px;
+      max-width: 50px;
       width: 35px;
       @include user-select(none);
       a {
@@ -99,6 +92,15 @@
           text-decoration: underline;
         }
       }
+      &.new {
+        background: #CFD;
+      }
+      &.old {
+        background: #FDD;
+      }
+    }
+    .diff_line {
+      padding: 0;
     }
     .line_holder {
       &.old .old_line,
@@ -129,6 +131,11 @@
         color: #ccc;
         background: #fafafa;
       }
+      &.parallel {
+        display: table-cell;
+        overflow: hidden;
+        width: 50%;
+      }
     }
   }
   .image {
@@ -293,6 +300,7 @@
     background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
     background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
     background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
+    background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf);
     background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
     ul, li{
@@ -391,8 +399,8 @@
 .commits-compare-switch{
   background: url("switch_icon.png") no-repeat center center;
-  width: 22px;
-  height: 22px;
+  width: 32px;
+  height: 32px;
   text-indent: -9999px;
   float: left;
   margin-right: 9px;
@@ -419,7 +427,6 @@
   .commit-title {
     margin: 0;
     font-size: 20px;
-    font-weight: bold;
   }
   .commit-description {
@@ -474,9 +481,13 @@ li.commit {
       font-family: $monospace_font;
     }
+    .str-truncated {
+      max-width: 70%;
+    }
+
     .commit-row-message {
-      color: #555;
-      font-weight: bolder;
+      color: #333;
+      font-weight: 500;
       &:hover {
         color: #444;
         text-decoration: underline;
@@ -485,13 +496,14 @@ li.commit {
   }
   .commit-row-info {
+    color: #777;
+
     a {
       color: #777;
     }
     .committed_ago {
       float: right;
-      @extend .cgray;
     }
   }
@@ -505,4 +517,4 @@ li.commit {
       @extend .cgray;
     }
   }
-}
 \ No newline at end of file
+}
 .dashboard {
-  @extend .row;
-  .activities {
-  }
-
   .side {
-    @extend .pull-right;
-
     .ui-box {
       margin: 0px;
       box-shadow: none;
@@ -20,7 +14,7 @@
   .search-text-input {
     float:left;
-    @extend .span2;
+    @extend .col-md-2;
   }
   .btn {
     margin-left: 5px;
@@ -32,14 +26,15 @@
   .dash-filter {
     margin: 7px 0;
     padding: 4px 6px;
-    width: 202px;
+    width: 220px;
     float: left;
+    height: inherit;
   }
 }
 @media (max-width: 1200px) {
   .dashboard .dash-filter {
-    width: 132px;
+    width: 150px;
   }
 }
@@ -51,7 +46,7 @@
   li {
     &.active {
       a {
-        @include linear-gradient(#f5f5f5, #eee);
+        background-color: #EEE;
         border-bottom: 1px solid #EEE !important;
         &:hover {
           background: #eee;
@@ -60,43 +55,64 @@
     }
     a {
-      border-color: #CCC !important;
+      border-color: #DDD !important;
     }
   }
 }
 .project-row, .group-row {
-  padding: 10px 15px !important;
+  padding: 10px 12px !important;
+  font-size: 14px;
+  line-height: 24px;
-  .namespace-name {
-    color: #666;
-    font-weight: bold;
+  a {
+    display: block;
   }
   .project-name, .group-name {
-    font-size: 16px;
+    font-weight: 500;
   }
   .arrow {
     float: right;
-    padding: 10px 5px;
+    padding: 0px 5px;
     margin: 0;
     font-size: 20px;
     color: #666;
   }
   .last-activity {
+    float: right;
+    font-size: 12px;
     color: #AAA;
     display: block;
-    margin-top: 5px;
     .date {
       color: #777;
     }
   }
 }
-.group-row {
-  .arrow {
-    padding: 2px 5px;
+.project-access-icon {
+  margin-left: 10px;
+  float: left;
+  margin-right: 15px;
+  font-size: 20px;
+  margin-bottom: 15px;
+  border: 1px solid #EEE;
+  padding: 8px 12px;
+  border-radius: 50px;
+  background: #f5f5f5;
+  text-align: center;
+
+  i {
+    color: #BBB;
   }
 }
+
+.dash-project-access-icon {
+  float: left;
+  margin-right: 3px;
+  color: #999;
+  margin-bottom: 10px;
+  width: 16px;
+}
@@ -34,15 +34,4 @@
       margin: 5px 8px 0 8px;
     }
   }
-  .commit_message-group {
-    margin-top: 20px;
-
-    label {
-      font-size: 16px;
-      line-height: 20px;
-    }
-    textarea {
-      @extend .span8;
-    }
-  }
 }
@@ -47,7 +47,7 @@
   .event-title {
     color: #333;
     font-weight: normal;
-    font-size: 15px;
+    font-size: 14px;
     .author_name {
       color: #333;
     }
@@ -60,14 +60,14 @@
       color: #666;
     }
     .event-note {
-      color: #555;
+      color: #666;
       margin-top: 5px;
       pre {
         border: none;
         background: #f9f9f9;
         border-radius: 0;
-        color: #555;
+        color: #666;
         margin: 0 20px;
       }
@@ -75,6 +75,7 @@
         margin-top: 4px;
         margin-left: 0px;
         max-width: 200px;
+        float: none;
       }
       p:last-child {
@@ -112,6 +113,7 @@
       &.commit {
         background: transparent;
         padding: 3px;
+        padding-left: 0;
         border: none;
         color: #666;
         .commit-row-title {
@@ -121,6 +123,7 @@
       &.commits-stat {
         display: block;
         padding: 3px;
+        padding-left: 0;
         &:hover {
           background: none;
@@ -142,19 +145,19 @@
   .filter_icon {
     a {
       text-align:center;
-      border-left: 3px solid $primary_color;
-      background: #f9f9f9;
+      background: #EEE;
       margin-bottom: 10px;
       float: left;
-      padding: 9px 7px;
+      padding: 9px 6px;
       font-size: 18px;
-      width: 26px;
+      width: 40px;
+      @include border-radius(3px);
     }
     &.inactive {
       a {
         color: #DDD;
-        border-left: 3px solid #EEE;
+        background: #f9f9f9;
       }
     }
   }
@@ -4,17 +4,24 @@
  */
 header {
   &.navbar-gitlab {
+    margin-bottom: 0;
+    min-height: 40px;
+
     .navbar-inner {
-      height: 40px;
-      padding: 3px;
       background: #F1F1F1;
+      border-bottom: 1px solid #DDD;
       filter: none;
       .nav > li > a {
         color: $style_color;
         text-shadow: 0 1px 0 #fff;
         font-size: 14px;
-        padding: 10px;
+        line-height: 32px;
+        padding: 6px 10px;
+
+        &:hover {
+          background: none;
+        }
       }
       /** NAV block with links and profile **/
@@ -22,6 +29,59 @@ header {
         float: right;
         margin-right: 0;
       }
+
+      .navbar-toggle {
+        color: $style_color;
+        margin: 0 -15px 0 0;
+        padding: 10px;
+        border-radius: 0;
+
+        button i { font-size: 22px; }
+
+        &.collapsed { background-color: transparent !important;}
+
+        &:hover {
+          background-color: #EEE;
+        }
+      }
+    }
+
+    @media (max-width: $screen-xs-max) {
+      border-width: 0;
+      font-size: 18px;
+
+      .app_logo { margin-left: -15px; }
+      .project_name {
+        display: inline-block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        vertical-align: top;
+        white-space: nowrap;
+        max-width: 70%;
+      }
+
+      .navbar-collapse {
+        padding-right: 0;
+        padding-left: 0;
+      }
+
+      .navbar-nav {
+        margin: 5px 0;
+
+        .visible-xs, .visable-sm {
+          display: table-cell !important;
+        }
+      }
+
+      li {
+        display: table-cell;
+        width: 1%;
+
+        a {
+          text-align: center;
+          font-size: 18px !important;
+        }
+      }
     }
   }
@@ -35,9 +95,6 @@ header {
   .app_logo {
     float: left;
     margin-right: 9px;
-    position: relative;
-    top: -5px;
-    padding-top: 5px;
     a {
       float: left;
@@ -46,10 +103,10 @@ header {
       h1 {
         margin: 0;
-        background: url('logo-black.png') no-repeat center 1px;
-        background-size: 38px;
+        background: url('logo-black.png') no-repeat center center;
+        background-size: 32px;
         float: left;
-        height: 40px;
+        height: 46px;
         width: 40px;
         @include header-font;
         text-indent: -9999px;
@@ -75,7 +132,7 @@ header {
   .profile-pic {
     position: relative;
-    top: -4px;
+    top: -1px;
     img {
       width: 26px;
       height: 26px;
@@ -91,21 +148,25 @@ header {
   .search {
     margin-right: 10px;
     margin-left: 10px;
+    margin-top: 8px;
+
+    form {
+      margin: 0;
+      padding: 0;
+    }
     .search-input {
-      @extend .span3;
       background-image: url("icon-search.png");
       background-repeat: no-repeat;
       background-position: 10px;
+      height: inherit;
+      padding: 4px 6px;
       padding-left: 25px;
       font-size: 13px;
       @include border-radius(3px);
       border: 1px solid #c6c6c6;
       box-shadow: none;
       @include transition(all 0.15s ease-in 0s);
-      &:focus {
-        @extend .span4;
-      }
     }
   }
@@ -120,6 +181,8 @@ header {
         background: #708090;
         border-bottom: 1px solid #AAA;
+        .navbar-toggle { color: #fff; }
+
         .nav > li > a {
           color: #AAA;
           text-shadow: 0 1px 0 #444;
@@ -133,6 +196,8 @@ header {
     .turbolink-spinner {
       color: #FFF;
+      font-size: 22px;
+      margin-right: 10px;
     }
     .search {
@@ -152,8 +217,8 @@ header {
     .app_logo {
       a {
         h1 {
-          background: url('logo-white.png') no-repeat center 1px;
-          background-size: 38px;
+          background: url('logo-white.png') no-repeat center center;
+          background-size: 32px;
           color: #fff;
           text-shadow: 0 1px 1px #444;
         }
@@ -181,12 +246,26 @@ header {
   .separator {
     float: left;
     height: 46px;
-    width: 1px;
+    width: 2px;
     background: white;
     border-left: 1px solid #DDD;
-    margin-top: -3px;
     margin-left: 10px;
     margin-right: 10px;
   }
 }
+.search .search-input {
+  width: 300px;
+  &:focus {
+    width: 400px;
+  }
+}
+
+@media (max-width: 1200px)  {
+  .search .search-input {
+    width: 200px;
+    &:focus {
+      width: 300px;
+    }
+  }
+}
@@ -60,7 +60,6 @@ input.check_all_issues {
 .btn.close_issue {
   color: #B94A48;
   font-weight: bold;
-  @include shade;
   &:hover {
     color: #B94A48;
   }
@@ -68,7 +67,6 @@ input.check_all_issues {
 .btn.reopen_issue {
   color: #468847;
   font-weight: bold;
-  @include shade;
   &:hover {
     color: #468847;
   }
@@ -77,8 +75,8 @@ input.check_all_issues {
 @media (min-width: 800px)  { .issues_filters select { width: 160px; }  }
 @media (min-width: 1200px) { .issues_filters select { width: 220px; }  }
-@media (min-width: 800px)  { .issues_bulk_update select { width: 120px; }  }
-@media (min-width: 1200px) { .issues_bulk_update select { width: 160px; }  }
+@media (min-width: 800px)  { .issues_bulk_update .select2-container { min-width: 120px; }  }
+@media (min-width: 1200px) { .issues_bulk_update .select2-container { min-width: 160px; }  }
 .issues-holder {
   .issues_filters {
@@ -103,3 +101,27 @@ input.check_all_issues {
 .participants {
   margin-bottom: 10px;
 }
+
+.issues_bulk_update {
+  .select2-container {
+    text-shadow: none;
+  }
+}
+
+.issue-search-form {
+  margin: 0;
+  height: 24px;
+
+  .issue_search {
+    border: 1px solid #DDD !important;
+    background-color: #f4f4f4;
+  }
+}
+
+.issue-show-labels .label {
+  padding: 6px 10px;
+}
+
+form.edit-issue {
+  margin: 0;
+}
 /* Login Page */
-body.login-page{
-  .container > .content {
-    padding-top: 20px;
+.login-page {
+  h1 {
+    font-size: 3em;
+    font-weight: 200;
   }
-}
-
-.login-box{
-  width: 304px;
-  position: relative;
-  @include border-radius(5px);
-  margin: auto;
-  padding: 20px;
-  background: white;
-}
-
-.login-box .login-logo{
-  margin: 10px 0 30px 0;
-  display: block;
-}
-
-.login-box input.text{background-color: #f1f1f1; font-size: 16px; @include border-radius(0); padding: 14px 10px; width: 280px}
-
-.login-box input.text.top{
-  @include border-radius(5px 5px 0 0);
-  margin-bottom: 0px;
-}
-.login-box input.text.bottom{
-  @include border-radius(0 0 5px 5px);
-  border-top: 0;
-  margin-bottom: 20px;
-}
+  .login-box{
+    max-width: 304px;
+    position: relative;
+    @include border-radius(5px);
+    margin: auto;
+    background: white;
+  }
-.login-box input.text.middle{
-  border-top: 0;
-  margin-bottom:0px;
-}
+  .login-logo{
+    margin: 10px 0 30px 0;
+    display: block;
+  }
-.login-box a.forgot{float: right; padding-top: 6px}
+  .form-control {
+    background-color: #f1f1f1;
+    font-size: 16px;
+    padding: 14px 10px;
+    width: 100%;
+    height: auto;
+
+    &.top {
+      @include border-radius(5px 5px 0 0);
+      margin-bottom: 0px;
+    }
+
+    &.bottom {
+      @include border-radius(0 0 5px 5px);
+      border-top: 0;
+      margin-bottom: 20px;
+    }
+
+    &.middle {
+      border-top: 0;
+      margin-bottom:0px;
+      @include border-radius(0);
+    }
+  }
-.remember_me {
-  text-align: left;
+  .login-box a.forgot {
+    float: right;
+    padding-top: 6px
+  }
-  input {
-    margin: 2px;
+  .devise-errors {
+    h2 {
+      font-size: 14px;
+      color: #a00;
+    }
   }
 }
@@ -4,10 +4,6 @@
  *
  */
 .automerge_widget {
-  &.can_be_merged {
-    background: #DFF0D8;
-  }
-
   form {
     margin-bottom: 0;
     .clearfix {
@@ -15,32 +11,12 @@
     }
   }
-  .accept_group {
-    float: left;
-    border: 1px solid #ADA;
-    padding: 2px;
-    @include border-radius(5px);
-    background: #CEB;
-
-    .accept_merge_request {
-      font-size: 13px;
-      float: left;
-    }
-    .remove_branch_holder {
-      margin-left: 20px;
-      margin-right: 10px;
-      float: left;
-    }
+  .accept-group {
     label {
-      color: #444;
-      text-align: left
+      margin: 5px;
+      margin-left: 20px;
     }
   }
-
-
-  .how_to_merge_link {
-    @extend .primary;
-  }
 }
 .merge-request .nav-tabs{
@@ -53,11 +29,6 @@
   }
 }
-.merge-in-progress {
-  @extend .padded;
-  @extend .append-bottom-10;
-}
-
 .mr_source_commit,
 .mr_target_commit {
   .commit {
@@ -110,9 +81,11 @@
 .merge-request-angle {
   text-align: center;
-  margin: 0;
+  margin: 0 auto;
+  font-size: 2em;
+  line-height: 1.1;
 }
 .merge-request-form-info {
-  padding: 15px 0;
+  padding-top: 15px;
 }
@@ -6,6 +6,7 @@
   border-bottom: 1px solid #E1E1E1;
   ul {
+    padding: 0;
     margin: auto;
     height: 40px;
     overflow: hidden;
@@ -34,7 +35,7 @@
       width: 1%;
       &.active {
         a {
-          color: $style_color;
+          color: #333;
           font-weight: bolder;
           &:after {
@@ -45,7 +46,7 @@
             left: 50%;
             width: 0;
             height: 0;
-            border-color: transparent transparent #777 transparent;
+            border-color: transparent transparent #333 transparent;
             border-style: solid;
             border-width: 6px;
             margin-left: -6px;
@@ -82,4 +83,38 @@
       padding-top: 2px;
     }
   }
+
+  @media (max-width: $screen-xs-max) {
+    font-size: 18px;
+    margin: 0;
+
+    max-height: none;
+
+    &, .container {
+      padding: 0;
+      border-top: 0;
+    }
+
+    ul {
+      height: auto;
+
+      li {
+        display: list-item;
+        width: auto;
+        padding: 5px 0;
+
+        &.active {
+          background-color: $primary_color;
+
+          a {
+            color: #fff;
+            font-weight: normal;
+            text-shadow: none;
+
+            &:after { display: none; }
+          }
+        }
+      }
+    }
+  }
 }
@@ -2,7 +2,7 @@
  * Notes
  */
-@-webkit-keyframes target-note {
+@-webkit-keyframes targe3-note {
   from { background:#fffff0; }
   50% { background:#ffffd3; }
   to { background:#fffff0; }
@@ -92,10 +92,6 @@ ul.notes {
     .note-body {
       @include md-typography;
       margin-left: 45px;
-
-      .highlight {
-        @include border-radius(4px);
-      }
     }
     .note-header {
       padding-bottom: 5px;
@@ -119,9 +115,9 @@ ul.notes {
 }
 .file .notes_holder {
-  font-family: $sansFontFamily;
   font-size: 13px;
   line-height: 18px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   td {
     border: 1px solid #ddd;
@@ -130,9 +126,15 @@ ul.notes {
     &.notes_line {
       text-align: center;
       padding: 10px 0;
+      background: #eee;
+    }
+    &.notes_line2 {
+      text-align: center;
+      padding: 10px 0;
+      border-left: 1px solid #ddd !important;
     }
     &.notes_content {
-      background-color: $white;
+      background-color: #fff;
       border-width: 1px 0;
       padding-top: 0;
@@ -251,12 +253,12 @@ ul.notes {
 .file,
 .discussion {
   .new_note {
-    margin: 8px 5px 8px 0;
+    margin: 0;
+    border: none;
   }
 }
 .new_note {
   display: none;
-
   .buttons {
     float: left;
     margin-top: 8px;
@@ -270,10 +272,9 @@ ul.notes {
     // preview/edit buttons
     > a {
-      font-size: 24px;
-      padding: 4px;
       position: absolute;
-      right: 10px;
+      right: 5px;
+      bottom: -60px;
     }
     .note_preview {
       background: #f5f5f5;
@@ -287,7 +288,7 @@ ul.notes {
       box-shadow: none;
       font-size: 14px;
       height: 80px;
-      width: 98.6%;
+      width: 100%;
     }
   }
 }
@@ -298,7 +299,7 @@ ul.notes {
 }
 .note-image-attach {
-  @extend .span4;
+  @extend .col-md-4;
   @extend .thumbnail;
   margin-left: 45px;
 }
@@ -306,10 +307,8 @@ ul.notes {
 .common-note-form {
   margin: 0;
-  height: 140px;
   background: #F9F9F9;
   padding: 3px;
-  padding-bottom: 25px;
   border: 1px solid #DDD;
 }
@@ -320,7 +319,7 @@ ul.notes {
   padding: 0 5px;
   .note-form-option {
-    margin-top: 10px;
+    margin-top: 8px;
     margin-left: 30px;
     @extend .pull-left;
   }
@@ -338,7 +337,7 @@ ul.notes {
     box-shadow: none;
     font-size: 14px;
     height: 80px;
-    width: 98.6%;
+    width: 100%;
   }
   .form-actions {
@@ -358,3 +357,7 @@ ul.notes {
 .js-note-attachment-delete {
   display: none;
 }
+
+.parallel-comment {
+  padding: 6px;
+}
 .update-notifications {
-  margin-bottom: 0;
+  .radio-inline {
+    margin-right: 9%;
+  }
+}
+
+.account-page {
+  fieldset {
+    margin-bottom: 15px;
+    border-bottom: 1px dashed #ddd;
+    padding-bottom: 15px;
+
+    &:last-child {
+      border: none;
+    }
+
+    legend {
+      border: none;
+      margin-bottom: 10px;
+    }
+  }
+}
+
+.oauth_select_holder {
+  img {
+    padding: 2px;
+    margin-right: 10px;
+  }
+  .active {
+    img {
+      border: 1px solid #4BD;
+      background: $hover;
+      @include border-radius(5px);
+    }
+  }
+}
+
+.btn-build-token {
+  float: left;
+  padding: 6px 20px;
+  margin-right: 12px;
+}
+
+.profile-avatar-form-option {
+  hr {
+    margin: 10px 0;
+  }
+}
+
+.user-show-username {
+  font-weight: 200;
+  color: #666;
+}
+
+/*
+ * Appearance settings
+ *
+ */
+.themes_opts {
+  label {
+    margin-right: 20px;
+    text-align: center;
+
+    .prev {
+      @extend .thumbnail;
+      height: 30px;
+      width: 175px;
+      margin-bottom: 10px;
+
+      &.classic {
+        background: #31363e;
+      }
+
+      &.default {
+        background: #f1f1f1;
+      }
+
+      &.modern {
+        background: #345;
+      }
+
+      &.gray {
+        background: #373737;
+      }
+
+      &.violet {
+        background: #547;
+      }
+    }
+  }
+}
+
+.code_highlight_opts {
+  margin-top: 10px;
+
   label {
-    margin-bottom: 0;
+    margin-right: 20px;
+    text-align: center;
+
+    .prev {
+      @extend .thumbnail;
+      height: 151px;
+      width: 220px;
+      margin-bottom: 10px;
+    }
   }
 }
@@ -14,43 +14,118 @@
   }
 }
-.project_clone_panel {
-  @include border-radius(4px);
-  @include bg-gray-gradient;
-  padding: 4px 7px;
-  border: 1px solid #CCC;
-  margin-bottom: 20px;
+.project-home-panel {
+  border-bottom: 1px solid #DDD;
+  padding-bottom: 15px;
+  margin-bottom: 30px;
+
+  &.empty-project {
+      border-bottom: 0px;
+      padding-bottom: 15px;
+      margin-bottom: 0px;
+  }
-  .btn {
-    padding: 4px 12px;
+  .project-home-title {
+    font-size: 18px;
+    color: #444;
+    margin: 0;
+    line-height: 32px;
+  }
+  .project-home-dropdown {
+    margin-left: 10px;
+    float: right;
+  }
+  .project-home-extra {
+    margin-top: 15px;
+
+    .project-home-desc {
+      float: left;
+      color: #777;
+      margin-bottom: 10px;
+    }
+
+    .project-home-links {
+      float: right;
+      a {
+        margin-left: 10px;
+        font-weight: 500;
+      }
+    }
+  }
+
+  .visibility-level-label {
+    font-size: 17px;
+    background: #f1f1f1;
+    border-radius: 4px;
+    color: #888;
+    position: absolute;
+    margin-left: -55px;
+    text-shadow: 0 1px 1px #FFF;
+    width: 40px;
+    text-align: center;
+    padding: 6px;
+
+    i {
+      color: inherit;
+    }
   }
 }
-.project_clone_holder {
-  input[type="text"] {
-    @extend .monospace;
-    border: 1px solid #BBB;
+.git-clone-holder {
+  .project-home-dropdown + & {
+    margin-right: 45px;
+  }
+
+  .btn,
+  .form-control {
+    border: 1px solid #E1E1E1;
     box-shadow: none;
-    margin-left: -1px;
-    background: #FFF;
+    padding: 6px 9px;
   }
-}
-.project-public-holder {
-  .help-inline {
-    padding-top: 7px;
+  .btn {
+    background: none;
+    color: #29b;
+
+    &.active {
+      color: #333;
+      font-weight: bold;
+    }
   }
-}
-.save-project-loader {
-  img {
-    margin-top: 50px;
-    margin-bottom: 50px;
+  .form-control {
+    cursor: auto;
+    @extend .monospace;
+    background: #FAFAFA;
+    width: 100%;
   }
-  h3 {
-    @extend .page-title;
+}
+
+.project-visibility-level-holder {
+  .radio {
+    margin-bottom: 10px;
+
+    i {
+      margin: 0 3px;
+      font-size: 20px;
+    }
+
+    .option-title {
+      font-weight: bold;
+      display: inline-block;
+    }
+
+    .option-descr {
+      margin-left: 24px;
+      color: #666;
+    }
   }
+}
+.save-project-loader {
+  margin-top: 50px;
+  margin-bottom: 50px;
+  color: #555;
 }
 ul.nav.nav-projects-tabs {
@@ -79,18 +154,19 @@ ul.nav.nav-projects-tabs {
   margin: 0px;
 }
-.my-projects {
+.my-projects,
+.public-projects {
   li {
-    .project-title {
-      font-size: 14px;
-    }
-
     .project-info {
       margin-bottom: 10px;
     }
-    .access-icon i {
+    .access-icon {
       color: #AAA;
+      margin-left: 10px;
+      i {
+        color: #AAA;
+      }
     }
   }
 }
@@ -115,3 +191,44 @@ ul.nav.nav-projects-tabs {
     color: #777;
   }
 }
+
+.project-side {
+  .btn-block {
+    background-image: none;
+    .btn,
+    &.btn,
+    &.btn-group ul.dropdown-menu {
+      background-color: #F1f1f1;
+      border-color: #EEE;
+      &:hover {
+        background-color: #eee;
+        border-color: #DDD;
+      }
+    }
+    &.btn-group-justified {
+        .btn {
+            width: 100%;
+        }
+        .dropdown-toggle {
+            width: 26px;
+        }
+    }
+    ul {
+        width: 100%;
+    }
+  }
+  .project-fork-icon {
+    float: left;
+    font-size: 26px;
+    margin-right: 10px;
+    line-height: 1.5;
+  }
+}
+
+.transfer-project .select2-container {
+  min-width: 200px;
+}
+
+.deploy-project-label {
+  margin: 1px;
+}
	@@ -34,3 +34,4 @@ doc/code/*		@@ -34,3 +34,4 @@ doc/code/*
34	.secret	34	.secret
35	*.log	35	*.log
36	public/uploads.*	36	public/uploads.*
		37	+public/assets/
1	language: ruby	1	language: ruby
2	env:	2	env:
3	- - DB=mysql TRAVIS=true	3	+ global:
		4	+ - DB=mysql
		5	+ - TRAVIS=true
		6	+ matrix:
		7	+ - TASK=spinach
		8	+ - TASK=spec
		9	+ - TASK=jasmine:ci
4	before_install:	10	before_install:
5	- sudo apt-get install libicu-dev -y	11	- sudo apt-get install libicu-dev -y
6	- - gem install charlock_holmes -v="0.6.9"
7	branches:	12	branches:
8	only:	13	only:
9	- 'master'	14	- 'master'
	@@ -11,8 +16,12 @@ rvm:		@@ -11,8 +16,12 @@ rvm:
11	- 2.0.0	16	- 2.0.0
12	services:	17	services:
13	- mysql	18	- mysql
14	- - postgresql	19	+ - redis-server
15	before_script:	20	before_script:
16	- "cp config/database.yml.$DB config/database.yml"	21	- "cp config/database.yml.$DB config/database.yml"
17	- "cp config/gitlab.yml.example config/gitlab.yml"	22	- "cp config/gitlab.yml.example config/gitlab.yml"
18	-script: "bundle exec rake gitlab:test --trace"	23	+ - "bundle exec rake db:setup"
		24	+ - "bundle exec rake db:seed_fu"
		25	+script: "bundle exec rake $TASK --trace"
		26	+notifications:
		27	+ email: false
1	-v 6.2.0	1	+v 6.6.0
2	- Retrieving user ssh keys publically(github style): http://__HOST__/__USERNAME__.keys	2	- Retrieving user ssh keys publically(github style): http://__HOST__/__USERNAME__.keys
		3	+ - Permissions: Developer now can manage issue tracker (modify any issue)
		4	+ - Improve Code Compare page performance
		5	+
		6	+v 6.5.1
		7	+ - Fix branch selectbox when create merge request from fork
		8	+
		9	+v 6.5.0
		10	+ - Dropdown menus on issue#show page for assignee and milestone (Jason Blanchard)
		11	+ - Add color custimization and previewing to broadcast messages
		12	+ - Fixed notes anchors
		13	+ - Load new comments in issues dynamically
		14	+ - Added sort options to Public page
		15	+ - New filters (assigned/authored/all) for Dashboard#issues/merge_requests (sponsored by Say Media)
		16	+ - Add project visibility icons to dashboard
		17	+ - Enable secure cookies if https used
		18	+ - Protect users/confirmation with rack_attack
		19	+ - Default HTTP headers to protect against MIME-sniffing, force https if enabled
		20	+ - Bootstrap 3 with responsive UI
		21	+ - New repository download formats: tar.bz2, zip, tar (Jason Hollingsworth)
		22	+ - Restyled accept widgets for MR
		23	+ - SCSS refactored
		24	+ - Use jquery timeago plugin
		25	+ - Fix 500 error for rdoc files
		26	+ - Ability to customize merge commit message (sponsored by Say Media)
		27	+ - Search autocomplete via ajax
		28	+ - Add website url to user profile
		29	+ - Files API supports base64 encoded content (sponsored by O'Reilly Media)
		30	+ - Added support for Go's repository retrieval (Bruno Albuquerque)
		31	+
		32	+v6.4.3
		33	+ - Don't use unicorn worker killer if PhusionPassenger is defined
		34	+
		35	+v6.4.2
		36	+ - Fixed wrong behaviour of script/upgrade.rb
		37	+
		38	+v6.4.1
		39	+ - Fixed bug with repository rename
		40	+ - Fixed bug with project transfer
		41	+
		42	+v 6.4.0
		43	+ - Added sorting to project issues page (Jason Blanchard)
		44	+ - Assembla integration (Carlos Paramio)
		45	+ - Fixed another 500 error with submodules
		46	+ - UI: More compact issues page
		47	+ - Minimal password length increased to 8 symbols
		48	+ - Side-by-side diff view (Steven Thonus)
		49	+ - Internal projects (Jason Hollingsworth)
		50	+ - Allow removal of avatar (Drew Blessing)
		51	+ - Project web hooks now support issues and merge request events
		52	+ - Visiting project page while not logged in will redirect to sign-in instead of 404 (Jason Hollingsworth)
		53	+ - Expire event cache on avatar creation/removal (Drew Blessing)
		54	+ - Archiving old projects (Steven Thonus)
		55	+ - Rails 4
		56	+ - Add time ago tooltips to show actual date/time
		57	+ - UI: Fixed UI for admin system hooks
		58	+ - Ruby script for easier GitLab upgrade
		59	+ - Do not remove Merge requests if fork project was removed
		60	+ - Improve sign-in/signup UX
		61	+ - Add resend confirmation link to sign-in page
		62	+ - Set noreply@HOSTNAME for reply_to field in all emails
		63	+ - Show GitLab API version on Admin#dashboard
		64	+ - API Cross-origin resource sharing
		65	+ - Show READMe link at project home page
		66	+ - Show repo size for projects in Admin area
		67	+
		68	+v 6.3.0
		69	+ - API for adding gitlab-ci service
		70	+ - Init script now waits for pids to appear after (re)starting before reporting status (Rovanion Luckey)
		71	+ - Restyle project home page
		72	+ - Grammar fixes
		73	+ - Show branches list (which branches contains commit) on commit page (Andrew Kumanyaev)
		74	+ - Security improvements
		75	+ - Added support for GitLab CI 4.0
		76	+ - Fixed issue with 500 error when group did not exist
		77	+ - Ability to leave project
		78	+ - You can create file in repo using UI
		79	+ - You can remove file from repo using UI
		80	+ - API: dropped default_branch attribute from project during creation
		81	+ - Project default_branch is not stored in db any more. It takes from repo now.
		82	+ - Admin broadcast messages
		83	+ - UI improvements
		84	+ - Dont show last push widget if user removed this branch
		85	+ - Fix 500 error for repos with newline in file name
		86	+ - Extended html titles
		87	+ - API: create/update/delete repo files
		88	+ - Admin can transfer project to any namespace
		89	+ - API: projects/all for admin users
		90	+ - Fix recent branches order
		91	+
		92	+v 6.2.4
		93	+ - Security: Cast API private_token to string (CVE-2013-4580)
		94	+ - Security: Require gitlab-shell 1.7.8 (CVE-2013-4581, CVE-2013-4582, CVE-2013-4583)
		95	+ - Fix for Git SSH access for LDAP users
		96	+
		97	+v 6.2.3
		98	+ - Security: More protection against CVE-2013-4489
		99	+ - Security: Require gitlab-shell 1.7.4 (CVE-2013-4490, CVE-2013-4546)
		100	+ - Fix sidekiq rake tasks
		101	+
		102	+v 6.2.2
		103	+ - Security: Update gitlab_git (CVE-2013-4489)
		104	+
		105	+v 6.2.1
		106	+ - Security: Fix issue with generated passwords for new users
		107	+
		108	+v 6.2.0
3	- Public projects are visible from the outside	109	- Public projects are visible from the outside
		110	+ - Public project pages are now visible to everyone (files, issues, wik, etc.)
		111	+ THIS MEANS YOUR ISSUES AND WIKI FOR PUBLIC PROJECTS ARE PUBLICLY VISIBLE AFTER THE UPGRADE
4	- Add group access to permissions page	112	- Add group access to permissions page
5	- Require current password to change one	113	- Require current password to change one
6	- Group owner or admin can remove other group owners	114	- Group owner or admin can remove other group owners
	@@ -13,6 +121,13 @@ v 6.2.0		@@ -13,6 +121,13 @@ v 6.2.0
13	- Update logic for validates_merge_request for tree of MR (Andrew Kumanyaev)	121	- Update logic for validates_merge_request for tree of MR (Andrew Kumanyaev)
14	- Rake tasks for web hooks management (Jonhnny Weslley)	122	- Rake tasks for web hooks management (Jonhnny Weslley)
15	- Extended User API to expose admin and can_create_group for user creation/updating (Boyan Tabakov)	123	- Extended User API to expose admin and can_create_group for user creation/updating (Boyan Tabakov)
		124	+ - API: Remove group
		125	+ - API: Remove project
		126	+ - Avatar upload on profile page with a maximum of 100KB (Steven Thonus)
		127	+ - Store the sessions in Redis instead of the cookie store
		128	+ - Fixed relative links in markdown
		129	+ - User must confirm their email if signup enabled
		130	+ - User must confirm changed email
16		131
17	v 6.1.0	132	v 6.1.0
18	- Project specific IDs for issues, mr, milestones	133	- Project specific IDs for issues, mr, milestones
	@@ -33,7 +148,7 @@ v 6.1.0		@@ -33,7 +148,7 @@ v 6.1.0
33	- Add links to create branch/tag from project home page	148	- Add links to create branch/tag from project home page
34	- Add public-project? checkbox to new-project view	149	- Add public-project? checkbox to new-project view
35	- Improved compare page. Added link to proceed into Merge Request	150	- Improved compare page. Added link to proceed into Merge Request
36	- - Send email to user when he was added to group	151	+ - Send an email to a user when they are added to group
37	- New landing page when you have 0 projects	152	- New landing page when you have 0 projects
38		153
39	v 6.0.0	154	v 6.0.0
	@@ -76,6 +191,14 @@ v 6.0.0		@@ -76,6 +191,14 @@ v 6.0.0
76	- Improved MR comments logic	191	- Improved MR comments logic
77	- Render readme file for projects in public area	192	- Render readme file for projects in public area
78		193
		194	+v 5.4.2
		195	+ - Security: Cast API private_token to string (CVE-2013-4580)
		196	+ - Security: Require gitlab-shell 1.7.8 (CVE-2013-4581, CVE-2013-4582, CVE-2013-4583)
		197	+
		198	+v 5.4.1
		199	+ - Security: Fixes for CVE-2013-4489
		200	+ - Security: Require gitlab-shell 1.7.4 (CVE-2013-4490, CVE-2013-4546)
		201	+
79	v 5.4.0	202	v 5.4.0
80	- Ability to edit own comments	203	- Ability to edit own comments
81	- Documentation improvements	204	- Documentation improvements
	@@ -8,14 +8,20 @@ def linux_only(require_as)		@@ -8,14 +8,20 @@ def linux_only(require_as)
8	RUBY_PLATFORM.include?('linux') && require_as	8	RUBY_PLATFORM.include?('linux') && require_as
9	end	9	end
10		10
11	-gem "rails", "3.2.13"	11	+gem "rails", "~> 4.0.0"
		12	+
		13	+gem "protected_attributes"
		14	+gem 'rails-observers'
		15	+gem 'actionpack-page_caching'
		16	+gem 'actionpack-action_caching'
12		17
13	# Supported DBs	18	# Supported DBs
14	gem "mysql2", group: :mysql	19	gem "mysql2", group: :mysql
15	-gem "pg", group: :postgres	20	+#gem "pg", group: :postgres
16		21
17	# Auth	22	# Auth
18	-gem "devise", '~> 2.2'	23	+gem "devise", '3.0.4'
		24	+gem "devise-async", '0.8.0'
19	gem 'omniauth', "~> 1.1.3"	25	gem 'omniauth', "~> 1.1.3"
20	gem 'omniauth-google-oauth2'	26	gem 'omniauth-google-oauth2'
21	gem 'omniauth-twitter'	27	gem 'omniauth-twitter'
	@@ -23,26 +29,27 @@ gem 'omniauth-github'		@@ -23,26 +29,27 @@ gem 'omniauth-github'
23		29
24	# Extracting information from a git repository	30	# Extracting information from a git repository
25	# Provide access to Gitlab::Git library	31	# Provide access to Gitlab::Git library
26	-gem "gitlab_git", '2.3.1'	32	+gem "gitlab_git", '~> 5.1.0'
27		33
28	# Ruby/Rack Git Smart-HTTP Server Handler	34	# Ruby/Rack Git Smart-HTTP Server Handler
29	-gem 'gitlab-grack', '~> 1.0.1', require: 'grack'	35	+gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
30		36
31	# LDAP Auth	37	# LDAP Auth
32	-gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap"
33	-
34	-# Syntax highlighter
35	-gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb'	38	+gem 'gitlab_omniauth-ldap', '1.0.4', require: "omniauth-ldap"
36		39
37	# Git Wiki	40	# Git Wiki
38	-gem "gitlab-gollum-lib", "~> 1.0.1", require: 'gollum-lib'	41	+gem "gitlab-gollum-lib", "~> 1.1.0", require: 'gollum-lib'
39		42
40	# Language detection	43	# Language detection
41	-gem "github-linguist", require: "linguist"	44	+gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
42		45
43	# API	46	# API
44	-gem "grape", "~> 0.4.1"	47	+gem "grape", "~> 0.6.1"
45	gem "grape-entity", "~> 0.3.0"	48	gem "grape-entity", "~> 0.3.0"
		49	+gem 'rack-cors', require: 'rack/cors'
		50	+
		51	+# Email validation
		52	+gem "email_validator", "~> 1.4.0", :require => 'email_validator/strict'
46		53
47	# Format dates and times	54	# Format dates and times
48	# based on human-friendly examples	55	# based on human-friendly examples
	@@ -52,7 +59,7 @@ gem "stamp"		@@ -52,7 +59,7 @@ gem "stamp"
52	gem 'enumerize'	59	gem 'enumerize'
53		60
54	# Pagination	61	# Pagination
55	-gem "kaminari", "~> 0.14.1"	62	+gem "kaminari", "~> 0.15.1"
56		63
57	# HAML	64	# HAML
58	gem "haml-rails"	65	gem "haml-rails"
	@@ -71,13 +78,16 @@ gem "seed-fu"		@@ -71,13 +78,16 @@ gem "seed-fu"
71		78
72	# Markdown to HTML	79	# Markdown to HTML
73	gem "redcarpet", "~> 2.2.2"	80	gem "redcarpet", "~> 2.2.2"
74	-gem "github-markup", "~> 0.7.4", require: 'github/markup'	81	+gem "github-markup", "~> 0.7.4", require: 'github/markup', git: 'https://github.com/gitlabhq/markup.git', ref: '61ade389c1e1c159359338f570d18464a44ddbc4'
75		82
76	# Asciidoc to HTML	83	# Asciidoc to HTML
77	gem "asciidoctor"	84	gem "asciidoctor"
78		85
79	# Application server	86	# Application server
80	-gem "unicorn", '~> 4.6.3', group: :unicorn	87	+group :unicorn do
		88	+ gem "unicorn", '~> 4.6.3'
		89	+ gem 'unicorn-worker-killer'
		90	+end
81		91
82	# State machine	92	# State machine
83	gem "state_machine"	93	gem "state_machine"
	@@ -109,7 +119,10 @@ gem "redis-rails"		@@ -109,7 +119,10 @@ gem "redis-rails"
109	gem 'tinder', '~> 1.9.2'	119	gem 'tinder', '~> 1.9.2'
110		120
111	# HipChat integration	121	# HipChat integration
112	-gem "hipchat", "~> 0.9.0"	122	+gem "hipchat", "~> 0.14.0"
		123	+
		124	+# Flowdock integration
		125	+gem "gitlab-flowdock-git-hook", "~> 0.4.2"
113		126
114	# d3	127	# d3
115	gem "d3_rails", "~> 3.1.4"	128	gem "d3_rails", "~> 3.1.4"
	@@ -123,26 +136,23 @@ gem "sanitize"		@@ -123,26 +136,23 @@ gem "sanitize"
123	# Protect against bruteforcing	136	# Protect against bruteforcing
124	gem "rack-attack"	137	gem "rack-attack"
125		138
126	-group :assets do
127	- gem "sass-rails"
128	- gem "coffee-rails"
129	- gem "uglifier"
130	- gem "therubyracer"
131	- gem 'turbolinks'
132	- gem 'jquery-turbolinks'
133	-
134	- gem 'chosen-rails', "1.0.0"
135	- gem 'select2-rails'
136	- gem 'jquery-atwho-rails', "0.3.0"
137	- gem "jquery-rails", "2.1.3"
138	- gem "jquery-ui-rails", "2.0.2"
139	- gem "modernizr", "2.6.2"
140	- gem "raphael-rails", "~> 2.1.2"
141	- gem 'bootstrap-sass'
142	- gem "font-awesome-rails"
143	- gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
144	- gem "gon"
145	-end	139	+gem "sass-rails"
		140	+gem "coffee-rails"
		141	+gem "uglifier"
		142	+gem "therubyracer"
		143	+gem 'turbolinks'
		144	+gem 'jquery-turbolinks'
		145	+
		146	+gem 'select2-rails'
		147	+gem 'jquery-atwho-rails', "~> 0.3.3"
		148	+gem "jquery-rails", "2.1.3"
		149	+gem "jquery-ui-rails", "2.0.2"
		150	+gem "modernizr", "2.6.2"
		151	+gem "raphael-rails", "~> 2.1.2"
		152	+gem 'bootstrap-sass', '~> 3.0'
		153	+gem "font-awesome-rails", '~> 3.2'
		154	+gem "gemoji", "~> 1.3.0"
		155	+gem "gon", '~> 5.0.0'
146		156
147	group :development do	157	group :development do
148	gem "annotate", "~> 2.6.0.beta2"	158	gem "annotate", "~> 2.6.0.beta2"
	@@ -165,7 +175,7 @@ end		@@ -165,7 +175,7 @@ end
165		175
166	group :development, :test do	176	group :development, :test do
167	gem 'coveralls', require: false	177	gem 'coveralls', require: false
168	- gem 'rails-dev-tweaks'	178	+ # gem 'rails-dev-tweaks'
169	gem 'spinach-rails'	179	gem 'spinach-rails'
170	gem "rspec-rails"	180	gem "rspec-rails"
171	gem "capybara"	181	gem "capybara"
	@@ -194,7 +204,7 @@ group :development, :test do		@@ -194,7 +204,7 @@ group :development, :test do
194	gem 'poltergeist', '~> 1.4.1'	204	gem 'poltergeist', '~> 1.4.1'
195		205
196	gem 'spork', '~> 1.0rc'	206	gem 'spork', '~> 1.0rc'
197	- gem 'jasmine'	207	+ gem 'jasmine', '2.0.0.rc5'
198	end	208	end
199		209
200	group :test do	210	group :test do
	@@ -8,6 +8,23 @@ class Admin		@@ -8,6 +8,23 @@ class Admin
8	else	8	else
9	elems.removeAttr 'disabled'	9	elems.removeAttr 'disabled'
10		10
		11	+ $('body').on 'click', '.js-toggle-colors-link', (e) ->
		12	+ e.preventDefault()
		13	+ $('.js-toggle-colors-link').hide()
		14	+ $('.js-toggle-colors-container').show()
		15	+
		16	+ $('input#broadcast_message_color').on 'input', ->
		17	+ previewColor = $('input#broadcast_message_color').val()
		18	+ $('div.broadcast-message-preview').css('background-color', previewColor)
		19	+
		20	+ $('input#broadcast_message_font').on 'input', ->
		21	+ previewColor = $('input#broadcast_message_font').val()
		22	+ $('div.broadcast-message-preview').css('color', previewColor)
		23	+
		24	+ $('textarea#broadcast_message_message').on 'input', ->
		25	+ previewMessage = $('textarea#broadcast_message_message').val()
		26	+ $('div.broadcast-message-preview span').text(previewMessage)
		27	+
11	$('.log-tabs a').click (e) ->	28	$('.log-tabs a').click (e) ->
12	e.preventDefault()	29	e.preventDefault()
13	$(this).tab('show')	30	$(this).tab('show')
	@@ -2,6 +2,7 @@		@@ -2,6 +2,7 @@
2	users_path: "/api/:version/users.json"	2	users_path: "/api/:version/users.json"
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		6
6	# Get 20 (depends on api) recent notes	7	# Get 20 (depends on api) recent notes
7	# and sort the ascending from oldest to newest	8	# and sort the ascending from oldest to newest
	@@ -49,6 +50,20 @@		@@ -49,6 +50,20 @@
49	).done (users) ->	50	).done (users) ->
50	callback(users)	51	callback(users)
51		52
		53	+ # Return namespaces list. Filtered by query
		54	+ namespaces: (query, callback) ->
		55	+ url = Api.buildUrl(Api.namespaces_path)
		56	+
		57	+ $.ajax(
		58	+ url: url
		59	+ data:
		60	+ private_token: gon.api_token
		61	+ search: query
		62	+ per_page: 20
		63	+ dataType: "json"
		64	+ ).done (namespaces) ->
		65	+ callback(namespaces)
		66	+
52	buildUrl: (url) ->	67	buildUrl: (url) ->
53	url = gon.relative_url_root + url if gon.relative_url_root?	68	url = gon.relative_url_root + url if gon.relative_url_root?
54	return url.replace(':version', gon.api_version)	69	return url.replace(':version', gon.api_version)
	@@ -3,7 +3,7 @@ $ ->		@@ -3,7 +3,7 @@ $ ->
3	container = $(@).closest(".js-toggler-container")	3	container = $(@).closest(".js-toggler-container")
4		4
5	container.toggleClass("on")	5	container.toggleClass("on")
6	-	6	+
7	$("body").on "click", ".js-toggle-visibility-link", (e) ->	7	$("body").on "click", ".js-toggle-visibility-link", (e) ->
8	$(@).find('i').	8	$(@).find('i').
9	toggleClass('icon-chevron-down').	9	toggleClass('icon-chevron-down').
	@@ -11,7 +11,7 @@ $ ->		@@ -11,7 +11,7 @@ $ ->
11	container = $(".js-toggle-visibility-container")	11	container = $(".js-toggle-visibility-container")
12	container.toggleClass("hide")	12	container.toggleClass("hide")
13	e.preventDefault()	13	e.preventDefault()
14	-	14	+
15	$("body").on "click", ".js-toggle-button", (e) ->	15	$("body").on "click", ".js-toggle-button", (e) ->
16	$(@).closest(".js-toggle-container").find(".js-toggle-content").toggle()	16	$(@).closest(".js-toggle-container").find(".js-toggle-content").toggle()
17	e.preventDefault()	17	e.preventDefault()
1	class BlobView	1	class BlobView
2	constructor: ->	2	constructor: ->
		3	+ # handle multi-line select
		4	+ handleMultiSelect = (e) ->
		5	+ [ first_line, last_line ] = parseSelectedLines()
		6	+ [ line_number ] = parseSelectedLines($(this).attr("id"))
		7	+ hash = "L#{line_number}"
		8	+
		9	+ if e.shiftKey and not isNaN(first_line) and not isNaN(line_number)
		10	+ if line_number < first_line
		11	+ last_line = first_line
		12	+ first_line = line_number
		13	+ else
		14	+ last_line = line_number
		15	+
		16	+ hash = if first_line == last_line then "L#{first_line}" else "L#{first_line}-#{last_line}"
		17	+
		18	+ setHash(hash)
		19	+ e.preventDefault()
		20	+
3	# See if there are lines selected	21	# See if there are lines selected
4	# "#L12" and "#L34-56" supported	22	# "#L12" and "#L34-56" supported
5	- highlightBlobLines = ->
6	- if window.location.hash isnt ""
7	- matches = window.location.hash.match(/\#L(\d+)(\-(\d+))?/)	23	+ highlightBlobLines = (e) ->
		24	+ [ first_line, last_line ] = parseSelectedLines()
		25	+
		26	+ unless isNaN first_line
		27	+ $("#tree-content-holder .highlight .line").removeClass("hll")
		28	+ $("#LC#{line}").addClass("hll") for line in [first_line..last_line]
		29	+ $("#L#{first_line}").ScrollTo() unless e?
		30	+
		31	+ # parse selected lines from hash
		32	+ # always return first and last line (initialized to NaN)
		33	+ parseSelectedLines = (str) ->
		34	+ first_line = NaN
		35	+ last_line = NaN
		36	+ hash = str \|\| window.location.hash
		37	+
		38	+ if hash isnt ""
		39	+ matches = hash.match(/\#?L(\d+)(\-(\d+))?/)
8	first_line = parseInt(matches?[1])	40	first_line = parseInt(matches?[1])
9	last_line = parseInt(matches?[3])	41	last_line = parseInt(matches?[3])
		42	+ last_line = first_line if isNaN(last_line)
		43	+
		44	+ [ first_line, last_line ]
		45	+
		46	+ setHash = (hash) ->
		47	+ hash = hash.replace(/^\#/, "")
		48	+ nodes = $("#" + hash)
		49	+ # if any nodes are using this id, they must be temporarily changed
		50	+ # also, add a temporary div at the top of the screen to prevent scrolling
		51	+ if nodes.length > 0
		52	+ scroll_top = $(document).scrollTop()
		53	+ nodes.attr("id", "")
		54	+ tmp = $("<div></div>")
		55	+ .css({ position: "absolute", visibility: "hidden", top: scroll_top + "px" })
		56	+ .attr("id", hash)
		57	+ .appendTo(document.body)
		58	+
		59	+ window.location.hash = hash
		60	+
		61	+ # restore the nodes
		62	+ if nodes.length > 0
		63	+ tmp.remove()
		64	+ nodes.attr("id", hash)
10		65
11	- unless isNaN first_line
12	- last_line = first_line if isNaN(last_line)
13	- $("#tree-content-holder .highlight .line").removeClass("hll")
14	- $("#LC#{line}").addClass("hll") for line in [first_line..last_line]
15	- $("#L#{first_line}").ScrollTo()	66	+ # initialize multi-line select
		67	+ $("#tree-content-holder .line-numbers a[id^=L]").on("click", handleMultiSelect)
16		68
17	# Highlight the correct lines on load	69	# Highlight the correct lines on load
18	highlightBlobLines()	70	highlightBlobLines()
19		71
20	# Highlight the correct lines when the hash part of the URL changes	72	# Highlight the correct lines when the hash part of the URL changes
21	- $(window).on 'hashchange', highlightBlobLines	73	+ $(window).on("hashchange", highlightBlobLines)
22		74
23		75
24	@BlobView = BlobView	76	@BlobView = BlobView
	@@ -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: ->
	@@ -47,5 +48,16 @@ class Dispatcher		@@ -47,5 +48,16 @@ class Dispatcher
47		48
48		49
49	initSearch: ->	50	initSearch: ->
50	- autocomplete_json = $('.search-autocomplete-json').data('autocomplete-opts')
51	- new SearchAutocomplete(autocomplete_json)	51	+ opts = $('.search-autocomplete-opts')
		52	+ path = opts.data('autocomplete-path')
		53	+ project_id = opts.data('autocomplete-project-id')
		54	+ project_ref = opts.data('autocomplete-project-ref')
		55	+
		56	+ new SearchAutocomplete(path, project_id, project_ref)
		57	+
		58	+ initHighlight: ->
		59	+ $('.highlight pre code').each (i, e) ->
		60	+ hljs.highlightBlock(e)
		61	+ $(e).html($.map($(e).html().split("\n"), (line, i) ->
		62	+ "<div class='line' id='LC" + (i + 1) + "'>" + line + "</div>"
		63	+ ).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