diff --git a/.gitignore b/.gitignore
index 4c25c8abf8..aa822771ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ doc/code/*
 *.log
 public/uploads.*
 public/assets/
+.envrc
diff --git a/.travis.yml b/.travis.yml
index 75b4c5c703..d7c65286cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,14 @@
 language: ruby
 env:
   global:
-    - DB=mysql
     - TRAVIS=true
   matrix:
-    - TASK=spinach
-    - TASK=spec
-    - TASK=jasmine:ci
+    - TASK=spinach DB=mysql
+    - TASK=spec DB=mysql
+    - TASK=jasmine:ci DB=mysql
+    - TASK=spinach DB=postgresql
+    - TASK=spec DB=postgresql
+    - TASK=jasmine:ci DB=postgresql
 before_install:
   - sudo apt-get install libicu-dev -y
 branches:
@@ -15,13 +17,12 @@ branches:
 rvm:
   - 2.0.0
 services:
-  - mysql
   - redis-server
 before_script:
-  - "cp config/database.yml.$DB config/database.yml"
-  - "cp config/gitlab.yml.example config/gitlab.yml"
   - "bundle exec rake db:setup"
   - "bundle exec rake db:seed_fu"
+  - "cp config/database.yml.$DB config/database.yml"
+  - "cp config/gitlab.yml.example config/gitlab.yml"
 script: "bundle exec rake $TASK --trace"
 notifications:
   email: false
diff --git a/CHANGELOG b/CHANGELOG
index cdd8ca1796..031536816a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,42 @@
+v 6.7.0
+  - Increased the example Nginx client_max_body_size from 5MB to 20MB, consider updating it manually on existing installations
+  - Add support for Gemnasium as a Project Service (Olivier Gonzalez)
+  - Add edit file button to MergeRequest diff
+  - Public groups (Jason Hollingsworth)
+  - Cleaner headers in Notification Emails (Pierre de La Morinerie)
+  - Blob and tree gfm links to anchors work
+  - Piwik Integration (Sebastian Winkler)
+  - Show contribution guide link for new issue form (Jeroen van Baarsen)
+  - Fix CI status for merge requests from fork 
+  - Added option to remove issue assignee on project issue page and issue edit page (Jason Blanchard)
+  - Converted all the help sections into markdown
+  - LDAP user filters
+  - Streamline the content of notification emails (Pierre de La Morinerie)
+  - Fixes a bug with group member administration (Matt DeTullio)
+  - Sort tag names using VersionSorter (Robert Speicher)
+  - Add GFM autocompletion for MergeRequests (Robert Speicher)
+  - Add webhook when a new tag is pushed (Jeroen van Baarsen)
+  - Add button for toggling inline comments in diff view
+  - Add retry feature for repository import
+  - Reuse the GitLab LDAP connection within each request
+  - Changed markdown new line behaviour to conform to markdown standards
+  - Fix global search
+  - Faster authorized_keys rebuilding in `rake gitlab:shell:setup` (requires gitlab-shell 1.8.5)
+  - Create and Update MR calls now support the description parameter (Greg Messner)
+  - Markdown relative links in the wiki link to wiki pages, markdown relative links in repositories link to files in the repository
+
+v 6.6.5
+  - Added option to remove issue assignee on project issue page and issue edit page (Jason Blanchard)
+  - Hide mr close button for comment form if merge request was closed or inline comment
+  - Adds ability to reopen closed merge request
+
+v 6.6.4
+  - Add missing html escape for highlighted code blocks in comments, issues
+
+v 6.6.3
+  - Fix 500 error when edit yourself from admin area
+  - Hide private groups for public profiles
+
 v 6.6.2
   - Fix 500 error on branch/tag create or remove via UI
 
@@ -18,7 +57,7 @@ v 6.6.0
   - Remove snippet expiration
   - Mobile UI improvements (Drew Blessing)
   - Fix block/remove UI for admin::users#show page
-  - Show users' group membership on users' activity page
+  - Show users' group membership on users' activity page (Robert Djurasaj)
   - User pages are visible without login if user is authorized to a public project
   - Markdown rendered headers have id derived from their name and link to their id
   - Improve application to work faster with large groups (100+ members)
@@ -27,6 +66,7 @@ v 6.6.0
   - Restyle Issue#show page and MR#show page
   - Ability to filter by multiple labels for Issues page
   - Rails version to 4.0.3
+  - Fixed attachment identifier displaying underneath note text (Jason Blanchard)
 
 v 6.5.1
   - Fix branch selectbox when create merge request from fork
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cf52808b74..93dd88360a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,7 +22,7 @@ Issues and merge requests should be in English and contain appropriate language
 
 ## Issue tracker
 
-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/).
+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#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/).
 
 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.
 
@@ -48,7 +48,7 @@ Please send a merge request with a tested solution or a merge request with a fai
 
 ## Merge requests
 
-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.
+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 requests' on our feedback forum](http://feedback.gitlab.com/forums/176466-general/status/796455) but other improvements are also welcome. If you want to add a new feature that is not marked it is best to first create a feedback issue (if there isn't one already) and leave a comment asking for it to be marked accepting merge requests. Please include screenshots or wireframes if the feature will also change the UI.
 
 ### Merge request guidelines
 
@@ -66,25 +66,30 @@ If you can, please submit a merge request with the fix or improvements including
 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
+1. If your MR touches code that executes shell commands, make sure it adheres to the [shell command guidelines](    doc/development/shell_commands.md).
+
+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.
 
 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.
+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). Please ensure that your merge request meets the following contribution acceptance criteria.
 
-We will accept a merge requests if it:
+## Contribution acceptance criteria
 
-* 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 configuration options since these complicate future changes
-* Contains a single commit (please use `git rebase -i` to squash commits)
+1. The change is as small as possible (see the above paragraph for details)
+1. Include proper tests and make all tests pass (unless it contains a test exposing a bug in existing code)
+1. Can merge without problems (if not please use: `git rebase master`)
+1. Does not break any existing functionality
+1. Fixes one specific issue or implements one specific feature (do not combine things, send separate merge requests if needed)
+1. Keeps the GitLab code base clean and well structured
+1. Contains functionality we think other users will benefit from too
+1. Doesn't add configuration options since they complicate future changes
+1. Contains a single commit (please use `git rebase -i` to squash commits)
+1. It conforms to the following style guides
 
-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).
+## Style guides
+
+1. [Ruby style guide](https://github.com/bbatsov/ruby-style-guide)
+1. [Rails style guide](https://github.com/bbatsov/rails-style-guide)
+1. [CoffeeScript style guide](https://github.com/polarmobile/coffeescript-style-guide)
+1. [Shell command guidelines](doc/development/shell_commands.md)
diff --git a/Gemfile b/Gemfile
index 027d3b732e..a433c85a80 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,9 @@ gem 'rails-observers'
 gem 'actionpack-page_caching'
 gem 'actionpack-action_caching'
 
+# Default values for AR models
+gem "default_value_for", "~> 3.0.0"
+
 # Supported DBs
 gem "mysql2", group: :mysql
 gem "pg", group: :postgres
@@ -29,7 +32,7 @@ gem 'omniauth-github'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 5.4.0'
+gem "gitlab_git", '~> 5.7.1'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
@@ -46,7 +49,8 @@ gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
 
 # API
 gem "grape", "~> 0.6.1"
-gem "grape-entity", "~> 0.3.0"
+# Replace with rubygems when nesteted entities get released
+gem "grape-entity", "~> 0.4.1", ref: 'd904381c951e86250c3f44213b349a3dd8e83fb1', git: 'https://github.com/intridea/grape-entity.git' 
 gem 'rack-cors', require: 'rack/cors'
 
 # Email validation
@@ -112,6 +116,7 @@ gem 'settingslogic'
 
 # Misc
 gem "foreman"
+gem 'version_sorter'
 
 # Cache
 gem "redis-rails"
@@ -125,6 +130,9 @@ gem "hipchat", "~> 0.14.0"
 # Flowdock integration
 gem "gitlab-flowdock-git-hook", "~> 0.4.2"
 
+# Gemnasium integration
+gem "gemnasium-gitlab-service", "~> 0.2"
+
 # d3
 gem "d3_rails", "~> 3.1.4"
 
@@ -162,7 +170,7 @@ group :development do
   gem "annotate", "~> 2.6.0.beta2"
   gem "letter_opener"
   gem 'quiet_assets', '~> 1.0.1'
-  gem 'rack-mini-profiler'
+  gem 'rack-mini-profiler', require: false
 
   # Better errors handler
   gem 'better_errors'
diff --git a/Gemfile.lock b/Gemfile.lock
index 24492e3de0..ef041c9439 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,6 +5,15 @@ GIT
   specs:
     github-markup (0.7.6)
 
+GIT
+  remote: https://github.com/intridea/grape-entity.git
+  revision: d904381c951e86250c3f44213b349a3dd8e83fb1
+  ref: d904381c951e86250c3f44213b349a3dd8e83fb1
+  specs:
+    grape-entity (0.4.1)
+      activesupport
+      multi_json (>= 1.3.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -101,6 +110,8 @@ GEM
     daemons (1.1.9)
     database_cleaner (1.2.0)
     debug_inspector (0.0.2)
+    default_value_for (3.0.0)
+      activerecord (>= 3.2.0, < 5.0)
     descendants_tracker (0.0.3)
     devise (3.0.4)
       bcrypt-ruby (~> 3.0)
@@ -152,6 +163,8 @@ GEM
       dotenv (>= 0.7)
       thor (>= 0.13.6)
     formatador (0.2.4)
+    gemnasium-gitlab-service (0.2.1)
+      rugged (~> 0.19)
     gemoji (1.3.1)
     gherkin-ruby (0.3.1)
       racc
@@ -177,7 +190,7 @@ GEM
       charlock_holmes (~> 0.6.6)
       escape_utils (~> 0.2.4)
       mime-types (~> 1.19)
-    gitlab_git (5.4.0)
+    gitlab_git (5.7.1)
       activesupport (~> 4.0.0)
       charlock_holmes (~> 0.6.9)
       gitlab-grit (~> 2.6.1)
@@ -202,9 +215,6 @@ GEM
       rack-accept
       rack-mount
       virtus (>= 1.0.0)
-    grape-entity (0.3.0)
-      activesupport
-      multi_json (>= 1.3.2)
     growl (1.0.3)
     guard (2.2.4)
       formatador (>= 0.2.4)
@@ -231,7 +241,7 @@ GEM
       httparty
       httparty
     http_parser.rb (0.5.3)
-    httparty (0.12.0)
+    httparty (0.13.0)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     httpauth (0.2.0)
@@ -338,7 +348,7 @@ GEM
     rack-attack (2.3.0)
       rack
     rack-cors (0.2.9)
-    rack-mini-profiler (0.1.31)
+    rack-mini-profiler (0.9.0)
       rack (>= 1.1.3)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
@@ -533,6 +543,7 @@ GEM
       raindrops (~> 0.7)
     unicorn-worker-killer (0.4.2)
       unicorn (~> 4)
+    version_sorter (1.1.0)
     virtus (1.0.1)
       axiom-types (~> 0.0.5)
       coercible (~> 1.0)
@@ -568,6 +579,7 @@ DEPENDENCIES
   coveralls
   d3_rails (~> 3.1.4)
   database_cleaner
+  default_value_for (~> 3.0.0)
   devise (= 3.0.4)
   devise-async (= 0.8.0)
   email_spec
@@ -578,18 +590,19 @@ DEPENDENCIES
   fog (~> 1.3.1)
   font-awesome-rails (~> 3.2)
   foreman
+  gemnasium-gitlab-service (~> 0.2)
   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.4.0)
+  gitlab_git (~> 5.7.1)
   gitlab_meta (= 6.0)
   gitlab_omniauth-ldap (= 1.0.4)
   gon (~> 5.0.0)
   grape (~> 0.6.1)
-  grape-entity (~> 0.3.0)
+  grape-entity (~> 0.4.1)!
   growl
   guard-rspec
   guard-spinach
@@ -657,4 +670,5 @@ DEPENDENCIES
   underscore-rails (~> 1.4.4)
   unicorn (~> 4.6.3)
   unicorn-worker-killer
+  version_sorter
   webmock
diff --git a/PROCESS.md b/PROCESS.md
index bf757025c4..c582dc6fd0 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -12,7 +12,7 @@ Below we describe the contributing process to GitLab for two reasons. So that co
 - 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/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/)
+- Asks for feedback from the relevant developer(s) based on the [list of members and their specialities](https://www.gitlab.com/core-team/)
 - 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 merge requests
@@ -37,7 +37,7 @@ Below we describe the contributing process to GitLab for two reasons. So that co
 
 ## Mentioning people
 
-The most important thing is making sure valid issues receive feedback from the development team. Therefore the priority is mentioning developers that can help on those issue. Please select someone with relevant experience from [GitLab core team](http://gitlab.org/team/). If there is nobody mentioned with that expertise look in the commit history for the affected files to find someone. Avoid mentioning the lead developer, this is the person that is least likely to give a timely response. If the involvement of the lead developer is needed the other core team members will mention this person.
+The most important thing is making sure valid issues receive feedback from the development team. Therefore the priority is mentioning developers that can help on those issue. Please select someone with relevant experience from [GitLab core team](https://www.gitlab.com/core-team/). If there is nobody mentioned with that expertise look in the commit history for the affected files to find someone. Avoid mentioning the lead developer, this is the person that is least likely to give a timely response. If the involvement of the lead developer is needed the other core team members will mention this person.
 
 ## Workflow labels
 
@@ -89,7 +89,7 @@ Please use ``` to format console output, logs, and code as it'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://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).
+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\]\(https://github.com/gitlabhq/gitlabhq/tree/master/doc/update). 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 merge request
 
diff --git a/README.md b/README.md
index 02766a334f..b23c0bb14f 100644
--- a/README.md
+++ b/README.md
@@ -23,19 +23,17 @@
 
 ### Resources
 
-* GitLab.org community site: [Homepage](http://gitlab.org) | [Screenshots](http://gitlab.org/screenshots/) | [Blog](http://blog.gitlab.org/) | [Demo](http://demo.gitlabhq.com/users/sign_in)
+* [GitLab.com](https://www.gitlab.com/) includes information about [subscriptions](https://www.gitlab.com/subscription/), [consultancy](https://www.gitlab.com/consultancy/), the [community](https://www.gitlab.com/community/) and the [hosted GitLab Cloud](https://www.gitlab.com/cloud/).
 
-* 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 Enterprise Edition](https://www.gitlab.com/gitlab-ce/) offers additional features that are useful for larger organizations (100+ users).
 
-* [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.
+* [GitLab CI](https://www.gitlab.com/gitlab-ci/) is a continuous integration (CI) server that is easy to integrate with GitLab.
 
 * Unofficial third-party [iPhone app](http://gitlabcontrol.com/) and [Android app](https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en) for GitLab
 
 ### Requirements
 
-* Ubuntu/Debian**
+* Ubuntu/Debian/CentOS/RHEL**
 * ruby 1.9.3+
 * git 1.7.10+
 * redis 2.0+
@@ -47,7 +45,7 @@
 
 #### Official installation methods
 
-* [GitLab packages (beta)](https://www.gitlab.com/downloads/) These packages contain GitLab and all its depencies (PostgreSQL, Redis, Nginx, Unicorn, etc.). They are made with [omnibus-gitlab](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md) that also contains the installation instructions. These packages currently support a reduced selection of GitLab's normal features. For instance, it is not yet possible to create/restore application backups or to use HTTPS.
+* [GitLab packages](https://www.gitlab.com/downloads/) These packages contain GitLab and all its depencies (Ruby, PostgreSQL, Redis, Nginx, Unicorn, etc.). They are made with [omnibus-gitlab](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md) that also contains the installation instructions.
 
 * [GitLab virtual machine images](https://www.gitlab.com/downloads/) contain an operating system and a preinstalled GitLab. They are made with [GitLab Packer](https://gitlab.com/gitlab-org/gitlab-packer/blob/master/README.md) that also contains the installation instructions.
 
@@ -155,12 +153,3 @@ or start each component separately
 * [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthusiast Jonathan M. Hethey is unofficial but it offers a good overview.
 
 * [Gitter chat room](https://gitter.im/gitlabhq/gitlabhq#) here you can ask questions when you need help.
-
-
-### Getting in touch
-
-* [Core team](http://gitlab.org/team/)
-
-* [Contributors](http://contributors.gitlab.org/)
-
-* [Community](http://gitlab.org/community/)
diff --git a/VERSION b/VERSION
index 7504502eee..5870f72108 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.6.0-ee
+6.7.0.pre-ee
diff --git a/vendor/assets/images/authbuttons/github_32.png b/app/assets/images/authbuttons/github_32.png
similarity index 100%
rename from vendor/assets/images/authbuttons/github_32.png
rename to app/assets/images/authbuttons/github_32.png
diff --git a/vendor/assets/images/authbuttons/github_64.png b/app/assets/images/authbuttons/github_64.png
similarity index 100%
rename from vendor/assets/images/authbuttons/github_64.png
rename to app/assets/images/authbuttons/github_64.png
diff --git a/vendor/assets/images/authbuttons/google_32.png b/app/assets/images/authbuttons/google_32.png
similarity index 100%
rename from vendor/assets/images/authbuttons/google_32.png
rename to app/assets/images/authbuttons/google_32.png
diff --git a/vendor/assets/images/authbuttons/google_64.png b/app/assets/images/authbuttons/google_64.png
similarity index 100%
rename from vendor/assets/images/authbuttons/google_64.png
rename to app/assets/images/authbuttons/google_64.png
diff --git a/vendor/assets/images/authbuttons/twitter_32.png b/app/assets/images/authbuttons/twitter_32.png
similarity index 100%
rename from vendor/assets/images/authbuttons/twitter_32.png
rename to app/assets/images/authbuttons/twitter_32.png
diff --git a/vendor/assets/images/authbuttons/twitter_64.png b/app/assets/images/authbuttons/twitter_64.png
similarity index 100%
rename from vendor/assets/images/authbuttons/twitter_64.png
rename to app/assets/images/authbuttons/twitter_64.png
diff --git a/vendor/assets/images/bg_fallback.png b/app/assets/images/bg_fallback.png
similarity index 100%
rename from vendor/assets/images/bg_fallback.png
rename to app/assets/images/bg_fallback.png
diff --git a/vendor/assets/images/icon_sprite.png b/app/assets/images/icon_sprite.png
similarity index 100%
rename from vendor/assets/images/icon_sprite.png
rename to app/assets/images/icon_sprite.png
diff --git a/vendor/assets/images/progress_bar.gif b/app/assets/images/progress_bar.gif
similarity index 100%
rename from vendor/assets/images/progress_bar.gif
rename to app/assets/images/progress_bar.gif
diff --git a/vendor/assets/images/slider_handles.png b/app/assets/images/slider_handles.png
similarity index 100%
rename from vendor/assets/images/slider_handles.png
rename to app/assets/images/slider_handles.png
diff --git a/vendor/assets/images/ui-icons_222222_256x240.png b/app/assets/images/ui-icons_222222_256x240.png
similarity index 100%
rename from vendor/assets/images/ui-icons_222222_256x240.png
rename to app/assets/images/ui-icons_222222_256x240.png
diff --git a/vendor/assets/images/ui-icons_454545_256x240.png b/app/assets/images/ui-icons_454545_256x240.png
similarity index 100%
rename from vendor/assets/images/ui-icons_454545_256x240.png
rename to app/assets/images/ui-icons_454545_256x240.png
diff --git a/app/assets/javascripts/behaviors/details_behavior.coffee b/app/assets/javascripts/behaviors/details_behavior.coffee
index 7ad5c81894..decab3e1be 100644
--- a/app/assets/javascripts/behaviors/details_behavior.coffee
+++ b/app/assets/javascripts/behaviors/details_behavior.coffee
@@ -1,5 +1,15 @@
 $ ->
   $("body").on "click", ".js-details-target", ->
     container = $(@).closest(".js-details-container")
-
     container.toggleClass("open")
+
+  # Show details content. Hides link after click.
+  #
+  # %div
+  #   %a.js-details-expand
+  #   %div.js-details-content
+  #
+  $("body").on "click", ".js-details-expand", (e) ->
+    $(@).next('.js-details-content').removeClass("hide")
+    $(@).hide()
+    e.preventDefault()
diff --git a/app/assets/javascripts/behaviors/toggler_behavior.coffee b/app/assets/javascripts/behaviors/toggler_behavior.coffee
index 5afb656e69..d06cb116df 100644
--- a/app/assets/javascripts/behaviors/toggler_behavior.coffee
+++ b/app/assets/javascripts/behaviors/toggler_behavior.coffee
@@ -1,17 +1,18 @@
 $ ->
   $("body").on "click", ".js-toggler-target", ->
     container = $(@).closest(".js-toggler-container")
-
     container.toggleClass("on")
 
-  $("body").on "click", ".js-toggle-visibility-link", (e) ->
+  # Toggle button. Show/hide content inside parent container.
+  # Button does not change visibility. If button has icon - it changes chevron style.
+  #
+  # %div.js-toggle-container
+  #   %a.js-toggle-button
+  #   %div.js-toggle-content
+  #
+  $("body").on "click", ".js-toggle-button", (e) ->
     $(@).find('i').
       toggleClass('icon-chevron-down').
       toggleClass('icon-chevron-up')
-    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()
diff --git a/app/assets/javascripts/commit.js.coffee b/app/assets/javascripts/commit.js.coffee
index 9f55a1e636..5f53439ca4 100644
--- a/app/assets/javascripts/commit.js.coffee
+++ b/app/assets/javascripts/commit.js.coffee
@@ -1,6 +1,6 @@
 class Commit
   constructor: ->
-    $('.files .file').each ->
+    $('.files .diff-file').each ->
       new CommitFile(this)
 
 @Commit = Commit
diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
index 77091da8f6..dd12000a1c 100644
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ b/app/assets/javascripts/gfm_auto_complete.js.coffee
@@ -13,6 +13,7 @@ GitLab.GfmAutoComplete =
   Members:
     template: '<li data-value="${username}">${username} <small>${name}</small></li>'
 
+  # Issues and MergeRequests
   Issues:
     template: '<li data-value="${id}"><small>${id}</small> ${title} </li>'
 
@@ -46,11 +47,22 @@ GitLab.GfmAutoComplete =
         before_save: (issues) ->
           $.map issues, (i) -> id: i.iid, title: sanitize(i.title), search: "#{i.iid} #{i.title}"
 
+    input.atwho
+      at: '!'
+      alias: 'mergerequests'
+      search_key: 'search'
+      tpl: @Issues.template
+      callbacks:
+        before_save: (merges) ->
+          $.map merges, (m) -> id: m.iid, title: sanitize(m.title), search: "#{m.iid} #{m.title}"
+
     input.one "focus", =>
       $.getJSON(@dataSource).done (data) ->
         # load members
         input.atwho 'load', "@", data.members
         # load issues
         input.atwho 'load', "issues", data.issues
+        # load merge requests
+        input.atwho 'load', "mergerequests", data.mergerequests
         # load emojis
         input.atwho 'load', ":", data.emojis
diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee
index 9cf4dba815..70e8972d24 100644
--- a/app/assets/javascripts/main.js.coffee
+++ b/app/assets/javascripts/main.js.coffee
@@ -62,11 +62,6 @@ $ ->
   $('.remove-row').bind 'ajax:success', ->
     $(this).closest('li').fadeOut()
 
-  # Click a .appear-link, appear-data fadeout
-  $(".appear-link").on 'click', (e) ->
-    $('.appear-data').fadeIn()
-    e.preventDefault()
-
   # Initialize select2 selects
   $('select.select2').select2(width: 'resolve', dropdownAutoWidth: true)
 
@@ -117,14 +112,10 @@ $ ->
 
 
   # Commit show suppressed diff
-  $(".content").on "click", ".supp_diff_link", ->
+  $(".diff-content").on "click", ".supp_diff_link", ->
     $(@).next('table').show()
     $(@).remove()
 
-  $(".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: ->
diff --git a/app/assets/javascripts/project_users_select.js.coffee b/app/assets/javascripts/project_users_select.js.coffee
index aa8b70d9b8..03fad41c49 100644
--- a/app/assets/javascripts/project_users_select.js.coffee
+++ b/app/assets/javascripts/project_users_select.js.coffee
@@ -10,6 +10,16 @@
         query: (query) ->
           Api.projectUsers project_id, query.term, (users) ->
             data = { results: users }
+
+            nullUser = {
+              name: 'Unassigned',
+              avatar: null,
+              username: 'none',
+              id: ''
+            }
+
+            data.results.unshift(nullUser)
+
             query.callback(data)
 
         initSelection: (element, callback) ->
@@ -35,8 +45,13 @@
     else
       avatar = gon.relative_url_root + "/assets/no_avatar.png"
 
+    if user.id == ''
+      avatarMarkup = ''
+    else
+      avatarMarkup = "<div class='user-image'><img class='avatar s24' src='#{avatar}'></div>"
+
     "<div class='user-result'>
-       <div class='user-image'><img class='avatar s24' src='#{avatar}'></div>
+       #{avatarMarkup}
        <div class='user-name'>#{user.name}</div>
        <div class='user-username'>#{user.username}</div>
      </div>"
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index d5522f00f5..3346671468 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -37,6 +37,7 @@
 @import "generic/issue_box.scss";
 @import "generic/files.scss";
 @import "generic/lists.scss";
+@import "generic/flash.scss";
 @import "generic/forms.scss";
 @import "generic/selects.scss";
 @import "generic/highlight.scss";
@@ -47,6 +48,7 @@
 @import "sections/header.scss";
 @import "sections/nav.scss";
 @import "sections/commits.scss";
+@import "sections/diff.scss";
 @import "sections/issues.scss";
 @import "sections/projects.scss";
 @import "sections/snippets.scss";
@@ -68,7 +70,7 @@
 @import "sections/groups.scss";
 
 /**
- * Code ighlight
+ * Code highlight
  */
 @import "highlight/white.scss";
 @import "highlight/dark.scss";
diff --git a/app/assets/stylesheets/generic/blocks.scss b/app/assets/stylesheets/generic/blocks.scss
index 1cbd743983..3536a68f41 100644
--- a/app/assets/stylesheets/generic/blocks.scss
+++ b/app/assets/stylesheets/generic/blocks.scss
@@ -2,3 +2,18 @@
   background: #f9f9f9;
   padding: 15px;
 }
+
+.centered-light-block {
+  text-align: center;
+  color: #888;
+  margin: 20px;
+}
+
+.nothing-here-block {
+  text-align: center;
+  padding: 20px;
+  color: #666;
+  font-weight: normal;
+  font-size: 16px;
+  line-height: 36px;
+}
diff --git a/app/assets/stylesheets/generic/buttons.scss b/app/assets/stylesheets/generic/buttons.scss
index 4cb41a79ff..dd0a2938cf 100644
--- a/app/assets/stylesheets/generic/buttons.scss
+++ b/app/assets/stylesheets/generic/buttons.scss
@@ -158,6 +158,14 @@
       color: #468847;
     }
   }
+
+  &.btn-grouped {
+    margin-right: 7px;
+    float: left;
+    &:last-child {
+      margin-right: 0px;
+    }
+  }
 }
 
 .btn-block {
@@ -169,9 +177,8 @@
   }
 }
 
-.btn,
 .btn-group {
-  &.grouped {
+  &.btn-grouped {
     margin-right: 7px;
     float: left;
     &:last-child {
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 0831d8be97..6ac06dd687 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -11,8 +11,6 @@
 .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 }
@@ -24,32 +22,9 @@
 .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; }
+.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;
@@ -59,53 +34,23 @@
   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: 9px 25px;
-  text-align: center;
-  text-shadow: none;
-  margin-right: 20px;
-
-  &.state-label-blue {
-    background: #31708f;
-    color: #FFF;
+pre {
+  &.clean {
+    background: none;
+    border: none;
+    margin: 0;
+    padding: 0;
   }
 
-  &.state-label-green {
-    background: #4A4;
-    color: #FFF;
-  }
-
-  &.state-label-red {
-    background: #DA4E49;
-    color: #FFF;
+  &.well-pre {
+    border: 1px solid #EEE;
+    background: #f9f9f9;
+    border-radius: 0;
+    color: #555;
   }
 }
 
@@ -135,31 +80,6 @@ pre.well-pre {
 }
 
 /** 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;
 }
@@ -279,22 +199,6 @@ li.note {
   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;
@@ -358,15 +262,6 @@ li.note {
   }
 }
 
-pre {
-  &.clean {
-    background: none;
-    border: none;
-    margin: 0;
-    padding: 0;
-  }
-}
-
 .milestone {
   &.milestone-closed {
     background: #eee;
@@ -403,10 +298,6 @@ img.emoji {
   width: 20px;
 }
 
-.appear-data {
-  display: none;
-}
-
 .chart {
   overflow: hidden;
   height: 220px;
@@ -459,40 +350,6 @@ table {
   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;
diff --git a/app/assets/stylesheets/generic/flash.scss b/app/assets/stylesheets/generic/flash.scss
new file mode 100644
index 0000000000..95d28aaef6
--- /dev/null
+++ b/app/assets/stylesheets/generic/flash.scss
@@ -0,0 +1,25 @@
+.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;
+  }
+}
diff --git a/app/assets/stylesheets/generic/forms.scss b/app/assets/stylesheets/generic/forms.scss
index 19e3e7a953..56cd4db905 100644
--- a/app/assets/stylesheets/generic/forms.scss
+++ b/app/assets/stylesheets/generic/forms.scss
@@ -1,5 +1,5 @@
 input[type='search'].search-text-input {
-  background-image: url("icon-search.png");
+  background-image: image-url("icon-search.png");
   background-repeat: no-repeat;
   background-position: 10px;
   padding-left: 25px;
diff --git a/app/assets/stylesheets/generic/issue_box.scss b/app/assets/stylesheets/generic/issue_box.scss
index 0e0a365a82..3db4d908d9 100644
--- a/app/assets/stylesheets/generic/issue_box.scss
+++ b/app/assets/stylesheets/generic/issue_box.scss
@@ -10,9 +10,61 @@
 .issue-box {
   color: #666;
   margin:20px 0;
-  background: #FAFAFA;
+  background: #FFF;
   border: 1px solid #EEE;
 
+  &.issue-box-closed {
+    border-color: #DA4E49;
+    .state {
+      background-color: #f2dede;
+      border-color: #ebccd1;
+      color: #a94442;
+      .state-label {
+        background: #DA4E49;
+        color: #FFF;
+      }
+    }
+  }
+
+  &.issue-box-merged {
+    border-color: #31708f;
+    .state {
+      background-color: #d9edf7;
+      border-color: #bce8f1;
+      color: #31708f;
+      .state-label {
+        background: #31708f;
+        color: #FFF;
+      }
+    }
+  }
+
+  &.issue-box-open {
+    border-color: #4A4;
+    .state {
+      background-color: #dff0d8;
+      border-color: #d6e9c6;
+      color: #3c763d;
+      .state-label {
+        background: #4A4;
+        color: #FFF;
+      }
+    }
+  }
+
+  &.issue-box-expired {
+    border-color: #cea61b;
+    .state {
+      background-color: #fcf8e3;
+      border-color: #faebcc;
+      color: #8a6d3b;
+      .state-label {
+        background: #cea61b;
+        color: #FFF;
+      }
+    }
+  }
+
   .control-group {
     margin-bottom: 0;
   }
@@ -48,4 +100,13 @@
       margin: 0;
     }
   }
+
+  .state-label {
+    font-size: 14px;
+    padding: 1px 25px;
+    text-align: center;
+    text-shadow: none;
+    margin-right: 20px;
+    display: inline-block;
+  }
 }
diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss
index 7ee1fec4e0..03597c1fc7 100644
--- a/app/assets/stylesheets/generic/selects.scss
+++ b/app/assets/stylesheets/generic/selects.scss
@@ -87,3 +87,37 @@ select {
     padding-top: 4px;
   }
 }
+
+.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;
+  }
+}
diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss
index 1a07fde53f..3a31e28e0a 100644
--- a/app/assets/stylesheets/generic/typography.scss
+++ b/app/assets/stylesheets/generic/typography.scss
@@ -105,7 +105,7 @@ a:focus {
       display: inline-block;
       width: $size;
       height: $size;
-      background-image: url("icon-link.png");
+      background-image: image-url("icon-link.png");
       background-size: contain;
       background-repeat: no-repeat;
     }
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss
index 880387a348..c06bed3c21 100644
--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -178,3 +178,9 @@
 .shadow {
   @include box-shadow(0 5px 15px #000);
 }
+
+.wiki, .note-body {
+  .highlight {
+    border: 1px solid #DDD;
+  }
+}
diff --git a/app/assets/stylesheets/main/layout.scss b/app/assets/stylesheets/main/layout.scss
index 9e009a5e0a..e28da65c01 100644
--- a/app/assets/stylesheets/main/layout.scss
+++ b/app/assets/stylesheets/main/layout.scss
@@ -5,9 +5,7 @@ html {
 }
 
 body {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  margin-bottom: 20px;
+  padding-bottom: 20px;
 }
 
 .container {
diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss
index 158db38549..855bb4ea01 100644
--- a/app/assets/stylesheets/sections/commits.scss
+++ b/app/assets/stylesheets/sections/commits.scss
@@ -10,332 +10,6 @@
   }
 }
 
-.file {
-  border: 1px solid #CCC;
-  margin-bottom: 1em;
-
-  .header {
-    @extend .clearfix;
-    background: #DDD;
-    border-bottom: 1px solid #CCC;
-    padding: 5px 5px 5px 10px;
-    color: #555;
-
-    > span {
-      font-family: $monospace_font;
-      font-size: 14px;
-      line-height: 2;
-    }
-
-    .view-file {
-      font-weight: bold;
-      float: right;
-      background-color: #EEE;
-    }
-
-    .commit-short-id {
-      font-family: $monospace_font;
-      font-size: smaller;
-    }
-
-    .file-mode {
-      font-family: $monospace_font;
-    }
-  }
-  .content {
-    overflow: auto;
-    overflow-y: hidden;
-    background: #FFF;
-    color: #333;
-    font-size: 12px;
-    .old {
-      span.idiff {
-        background-color: #FAA;
-      }
-    }
-    .new {
-      span.idiff {
-        background-color: #AFA;
-      }
-    }
-
-    table {
-      width: 100%;
-      font-family: $monospace_font;
-      border: none;
-      margin: 0px;
-      padding: 0px;
-      td {
-        line-height: 18px;
-        font-size: 12px;
-      }
-    }
-    .old_line, .new_line, .diff_line {
-      margin: 0px;
-      padding: 0px;
-      border: none;
-      background: #EEE;
-      color: #666;
-      padding: 0px 5px;
-      border-right: 1px solid #ccc;
-      text-align: right;
-      min-width: 35px;
-      max-width: 50px;
-      width: 35px;
-      @include user-select(none);
-      a {
-        float: left;
-        width: 35px;
-        font-weight: normal;
-        color: #666;
-        &:hover {
-          text-decoration: underline;
-        }
-      }
-      &.new {
-        background: #CFD;
-      }
-      &.old {
-        background: #FDD;
-      }
-    }
-    .diff_line {
-      padding: 0;
-    }
-    .line_holder {
-      &.old .old_line,
-      &.old .new_line {
-        background: #FCC;
-        border-color: #E7BABA;
-      }
-      &.new .old_line,
-      &.new .new_line {
-        background: #CFC;
-        border-color: #B9ECB9;
-      }
-    }
-    .line_content {
-      display: block;
-      white-space: pre;
-      height: 18px;
-      margin: 0px;
-      padding: 0px 0.5em;
-      border: none;
-      &.new {
-        background: #CFD;
-      }
-      &.old {
-        background: #FDD;
-      }
-      &.matched {
-        color: #ccc;
-        background: #fafafa;
-      }
-      &.parallel {
-        display: table-cell;
-        overflow: hidden;
-        width: 50%;
-      }
-    }
-  }
-  .image {
-    background: #ddd;
-    text-align: center;
-    padding: 30px;
-    .wrap{
-      display: inline-block;
-    }
-
-    .frame {
-      display: inline-block;
-      background-color: #fff;
-      line-height: 0;
-      img{
-        border: 1px solid #FFF;
-        background: url('trans_bg.gif');
-        max-width: 100%;
-      }
-      &.deleted {
-        border: 1px solid $deleted;
-      }
-
-      &.added {
-        border: 1px solid $added;
-      }
-    }
-    .image-info{
-      font-size: 12px;
-      margin: 5px 0 0 0;
-      color: grey;
-    }
-
-    .view.swipe{
-      position: relative;
-
-      .swipe-frame{
-        display: block;
-        margin: auto;
-        position: relative;
-      }
-      .swipe-wrap{
-        overflow: hidden;
-        border-left: 1px solid #999;
-        position: absolute;
-        display: block;
-        top: 13px;
-        right: 7px;
-      }
-      .frame{
-        top: 0;
-        right: 0;
-        position: absolute;
-        &.deleted{
-          margin: 0;
-          display: block;
-          top: 13px;
-          right: 7px;
-        }
-      }
-      .swipe-bar{
-        display: block;
-        height: 100%;
-        width: 15px;
-        z-index: 100;
-        position: absolute;
-        cursor: pointer;
-        &:hover{
-          .top-handle{
-            background-position: -15px 3px;
-          }
-          .bottom-handle{
-            background-position: -15px -11px;
-          }
-        };
-        .top-handle{
-          display: block;
-          height: 14px;
-          width: 15px;
-          position: absolute;
-          top: 0px;
-          background: url('swipemode_sprites.gif') 0 3px no-repeat;
-        }
-        .bottom-handle{
-          display: block;
-          height: 14px;
-          width: 15px;
-          position: absolute;
-          bottom: 0px;
-          background: url('swipemode_sprites.gif') 0 -11px no-repeat;
-        }
-      }
-    } //.view.swipe
-    .view.onion-skin{
-      .onion-skin-frame{
-        display: block;
-        margin: auto;
-        position: relative;
-      }
-      .frame.added, .frame.deleted {
-        position: absolute;
-        display: block;
-        top: 0px;
-        left: 0px;
-      }
-      .controls{
-        display: block;
-        height: 14px;
-        width: 300px;
-        z-index: 100;
-        position: absolute;
-        bottom: 0px;
-        left: 50%;
-        margin-left: -150px;
-
-        .drag-track{
-          display: block;
-          position: absolute;
-          left: 12px;
-          height: 10px;
-          width: 276px;
-          background: url('onion_skin_sprites.gif') -4px -20px repeat-x;
-        }
-
-        .dragger {
-          display: block;
-          position: absolute;
-          left: 0px;
-          top: 0px;
-          height: 14px;
-          width: 14px;
-          background: url('onion_skin_sprites.gif') 0px -34px repeat-x;
-          cursor: pointer;
-        }
-
-        .transparent {
-          display: block;
-          position: absolute;
-          top: 2px;
-          right: 0px;
-          height: 10px;
-          width: 10px;
-          background: url('onion_skin_sprites.gif') -2px 0px no-repeat;
-        }
-
-        .opaque {
-          display: block;
-          position: absolute;
-          top: 2px;
-          left: 0px;
-          height: 10px;
-          width: 10px;
-          background: url('onion_skin_sprites.gif') -2px -10px no-repeat;
-        }
-      }
-    } //.view.onion-skin
-  }
-  .view-modes{
-
-    padding: 10px;
-    text-align: center;
-
-    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{
-      list-style: none;
-      margin: 0;
-      padding: 0;
-      display: inline-block;
-    }
-
-    li{
-      color: grey;
-      border-left: 1px solid #c1c1c1;
-      padding: 0 12px 0 16px;
-      cursor: pointer;
-      &:first-child{
-        border-left: none;
-      }
-      &:hover{
-        text-decoration: underline;
-      }
-      &.active{
-        &:hover{
-          text-decoration: none;
-        }
-        cursor: default;
-        color: #333;
-      }
-      &.disabled{
-        display: none;
-      }
-    }
-  }
-}
-
 /** COMMIT BLOCK **/
 .commit-title{
   display: block;
@@ -399,7 +73,7 @@
 
 
 .commits-compare-switch{
-  background: url("switch_icon.png") no-repeat center center;
+  background: image-url("switch_icon.png") no-repeat center center;
   width: 32px;
   height: 32px;
   text-indent: -9999px;
@@ -494,6 +168,25 @@ li.commit {
         text-decoration: underline;
       }
     }
+
+    .text-expander {
+      background: #eee;
+      color: #555;
+      padding: 0 5px;
+      cursor: pointer;
+      margin-left: 4px;
+      &:hover {
+        background-color: #ddd;
+      }
+    }
+  }
+
+  .commit-row-description {
+    font-size: 14px;
+    border-left: 1px solid #e5e5e5;
+    padding: 0 15px 0 7px;
+    margin: 5px 0 10px 5px;
+    display: none;
   }
 
   .commit-row-info {
diff --git a/app/assets/stylesheets/sections/diff.scss b/app/assets/stylesheets/sections/diff.scss
new file mode 100644
index 0000000000..813566c4de
--- /dev/null
+++ b/app/assets/stylesheets/sections/diff.scss
@@ -0,0 +1,329 @@
+.diff-file {
+  border: 1px solid #CCC;
+  margin-bottom: 1em;
+
+  .diff-header {
+    @extend .clearfix;
+    background: #DDD;
+    border-bottom: 1px solid #CCC;
+    padding: 5px 5px 5px 10px;
+    color: #555;
+
+    > span {
+      font-family: $monospace_font;
+      font-size: 14px;
+      line-height: 2;
+    }
+
+    .diff-btn-group {
+      float: right;
+
+      .btn {
+        background-color: #EEE;
+        color: #666;
+        font-weight: bolder;
+      }
+    }
+
+    .commit-short-id {
+      font-family: $monospace_font;
+      font-size: smaller;
+    }
+
+    .file-mode {
+      font-family: $monospace_font;
+    }
+  }
+  .diff-content {
+    overflow: auto;
+    overflow-y: hidden;
+    background: #FFF;
+    color: #333;
+    font-size: 12px;
+    .old {
+      span.idiff {
+        background-color: #FAA;
+      }
+    }
+    .new {
+      span.idiff {
+        background-color: #AFA;
+      }
+    }
+
+    table {
+      width: 100%;
+      font-family: $monospace_font;
+      border: none;
+      margin: 0px;
+      padding: 0px;
+      td {
+        line-height: 18px;
+        font-size: 12px;
+      }
+    }
+    .old_line, .new_line, .diff_line {
+      margin: 0px;
+      padding: 0px;
+      border: none;
+      background: #EEE;
+      color: #666;
+      padding: 0px 5px;
+      border-right: 1px solid #ccc;
+      text-align: right;
+      min-width: 35px;
+      max-width: 50px;
+      width: 35px;
+      @include user-select(none);
+      a {
+        float: left;
+        width: 35px;
+        font-weight: normal;
+        color: #666;
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+      &.new {
+        background: #CFD;
+      }
+      &.old {
+        background: #FDD;
+      }
+    }
+    .diff_line {
+      padding: 0;
+    }
+    .line_holder {
+      &.old .old_line,
+      &.old .new_line {
+        background: #FCC;
+        border-color: #E7BABA;
+      }
+      &.new .old_line,
+      &.new .new_line {
+        background: #CFC;
+        border-color: #B9ECB9;
+      }
+    }
+    .line_content {
+      display: block;
+      white-space: pre;
+      height: 18px;
+      margin: 0px;
+      padding: 0px 0.5em;
+      border: none;
+      &.new {
+        background: #CFD;
+      }
+      &.old {
+        background: #FDD;
+      }
+      &.matched {
+        color: #ccc;
+        background: #fafafa;
+      }
+      &.parallel {
+        display: table-cell;
+        overflow: hidden;
+        width: 50%;
+      }
+    }
+  }
+  .image {
+    background: #ddd;
+    text-align: center;
+    padding: 30px;
+    .wrap{
+      display: inline-block;
+    }
+
+    .frame {
+      display: inline-block;
+      background-color: #fff;
+      line-height: 0;
+      img{
+        border: 1px solid #FFF;
+        background: image-url('trans_bg.gif');
+        max-width: 100%;
+      }
+      &.deleted {
+        border: 1px solid $deleted;
+      }
+
+      &.added {
+        border: 1px solid $added;
+      }
+    }
+    .image-info{
+      font-size: 12px;
+      margin: 5px 0 0 0;
+      color: grey;
+    }
+
+    .view.swipe{
+      position: relative;
+
+      .swipe-frame{
+        display: block;
+        margin: auto;
+        position: relative;
+      }
+      .swipe-wrap{
+        overflow: hidden;
+        border-left: 1px solid #999;
+        position: absolute;
+        display: block;
+        top: 13px;
+        right: 7px;
+      }
+      .frame{
+        top: 0;
+        right: 0;
+        position: absolute;
+        &.deleted{
+          margin: 0;
+          display: block;
+          top: 13px;
+          right: 7px;
+        }
+      }
+      .swipe-bar{
+        display: block;
+        height: 100%;
+        width: 15px;
+        z-index: 100;
+        position: absolute;
+        cursor: pointer;
+        &:hover{
+          .top-handle{
+            background-position: -15px 3px;
+          }
+          .bottom-handle{
+            background-position: -15px -11px;
+          }
+        };
+        .top-handle{
+          display: block;
+          height: 14px;
+          width: 15px;
+          position: absolute;
+          top: 0px;
+          background: image-url('swipemode_sprites.gif') 0 3px no-repeat;
+        }
+        .bottom-handle{
+          display: block;
+          height: 14px;
+          width: 15px;
+          position: absolute;
+          bottom: 0px;
+          background: image-url('swipemode_sprites.gif') 0 -11px no-repeat;
+        }
+      }
+    } //.view.swipe
+    .view.onion-skin{
+      .onion-skin-frame{
+        display: block;
+        margin: auto;
+        position: relative;
+      }
+      .frame.added, .frame.deleted {
+        position: absolute;
+        display: block;
+        top: 0px;
+        left: 0px;
+      }
+      .controls{
+        display: block;
+        height: 14px;
+        width: 300px;
+        z-index: 100;
+        position: absolute;
+        bottom: 0px;
+        left: 50%;
+        margin-left: -150px;
+
+        .drag-track{
+          display: block;
+          position: absolute;
+          left: 12px;
+          height: 10px;
+          width: 276px;
+          background: image-url('onion_skin_sprites.gif') -4px -20px repeat-x;
+        }
+
+        .dragger {
+          display: block;
+          position: absolute;
+          left: 0px;
+          top: 0px;
+          height: 14px;
+          width: 14px;
+          background: image-url('onion_skin_sprites.gif') 0px -34px repeat-x;
+          cursor: pointer;
+        }
+
+        .transparent {
+          display: block;
+          position: absolute;
+          top: 2px;
+          right: 0px;
+          height: 10px;
+          width: 10px;
+          background: image-url('onion_skin_sprites.gif') -2px 0px no-repeat;
+        }
+
+        .opaque {
+          display: block;
+          position: absolute;
+          top: 2px;
+          left: 0px;
+          height: 10px;
+          width: 10px;
+          background: image-url('onion_skin_sprites.gif') -2px -10px no-repeat;
+        }
+      }
+    } //.view.onion-skin
+  }
+  .view-modes{
+
+    padding: 10px;
+    text-align: center;
+
+    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{
+      list-style: none;
+      margin: 0;
+      padding: 0;
+      display: inline-block;
+    }
+
+    li{
+      color: grey;
+      border-left: 1px solid #c1c1c1;
+      padding: 0 12px 0 16px;
+      cursor: pointer;
+      &:first-child{
+        border-left: none;
+      }
+      &:hover{
+        text-decoration: underline;
+      }
+      &.active{
+        &:hover{
+          text-decoration: none;
+        }
+        cursor: default;
+        color: #333;
+      }
+      &.disabled{
+        display: none;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index 883c9a859e..f8da4f0f87 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -19,7 +19,7 @@ header {
         line-height: 32px;
         padding: 6px 10px;
 
-        &:hover {
+        &:hover, &:focus, &:active {
           background: none;
         }
       }
@@ -161,7 +161,7 @@ header {
     }
 
     .search-input {
-      background-image: url("icon-search.png");
+      background-image: image-url("icon-search.png");
       background-repeat: no-repeat;
       background-position: 10px;
       height: inherit;
@@ -192,7 +192,8 @@ header {
           color: #AAA;
           text-shadow: 0 1px 0 #444;
 
-          &:hover {
+          &:hover, &:focus, &:active {
+            background: none;
             color: #FFF;
           }
         }
diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss
index 4cb8117633..d4f8c8108a 100644
--- a/app/assets/stylesheets/sections/issues.scss
+++ b/app/assets/stylesheets/sections/issues.scss
@@ -125,3 +125,21 @@
 form.edit-issue {
   margin: 0;
 }
+
+.merge-request,
+.issue {
+  &.today {
+    background: #EFE;
+    border-color: #CEC;
+  }
+
+  &.closed {
+    background: #F5f5f5;
+    border-color: #E5E5E5;
+  }
+
+  &.merged {
+    background: #F5f5f5;
+    border-color: #E5E5E5;
+  }
+}
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
index 6e21bf0b0a..5341f411e5 100644
--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -89,3 +89,9 @@
 .merge-request-form-info {
   padding-top: 15px;
 }
+
+// hide mr close link for inline diff comment form
+.diff-file .close-mr-link,
+.diff-file .reopen-mr-link {
+  display: none;
+}
diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index 9f5f1579fb..a65771974c 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -47,13 +47,13 @@ ul.notes {
     .discussion-body {
       margin-left: 50px;
 
-      .file,
+      .diff-file,
       .discussion-hidden,
       .notes {
         @extend .borders;
         background-color: #F9F9F9;
       }
-      .file .notes {
+      .diff-file .notes {
         /* reset */
         background: inherit;
         border: none;
@@ -87,7 +87,6 @@ ul.notes {
     }
     .attachment {
       font-size: 14px;
-      margin-top: -20px;
     }
     .note-body {
       @include md-typography;
@@ -114,7 +113,7 @@ ul.notes {
   }
 }
 
-.file .notes_holder {
+.diff-file .notes_holder {
   font-size: 13px;
   line-height: 18px;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -184,20 +183,19 @@ ul.notes {
     }
   }
 }
-.file .note .note-actions {
+.diff-file .note .note-actions {
   right: 0;
   top: 0;
 }
 
 
-
 /**
  * Line note button on the side of diffs
  */
 
-.file tr.line_holder {
+.diff-file tr.line_holder {
   .add-diff-note {
-    background: url("diff_note_add.png") no-repeat left 0;
+    background: image-url("diff_note_add.png") no-repeat left 0;
     height: 22px;
     margin-left: -65px;
     position: absolute;
@@ -235,22 +233,25 @@ ul.notes {
 .reply-btn {
   @extend .btn-primary;
 }
-.file .content tr.line_holder:hover {
-  &> td.line_content {
-    background: $hover !important;
-    border-color: darken($hover, 10%) !important;
+.diff-file .diff-content {
+  tr.line_holder:hover {
+    &> td.line_content {
+      background: $hover !important;
+      border-color: darken($hover, 10%) !important;
+    }
+    &> td.new_line,
+    &> td.old_line {
+      background: darken($hover, 4%) !important;
+      border-color: darken($hover, 10%) !important;
+    }
   }
-  &> td.new_line,
-  &> td.old_line {
-    background: darken($hover, 4%) !important;
-    border-color: darken($hover, 10%) !important;
+
+  tr.line_holder:hover > td .line_note_link {
+    opacity: 1.0;
+    filter: alpha(opacity=100);
   }
 }
-.file .content tr.line_holder:hover > td .line_note_link {
-  opacity: 1.0;
-  filter: alpha(opacity=100);
-}
-.file,
+.diff-file,
 .discussion {
   .new_note {
     margin: 0;
@@ -302,6 +303,7 @@ ul.notes {
   @extend .col-md-4;
   @extend .thumbnail;
   margin-left: 45px;
+  float: none;
 }
 
 
diff --git a/app/controllers/admin/background_jobs_controller.rb b/app/controllers/admin/background_jobs_controller.rb
index 159ab2027c..4c1d0df411 100644
--- a/app/controllers/admin/background_jobs_controller.rb
+++ b/app/controllers/admin/background_jobs_controller.rb
@@ -1,5 +1,6 @@
 class Admin::BackgroundJobsController < Admin::ApplicationController
   def show
-    @sidekiq_processes = `ps -U #{Settings.gitlab.user} -o euser,pid,pcpu,pmem,stat,start,command | grep sidekiq | grep -v grep`
+    ps_output, _ = Gitlab::Popen.popen(%W(ps -U #{Settings.gitlab.user} -o pid,pcpu,pmem,stat,start,command))
+    @sidekiq_processes = ps_output.split("\n").grep(/sidekiq/)
   end
 end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index bdbb9a354b..5b06af79d5 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -68,7 +68,9 @@ class Admin::UsersController < Admin::ApplicationController
       params[:user].delete(:password_confirmation)
     end
 
-    user.admin = (admin && admin.to_i > 0)
+    if admin.present?
+      user.admin = !admin.to_i.zero?
+    end
 
     respond_to do |format|
       if user.update_attributes(params[:user], as: :admin)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9574685b1c..c83768e654 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -155,7 +155,6 @@ class ApplicationController < ActionController::Base
   end
 
   def dev_tools
-    Rack::MiniProfiler.authorize_request
   end
 
   def default_headers
@@ -182,7 +181,7 @@ class ApplicationController < ActionController::Base
   end
 
   def ldap_security_check
-    if current_user && current_user.ldap_user? && current_user.requires_ldap_check?
+    if current_user && current_user.requires_ldap_check?
       gitlab_ldap_access do |access|
         if access.allowed?(current_user)
           access.update_permissions(current_user)
@@ -232,4 +231,8 @@ class ApplicationController < ActionController::Base
     devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:username, :email, :password, :login, :remember_me) }
     devise_parameter_sanitizer.for(:sign_up) { |u| u.permit(:username, :email, :name, :password, :password_confirmation) }
   end
+
+  def hexdigest(string)
+    Digest::SHA1.hexdigest string
+  end
 end
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index b95233c0e9..233b91680f 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -22,6 +22,8 @@ class DashboardController < ApplicationController
 
     @last_push = current_user.recent_push
 
+    @publicish_project_count = Project.publicish(current_user).count
+
     respond_to do |format|
       format.html
       format.json { pager_json("events/_events", @events.count) }
@@ -53,14 +55,15 @@ class DashboardController < ApplicationController
   end
 
   def merge_requests
-    @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params)
+    @merge_requests = MergeRequestsFinder.new.execute(current_user, params)
     @merge_requests = @merge_requests.page(params[:page]).per(20)
+    @merge_requests = @merge_requests.preload(:author, :target_project)
   end
 
   def issues
-    @issues = FilteringService.new.execute(Issue, current_user, params)
+    @issues = IssuesFinder.new.execute(current_user, params)
     @issues = @issues.page(params[:page]).per(20)
-    @issues = @issues.includes(:author, :project)
+    @issues = @issues.preload(:author, :project)
 
     respond_to do |format|
       format.html
@@ -77,5 +80,6 @@ class DashboardController < ApplicationController
   def default_filter
     params[:scope] = 'assigned-to-me' if params[:scope].blank?
     params[:state] = 'opened' if params[:state].blank?
+    params[:authorized_only] = true
   end
 end
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 4e32bdb172..533019ee0c 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -1,4 +1,5 @@
 class GroupsController < ApplicationController
+  skip_before_filter :authenticate_user!, only: [:show, :issues, :members, :merge_requests]
   respond_to :html
   before_filter :group, except: [:new, :create]
 
@@ -36,7 +37,7 @@ class GroupsController < ApplicationController
     @events = Event.in_projects(project_ids)
     @events = event_filter.apply_filter(@events)
     @events = @events.limit(20).offset(params[:offset] || 0)
-    @last_push = current_user.recent_push
+    @last_push = current_user.recent_push if current_user
 
     @shared_projects = @group.shared_projects
 
@@ -48,14 +49,15 @@ class GroupsController < ApplicationController
   end
 
   def merge_requests
-    @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params)
+    @merge_requests = MergeRequestsFinder.new.execute(current_user, params)
     @merge_requests = @merge_requests.page(params[:page]).per(20)
+    @merge_requests = @merge_requests.preload(:author, :target_project)
   end
 
   def issues
-    @issues = FilteringService.new.execute(Issue, current_user, params)
+    @issues = IssuesFinder.new.execute(current_user, params)
     @issues = @issues.page(params[:page]).per(20)
-    @issues = @issues.includes(:author, :project)
+    @issues = @issues.preload(:author, :project)
 
     respond_to do |format|
       format.html
@@ -100,17 +102,21 @@ class GroupsController < ApplicationController
   end
 
   def projects
-    @projects ||= current_user.authorized_projects.where(namespace_id: group.id).sorted_by_activity
+    @projects ||= ProjectsFinder.new.execute(current_user, group: group).sorted_by_activity.non_archived
   end
 
   def project_ids
-    projects.map(&:id)
+    projects.pluck(:id)
   end
 
   # Dont allow unauthorized access to group
   def authorize_read_group!
     unless @group and (projects.present? or can?(current_user, :read_group, @group))
-      return render_404
+      if current_user.nil?
+        return authenticate_user!
+      else
+        return render_404
+      end
     end
   end
 
@@ -133,13 +139,21 @@ class GroupsController < ApplicationController
   def determine_layout
     if [:new, :create].include?(action_name.to_sym)
       'navless'
-    else
+    elsif current_user
       'group'
+    else
+      'public_group'
     end
   end
 
   def default_filter
-    params[:scope] = 'assigned-to-me' if params[:scope].blank?
+    if params[:scope].blank?
+      if current_user
+        params[:scope] = 'assigned-to-me'
+      else
+        params[:scope] = 'all'
+      end
+    end
     params[:state] = 'opened' if params[:state].blank?
     params[:group_id] = @group.id
   end
diff --git a/app/controllers/projects/edit_tree_controller.rb b/app/controllers/projects/edit_tree_controller.rb
index 6bd1a455f3..ff5206b6fa 100644
--- a/app/controllers/projects/edit_tree_controller.rb
+++ b/app/controllers/projects/edit_tree_controller.rb
@@ -2,6 +2,8 @@ class Projects::EditTreeController < Projects::BaseTreeController
   before_filter :require_branch_head
   before_filter :blob
   before_filter :authorize_push!
+  before_filter :from_merge_request
+  before_filter :after_edit_path
 
   def show
     @last_commit = Gitlab::Git::Commit.last_for_path(@repository, @ref, @path).sha
@@ -12,7 +14,12 @@ class Projects::EditTreeController < Projects::BaseTreeController
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
-      redirect_to project_blob_path(@project, @id)
+
+      if from_merge_request
+        from_merge_request.reload_code
+      end
+
+      redirect_to after_edit_path
     else
       flash[:alert] = result[:error]
       render :show
@@ -24,4 +31,19 @@ class Projects::EditTreeController < Projects::BaseTreeController
   def blob
     @blob ||= @repository.blob_at(@commit.id, @path)
   end
+
+  def after_edit_path
+    @after_edit_path ||=
+      if from_merge_request
+        diffs_project_merge_request_path(from_merge_request.target_project, from_merge_request) +
+          "#file-path-#{hexdigest(@path)}"
+      else
+        project_blob_path(@project, @id)
+      end
+  end
+
+  def from_merge_request
+    # If blob edit was initiated from merge request page
+    @from_merge_request ||= MergeRequest.find_by(id: params[:from_merge_request_id])
+  end
 end
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index dd11948edd..9d97c820f3 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -121,7 +121,7 @@ class Projects::IssuesController < Projects::ApplicationController
   def issues_filtered
     params[:scope] = 'all' if params[:scope].blank?
     params[:state] = 'opened' if params[:state].blank?
-    @issues = FilteringService.new.execute(Issue, current_user, params.merge(project_id: @project.id))
+    @issues = IssuesFinder.new.execute(current_user, params.merge(project_id: @project.id))
   end
 
   # Since iids are implemented only in 6.1
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index 65f9e2b9d5..0166ca9ff0 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -13,7 +13,7 @@ class Projects::LabelsController < Projects::ApplicationController
   def generate
     Gitlab::IssuesLabels.generate(@project)
 
-    redirect_to project_labels_path(@project)
+    redirect_to project_issues_path(@project)
   end
 
   protected
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 2b410c5a61..38e567f3b1 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -21,7 +21,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     params[:scope] = 'all' if params[:scope].blank?
     params[:state] = 'opened' if params[:state].blank?
 
-    @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params.merge(project_id: @project.id))
+    @merge_requests = MergeRequestsFinder.new.execute(current_user, params.merge(project_id: @project.id))
     @merge_requests = @merge_requests.page(params[:page]).per(20)
 
     @sort = params[:sort].humanize
@@ -60,7 +60,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   def new
     @merge_request = MergeRequest.new(params[:merge_request])
     @merge_request.source_project = @project unless @merge_request.source_project
-    @merge_request.target_project = @project unless @merge_request.target_project
+    @merge_request.target_project ||= (@project.forked_from_project || @project)
+    @target_branches = @merge_request.target_project.nil? ? [] : @merge_request.target_project.repository.branch_names
+
+    @merge_request.target_branch ||= @merge_request.target_project.default_branch
+
     @source_project = @merge_request.source_project
     @merge_request
   end
@@ -131,7 +135,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   def automerge
     return access_denied! unless allowed_to_merge?
 
-    if @merge_request.opened? && @merge_request.can_be_merged?
+    if @merge_request.open? && @merge_request.can_be_merged?
       @merge_request.should_remove_source_branch = params[:should_remove_source_branch]
       @merge_request.automerge!(current_user, params[:merge_commit_message])
       @status = true
@@ -162,7 +166,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def ci_status
-    status = project.gitlab_ci_service.commit_status(merge_request.last_commit.sha)
+    status = @merge_request.source_project.gitlab_ci_service.commit_status(merge_request.last_commit.sha)
     response = {status: status}
 
     render json: response
@@ -226,7 +230,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     @merge_request_diff = @merge_request.merge_request_diff
     @allowed_to_merge = allowed_to_merge?
-    @show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
+    @show_merge_controls = @merge_request.open? && @commits.any? && @allowed_to_merge
   end
 
   def allowed_to_merge?
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 9c9c2decc7..85d042a89b 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -5,7 +5,7 @@ class Projects::NotesController < Projects::ApplicationController
   before_filter :authorize_admin_note!, only: [:update, :destroy]
 
   def index
-    @notes = Notes::LoadService.new(project, current_user, params).execute
+    @notes = NotesFinder.new.execute(project, current_user, params)
 
     notes_json = { notes: [] }
 
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 6ec109b914..8d24052f72 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -5,7 +5,7 @@ class ProjectsController < ApplicationController
 
   # Authorize
   before_filter :authorize_read_project!, except: [:index, :new, :create]
-  before_filter :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer, :archive, :unarchive]
+  before_filter :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer, :archive, :unarchive, :retry_import]
   before_filter :require_non_empty_project, only: [:blob, :tree, :graph]
 
   layout 'navless', only: [:new, :create, :fork]
@@ -21,16 +21,9 @@ class ProjectsController < ApplicationController
 
   def create
     @project = ::Projects::CreateService.new(current_user, params[:project]).execute
+    flash[:notice] = 'Project was successfully created.' if @project.saved?
 
     respond_to do |format|
-      flash[:notice] = 'Project was successfully created.' if @project.saved?
-      format.html do
-        if @project.saved?
-          redirect_to @project
-        else
-          render "new"
-        end
-      end
       format.js
     end
   end
@@ -55,6 +48,11 @@ class ProjectsController < ApplicationController
   end
 
   def show
+    if @project.import_in_progress?
+      redirect_to import_project_path(@project)
+      return
+    end
+
     return authenticate_user! unless @project.public? || current_user
 
     limit = (params[:limit] || 20).to_i
@@ -67,9 +65,7 @@ class ProjectsController < ApplicationController
         if @project.empty_repo?
           render "projects/empty", layout: user_layout
         else
-          if current_user
-            @last_push = current_user.recent_push(@project.id)
-          end
+          @last_push = current_user.recent_push(@project.id) if current_user
           render :show, layout: user_layout
         end
       end
@@ -77,6 +73,28 @@ class ProjectsController < ApplicationController
     end
   end
 
+  def import
+    if project.import_finished?
+      redirect_to @project
+      return
+    end
+  end
+
+  def retry_import
+    unless @project.import_failed?
+      redirect_to import_project_path(@project)
+    end
+
+    @project.import_url = params[:project][:import_url]
+
+    if @project.save
+      @project.reload
+      @project.import_retry
+    end
+
+    redirect_to import_project_path(@project)
+  end
+
   def destroy
     return access_denied! unless can?(current_user, :remove_project, project)
 
@@ -108,6 +126,7 @@ class ProjectsController < ApplicationController
     @suggestions = {
       emojis: Emoji.names,
       issues: @project.issues.select([:iid, :title, :description]),
+      mergerequests: @project.merge_requests.select([:iid, :title, :description]),
       members: @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } }
     }
 
diff --git a/app/controllers/public/projects_controller.rb b/app/controllers/public/projects_controller.rb
index d7297161c2..d6238f7954 100644
--- a/app/controllers/public/projects_controller.rb
+++ b/app/controllers/public/projects_controller.rb
@@ -6,7 +6,7 @@ class Public::ProjectsController < ApplicationController
   layout 'public'
 
   def index
-    @projects = Project.public_or_internal_only(current_user)
+    @projects = Project.publicish(current_user)
     @projects = @projects.search(params[:search]) if params[:search].present?
     @projects = @projects.sort(@sort = params[:sort])
     @projects = @projects.includes(:namespace).page(params[:page]).per(20)
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index c1648d6c38..8df84e9884 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -7,6 +7,7 @@ class SearchController < ApplicationController
 
     if @project
       return access_denied! unless can?(current_user, :download_code, @project)
+
       @search_results = Search::ProjectService.new(@project, current_user, params).execute
     else
       @search_results = Search::GlobalService.new(current_user, params).execute
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index e54a968326..0dd941a48e 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -19,6 +19,9 @@ class SnippetsController < ApplicationController
 
   def user_index
     @user = User.find_by(username: params[:username])
+
+    render_404 and return unless @user
+
     @snippets = @user.snippets.fresh.non_expired
 
     if @user == current_user
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e86601a439..9461174b95 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,15 +1,15 @@
 class UsersController < ApplicationController
-
   skip_before_filter :authenticate_user!, only: [:show]
   layout :determine_layout
 
   def show
     @user = User.find_by_username!(params[:username])
-    @projects = @user.authorized_projects.includes(:namespace).select {|project| can?(current_user, :read_project, project)}
+    @projects = @user.authorized_projects.accessible_to(current_user)
     if !current_user && @projects.empty?
       return authenticate_user!
     end
-    @events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20)
+    @groups = @user.groups.accessible_to(current_user)
+    @events = @user.recent_events.where(project_id: @projects.pluck(:id)).limit(20)
     @title = @user.name
   end
 
diff --git a/app/finders/README.md b/app/finders/README.md
new file mode 100644
index 0000000000..47823c51ef
--- /dev/null
+++ b/app/finders/README.md
@@ -0,0 +1,22 @@
+# Finders
+
+This type of classes responsible for collectiong items based on different conditions.
+To prevent lookup methods in models like this: 
+
+```ruby
+class Project
+  def issues_for_user_filtered_by(user, filter)
+    # A lot of logic not related to project model itself
+  end
+end
+
+issues = project.issues_for_user_filtered_by(user, params)
+```
+
+Better use this: 
+
+```ruby
+issues = IssuesFinder.new.execute(project, user, filter)
+```
+
+It will help keep models thiner
diff --git a/app/services/filtering_service.rb b/app/finders/base_finder.rb
similarity index 89%
rename from app/services/filtering_service.rb
rename to app/finders/base_finder.rb
index 52537f7ba4..d20716fb17 100644
--- a/app/services/filtering_service.rb
+++ b/app/finders/base_finder.rb
@@ -1,4 +1,4 @@
-# FilteringService class
+# BaseFinder
 #
 # Used to filter Issues and MergeRequests collections by set of params
 #
@@ -16,11 +16,10 @@
 #     label_name: string
 #     sort: string
 #
-class FilteringService
-  attr_accessor :klass, :current_user, :params
+class BaseFinder
+  attr_accessor :current_user, :params
 
-  def execute(klass, current_user, params)
-    @klass = klass
+  def execute(current_user, params)
     @current_user = current_user
     @params = params
 
@@ -41,16 +40,16 @@ class FilteringService
   def init_collection
     table_name = klass.table_name
 
-    return klass.of_projects(Project.public_only) unless current_user
-
     if project
-      if current_user.can?(:read_project, project)
+      if project.public? || (current_user && current_user.can?(:read_project, project))
         project.send(table_name)
       else
         []
       end
-    else
+    elsif current_user && params[:authorized_only].presence
       klass.of_projects(current_user.authorized_projects)
+    else
+      klass.of_projects(Project.accessible_to(current_user))
     end
   end
 
diff --git a/app/finders/issues_finder.rb b/app/finders/issues_finder.rb
new file mode 100644
index 0000000000..8e0c606249
--- /dev/null
+++ b/app/finders/issues_finder.rb
@@ -0,0 +1,22 @@
+# Finders::Issues class
+#
+# Used to filter Issues collections by set of params
+#
+# Arguments:
+#   current_user - which user use
+#   params:
+#     scope: 'created-by-me' or 'assigned-to-me' or 'all'
+#     state: 'open' or 'closed' or 'all'
+#     group_id: integer
+#     project_id: integer
+#     milestone_id: integer
+#     assignee_id: integer
+#     search: string
+#     label_name: string
+#     sort: string
+#
+class IssuesFinder < BaseFinder
+  def klass
+    Issue
+  end
+end
diff --git a/app/finders/merge_requests_finder.rb b/app/finders/merge_requests_finder.rb
new file mode 100644
index 0000000000..3727149c8f
--- /dev/null
+++ b/app/finders/merge_requests_finder.rb
@@ -0,0 +1,22 @@
+# Finders::MergeRequest class
+#
+# Used to filter MergeRequests collections by set of params
+#
+# Arguments:
+#   current_user - which user use
+#   params:
+#     scope: 'created-by-me' or 'assigned-to-me' or 'all'
+#     state: 'open' or 'closed' or 'all'
+#     group_id: integer
+#     project_id: integer
+#     milestone_id: integer
+#     assignee_id: integer
+#     search: string
+#     label_name: string
+#     sort: string
+#
+class MergeRequestsFinder < BaseFinder
+  def klass
+    MergeRequest
+  end
+end
diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb
new file mode 100644
index 0000000000..384316e14b
--- /dev/null
+++ b/app/finders/notes_finder.rb
@@ -0,0 +1,17 @@
+class NotesFinder
+  def execute(project, current_user, params)
+    target_type = params[:target_type]
+    target_id   = params[:target_id]
+
+    case target_type
+    when "commit"
+      project.notes.for_commit_id(target_id).not_inline.fresh
+    when "issue"
+      project.issues.find(target_id).notes.inc_author.fresh
+    when "merge_request"
+      project.merge_requests.find(target_id).mr_and_commit_notes.inc_author.fresh
+    when "snippet"
+      project.snippets.find(target_id).notes.fresh
+    end
+  end
+end
diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb
new file mode 100644
index 0000000000..bfaba75878
--- /dev/null
+++ b/app/finders/projects_finder.rb
@@ -0,0 +1,63 @@
+class ProjectsFinder
+  def execute(current_user, options)
+    group = options[:group]
+
+    if group
+      group_projects(current_user, group)
+    else
+      all_projects(current_user)
+    end
+  end
+
+  private
+
+  def group_projects(current_user, group)
+    if current_user
+      if group.users.include?(current_user)
+        # User is group member
+        #
+        # Return ALL group projects
+        group.projects
+      else
+        projects_members = UsersProject.where(
+          project_id: group.projects,
+          user_id: current_user
+        )
+
+        if projects_members.any?
+          # User is a project member
+          #
+          # Return only:
+          #   public projects
+          #   internal projects
+          #   joined projects
+          #
+          group.projects.where(
+            "projects.id IN (?) OR projects.visibility_level IN (?)",
+            projects_members.pluck(:project_id),
+            Project.public_and_internal_levels
+          )
+        else
+          # User has no access to group or group projects
+          #
+          # Return only:
+          #   public projects
+          #   internal projects
+          #
+          group.projects.public_and_internal_only
+        end
+      end
+    else
+      # Not authenticated
+      #
+      # Return only:
+      #   public projects
+      group.projects.public_only
+    end
+  end
+
+  def all_projects
+    # TODO: implement
+    raise 'Not implemented yet'
+  end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bd1b67291e..00ee734705 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -54,7 +54,7 @@ module ApplicationHelper
     if group && group.avatar.present?
       group.avatar.url
     else
-      '/assets/no_group_avatar.png'
+      image_path('no_group_avatar.png')
     end
   end
 
@@ -89,16 +89,15 @@ module ApplicationHelper
     "Never"
   end
 
-  def grouped_options_refs(destination = :tree)
+  def grouped_options_refs
     repository = @project.repository
 
     options = [
       ["Branches", repository.branch_names],
-      ["Tags", repository.tag_names]
+      ["Tags", VersionSorter.rsort(repository.tag_names)]
     ]
 
-    # If reference is commit id -
-    # we should add it to branch/tag selectbox
+    # If reference is commit id - we should add it to branch/tag selectbox
     if(@ref && !options.flatten.include?(@ref) &&
        @ref =~ /^[0-9a-zA-Z]{6,52}$/)
       options << ["Commit", [@ref]]
@@ -147,8 +146,7 @@ module ApplicationHelper
 
   def authbutton(provider, size = 64)
     file_name = "#{provider.to_s.split('_').first}_#{size}.png"
-    image_tag("authbuttons/#{file_name}",
-              alt: "Sign in with #{provider.to_s.titleize}")
+    image_tag(image_path("authbuttons/#{file_name}"), alt: "Sign in with #{provider.to_s.titleize}")
   end
 
   def simple_sanitize(str)
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index b25662e3ba..69425bc171 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -35,7 +35,6 @@ module GitlabMarkdownHelper
                             # see https://github.com/vmg/redcarpet#darling-i-packed-you-a-couple-renderers-for-lunch-
                             filter_html: true,
                             with_toc_data: true,
-                            hard_wrap: true,
                             safe_links_only: true
                           }.merge(options))
       @markdown = Redcarpet::Markdown.new(gitlab_renderer,
@@ -45,7 +44,7 @@ module GitlabMarkdownHelper
                       fenced_code_blocks: true,
                       autolink: true,
                       strikethrough: true,
-                      lax_html_blocks: true,
+                      lax_spacing: true,
                       space_after_headers: true,
                       superscript: true)
     end
@@ -64,8 +63,7 @@ module GitlabMarkdownHelper
   # project_path_with_namespace - namespace/projectname, eg. gitlabhq/gitlabhq
   # ref - name of the branch or reference, eg. stable
   # requested_path - path of request, eg. doc/api/README.md, used in special case when path is pointing to the .md file were the original request is coming from
-  # wiki - whether the markdown is from wiki or not
-  def create_relative_links(text, project, ref, requested_path, wiki = false)
+  def create_relative_links(text, project, ref, requested_path)
     @path_to_satellite = project.satellite.path
     project_path_with_namespace = project.path_with_namespace
     paths = extract_paths(text)
@@ -124,21 +122,23 @@ module GitlabMarkdownHelper
   end
 
   def rebuild_path(path_with_namespace, path, requested_path, ref)
+    path.gsub!(/(#.*)/, "")
+    id = $1 || ""
     file_path = relative_file_path(path, requested_path)
     [
       path_with_namespace,
       path_with_ref(file_path, ref),
       file_path
-    ].compact.join("/")
+    ].compact.join("/").gsub(/\/*$/, '') + id
   end
 
   # Checks if the path exists in the repo
-  # eg. checks if doc/README.md exists, if it doesn't then it is a wiki link
+  # eg. checks if doc/README.md exists, if not then link to blob
   def path_with_ref(path, ref)
     if file_exists?(path)
       "#{local_path(path)}/#{correct_ref(ref)}"
     else
-      "wikis"
+      "blob/#{correct_ref(ref)}"
     end
   end
 
@@ -154,6 +154,7 @@ module GitlabMarkdownHelper
   # If we are at doc/api and the README.md shown in below the tree view
   # this takes the rquest path(doc/api) and adds users.md so the path looks like doc/api/users.md
   def build_nested_path(path, request_path)
+    return request_path if path == ""
     return path unless request_path
     if local_path(request_path) == "tree"
       base = request_path.split("/").push(path)
@@ -166,7 +167,7 @@ module GitlabMarkdownHelper
   end
 
   def file_exists?(path)
-    return false if path.nil? || path.empty?
+    return false if path.nil?
     return @repository.blob_at(current_sha, path).present? || @repository.tree(current_sha, path).entries.any?
   end
 
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index 5865396b69..cfc9a572ca 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -6,6 +6,14 @@ module GroupsHelper
   def leave_group_message(group)
     "Are you sure you want to leave \"#{group}\" group?"
   end
+  
+  def should_user_see_group_roles?(user, group)
+    if user
+      user.is_admin? || group.members.exists?(user_id: user.id)
+    else
+      false
+    end
+  end
 
   def group_head_title
     title = @group.name
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 0374992ebf..95f0eff58b 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -85,11 +85,15 @@ module IssuesHelper
     options_from_collection_for_select(@project.milestones.active, 'id', 'title', object.milestone_id)
   end
 
-  def issue_alert_class(issue)
-    if issue.closed?
-      'alert-danger'
+  def issue_box_class(item)
+    if item.respond_to?(:expired?) && item.expired?
+      'issue-box-expired'
+    elsif item.respond_to?(:merged?) && item.merged?
+      'issue-box-merged'
+    elsif item.closed?
+      'issue-box-closed'
     else
-      'alert-success'
+      'issue-box-open'
     end
   end
 end
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 62f061bb07..1381b0220d 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -1,8 +1,9 @@
 module MergeRequestsHelper
   def new_mr_path_from_push_event(event)
+    target_project = event.project.forked_from_project || event.project
     new_project_merge_request_path(
       event.project,
-      new_mr_from_push_event(event, event.project)
+      new_mr_from_push_event(event, target_project)
     )
   end
 
@@ -41,14 +42,4 @@ module MergeRequestsHelper
       "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}"
     end
   end
-
-  def merge_request_alert_class(merge_request)
-    if merge_request.merged?
-      'alert-info'
-    elsif merge_request.closed?
-      'alert-danger'
-    else
-      'alert-success'
-    end
-  end
 end
diff --git a/app/helpers/profile_helper.rb b/app/helpers/profile_helper.rb
index dd9e03d95a..297ae83d89 100644
--- a/app/helpers/profile_helper.rb
+++ b/app/helpers/profile_helper.rb
@@ -10,7 +10,7 @@ module ProfileHelper
   end
 
   def show_profile_social_tab?
-    Gitlab.config.omniauth.enabled && !current_user.ldap_user?
+    enabled_social_providers.any? && !current_user.ldap_user?
   end
 
   def show_profile_remove_tab?
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 470a495f03..d7f3da7e53 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -4,8 +4,7 @@ module SearchHelper
 
     resources_results = [
       groups_autocomplete(term),
-      projects_autocomplete(term),
-      public_projects_autocomplete(term),
+      projects_autocomplete(term)
     ].flatten
 
     generic_results = project_autocomplete + default_autocomplete + help_autocomplete
@@ -82,17 +81,7 @@ module SearchHelper
 
   # Autocomplete results for the current user's projects
   def projects_autocomplete(term, limit = 5)
-    current_user.authorized_projects.search_by_title(term).non_archived.limit(limit).map do |p|
-      {
-        label: "project: #{search_result_sanitize(p.name_with_namespace)}",
-        url: project_path(p)
-      }
-    end
-  end
-
-  # Autocomplete results for the current user's projects
-  def public_projects_autocomplete(term, limit = 5)
-    Project.public_or_internal_only(current_user).search_by_title(term).non_archived.limit(limit).map do |p|
+    Project.accessible_to(current_user).search_by_title(term).non_archived.limit(limit).map do |p|
       {
         label: "project: #{search_result_sanitize(p.name_with_namespace)}",
         url: project_path(p)
diff --git a/app/mailers/emails/groups.rb b/app/mailers/emails/groups.rb
index 1c8ae122c4..1654fc55bc 100644
--- a/app/mailers/emails/groups.rb
+++ b/app/mailers/emails/groups.rb
@@ -3,7 +3,7 @@ module Emails
     def group_access_granted_email(user_group_id)
       @membership = UsersGroup.find(user_group_id)
       @group = @membership.group
-
+      @target_url = group_url(@group)
       mail(to: @membership.user.email,
            subject: subject("Access to group was granted"))
     end
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb
index b2b4b83d6c..d684e35445 100644
--- a/app/mailers/emails/issues.rb
+++ b/app/mailers/emails/issues.rb
@@ -3,22 +3,30 @@ module Emails
     def new_issue_email(recipient_id, issue_id)
       @issue = Issue.find(issue_id)
       @project = @issue.project
-      mail(to: recipient(recipient_id), subject: subject("New issue ##{@issue.iid}", @issue.title))
+      @target_url = project_issue_url(@project, @issue)
+      mail(from: sender(@issue.author_id),
+           to: recipient(recipient_id),
+           subject: subject("#{@issue.title} (##{@issue.iid})"))
     end
 
-    def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id)
+    def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id, updated_by_user_id)
       @issue = Issue.find(issue_id)
       @previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
       @project = @issue.project
-      mail(to: recipient(recipient_id), subject: subject("Changed issue ##{@issue.iid}", @issue.title))
+      @target_url = project_issue_url(@project, @issue)
+      mail(from: sender(updated_by_user_id),
+           to: recipient(recipient_id),
+           subject: subject("#{@issue.title} (##{@issue.iid})"))
     end
 
     def closed_issue_email(recipient_id, issue_id, updated_by_user_id)
       @issue = Issue.find issue_id
       @project = @issue.project
       @updated_by = User.find updated_by_user_id
-      mail(to: recipient(recipient_id),
-           subject: subject("Closed issue ##{@issue.iid}", @issue.title))
+      @target_url = project_issue_url(@project, @issue)
+      mail(from: sender(updated_by_user_id),
+           to: recipient(recipient_id),
+           subject: subject("#{@issue.title} (##{@issue.iid})"))
     end
 
     def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id)
@@ -26,8 +34,10 @@ module Emails
       @issue_status = status
       @project = @issue.project
       @updated_by = User.find updated_by_user_id
-      mail(to: recipient(recipient_id),
-           subject: subject("Changed issue ##{@issue.iid}", @issue.title))
+      @target_url = project_issue_url(@project, @issue)
+      mail(from: sender(updated_by_user_id),
+           to: recipient(recipient_id),
+           subject: subject("#{@issue.title} (##{@issue.iid})"))
     end
   end
 end
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index e60887d525..5e1b8faf13 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -3,27 +3,39 @@ module Emails
     def new_merge_request_email(recipient_id, merge_request_id)
       @merge_request = MergeRequest.find(merge_request_id)
       @project = @merge_request.project
-      mail(to: recipient(recipient_id), subject: subject("New merge request ##{@merge_request.iid}", @merge_request.title))
+      @target_url = project_merge_request_url(@project, @merge_request)
+      mail(from: sender(@merge_request.author_id),
+           to: recipient(recipient_id),
+           subject: subject("#{@merge_request.title} (!#{@merge_request.iid})"))
     end
 
-    def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id)
+    def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id, updated_by_user_id)
       @merge_request = MergeRequest.find(merge_request_id)
       @previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
       @project = @merge_request.project
-      mail(to: recipient(recipient_id), subject: subject("Changed merge request ##{@merge_request.iid}", @merge_request.title))
+      @target_url = project_merge_request_url(@project, @merge_request)
+      mail(from: sender(updated_by_user_id),
+           to: recipient(recipient_id),
+           subject: subject("#{@merge_request.title} (!#{@merge_request.iid})"))
     end
 
     def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
       @merge_request = MergeRequest.find(merge_request_id)
       @updated_by = User.find updated_by_user_id
       @project = @merge_request.project
-      mail(to: recipient(recipient_id), subject: subject("Closed merge request ##{@merge_request.iid}", @merge_request.title))
+      @target_url = project_merge_request_url(@project, @merge_request)
+      mail(from: sender(updated_by_user_id),
+           to: recipient(recipient_id),
+           subject: subject("#{@merge_request.title} (!#{@merge_request.iid})"))
     end
 
     def merged_merge_request_email(recipient_id, merge_request_id)
       @merge_request = MergeRequest.find(merge_request_id)
       @project = @merge_request.project
-      mail(to: recipient(recipient_id), subject: subject("Accepted merge request ##{@merge_request.iid}", @merge_request.title))
+      @target_url = project_merge_request_url(@project, @merge_request)
+      mail(from: sender(@merge_request.author_id_of_changes),
+           to: recipient(recipient_id),
+           subject: subject("#{@merge_request.title} (!#{@merge_request.iid})"))
     end
   end
 
@@ -57,7 +69,7 @@ module Emails
   #   >> subject('Lorem ipsum', 'Dolor sit amet')
   #   => "GitLab Merge Request | Lorem ipsum | Dolor sit amet"
   def subject(*extra)
-    subject = "GitLab Merge Request |"
+    subject = "Merge Request | "
     if @merge_request.for_fork?
       subject << "#{@merge_request.source_project.name_with_namespace}:#{merge_request.source_branch} >> #{@merge_request.target_project.name_with_namespace}:#{merge_request.target_branch}"
     else
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index e967cf6dc7..ccbdadf010 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -4,27 +4,39 @@ module Emails
       @note = Note.find(note_id)
       @commit = @note.noteable
       @project = @note.project
-      mail(to: recipient(recipient_id), subject: subject("Note for commit #{@commit.short_id}", @commit.title))
+      @target_url = project_commit_url(@project, @commit, anchor: "note_#{@note.id}")
+      mail(from: sender(@note.author_id),
+           to: recipient(recipient_id),
+           subject: subject("#{@commit.title} (#{@commit.short_id})"))
     end
 
     def note_issue_email(recipient_id, note_id)
       @note = Note.find(note_id)
       @issue = @note.noteable
       @project = @note.project
-      mail(to: recipient(recipient_id), subject: subject("Note for issue ##{@issue.iid}"))
+      @target_url = project_issue_url(@project, @issue, anchor: "note_#{@note.id}")
+      mail(from: sender(@note.author_id),
+           to: recipient(recipient_id),
+           subject: subject("#{@issue.title} (##{@issue.iid})"))
     end
 
     def note_merge_request_email(recipient_id, note_id)
       @note = Note.find(note_id)
       @merge_request = @note.noteable
       @project = @note.project
-      mail(to: recipient(recipient_id), subject: subject("Note for merge request ##{@merge_request.iid}"))
+      @target_url = project_merge_request_url(@project, @merge_request, anchor: "note_#{@note.id}")
+      mail(from: sender(@note.author_id),
+           to: recipient(recipient_id),
+           subject: subject("#{@merge_request.title} (!#{@merge_request.iid})"))
     end
 
     def note_wall_email(recipient_id, note_id)
       @note = Note.find(note_id)
       @project = @note.project
-      mail(to: recipient(recipient_id), subject: subject("Note on wall"))
+      @target_url = project_wall_url(@note.project, anchor: "note_#{@note.id}")
+      mail(from: sender(@note.author_id),
+           to: recipient(recipient_id),
+           subject: subject("Note on wall"))
     end
   end
 end
diff --git a/app/mailers/emails/profile.rb b/app/mailers/emails/profile.rb
index c91660a02b..f02d95fd55 100644
--- a/app/mailers/emails/profile.rb
+++ b/app/mailers/emails/profile.rb
@@ -3,6 +3,7 @@ module Emails
     def new_user_email(user_id, password)
       @user = User.find(user_id)
       @password = password
+      @target_url = user_url(@user)
       mail(to: @user.email, subject: subject("Account was created for you"))
     end
 
@@ -15,6 +16,7 @@ module Emails
     def new_ssh_key_email(key_id)
       @key = Key.find(key_id)
       @user = @key.user
+      @target_url = user_url(@user)
       mail(to: @user.email, subject: subject("SSH key was added to your account"))
     end
   end
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 428d74d83c..46aa34d13d 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -3,6 +3,7 @@ module Emails
     def project_access_granted_email(user_project_id)
       @users_project = UsersProject.find user_project_id
       @project = @users_project.project
+      @target_url = project_url(@project)
       mail(to: @users_project.user.email,
            subject: subject("Access to project was granted"))
     end
@@ -10,6 +11,7 @@ module Emails
     def project_was_moved_email(project_id, user_id)
       @user = User.find user_id
       @project = Project.find project_id
+      @target_url = project_url(@project)
       mail(to: @user.email,
            subject: subject("Project was moved"))
     end
@@ -21,8 +23,15 @@ module Emails
       @commits = Commit.decorate(compare.commits)
       @diffs   = compare.diffs
       @branch  = branch
+      if @commits.length > 1
+        @target_url = project_compare_url(@project, from: @commits.first, to: @commits.last)
+      else
+        @target_url = project_commit_url(@project, @compare.commit)
+      end
 
-      mail(to: recipient, subject: subject("New push to repository"))
+      mail(from: sender(author_id),
+           to: recipient,
+           subject: subject("New push to repository"))
     end
   end
 end
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 6c1a332896..554f53cf14 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -15,16 +15,33 @@ class Notify < ActionMailer::Base
   default_url_options[:port]     = Gitlab.config.gitlab.port unless Gitlab.config.gitlab_on_standard_port?
   default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root
 
-  default from: Gitlab.config.gitlab.email_from
+  default from: Proc.new { default_sender_address.format }
   default reply_to: "noreply@#{Gitlab.config.gitlab.host}"
 
-  # Just send email with 3 seconds delay
+  # Just send email with 2 seconds delay
   def self.delay
     delay_for(2.seconds)
   end
 
   private
 
+  # The default email address to send emails from
+  def default_sender_address
+    address = Mail::Address.new(Gitlab.config.gitlab.email_from)
+    address.display_name = "GitLab"
+    address
+  end
+
+  # Return an email address that displays the name of the sender.
+  # Only the displayed name changes; the actual email address is always the same.
+  def sender(sender_id)
+    if sender = User.find(sender_id)
+      address = default_sender_address
+      address.display_name = sender.name
+      address.format
+    end
+  end
+
   # Look up a User by their ID and return their email address
   #
   # recipient_id - User ID
@@ -43,21 +60,21 @@ class Notify < ActionMailer::Base
   # Examples
   #
   #   >> subject('Lorem ipsum')
-  #   => "GitLab | Lorem ipsum"
+  #   => "Lorem ipsum"
   #
   #   # Automatically inserts Project name when @project is set
   #   >> @project = Project.last
   #   => #<Project id: 1, name: "Ruby on Rails", path: "ruby_on_rails", ...>
   #   >> subject('Lorem ipsum')
-  #   => "GitLab | Ruby on Rails | Lorem ipsum "
+  #   => "Ruby on Rails | Lorem ipsum "
   #
   #   # Accepts multiple arguments
   #   >> subject('Lorem ipsum', 'Dolor sit amet')
-  #   => "GitLab | Lorem ipsum | Dolor sit amet"
+  #   => "Lorem ipsum | Dolor sit amet"
   def subject(*extra)
-    subject = "GitLab"
-    subject << (@project ? " | #{@project.name_with_namespace}" : "")
-    subject << " | " + extra.join(' | ') if extra.present?
+    subject = ""
+    subject << "#{@project.name} | " if @project
+    subject << extra.join(' | ') if extra.present?
     subject
   end
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index ba0ce527f6..1afe8a4638 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -43,7 +43,19 @@ class Ability
           :download_code
         ]
       else
-        []
+        group = if subject.kind_of?(Group)
+                  subject
+                elsif subject.respond_to?(:group)
+                  subject.group
+                else
+                  nil
+                end
+
+        if group && group.has_projects_accessible_to?(nil)
+          [:read_group]
+        else
+          []
+        end
       end
     end
 
@@ -172,7 +184,7 @@ class Ability
     def group_abilities user, group
       rules = []
 
-      if group.users.include?(user) || user.admin?
+      if user.admin? || group.users.include?(user) || ProjectsFinder.new.execute(user, group: group).any?
         rules << :read_group
       end
 
@@ -228,6 +240,7 @@ class Ability
       can_manage = group_abilities(user, group).include?(:manage_group)
       if can_manage && (user != target_user)
         rules << :modify
+        rules << :destroy
       end
       if !group.last_owner?(user) && (can_manage || (user == target_user))
         rules << :destroy
diff --git a/app/models/commit.rb b/app/models/commit.rb
index bcc1bcbd96..c313aeb757 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -99,14 +99,16 @@ class Commit
   #
   # cut off, ellipses (`&hellp;`) are prepended to the commit message.
   def description
-    description = safe_message
+    title_end = safe_message.index(/\n/)
+    @description ||= if (!title_end && safe_message.length > 100) || (title_end && title_end > 100)
+                    "&hellip;".html_safe << safe_message[80..-1]
+                  else
+                    safe_message.split(/\n/, 2)[1].try(:chomp)
+                  end
+  end
 
-    title_end = description.index(/\n/)
-    if (!title_end && description.length > 100) || (title_end && title_end > 100)
-      "&hellip;".html_safe << description[80..-1]
-    else
-      description.split(/\n/, 2)[1].try(:chomp)
-    end
+  def description?
+    description.present?
   end
 
   # Regular expression that identifies commit message clauses that trigger issue closing.
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index bf2c2157d3..75989888bf 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -23,7 +23,8 @@ module Issuable
     scope :assigned, -> { where("assignee_id IS NOT NULL") }
     scope :unassigned, -> { where("assignee_id IS NULL") }
     scope :of_projects, ->(ids) { where(project_id: ids) }
-
+    scope :opened, -> { with_state(:opened, :reopened) }
+    scope :closed, -> { with_state(:closed) }
 
     delegate :name,
              :email,
diff --git a/app/models/group.rb b/app/models/group.rb
index f8291c067e..d6013c45b7 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -35,6 +35,12 @@ class Group < Namespace
   validates :avatar, file_size: { maximum: 100.kilobytes.to_i }
 
   mount_uploader :avatar, AttachmentUploader
+  
+  def self.accessible_to(user)
+    accessible_ids = Project.accessible_to(user).pluck(:namespace_id)
+    accessible_ids += user.groups.pluck(:id) if user
+    where(id: accessible_ids)
+  end
 
   def human_name
     name
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 6580c5004a..a8dc6e5fd8 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -28,8 +28,6 @@ class Issue < ActiveRecord::Base
 
   scope :of_group, ->(group) { where(project_id: group.project_ids) }
   scope :of_user_team, ->(team) { where(project_id: team.project_ids, assignee_id: team.member_ids) }
-  scope :opened, -> { with_state(:opened, :reopened) }
-  scope :closed, -> { with_state(:closed) }
 
   attr_accessible :title, :assignee_id, :position, :description,
                   :milestone_id, :label_list, :author_id_of_changes,
@@ -50,9 +48,7 @@ class Issue < ActiveRecord::Base
     end
 
     state :opened
-
     state :reopened
-
     state :closed
   end
 
diff --git a/app/models/key.rb b/app/models/key.rb
index 79f7bbd259..29a76f53f3 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -53,7 +53,7 @@ class Key < ActiveRecord::Base
     Tempfile.open('gitlab_key_file') do |file|
       file.puts key
       file.rewind
-      cmd_output, cmd_status = popen("ssh-keygen -lf #{file.path}", '/tmp')
+      cmd_output, cmd_status = popen(%W(ssh-keygen -lf #{file.path}), '/tmp')
     end
 
     if cmd_status.zero?
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b596d7eb9c..7c2648d8c7 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -100,8 +100,6 @@ class MergeRequest < ActiveRecord::Base
 
   scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.project_ids) }
   scope :of_user_team, ->(team) { where("(source_project_id in (:team_project_ids) OR target_project_id in (:team_project_ids) AND assignee_id in (:team_member_ids))", team_project_ids: team.project_ids, team_member_ids: team.member_ids) }
-  scope :opened, -> { with_state(:opened) }
-  scope :closed, -> { with_state(:closed) }
   scope :merged, -> { with_state(:merged) }
   scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
   scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
@@ -135,7 +133,7 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def reload_code
-    if merge_request_diff && opened?
+    if merge_request_diff && open?
       merge_request_diff.reload_content
     end
   end
@@ -160,6 +158,10 @@ class MergeRequest < ActiveRecord::Base
     MergeRequests::AutoMergeService.new.execute(self, current_user, commit_message)
   end
 
+  def open?
+    opened? || reopened?
+  end
+
   def mr_and_commit_notes
     # Fetch comments only from last 100 commits
     commits_for_notes_limit = 100
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index a226fef734..99afffc1db 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -69,12 +69,6 @@ class MergeRequestDiff < ActiveRecord::Base
     end
   end
 
-  # When Git::Diff is not able to get diff
-  # because of git timeout it return this value
-  def broken_diffs
-    [Gitlab::Git::Diff::BROKEN_DIFF]
-  end
-
   # Collect array of Git::Commit objects
   # between target and source branches
   def unmerged_commits
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 0bc5e1862e..468c93bd42 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -47,6 +47,14 @@ class Namespace < ActiveRecord::Base
   def self.global_id
     'GLN'
   end
+  
+  def projects_accessible_to(user)
+    projects.accessible_to(user)
+  end
+  
+  def has_projects_accessible_to?(user)
+    projects_accessible_to(user).present?
+  end
 
   def to_param
     path
diff --git a/app/models/project.rb b/app/models/project.rb
index 8937e0d7f2..14b59c795f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -28,6 +28,8 @@ class Project < ActiveRecord::Base
   include Gitlab::VisibilityLevel
   extend Enumerize
 
+  default_value_for :archived, false
+
   ActsAsTaggableOn.strict_case_match = true
 
   attr_accessible :name, :path, :description, :issues_tracker, :label_list,
@@ -53,15 +55,13 @@ class Project < ActiveRecord::Base
   has_one :hipchat_service, dependent: :destroy
   has_one :flowdock_service, dependent: :destroy
   has_one :assembla_service, dependent: :destroy
+  has_one :gemnasium_service, dependent: :destroy
   has_one :forked_project_link, dependent: :destroy, foreign_key: "forked_to_project_id"
   has_one :forked_from_project, through: :forked_project_link
-
   # Merge Requests for target project should be removed with it
   has_many :merge_requests,     dependent: :destroy, foreign_key: "target_project_id"
-
   # Merge requests from source project should be kept when source project was removed
   has_many :fork_merge_requests, foreign_key: "source_project_id", class_name: MergeRequest
-
   has_many :issues, -> { order "state DESC, created_at DESC" }, dependent: :destroy
   has_many :services,           dependent: :destroy
   has_many :events,             dependent: :destroy
@@ -70,10 +70,8 @@ class Project < ActiveRecord::Base
   has_many :snippets,           dependent: :destroy, class_name: "ProjectSnippet"
   has_many :hooks,              dependent: :destroy, class_name: "ProjectHook"
   has_many :protected_branches, dependent: :destroy
-
   has_many :users_projects, dependent: :destroy
   has_many :users, through: :users_projects
-
   has_many :deploy_keys_projects, dependent: :destroy
   has_many :deploy_keys, through: :deploy_keys_projects
 
@@ -96,15 +94,12 @@ class Project < ActiveRecord::Base
   validates :issues_enabled, :wall_enabled, :merge_requests_enabled,
             :wiki_enabled, inclusion: { in: [true, false] }
   validates :issues_tracker_id, length: { maximum: 255 }, allow_blank: true
-
   validates :namespace, presence: true
   validates_uniqueness_of :name, scope: :namespace_id
   validates_uniqueness_of :path, scope: :namespace_id
-
   validates :import_url,
     format: { with: URI::regexp(%w(git http https)), message: "should be a valid url" },
     if: :import?
-
   validate :check_limit, on: :create
 
   # Scopes
@@ -117,18 +112,57 @@ class Project < ActiveRecord::Base
   scope :sorted_by_activity, -> { reorder("projects.last_activity_at DESC") }
   scope :personal, ->(user) { where(namespace_id: user.namespace_id) }
   scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) }
-  scope :public_only, -> { where(visibility_level: PUBLIC) }
-  scope :public_or_internal_only, ->(user) { where("visibility_level IN (:levels)", levels: user ? [ INTERNAL, PUBLIC ] : [ PUBLIC ]) }
-
+  scope :public_only, -> { where(visibility_level: Project::PUBLIC) }
+  scope :public_and_internal_only, -> { where(visibility_level: Project.public_and_internal_levels) }
   scope :non_archived, -> { where(archived: false) }
 
   enumerize :issues_tracker, in: (Gitlab.config.issues_tracker.keys).append(:gitlab), default: :gitlab
 
+  state_machine :import_status, initial: :none do
+    event :import_start do
+      transition :none => :started
+    end
+
+    event :import_finish do
+      transition :started => :finished
+    end
+
+    event :import_fail do
+      transition :started => :failed
+    end
+
+    event :import_retry do
+      transition :failed => :started
+    end
+
+    state :started
+    state :finished
+    state :failed
+
+    after_transition any => :started, :do => :add_import_job
+  end
+
   class << self
+    def public_and_internal_levels
+      [Project::PUBLIC, Project::INTERNAL]
+    end
+
     def abandoned
       where('projects.last_activity_at < ?', 6.months.ago)
     end
 
+    def publicish(user)
+      visibility_levels = [Project::PUBLIC]
+      visibility_levels += [Project::INTERNAL] if user
+      where(visibility_level: visibility_levels)
+    end
+
+    def accessible_to(user)
+      accessible_ids = publicish(user).pluck(:id)
+      accessible_ids += user.authorized_projects.pluck(:id) if user
+      where(id: accessible_ids)
+    end
+
     def with_push
       includes(:events).where('events.action = ?', Event::PUSHED)
     end
@@ -146,15 +180,13 @@ class Project < ActiveRecord::Base
     end
 
     def find_with_namespace(id)
-      if id.include?("/")
-        id = id.split("/")
-        namespace = Namespace.find_by(path: id.first)
-        return nil unless namespace
+      return nil unless id.include?("/")
 
-        where(namespace_id: namespace.id).find_by(path: id.second)
-      else
-        where(path: id, namespace_id: nil).last
-      end
+      id = id.split("/")
+      namespace = Namespace.find_by(path: id.first)
+      return nil unless namespace
+
+      where(namespace_id: namespace.id).find_by(path: id.second)
     end
 
     def visibility_levels
@@ -184,12 +216,28 @@ class Project < ActiveRecord::Base
     id && persisted?
   end
 
+  def add_import_job
+    RepositoryImportWorker.perform_in(2.seconds, id)
+  end
+
   def import?
     import_url.present?
   end
 
   def imported?
-    imported
+    import_finished?
+  end
+
+  def import_in_progress?
+    import? && import_status == 'started'
+  end
+
+  def import_failed?
+    import_status == 'failed'
+  end
+
+  def import_finished?
+    import_status == 'finished'
   end
 
   def check_limit
@@ -259,7 +307,7 @@ class Project < ActiveRecord::Base
   end
 
   def available_services_names
-    %w(gitlab_ci campfire hipchat pivotaltracker flowdock assembla emails_on_push)
+    %w(gitlab_ci campfire hipchat pivotaltracker flowdock assembla emails_on_push gemnasium)
   end
 
   def gitlab_ci?
@@ -343,18 +391,17 @@ class Project < ActiveRecord::Base
     branch_name = ref.gsub("refs/heads/", "")
     c_ids = self.repository.commits_between(oldrev, newrev).map(&:id)
 
-    # Update code for merge requests into project between project branches
-    mrs = self.merge_requests.opened.by_branch(branch_name).to_a
-    # Update code for merge requests between project and project fork
-    mrs += self.fork_merge_requests.opened.by_branch(branch_name).to_a
-
-    mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked }
-
     # Close merge requests
     mrs = self.merge_requests.opened.where(target_branch: branch_name).to_a
     mrs = mrs.select(&:last_commit).select { |mr| c_ids.include?(mr.last_commit.id) }
     mrs.each { |merge_request| MergeRequests::MergeService.new.execute(merge_request, user, nil) }
 
+    # Update code for merge requests into project between project branches
+    mrs = self.merge_requests.opened.by_branch(branch_name).to_a
+    # Update code for merge requests between project and project fork
+    mrs += self.fork_merge_requests.opened.by_branch(branch_name).to_a
+    mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked }
+
     true
   end
 
diff --git a/app/models/project_hook.rb b/app/models/project_hook.rb
index e1c9ed01bc..4e9b22532c 100644
--- a/app/models/project_hook.rb
+++ b/app/models/project_hook.rb
@@ -17,9 +17,10 @@
 class ProjectHook < WebHook
   belongs_to :project
 
-  attr_accessible :push_events, :issues_events, :merge_requests_events
+  attr_accessible :push_events, :issues_events, :merge_requests_events, :tag_push_events
 
   scope :push_hooks, -> { where(push_events: true) }
+  scope :tag_push_hooks, -> { where(tag_push_events: true) }
   scope :issue_hooks, -> { where(issues_events: true) }
   scope :merge_request_hooks, -> { where(merge_requests_events: true) }
 end
diff --git a/app/models/project_services/assembla_service.rb b/app/models/project_services/assembla_service.rb
index ad7eade5c7..2a2c517291 100644
--- a/app/models/project_services/assembla_service.rb
+++ b/app/models/project_services/assembla_service.rb
@@ -13,6 +13,7 @@
 #  project_url :string(255)
 #  subdomain   :string(255)
 #  room        :string(255)
+#  api_key     :string(255)
 #
 
 class AssemblaService < Service
diff --git a/app/models/project_services/campfire_service.rb b/app/models/project_services/campfire_service.rb
index fb2a49fd58..f9247e054c 100644
--- a/app/models/project_services/campfire_service.rb
+++ b/app/models/project_services/campfire_service.rb
@@ -13,6 +13,7 @@
 #  project_url :string(255)
 #  subdomain   :string(255)
 #  room        :string(255)
+#  api_key     :string(255)
 #
 
 class CampfireService < Service
diff --git a/app/models/project_services/emails_on_push_service.rb b/app/models/project_services/emails_on_push_service.rb
index 2a46eff784..0a45316634 100644
--- a/app/models/project_services/emails_on_push_service.rb
+++ b/app/models/project_services/emails_on_push_service.rb
@@ -13,6 +13,7 @@
 #  project_url :string(255)
 #  subdomain   :string(255)
 #  room        :string(255)
+#  api_key     :string(255)
 #
 
 class EmailsOnPushService < Service
diff --git a/app/models/project_services/flowdock_service.rb b/app/models/project_services/flowdock_service.rb
index f72d9fa901..2603a1f67a 100644
--- a/app/models/project_services/flowdock_service.rb
+++ b/app/models/project_services/flowdock_service.rb
@@ -13,6 +13,7 @@
 #  project_url :string(255)
 #  subdomain   :string(255)
 #  room        :string(255)
+#  api_key     :string(255)
 #
 
 require "flowdock-git-hook"
diff --git a/app/models/project_services/gemnasium_service.rb b/app/models/project_services/gemnasium_service.rb
new file mode 100644
index 0000000000..0b8e7bad35
--- /dev/null
+++ b/app/models/project_services/gemnasium_service.rb
@@ -0,0 +1,54 @@
+# == Schema Information
+#
+# Table name: services
+#
+#  id          :integer          not null, primary key
+#  type        :string(255)
+#  title       :string(255)
+#  token       :string(255)
+#  project_id  :integer          not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  active      :boolean          default(FALSE), not null
+#  project_url :string(255)
+#  subdomain   :string(255)
+#  room        :string(255)
+#  api_key     :string(255)
+#
+
+require "gemnasium/gitlab_service"
+
+class GemnasiumService < Service
+  validates :token, :api_key, presence: true, if: :activated?
+
+  def title
+    'Gemnasium'
+  end
+
+  def description
+    'Gemnasium monitors your project dependencies and alerts you about updates and security vulnerabilities.'
+  end
+
+  def to_param
+    'gemnasium'
+  end
+
+  def fields
+    [
+      { type: 'text', name: 'api_key', placeholder: 'Your personal API KEY on gemnasium.com ' },
+      { type: 'text', name: 'token', placeholder: 'The project\'s slug on gemnasium.com' }
+    ]
+  end
+
+  def execute(push_data)
+    repo_path = File.join(Gitlab.config.gitlab_shell.repos_path, "#{project.path_with_namespace}.git")
+    Gemnasium::GitlabService.execute(
+      ref: push_data[:ref],
+      before: push_data[:before],
+      after: push_data[:after],
+      token: token,
+      api_key: api_key,
+      repo: repo_path
+      )
+  end
+end
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb
index 7f5380a455..81ac47c913 100644
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -13,6 +13,7 @@
 #  project_url :string(255)
 #  subdomain   :string(255)
 #  room        :string(255)
+#  api_key     :string(255)
 #
 
 class GitlabCiService < Service
@@ -36,7 +37,7 @@ class GitlabCiService < Service
   end
 
   def commit_status sha
-    response = HTTParty.get(commit_status_path(sha))
+    response = HTTParty.get(commit_status_path(sha), verify: false)
 
     if response.code == 200 and response["status"]
       response["status"]
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index d4795867ba..3cee047a32 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -13,6 +13,7 @@
 #  project_url :string(255)
 #  subdomain   :string(255)
 #  room        :string(255)
+#  api_key     :string(255)
 #
 
 class HipchatService < Service
diff --git a/app/models/project_services/pivotaltracker_service.rb b/app/models/project_services/pivotaltracker_service.rb
index c5b1b9ab8d..877b9a7740 100644
--- a/app/models/project_services/pivotaltracker_service.rb
+++ b/app/models/project_services/pivotaltracker_service.rb
@@ -13,6 +13,7 @@
 #  project_url :string(255)
 #  subdomain   :string(255)
 #  room        :string(255)
+#  api_key     :string(255)
 #
 
 class PivotaltrackerService < Service
diff --git a/app/models/repository.rb b/app/models/repository.rb
index a2317fd592..35ec84f165 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -134,6 +134,7 @@ class Repository
     Rails.cache.delete(cache_key(:commit_count))
     Rails.cache.delete(cache_key(:graph_log))
     Rails.cache.delete(cache_key(:readme))
+    Rails.cache.delete(cache_key(:contribution_guide))
   end
 
   def graph_log
@@ -167,6 +168,12 @@ class Repository
     end
   end
 
+  def contribution_guide
+    Rails.cache.fetch(cache_key(:contribution_guide)) do
+      tree(:head).contribution_guide
+    end
+  end
+
   def head_commit
     commit(self.root_ref)
   end
diff --git a/app/models/service.rb b/app/models/service.rb
index 540aaad1ce..f7e440dcc8 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -13,12 +13,15 @@
 #  project_url :string(255)
 #  subdomain   :string(255)
 #  room        :string(255)
+#  api_key     :string(255)
 #
 
 # To add new service you should build a class inherited from Service
 # and implement a set of methods
 class Service < ActiveRecord::Base
-  attr_accessible :title, :token, :type, :active
+  default_value_for :active, false
+
+  attr_accessible :title, :token, :type, :active, :api_key
 
   belongs_to :project
   has_one :service_hook
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index edc179b20f..c1c9ba257f 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -20,6 +20,8 @@ class Snippet < ActiveRecord::Base
 
   attr_accessible :title, :content, :file_name, :expires_at, :private
 
+  default_value_for :private, true
+
   belongs_to :author, class_name: "User"
 
   has_many :notes, as: :noteable, dependent: :destroy
diff --git a/app/models/tree.rb b/app/models/tree.rb
index 4f866f1a33..ac2183be44 100644
--- a/app/models/tree.rb
+++ b/app/models/tree.rb
@@ -1,5 +1,5 @@
 class Tree
-  attr_accessor :entries, :readme
+  attr_accessor :entries, :readme, :contribution_guide
 
   def initialize(repository, sha, path = '/')
     path = '/' if path.blank?
@@ -10,6 +10,11 @@ class Tree
       readme_path = path == '/' ? readme_tree.name : File.join(path, readme_tree.name)
       @readme = Gitlab::Git::Blob.find(git_repo, sha, readme_path)
     end
+
+    if contribution_tree = @entries.find(&:contributing?)
+      contribution_path = path == '/' ? contribution_tree.name : File.join(path, contribution_tree.name)
+      @contribution_guide = Gitlab::Git::Blob.find(git_repo, sha, contribution_path)
+    end
   end
 
   def trees
diff --git a/app/models/user.rb b/app/models/user.rb
index 7d906fc0d0..6557622aa4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -185,7 +185,7 @@ class User < ActiveRecord::Base
         where(conditions).first
       end
     end
-    
+
     def find_for_commit(email, name)
       # Prefer email match over name match
       User.where(email: email).first ||
@@ -279,8 +279,7 @@ class User < ActiveRecord::Base
                                project_ids += groups_projects.pluck(:id)
                                project_ids += projects.pluck(:id)
                                project_ids += groups.joins(:shared_projects).pluck(:project_id)
-
-                               Project.where(id: project_ids.uniq).joins(:namespace).order('namespaces.name ASC')
+                               Project.where(id: project_ids).joins(:namespace).order('namespaces.name ASC')
                              end
   end
 
@@ -411,7 +410,11 @@ class User < ActiveRecord::Base
   end
 
   def requires_ldap_check?
-    !last_credential_check_at || (last_credential_check_at + 1.hour) < Time.now
+    if ldap_user?
+      !last_credential_check_at || (last_credential_check_at + 1.hour) < Time.now
+    else
+      false
+    end
   end
 
   def solo_owned_groups
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index 8a5c4b6cd4..45a795391a 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -17,6 +17,10 @@
 class WebHook < ActiveRecord::Base
   include HTTParty
 
+  default_value_for :push_events, true
+  default_value_for :issues_events, false
+  default_value_for :merge_requests_events, false
+
   attr_accessible :url
 
   # HTTParty timeout
diff --git a/app/observers/merge_request_observer.rb b/app/observers/merge_request_observer.rb
index ef31498e7d..f2e2d16c94 100644
--- a/app/observers/merge_request_observer.rb
+++ b/app/observers/merge_request_observer.rb
@@ -22,6 +22,8 @@ class MergeRequestObserver < ActivityObserver
     create_event(merge_request, Event::REOPENED)
     create_note(merge_request)
     execute_hooks(merge_request)
+    merge_request.reload_code
+    merge_request.mark_as_unchecked
   end
 
   def after_update(merge_request)
diff --git a/app/observers/project_observer.rb b/app/observers/project_observer.rb
index 4e3deec01b..ad41ddad58 100644
--- a/app/observers/project_observer.rb
+++ b/app/observers/project_observer.rb
@@ -1,30 +1,6 @@
 class ProjectObserver < BaseObserver
   def after_create(project)
-    project.update_column(:last_activity_at, project.created_at)
-
-    return true if project.forked?
-
-    if project.import?
-      RepositoryImportWorker.perform_in(5.seconds, project.id)
-    else
-      GitlabShellWorker.perform_async(
-        :add_repository,
-        project.path_with_namespace
-      )
-
-      log_info("#{project.owner.name} created a new project \"#{project.name_with_namespace}\"")
-    end
-
-    if project.wiki_enabled?
-      begin
-        # force the creation of a wiki,
-        GollumWiki.new(project, project.owner).wiki
-      rescue GollumWiki::CouldNotCreateWikiError => ex
-        # Prevent project observer crash
-        # if failed to create wiki
-        nil
-      end
-    end
+    log_info("#{project.owner.name} created a new project \"#{project.name_with_namespace}\"")
   end
 
   def after_update(project)
diff --git a/app/services/git_tag_push_service.rb b/app/services/git_tag_push_service.rb
new file mode 100644
index 0000000000..62eaf9b4f5
--- /dev/null
+++ b/app/services/git_tag_push_service.rb
@@ -0,0 +1,40 @@
+class GitTagPushService
+  attr_accessor :project, :user, :push_data
+
+  def execute(project, user, oldrev, newrev, ref)
+    @project, @user = project, user
+    @push_data = create_push_data(oldrev, newrev, ref)
+
+    create_push_event
+    project.repository.expire_cache
+    project.execute_hooks(@push_data.dup, :tag_push_hooks)
+  end
+
+  private
+
+  def create_push_data(oldrev, newrev, ref)
+    data = {
+      ref: ref,
+      before: oldrev,
+      after: newrev,
+      user_id: user.id,
+      user_name: user.name,
+      project_id: project.id,
+      repository: {
+        name: project.name,
+        url: project.url_to_repo,
+        description: project.description,
+        homepage: project.web_url
+      }
+    }
+  end
+
+  def create_push_event
+    Event.create!(
+      project: project,
+      action: Event::PUSHED,
+      data: push_data,
+      author_id: push_data[:user_id]
+    )
+  end
+end
diff --git a/app/services/notes/load_service.rb b/app/services/notes/load_service.rb
deleted file mode 100644
index f7ad7d60a3..0000000000
--- a/app/services/notes/load_service.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Notes
-  class LoadService < BaseService
-    def execute
-      target_type = params[:target_type]
-      target_id   = params[:target_id]
-
-
-      @notes = case target_type
-               when "commit"
-                 project.notes.for_commit_id(target_id).not_inline.fresh
-               when "issue"
-                 project.issues.find(target_id).notes.inc_author.fresh
-               when "merge_request"
-                 project.merge_requests.find(target_id).mr_and_commit_notes.inc_author.fresh
-               when "snippet"
-                 project.snippets.find(target_id).notes.fresh
-               end
-    end
-  end
-end
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 9d7bb9639a..5daf573630 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -257,7 +257,7 @@ class NotificationService
     recipients.delete(current_user)
 
     recipients.each do |recipient|
-      mailer.send(method, recipient.id, target.id, target.assignee_id_was)
+      mailer.send(method, recipient.id, target.id, target.assignee_id_was, current_user.id)
     end
   end
 
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index ba131d8ffb..4d3d518a50 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -58,6 +58,29 @@ module Projects
             user: current_user
           )
         end
+
+        @project.update_column(:last_activity_at, @project.created_at)
+
+        if @project.import?
+          @project.import_start
+        else
+          GitlabShellWorker.perform_async(
+            :add_repository,
+            @project.path_with_namespace
+          )
+
+        end
+
+        if @project.wiki_enabled?
+          begin
+            # force the creation of a wiki,
+            GollumWiki.new(@project, @project.owner).wiki
+          rescue GollumWiki::CouldNotCreateWikiError => ex
+            # Prevent project observer crash
+            # if failed to create wiki
+            nil
+          end
+        end
       end
 
       @project
diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb
index c113040157..8a1fce17ce 100644
--- a/app/services/search/global_service.rb
+++ b/app/services/search/global_service.rb
@@ -11,17 +11,12 @@ module Search
       query = Shellwords.shellescape(query) if query.present?
       return result unless query.present?
 
-      authorized_projects_ids = []
-      authorized_projects_ids += current_user.authorized_projects.pluck(:id) if current_user
-      authorized_projects_ids += Project.public_or_internal_only(current_user).pluck(:id)
-
       group = Group.find_by(id: params[:group_id]) if params[:group_id].present?
-      projects = Project.where(id: authorized_projects_ids)
+      projects = Project.accessible_to(current_user)
       projects = projects.where(namespace_id: group.id) if group
-      projects = projects.search(query)
       project_ids = projects.pluck(:id)
 
-      result[:projects] = projects.limit(20)
+      result[:projects] = projects.search(query).limit(20)
       result[:merge_requests] = MergeRequest.in_projects(project_ids).search(query).order('updated_at DESC').limit(20)
       result[:issues] = Issue.where(project_id: project_ids).search(query).order('updated_at DESC').limit(20)
       result[:total_results] = %w(projects issues merge_requests).sum { |items| result[items.to_sym].size }
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml
index e5af56ffc5..32f77cc1a7 100644
--- a/app/views/admin/background_jobs/show.html.haml
+++ b/app/views/admin/background_jobs/show.html.haml
@@ -14,27 +14,21 @@
       %table.table
         %thead
           %th USER
-          %th
           %th PID
-          %th
           %th CPU
-          %th
           %th MEM
-          %th
           %th STATE
-          %th
           %th START
-          %th
           %th COMMAND
-          %th
-          - @sidekiq_processes.split("\n").each do |process|
+        %tbody
+          - @sidekiq_processes.each do |process|
             - next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/)
-            - data = process.gsub!(/\s+/m, '|').strip.split('|')
+            - data = process.strip.split(' ')
             %tr
-              - 6.times do
+              %td= Settings.gitlab.user
+              - 5.times do
                 %td= data.shift
-                %td
-              %td= data.join(" ")
+              %td= data.join(' ')
 
       .clearfix
         %p
diff --git a/app/views/admin/hooks/_data_ex.html.haml b/app/views/admin/hooks/_data_ex.html.haml
deleted file mode 100644
index 9861e372ef..0000000000
--- a/app/views/admin/hooks/_data_ex.html.haml
+++ /dev/null
@@ -1,67 +0,0 @@
-= highlight_js do
-  :erb
-    1. Project created:
-    {
-              "created_at": "2012-07-21T07:30:54Z",
-              "event_name": "project_create",
-                    "name": "StoreCloud",
-             "owner_email": "johnsmith@gmail.com"
-              "owner_name": "John Smit",
-                    "path": "stormcloud",
-     "path_with_namespace": "jsmith/stormcloud",
-              "project_id": 74,
-    }
-
-    2. Project destroyed:
-    {
-              "created_at": "2012-07-21T07:30:58Z",
-              "event_name": "project_destroy",
-                    "name": "Underscore",
-             "owner_email": "johnsmith@gmail.com"
-              "owner_name": "John Smith",
-                    "path": "underscore",
-     "path_with_namespace": "jsmith/underscore",
-              "project_id": 73,
-    }
-
-    3. New Team Member:
-    {
-         "created_at": "2012-07-21T07:30:56Z",
-         "event_name": "user_add_to_team",
-     "project_access": "Master",
-         "project_id": 74, 
-       "project_name": "StoreCloud",
-       "project_path": "storecloud", 
-        "user_email": "johnsmith@gmail.com",
-         "user_name": "John Smith",
-    }
-
-    4. Team Member Removed:
-    {
-         "created_at": "2012-07-21T07:30:56Z",
-         "event_name": "user_remove_from_team",
-     "project_access": "Master",
-         "project_id": 74, 
-       "project_name": "StoreCloud",
-       "project_path": "storecloud", 
-        "user_email": "johnsmith@gmail.com",
-         "user_name": "John Smith",
-    }
-
-    5. User created:
-    { 
-       "created_at": "2012-07-21T07:44:07Z",
-            "email": "js@gitlabhq.com",
-       "event_name": "user_create",
-             "name": "John Smith", 
-          "user_id": 41 
-    }
-
-    6. User removed:
-    { 
-       "created_at": "2012-07-21T07:44:07Z",
-            "email": "js@gitlabhq.com",
-       "event_name": "user_destroy",
-             "name": "John Smith",
-          "user_id": 41 
-    }
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index 940a539d5e..5f19d21f10 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -53,5 +53,5 @@
               = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
               = link_to 'Destroy', [project], data: { confirm: remove_project_message(project) }, method: :delete, class: "btn btn-small btn-remove"
         - if @projects.blank?
-          %p.nothing_here_message 0 projects matches
+          .nothing-here-block 0 projects matches
     = paginate @projects, theme: "gitlab"
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index e888358dc6..d66119e271 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -7,7 +7,7 @@
     %span.cred (Admin)
 
   .pull-right
-    = link_to edit_admin_user_path(@user), class: "btn grouped" do
+    = link_to edit_admin_user_path(@user), class: "btn btn-grouped" do
       %i.icon-edit
       Edit
 %hr
diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml
index 39dd600dba..fdf96dd6f5 100644
--- a/app/views/dashboard/_activities.html.haml
+++ b/app/views/dashboard/_activities.html.haml
@@ -4,6 +4,6 @@
 - if @events.any?
   .content_list
 - else
-  %p.nothing_here_message Projects activity will be displayed here
+  .nothing-here-block Projects activity will be displayed here
 
 = spinner
diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml
index 2ff1c33c53..a6bc946bed 100644
--- a/app/views/dashboard/_groups.html.haml
+++ b/app/views/dashboard/_groups.html.haml
@@ -17,4 +17,4 @@
             %i.icon-angle-right
     - if groups.blank?
       %li
-        %h3.nothing_here_message You have no groups yet.
+        .nothing-here-block You have no groups yet.
diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml
index 8313cc07b5..44c7a4b8c8 100644
--- a/app/views/dashboard/_projects.html.haml
+++ b/app/views/dashboard/_projects.html.haml
@@ -14,7 +14,7 @@
 
     - if projects.blank?
       %li
-        %h3.nothing_here_message There are no projects here.
+        .nothing-here-block There are no projects here.
     - if @projects_count > @projects_limit
       %li.bottom
         %span.light
diff --git a/app/views/dashboard/_zero_authorized_projects.html.haml b/app/views/dashboard/_zero_authorized_projects.html.haml
index 79d5dca884..e0993293ea 100644
--- a/app/views/dashboard/_zero_authorized_projects.html.haml
+++ b/app/views/dashboard/_zero_authorized_projects.html.haml
@@ -29,8 +29,23 @@
       %p.slead
         You can create a group for several dependent projects.
         %br
-        Group is the best way to manage projects and members
+        Groups are the best way to manage projects and members
       .link_holder
         = link_to new_group_path, class: "btn btn-new" do
           New group »
 
+-if @publicish_project_count > 0
+  %hr
+  %div
+    .dashboard-intro-icon
+      %i.icon-globe
+    %div
+      %p.slead
+        There are
+        %strong= @publicish_project_count
+        public projects on this server.
+        %br
+        Public projects are an easy way to allow everyone to have read-only access.
+      .link_holder
+        = link_to public_projects_path, class: "btn btn-new" do
+          Browse public projects »
diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml
index 8feef97c73..e1c9a5941e 100644
--- a/app/views/dashboard/projects.html.haml
+++ b/app/views/dashboard/projects.html.haml
@@ -67,7 +67,7 @@
 
         - if @projects.blank?
           %li
-            %h3.nothing_here_message There are no projects here.
+            .nothing-here-block There are no projects here.
     .bottom
       = paginate @projects, theme: "gitlab"
 
diff --git a/app/views/groups/_filter.html.haml b/app/views/groups/_filter.html.haml
index 9fbc6c190c..fe8c0669c0 100644
--- a/app/views/groups/_filter.html.haml
+++ b/app/views/groups/_filter.html.haml
@@ -21,7 +21,7 @@
               = project.name_with_namespace
               %small.pull-right= entities_per_project(project, entity)
       - if @projects.blank?
-        %p.nothing_here_message This group has no projects yet
+        .nothing-here-block This group has no projects yet
 
   %fieldset
     %hr
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index 9e3f342f3d..c5f20d61f5 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -9,7 +9,7 @@
           New project
   %ul.well-list
     - if projects.blank?
-      %p.nothing_here_message This groups has no projects yet
+      .nothing-here-block This groups has no projects yet
     - projects.each do |project|
       %li.project-row
         = link_to project_path(project), class: dom_class(project) do
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 627567597d..154f510ee0 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -84,7 +84,7 @@
                   = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
                   = link_to 'Remove', project, data: { confirm: remove_project_message(project)}, method: :delete, class: "btn btn-small btn-remove"
             - if @group.projects.blank?
-              %p.nothing_here_message This group has no projects yet
+              .nothing-here-block This group has no projects yet
 
       .tab-pane#tab-ldap
         .ui-box
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index e24df31091..4b11d91dc9 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -5,7 +5,9 @@
 %p.light
   Only issues from
   %strong #{@group.name}
-  group are listed here. To see all issues you should visit #{link_to 'dashboard', issues_dashboard_path} page.
+  group are listed here.
+  - if current_user
+    To see all issues you should visit #{link_to 'dashboard', issues_dashboard_path} page.
 %hr
 
 .row
diff --git a/app/views/groups/members.html.haml b/app/views/groups/members.html.haml
index a93ddad758..d717be725a 100644
--- a/app/views/groups/members.html.haml
+++ b/app/views/groups/members.html.haml
@@ -1,29 +1,31 @@
+- show_roles = should_user_see_group_roles?(current_user, @group)
 %h3.page-title
   Group members
-%p.light
-  Members of group have access to all group projects.
-  Read more about permissions
-  %strong= link_to "here", help_permissions_path, class: "vlink"
+- if show_roles
+  %p.light
+    Members of group have access to all group projects.
+    Read more about permissions
+    %strong= link_to "here", help_permissions_path, class: "vlink"
 
 %hr
 
-.clearfix
+.clearfix.js-toggle-container
   = form_tag members_group_path(@group), method: :get, class: 'form-inline member-search-form'  do
     .form-group
       = search_field_tag :search, params[:search], { placeholder: 'Find member by name', class: 'form-control search-text-input input-mn-300' }
     = submit_tag 'Search', class: 'btn'
 
-  - if current_user.can? :manage_group, @group
+  - if current_user && current_user.can?(:manage_group, @group)
     .pull-right
       - if ldap_enabled? && @group.ldap_cn.present?
         = link_to reset_access_group_ldap_path(@group), class: 'btn grouped', data: { confirm: "Reset the access level of all other LDAP group team members to '#{@group.human_ldap_access}'?" }, method: :put do
           Reset access
 
-      = link_to '#', class: 'btn btn-new js-toggle-visibility-link' do
+      = link_to '#', class: 'btn btn-new js-toggle-button' do
         Add members
         %i.icon-chevron-down
 
-    .js-toggle-visibility-container.hide.new-group-member-holder
+    .js-toggle-content.hide.new-group-member-holder
       = render "new_group_member"
 
 .ui-box.prepend-top-20
@@ -34,7 +36,7 @@
       (#{@members.total_count})
   %ul.well-list
     - @members.each do |member|
-      = render 'users_groups/users_group', member: member, show_controls: true
+      = render 'users_groups/users_group', member: member, show_roles: show_roles, show_controls: true
 = paginate @members, theme: 'gitlab'
 
 :coffeescript
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index eaf85bbdbc..209130ec44 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -5,7 +5,9 @@
 %p.light
   Only merge requests from
   %strong #{@group.name}
-  group are listed here. To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
+  group are listed here.
+  - if current_user
+    To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
 %hr
 .row
   .col-md-3
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index b50aa2e2e5..9336303b2f 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,16 +1,17 @@
 .dashboard
   .activities.col-md-8.hidden-sm
-    = render "events/event_last_push", event: @last_push
-    = link_to dashboard_path, class: 'btn btn-tiny' do
-      &larr; To dashboard
-    &nbsp;
+    - if current_user
+      = render "events/event_last_push", event: @last_push
+      = link_to dashboard_path, class: 'btn btn-tiny' do
+        &larr; To dashboard
+      &nbsp;
     %span.cgray You will only see events from projects in this group
     %hr
     = render 'shared/event_filter'
     - if @events.any?
       .content_list
     - else
-      %p.nothing_here_message Project activity will be displayed here
+      .nothing-here-block Project activity will be displayed here
     = spinner
   .side.col-md-4
     .light-well.append-bottom-20
@@ -24,11 +25,12 @@
     %br
     = render "shared_projects", projects: @shared_projects
 
-    .prepend-top-20
-      = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed" do
-        %strong
-          %i.icon-rss
-          News Feed
+    - if current_user
+      .prepend-top-20
+        = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed" do
+          %strong
+            %i.icon-rss
+            News Feed
 
     %hr
     = render 'shared/promo'
diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml
index 7fd0c74057..5d3ee4526f 100644
--- a/app/views/help/permissions.html.haml
+++ b/app/views/help/permissions.html.haml
@@ -1,220 +1,6 @@
 = render layout: 'help/layout' do
-  %h3.page-title Permissions
-  %p.light Users have different abilities depending on the access level they have in particular group or project.
-  %p.light If a user is both in a project group and in the project itself the highest permission level is used.
-  %p.light If a user is a GitLab administrator they receive all permissions.
-  %hr
+  %h3.page-title Permissions 
 
-  %h4 Project:
-  %table.table
-    %thead
-      %tr
-        %th Action
-        %th Guest
-        %th Reporter
-        %th Developer
-        %th Master
-        %th Owner
-    %tbody
-      %tr
-        %td Create new issue
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Leave comments
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Write on project wall
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Pull project code
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Download project
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Create code snippets
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Create new merge request
-        %td
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Create new branches
-        %td
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Push to non-protected branches
-        %td
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Remove non-protected branches
-        %td
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Add tags
-        %td
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Write a wiki
-        %td
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Manage issue tracker
-        %td
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Add new team members
-        %td
-        %td
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Push to protected branches
-        %td
-        %td
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Remove protected branches
-        %td
-        %td
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Edit project
-        %td
-        %td
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Add Deploy Keys to project
-        %td
-        %td
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Configure Project Hooks
-        %td
-        %td
-        %td
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Switch visibility level
-        %td
-        %td
-        %td
-        %td
-        %td.permission-x &#10003;
-      %tr
-        %td Transfer project to another namespace
-        %td
-        %td
-        %td
-        %td
-        %td.permission-x &#10003;
-      %tr
-        %td Remove project
-        %td
-        %td
-        %td
-        %td
-        %td.permission-x &#10003;
-
-  %h4 Group
-  %table.table
-    %thead
-      %tr
-        %th Action
-        %th Guest
-        %th Reporter
-        %th Developer
-        %th Master
-        %th Owner
-    %tbody
-      %tr
-        %td Browse group
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-        %td.permission-x &#10003;
-      %tr
-        %td Edit group
-        %td
-        %td
-        %td
-        %td
-        %td.permission-x &#10003;
-      %tr
-        %td Create project in group
-        %td
-        %td
-        %td
-        %td
-        %td.permission-x &#10003;
-      %tr
-        %td Manage group members
-        %td
-        %td
-        %td
-        %td
-        %td.permission-x &#10003;
-      %tr
-        %td Remove group
-        %td
-        %td
-        %td
-        %td
-        %td.permission-x &#10003;
-  %p.light Any user can remove himself from a group, unless he is the last Owner of the group.
+  .help_body
+    = preserve do
+      = markdown File.read(Rails.root.join("doc", "permissions", "permissions.md"))
diff --git a/app/views/help/public_access.html.haml b/app/views/help/public_access.html.haml
index e1b2a2ce1f..d1ec3f5d5c 100644
--- a/app/views/help/public_access.html.haml
+++ b/app/views/help/public_access.html.haml
@@ -1,61 +1,6 @@
 = render layout: 'help/layout' do
-  %h3.page-title Public Access
+  %h3.page-title Public Access 
 
-  %p.slead
-    GitLab allows you to open selected projects to be accessed
-    %strong publicly
-    or
-    %strong internally
-    \.
-    %br
-    Projects with either of these visibility levels will be listed in the #{link_to "public access directory", public_root_path}.
-    %br
-    Internal projects will only be available to authenticated users.
-
-  .clearfix
-    .dashboard-intro-icon
-      = public_icon
-    %h4
-      Public projects
-    %p
-      Public project can be cloned
-      %strong without any
-      authentication.
-      %br
-      It will also be listed on the #{link_to "public access directory", public_root_path}.
-      %br
-      %strong Any logged in user
-      will have #{link_to "Guest", help_permissions_path} permissions on the repository.
-
-  .clearfix
-    .dashboard-intro-icon
-      = internal_icon
-    %h4
-      Internal projects
-    %p
-      Internal project can be cloned by any logged in user.
-      %br
-      It will also be listed on the #{link_to "public access directory", public_root_path} for logged in users.
-      %br
-      Any logged in user will have #{link_to "Guest", help_permissions_path} permissions on the repository.
-
-  %h4 How to change project visibility
-  %ol
-    %li Go to your project dashboard
-    %li Click on the "Edit" tab
-    %li Change "Visibility Level"
-
-  %h4 Visibility of users
-  The public page of users, located at
-  = succeed "," do
-    %code u/username
-  is visible if either:
-  %ul
-    %li
-      You are logged in.
-    %li
-      %p
-        You are logged out, and the target user is authorized to (is Guest, Reporter, etc.)
-        at least one public project.
-      %p Otherwise, you will be redirected to the sign in page.
-  When visiting the public page of an user, you will only see listed projects which you can view yourself.
+  .help_body
+    = preserve do
+      = markdown File.read(Rails.root.join("doc", "public_access", "public_access.md"))
diff --git a/app/views/help/ssh.html.haml b/app/views/help/ssh.html.haml
index 1c7b08aa7c..8ae1ed1ab6 100644
--- a/app/views/help/ssh.html.haml
+++ b/app/views/help/ssh.html.haml
@@ -1,28 +1,6 @@
 = render layout: 'help/layout' do
-  %h3.page-title SSH Keys
+  %h3.page-title SSH Keys 
 
-  %p.slead
-    SSH key allows you to establish a secure connection between your computer and GitLab
-
-  %p.slead
-    Before generating an SSH key, check if your system already has one by running cat ~/.ssh/id_rsa.pub
-    If your see a long string starting with 'ssh-rsa' or 'ssh-dsa', you can skip the ssh-keygen step.
-
-  %p.slead
-    To generate a new SSH key just open your terminal and use code below. The ssh-keygen command prompts you for a location and filename to store the key pair and for a password. 
-    When prompted for the location and filename you can press enter to use the default. 
-    It is a best practice to use a password for an SSH key but it is not required and you can skip creating a password by pressing enter. 
-    Note that the password you choose here can't be altered or retrieved.
-
-  %pre.dark
-    ssh-keygen -t rsa -C "#{current_user.email}"
-
-  %p.slead
-    Use code below to show your public key.
-
-  %pre.dark
-    cat ~/.ssh/id_rsa.pub
-
-  %p.slead
-    Copy-paste the key to the 'My SSH Keys' section under the 'SSH' tab in your user profile. 
-    Please copy the complete key starting with 'ssh-' and ending with your username and host.
+  .help_body
+    = preserve do
+      = markdown File.read(Rails.root.join("doc", "ssh", "ssh.md"))
diff --git a/app/views/help/system_hooks.html.haml b/app/views/help/system_hooks.html.haml
index 3e401a6e19..e24f566121 100644
--- a/app/views/help/system_hooks.html.haml
+++ b/app/views/help/system_hooks.html.haml
@@ -1,11 +1,6 @@
 = render layout: 'help/layout' do
-  %h3.page-title System hooks
+  %h3.page-title System hooks 
 
-  %p.slead
-    Your GitLab instance can perform HTTP POST requests on the following events: create_project, delete_project, create_user, delete_user, change_team_member.
-    %br
-    %br
-    System Hooks can be used, e.g. for logging or changing information in a LDAP server.
-    %br
-  %h5 Hooks request example:
-  = render "admin/hooks/data_ex"
+  .help_body
+    = preserve do
+      = markdown File.read(Rails.root.join("doc", "system_hooks", "system_hooks.md"))
diff --git a/app/views/help/web_hooks.html.haml b/app/views/help/web_hooks.html.haml
index 7bde7fcc3d..9e2b54ab6e 100644
--- a/app/views/help/web_hooks.html.haml
+++ b/app/views/help/web_hooks.html.haml
@@ -1,115 +1,6 @@
 = render layout: 'help/layout' do
-  %h3.page-title Project web hooks
-  %p.light
-    Project web hooks allow you to trigger url if new code is pushed or new issue is created
-  %hr
+  %h3.page-title Project web hooks 
 
-  %p.slead
-    You can configure web hook to listen for specific events like pushes, issues, merge requests.
-    %br
-    GitLab will send POST request with data to web hook url.
-    %br
-    Web Hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
-  %hr
-
-  %h4 Push events
-  %p.light
-    Triggered when you push to the repository except pushing tags.
-    %br
-    Request body:
-  = highlight_js do
-    :erb
-      {
-        "before": "95790bf891e76fee5e1747ab589903a6a1f80f22",
-        "after": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
-        "ref": "refs/heads/master",
-        "user_id": 4,
-        "user_name": "John Smith",
-        "project_id": 15,
-        "repository": {
-          "name": "Diaspora",
-          "url": "git@localhost:diaspora.git",
-          "description": "",
-          "homepage": "http://localhost/diaspora",
-        },
-        "commits": [
-          {
-            "id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
-            "message": "Update Catalan translation to e38cb41.",
-            "timestamp": "2011-12-12T14:27:31+02:00",
-            "url": "http://localhost/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
-            "author": {
-              "name": "Jordi Mallach",
-              "email": "jordi@softcatala.org",
-            }
-          },
-          // ...
-          {
-            "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
-            "message": "fixed readme",
-            "timestamp": "2012-01-03T23:36:29+02:00",
-            "url": "http://localhost/diaspora/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
-            "author": {
-              "name": "GitLab dev user",
-              "email": "gitlabdev@dv6700.(none)",
-            },
-          },
-        ],
-        "total_commits_count": 4,
-      };
-
-
-  %h4.prepend-top-20 Issues events
-  %p.light
-    Triggered when new issue created or existing issue was updated/closed/reopened.
-    %br
-    Request body:
-  = highlight_js do
-    :erb
-      {
-        "object_kind":"issue",
-        "object_attributes":{
-          "id":301,
-          "title":"New API: create/update/delete file",
-          "assignee_id":51,
-          "author_id":51,
-          "project_id":14,
-          "created_at":"2013-12-03T17:15:43Z",
-          "updated_at":"2013-12-03T17:15:43Z",
-          "position":0,
-          "branch_name":null,
-          "description":"Create new API for manipulations with repository",
-          "milestone_id":null,
-          "state":"opened",
-          "iid":23
-        }
-      }
-  %h4.prepend-top-20 Merge request events
-  %p.light
-    Triggered when new merge request created or existing merge request was updated/merged/closed.
-    %br
-    Request body:
-  = highlight_js do
-    :erb
-      {
-        "object_kind":"merge_request",
-        "object_attributes":{
-          "id":99,
-          "target_branch":"master",
-          "source_branch":"ms-viewport",
-          "source_project_id":14,
-          "author_id":51,
-          "assignee_id":6,
-          "title":"MS-Viewport",
-          "created_at":"2013-12-03T17:23:34Z",
-          "updated_at":"2013-12-03T17:23:34Z",
-          "st_commits":null,
-          "st_diffs":null,
-          "milestone_id":null,
-          "state":"opened",
-          "merge_status":"unchecked",
-          "target_project_id":14,
-          "iid":1,
-          "description":""
-        }
-      }
+  .help_body
+    = preserve do
+      = markdown File.read(Rails.root.join("doc", "web_hooks", "web_hooks.md"))
diff --git a/app/views/help/workflow.html.haml b/app/views/help/workflow.html.haml
index 2ac5cd3a65..47de4ad796 100644
--- a/app/views/help/workflow.html.haml
+++ b/app/views/help/workflow.html.haml
@@ -1,73 +1,6 @@
 = render layout: 'help/layout' do
-  %h3.page-title Workflow
+  %h3.page-title Workflow 
 
-  %h4 Summary
-
-  %ol.help
-    %li
-      %p Clone project
-      .bash
-        %pre.dark
-          git clone git@example.com:project-name.git
-
-    %li
-      %p Create branch with your feature
-      .bash
-        %pre.dark
-          git checkout -b $feature_name
-
-    %li
-      %p Write code. Commit changes
-      .bash
-        %pre.dark
-          git commit -am "My feature is ready"
-
-    %li
-      %p Push your branch to GitLab
-      .bash
-        %pre.dark
-          git push origin $feature_name
-
-    %li
-      %p Review your code on Commits page
-
-    %li
-      %p Create a merge request
-
-    %li
-      %p Your team lead will review code &amp; merge it to main branch
-
-  %h3 Authorization for Merge Requests
-  %p
-    There are two main ways to have a merge request flow with GitLab: working with protected branches in a single repository, or working with forks of an authoritative project.
-
-  %h4 Protected branch flow
-  %p
-    With the protected branch flow everybody works within the same GitLab project.
-    The project maintainers get Master access and the regular developers get Developer access.
-    The maintainers mark the authoritative branches as 'Protected'.
-    The developers push feature branches to the project and create merge requests to have their feature branches reviewed and merged into one of the protected branches.
-    Only users with Master access can merge changes into a protected branch.
-
-  %h5 Advantages
-  %ul
-    %li fewer projects means less clutter
-    %li developers need to consider only one remote repository
-
-  %h5 Disadvantages
-  %ul
-    %li manual setup of protected branch required for each new project
-
-  %h4 Forking workflow
-  %p
-    With the forking workflow the maintainers get Master access and the regular developers get Reporter access to the authoritative repository, which prohibits them from pushing any changes to it.
-    Developers create forks of the authoritative project and push their feature branches to their own forks.
-    To get their changes into master they need to create a merge request across forks.
-
-  %h5 Advantages
-  %ul
-    %li in an appropriately configured GitLab group, new projects automatically get the required access restrictions for regular developers: fewer manual steps to configure authorization for new projects
-
-  %h5 Disadvantages
-  %ul
-    %li all developers on the project need to keep their forks up to date, which requires more advanced Git skills (managing multiple remotes)
+  .help_body
+    = preserve do
+      = markdown File.read(Rails.root.join("doc", "workflow", "workflow.md"))
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 5723250151..9ba20f1347 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -12,6 +12,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id')
+  = render 'layouts/piwik' if extra_config.has_key?('piwik_url') && extra_config.has_key?('piwik_site_id')
 
   -# Atom feed
   - if current_user
diff --git a/app/views/layouts/_piwik.html.haml b/app/views/layouts/_piwik.html.haml
new file mode 100644
index 0000000000..135e8daca2
--- /dev/null
+++ b/app/views/layouts/_piwik.html.haml
@@ -0,0 +1,12 @@
+:javascript
+  var _paq = _paq || [];
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+
+  (function() {
+    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://#{extra_config.piwik_url}/";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "#{extra_config.piwik_site_id}"]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+  })();
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index a8bb3b9155..36b102dc25 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -5,11 +5,13 @@
   = nav_link(path: 'groups#issues') do
     = link_to issues_group_path(@group) do
       Issues
-      %span.count= current_user.assigned_issues.opened.of_group(@group).count
+      - if current_user
+        %span.count= current_user.assigned_issues.opened.of_group(@group).count
   = nav_link(path: 'groups#merge_requests') do
     = link_to merge_requests_group_path(@group) do
       Merge Requests
-      %span.count= current_user.cared_merge_requests.opened.of_group(@group).count
+      - if current_user
+        %span.count= current_user.cared_merge_requests.opened.of_group(@group).count
   = nav_link(path: 'groups#members') do
     = link_to "Members", members_group_path(@group)
 
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
index f88abeca88..09d84a3eb9 100644
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -3,20 +3,24 @@
     %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
       %title
         GitLab
+  :css
+    p.details {
+      font-style:italic;
+      color:#777
+    }
+    .footer p {
+      font-size:small;
+      color:#777
+    }
 
   %body
-    %h1{style: "background: #EEE; border-bottom: 1px solid #DDD; color: #474D57; font: normal 20px Helvetica, Arial, sans-serif; margin: 0; padding: 5px 10px; line-height: 32px; font-size: 16px;"}
-      GitLab
-      - if @project
-        \|
-        = link_to @project.name_with_namespace, project_url(@project), style: 'color: #29B; text-decoration: none'
-    %table{align: "left", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 10px 0;", width: "100%"}
-      %tr
-        %td{align: "left", style: "margin: 0; padding: 10px;"}
-          = yield
-          %br
-      %tr
-        %td{align: "left", style: "margin: 0; padding: 10px;"}
-          %p{style: "font-size:small;color:#777"}
-            - if @project
-              You're receiving this notification because you are a member of the #{@project.name_with_namespace} project team.
+    %div.content
+      = yield
+    %div.footer{style: "margin-top: 10px;"}
+      %p
+        \—
+        %br
+        - if @project
+          You're receiving this notification because you are a member of the #{link_to @project.name_with_namespace, project_url(@project)} project team.
+        - if @target_url
+          #{link_to "View in GitLab", @target_url}
diff --git a/app/views/layouts/public_group.html.haml b/app/views/layouts/public_group.html.haml
new file mode 100644
index 0000000000..a289b78472
--- /dev/null
+++ b/app/views/layouts/public_group.html.haml
@@ -0,0 +1,10 @@
+!!! 5
+%html{ lang: "en"}
+  = render "layouts/head", title: group_head_title
+  %body{class: "#{app_theme} application", :'data-page' => body_data_page}
+    = render "layouts/broadcast"
+    = render "layouts/public_head_panel", title: "group: #{@group.name}"
+    %nav.main-nav.navbar-collapse.collapse
+      .container= render 'layouts/nav/group'
+    .container
+      .content= yield
diff --git a/app/views/layouts/public_projects.html.haml b/app/views/layouts/public_projects.html.haml
index 5fcf9f99e7..cf4ca9c7a8 100644
--- a/app/views/layouts/public_projects.html.haml
+++ b/app/views/layouts/public_projects.html.haml
@@ -3,7 +3,7 @@
   = render "layouts/head", title: @project.name_with_namespace
   %body{class: "#{app_theme} application", :'data-page' => body_data_page}
     = render "layouts/broadcast"
-    = render "layouts/public_head_panel", title: @project.name_with_namespace
+    = render "layouts/public_head_panel", title: project_title(@project)
     %nav.main-nav
       .container= render 'layouts/nav/project'
     .container
diff --git a/app/views/notify/_note_message.html.haml b/app/views/notify/_note_message.html.haml
index 9e329af2d4..5272dfa0ed 100644
--- a/app/views/notify/_note_message.html.haml
+++ b/app/views/notify/_note_message.html.haml
@@ -1,6 +1,2 @@
-%p
-  %strong #{@note.author_name}
-  wrote:
-
-%cite{style: 'color: #666'}
+%div
   = markdown(@note.note)
diff --git a/app/views/notify/closed_issue_email.html.haml b/app/views/notify/closed_issue_email.html.haml
index 325cd44eb4..56c18cd83c 100644
--- a/app/views/notify/closed_issue_email.html.haml
+++ b/app/views/notify/closed_issue_email.html.haml
@@ -1,5 +1,2 @@
 %p
   = "Issue was closed by #{@updated_by.name}"
-%p
-  = "Issue ##{@issue.iid}"
-  = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
diff --git a/app/views/notify/closed_merge_request_email.html.haml b/app/views/notify/closed_merge_request_email.html.haml
index 45770cc85d..809d46f31b 100644
--- a/app/views/notify/closed_merge_request_email.html.haml
+++ b/app/views/notify/closed_merge_request_email.html.haml
@@ -1,9 +1,2 @@
 %p
-  = "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}"
-%p
-  = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
-%p
-  != merge_path_description(@merge_request, '&rarr;')
-%p
-  Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
-
+  = "Merge Request !#{@merge_request.iid} was closed by #{@updated_by.name}"
diff --git a/app/views/notify/group_access_granted_email.html.haml b/app/views/notify/group_access_granted_email.html.haml
index 5023ec737a..823ebf7734 100644
--- a/app/views/notify/group_access_granted_email.html.haml
+++ b/app/views/notify/group_access_granted_email.html.haml
@@ -1,5 +1,4 @@
 %p
   = "You have been granted #{@membership.human_access} access to group"
-%p
   = link_to group_url(@group) do
     = @group.name
diff --git a/app/views/notify/issue_status_changed_email.html.haml b/app/views/notify/issue_status_changed_email.html.haml
index 7706b3f751..482c884a9d 100644
--- a/app/views/notify/issue_status_changed_email.html.haml
+++ b/app/views/notify/issue_status_changed_email.html.haml
@@ -1,5 +1,2 @@
 %p
   = "Issue was #{@issue_status} by #{@updated_by.name}"
-%p
-  = "Issue ##{@issue.iid}"
-  = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
diff --git a/app/views/notify/merged_merge_request_email.html.haml b/app/views/notify/merged_merge_request_email.html.haml
index e2bc9cf5c0..0c62d439ae 100644
--- a/app/views/notify/merged_merge_request_email.html.haml
+++ b/app/views/notify/merged_merge_request_email.html.haml
@@ -1,9 +1,2 @@
 %p
-  = "Merge Request #{@merge_request.iid} was merged"
-%p
-  = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
-%p
-  != merge_path_description(@merge_request, '&rarr;')
-%p
-  Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
-
+  = "Merge Request !#{@merge_request.iid} was merged"
diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml
index 3b3c148517..f2f8eee18c 100644
--- a/app/views/notify/new_issue_email.html.haml
+++ b/app/views/notify/new_issue_email.html.haml
@@ -1,9 +1,6 @@
-%p
-  New Issue was created.
-%p
-  = "Issue ##{@issue.iid}"
-  = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
-%p
-  Author: #{@issue.author_name}
-%p
-  Assignee: #{@issue.assignee_name}
+-if @issue.description
+  = markdown(@issue.description)
+
+- if @issue.assignee_id.present?
+  %p
+    Assignee: #{@issue.assignee_name}
diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml
index 321f9418de..f02d5111b2 100644
--- a/app/views/notify/new_merge_request_email.html.haml
+++ b/app/views/notify/new_merge_request_email.html.haml
@@ -1,9 +1,9 @@
-%p
-  = "New Merge Request ##{@merge_request.iid}"
-%p
-  = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
-%p
+%p.details
   != merge_path_description(@merge_request, '&rarr;')
-%p
-  Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
 
+- if @merge_request.assignee_id.present?
+  %p
+    Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
+
+-if @merge_request.description
+  = markdown(@merge_request.description)
diff --git a/app/views/notify/note_commit_email.html.haml b/app/views/notify/note_commit_email.html.haml
index 620b258fc1..1d961e4424 100644
--- a/app/views/notify/note_commit_email.html.haml
+++ b/app/views/notify/note_commit_email.html.haml
@@ -1,5 +1,2 @@
-%p
-  = "New comment for Commit #{@commit.short_id}"
-  = link_to_gfm truncate(@commit.title, length: 16), project_commit_url(@note.project, id: @commit.id, anchor: "note_#{@note.id}")
 = render 'note_message'
 
diff --git a/app/views/notify/note_issue_email.html.haml b/app/views/notify/note_issue_email.html.haml
index b3230953e7..2fa2f78466 100644
--- a/app/views/notify/note_issue_email.html.haml
+++ b/app/views/notify/note_issue_email.html.haml
@@ -1,4 +1 @@
-%p
-  = "New comment for Issue ##{@issue.iid}"
-  = link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")
 = render 'note_message'
diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml
index d587b06848..65f0e4c406 100644
--- a/app/views/notify/note_merge_request_email.html.haml
+++ b/app/views/notify/note_merge_request_email.html.haml
@@ -1,8 +1,7 @@
-%p
-  - if @note.for_diff_line?
-    = link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
-  - else
-    = link_to "New comment", project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
-  for Merge Request ##{@merge_request.iid}
-  %cite "#{truncate(@merge_request.title, length: 20)}"
+- if @note.diff_file_name
+  %p.details
+    New comment on diff for
+    = link_to @note.diff_file_name, @target_url
+    \:
+
 = render 'note_message'
diff --git a/app/views/notify/note_wall_email.html.haml b/app/views/notify/note_wall_email.html.haml
index 92200e83ef..2fa2f78466 100644
--- a/app/views/notify/note_wall_email.html.haml
+++ b/app/views/notify/note_wall_email.html.haml
@@ -1,5 +1 @@
-%p
-  New message on
-  = link_to "Project Wall", project_wall_url(@note.project, anchor: "note_#{@note.id}")
-
 = render 'note_message'
diff --git a/app/views/notify/reassigned_issue_email.html.haml b/app/views/notify/reassigned_issue_email.html.haml
index b0edff44ce..07227a3e68 100644
--- a/app/views/notify/reassigned_issue_email.html.haml
+++ b/app/views/notify/reassigned_issue_email.html.haml
@@ -1,6 +1,3 @@
-%p
-  = "Reassigned Issue ##{@issue.iid}"
-  = link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue)
 %p
   Assignee changed
   - if @previous_assignee
diff --git a/app/views/notify/reassigned_merge_request_email.html.haml b/app/views/notify/reassigned_merge_request_email.html.haml
index d2d82d36c4..00aee6bc95 100644
--- a/app/views/notify/reassigned_merge_request_email.html.haml
+++ b/app/views/notify/reassigned_merge_request_email.html.haml
@@ -1,6 +1,3 @@
-%p
-  = "Reassigned Merge Request ##{@merge_request.iid}"
-  = link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.target_project, @merge_request)
 %p
   Assignee changed
   - if @previous_assignee
diff --git a/app/views/profiles/groups/index.html.haml b/app/views/profiles/groups/index.html.haml
index eefebf98c5..cebc0b6bcc 100644
--- a/app/views/profiles/groups/index.html.haml
+++ b/app/views/profiles/groups/index.html.haml
@@ -18,12 +18,12 @@
       %li
         .pull-right
           - if can?(current_user, :manage_group, group)
-            = link_to edit_group_path(group), class: "btn-small btn grouped" do
+            = link_to edit_group_path(group), class: "btn-small btn btn-grouped" do
               %i.icon-cogs
               Settings
 
           - if can?(current_user, :destroy, user_group)
-            = link_to leave_profile_group_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-small btn grouped", title: 'Remove user from group' do
+            = link_to leave_profile_group_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-small btn btn-grouped", title: 'Remove user from group' do
               %i.icon-signout
               Leave
 
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index 79fdb16408..71a4ca91d4 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -17,6 +17,6 @@
     = render @keys
     - if @keys.blank?
       %li
-        %h3.nothing_here_message There are no SSH keys with access to your account.
+        .nothing-here-block There are no SSH keys with access to your account.
 
 
diff --git a/app/views/projects/blob/_text.html.haml b/app/views/projects/blob/_text.html.haml
index 080a39ab94..7cbea7c3eb 100644
--- a/app/views/projects/blob/_text.html.haml
+++ b/app/views/projects/blob/_text.html.haml
@@ -10,4 +10,4 @@
     - unless blob.empty?
       = render 'shared/file_hljs', blob: blob
     - else
-      %p.nothing_here_message Empty file
+      .nothing-here-block Empty file
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index 902dfcea31..f073197709 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -10,14 +10,14 @@
           %i.icon-lock
     .pull-right
       - if can?(current_user, :download_code, @project)
-        = render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'grouped btn-group-small'
+        = render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'btn-grouped btn-group-small'
       - if branch.name != @repository.root_ref
-        = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name), class: 'btn grouped btn-small', method: :post, title: "Compare" do
+        = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-small', method: :post, title: "Compare" do
           %i.icon-copy
           Compare
 
       - if can?(current_user, :admin_project, @project) && branch.name != @repository.root_ref
-        = link_to project_branch_path(@project, branch.name), class: 'btn grouped btn-small remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do
+        = link_to project_branch_path(@project, branch.name), class: 'btn btn-grouped btn-small remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do
           %i.icon-trash
 
   - if commit
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 3d666807cf..f2b0699f13 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -1,18 +1,18 @@
 .pull-right
   %div
     - if @notes_count > 0
-      %span.btn.disabled.grouped
+      %span.btn.disabled.btn-grouped
         %i.icon-comment
         = @notes_count
     .pull-left.btn-group
-      %a.btn.grouped.dropdown-toggle{ data: {toggle: :dropdown} }
+      %a.btn.btn-grouped.dropdown-toggle{ data: {toggle: :dropdown} }
         %i.icon-download-alt
         Download as
         %span.caret
       %ul.dropdown-menu
         %li= link_to "Email Patches", project_commit_path(@project, @commit, format: :patch)
         %li= link_to "Plain Diff",    project_commit_path(@project, @commit, format: :diff)
-    = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do
+    = link_to project_tree_path(@project, @commit), class: "btn btn-primary btn-grouped" do
       %span Browse Code »
   %div
 
@@ -47,7 +47,7 @@
       - if @branches.any?
         and in
         = link_to("#{pluralize(@branches.count, "other branch")}", "#", class: "js-details-expand")
-        %span.js-details-contain.hide
+        %span.js-details-content.hide
           = commit_branches_links(@project, @branches)
 
 .commit-box
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 9772d3ef2e..a060666280 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -1,9 +1,12 @@
-%li.commit
+%li.commit.js-toggle-container
   .commit-row-title
     = link_to commit.short_id(8), project_commit_path(project, commit), class: "commit_short_id"
     &nbsp;
     %span.str-truncated
       = link_to_gfm commit.title, project_commit_path(project, commit.id), class: "commit-row-message"
+      - if commit.description?
+        %a.text-expander.js-toggle-button ...
+
     = link_to "Browse Code »", project_tree_path(project, commit), class: "pull-right"
     .notes_count
       - notes = project.notes.for_commit_id(commit.id)
@@ -12,6 +15,10 @@
           %i.icon-comment
           = notes.count
 
+  - if commit.description?
+    .commit-row-description.js-toggle-content
+      = simple_format(commit.description)
+
   .commit-row-info
     = commit_author_link(commit, avatar: true, size: 16)
     .committed_ago
diff --git a/app/views/projects/commits/_diffs.html.haml b/app/views/projects/commits/_diffs.html.haml
index a41a89bb97..466085139f 100644
--- a/app/views/projects/commits/_diffs.html.haml
+++ b/app/views/projects/commits/_diffs.html.haml
@@ -8,18 +8,18 @@
       - if current_controller?(:commit) or current_controller?(:merge_requests)
         Please, download the diff as
         - if current_controller?(:commit)
-          = link_to "plain diff", project_commit_path(@project, @commit, format: :diff), class: "underlined_link"
+          = link_to "plain diff", project_commit_path(@project, @commit, format: :diff), class: "underlined-link"
           or
-          = link_to "email patch", project_commit_path(@project, @commit, format: :patch), class: "underlined_link"
+          = link_to "email patch", project_commit_path(@project, @commit, format: :patch), class: "underlined-link"
         - else
-          = link_to "plain diff", project_merge_request_path(@project, @merge_request, format: :diff), class: "underlined_link"
+          = link_to "plain diff", project_merge_request_path(@project, @merge_request, format: :diff), class: "underlined-link"
           or
-          = link_to "email patch", project_merge_request_path(@project, @merge_request, format: :patch), class: "underlined_link"
+          = link_to "email patch", project_merge_request_path(@project, @merge_request, format: :patch), class: "underlined-link"
         instead.
     - unless @force_suppress_diff
       %p
         If you still want to see the diff
-        = link_to "click this link", url_for(force_show_diff: true), class: "underlined_link"
+        = link_to "click this link", url_for(force_show_diff: true), class: "underlined-link"
 
 %p.commit-stat-summary
   Showing
@@ -44,25 +44,38 @@
       - file = project.repository.blob_at(@commit.id, diff.new_path)
       - file = project.repository.blob_at(@commit.parent_id, diff.old_path) unless file
       - next unless file
-      .file{id: "diff-#{i}"}
-        .header
+      .diff-file.js-toggle-container{id: "diff-#{i}"}
+        .diff-header{id: "file-path-#{hexdigest(diff.new_path || diff.old_path)}"}
           - if diff.deleted_file
             %span= diff.old_path
 
-            - if @commit.parent_ids.present?
-              = link_to project_blob_path(project, tree_join(@commit.parent_id, diff.new_path)), { class: 'btn btn-small view-file' } do
-                View file @
-                %span.commit-short-id= @commit.short_id(6)
+            .diff-btn-group
+              - if @commit.parent_ids.present?
+                = link_to project_blob_path(project, tree_join(@commit.parent_id, diff.new_path)), { class: 'btn btn-small view-file' } do
+                  View file @
+                  %span.commit-short-id= @commit.short_id(6)
           - else
             %span= diff.new_path
             - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
               %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
 
-            = link_to project_blob_path(project, tree_join(@commit.id, diff.new_path)), { class: 'btn btn-small view-file' } do
-              View file @
-              %span.commit-short-id= @commit.short_id(6)
+            .diff-btn-group
+              = link_to "#", class: "js-toggle-button btn btn-small" do
+                %i.icon-chevron-down
+                Diff comments
+              &nbsp;
 
-        .content
+              - if @merge_request && @merge_request.source_project
+                = link_to project_edit_tree_path(@merge_request.source_project, tree_join(@merge_request.source_branch, diff.new_path), from_merge_request_id: @merge_request.id), { class: 'btn btn-small' } do
+                  Edit
+                &nbsp;
+
+              = link_to project_blob_path(project, tree_join(@commit.id, diff.new_path)), { class: 'btn btn-small view-file' } do
+                View file @
+                %span.commit-short-id= @commit.short_id(6)
+
+
+        .diff-content
           -# Skipp all non non-supported blobs
           - next unless file.respond_to?('text?')
           - if file.text?
@@ -74,4 +87,4 @@
             - old_file = project.repository.blob_at(@commit.parent_id, diff.old_path) if @commit.parent_id
             = render "projects/commits/image", diff: diff, old_file: old_file, file: file, index: i
           - else
-            %p.nothing_here_message No preview for this file type
+            .nothing-here-block No preview for this file type
diff --git a/app/views/projects/commits/_image.html.haml b/app/views/projects/commits/_image.html.haml
index 9a8b7c857e..6d9ef5964d 100644
--- a/app/views/projects/commits/_image.html.haml
+++ b/app/views/projects/commits/_image.html.haml
@@ -15,7 +15,7 @@
           %span.meta-filesize= "#{number_to_human_size old_file.size}"
           |
           %b W:
-          %span.meta-width 
+          %span.meta-width
           |
           %b H:
           %span.meta-height
@@ -27,7 +27,7 @@
           %span.meta-filesize= "#{number_to_human_size file.size}"
           |
           %b W:
-          %span.meta-width 
+          %span.meta-width
           |
           %b H:
           %span.meta-height
@@ -49,7 +49,7 @@
           %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
         .frame.added
           %img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
-        .col-sm-10
+        .controls
           .transparent
           .drag-track
             .dragger{:style => "left: 0px;"}
diff --git a/app/views/projects/create.js.haml b/app/views/projects/create.js.haml
index a444b8b59a..89710d3a09 100644
--- a/app/views/projects/create.js.haml
+++ b/app/views/projects/create.js.haml
@@ -1,6 +1,10 @@
 - if @project.saved?
-  :plain
-    location.href = "#{project_path(@project)}";
+  - if @project.import?
+    :plain
+      location.href = "#{import_project_path(@project)}";
+  - else
+    :plain
+      location.href = "#{project_path(@project)}";
 - else
   :plain
     $(".project-edit-errors").html("#{escape_javascript(render('errors'))}");
diff --git a/app/views/projects/deploy_keys/index.html.haml b/app/views/projects/deploy_keys/index.html.haml
index 90d86102ac..f50aeba337 100644
--- a/app/views/projects/deploy_keys/index.html.haml
+++ b/app/views/projects/deploy_keys/index.html.haml
@@ -20,7 +20,7 @@
       = render @enabled_keys
       - if @enabled_keys.blank?
         .light-well
-          %p.nothing_here_message Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one
+          .nothing-here-block Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one
   .col-md-6.available-keys
     %h5
       %strong Deploy keys
@@ -29,4 +29,4 @@
       = render @available_keys
       - if @available_keys.blank?
         .light-well
-          %p.nothing_here_message Deploy keys from projects you have access to will be displayed here
+          .nothing-here-block Deploy keys from projects you have access to will be displayed here
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index b9cd5a20d5..10674ccae4 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -93,99 +93,101 @@
 
 
 
-    %center.light.prepend-top-20.padded
-      %h3
-        %i.icon-warning-sign
-        Dangerous settings
-      %p Project settings below may result in data loss!
-      = link_to '#', class: 'btn js-toggle-visibility-link' do
-        Show it to me
-        %i.icon-chevron-down
+    .danger-settings.js-toggle-container
+      .centered-light-block
+        %h3
+          %i.icon-warning-sign
+          Dangerous settings
 
-    .js-toggle-visibility-container.hide
-      - if can? current_user, :archive_project, @project
-        .ui-box.ui-box-danger
-          .title
-            - if @project.archived?
-              Unarchive project
-            - else
-              Archive project
-          .body
-            - if @project.archived?
-              %p
-                Unarchiving the project will mark its repository as active.
-                %br
-                The project can be committed to.
-                %br
-                %strong Once active this project shows up in the search and on the dashboard.
-              = link_to 'Unarchive', unarchive_project_path(@project),
-                  data: { confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be comitted to again." },
-                  method: :post, class: "btn btn-remove"
-            - else
-              %p
-                Archiving the project will mark its repository as read-only.
-                %br
-                It is hidden from the dashboard and doesn't show up in searches.
-                %br
-                %strong Archived projects cannot be committed to!
-              = link_to 'Archive', archive_project_path(@project),
-                  data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." },
-                  method: :post, class: "btn btn-remove"
-      - else
-        %p.nothing_here_message Only the project owner can archive a project
+        %p Project settings below may result in data loss!
+        = link_to '#', class: 'btn js-toggle-button' do
+          Show it to me
+          %i.icon-chevron-down
+
+      .js-toggle-content.hide
+        - if can? current_user, :archive_project, @project
+          .ui-box.ui-box-danger
+            .title
+              - if @project.archived?
+                Unarchive project
+              - else
+                Archive project
+            .body
+              - if @project.archived?
+                %p
+                  Unarchiving the project will mark its repository as active.
+                  %br
+                  The project can be committed to.
+                  %br
+                  %strong Once active this project shows up in the search and on the dashboard.
+                = link_to 'Unarchive', unarchive_project_path(@project),
+                    data: { confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be comitted to again." },
+                    method: :post, class: "btn btn-remove"
+              - else
+                %p
+                  Archiving the project will mark its repository as read-only.
+                  %br
+                  It is hidden from the dashboard and doesn't show up in searches.
+                  %br
+                  %strong Archived projects cannot be committed to!
+                = link_to 'Archive', archive_project_path(@project),
+                    data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." },
+                    method: :post, class: "btn btn-remove"
+        - else
+          .nothing-here-block Only the project owner can archive a project
+
+        - if can?(current_user, :change_namespace, @project)
+          .ui-box.ui-box-danger
+            .title Transfer project
+            .errors-holder
+            .form-holder
+              = form_for(@project, url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'transfer-project form-horizontal' }) do |f|
+                .form-group
+                  = f.label :namespace_id, class: 'control-label' do
+                    %span Namespace
+                  .col-sm-10
+                    .form-group
+                      = f.select :namespace_id, namespaces_options(@project.namespace_id), { prompt: 'Choose a project namespace' }, { class: 'select2' }
+                    %ul
+                      %li Be careful. Changing the project's namespace can have unintended side effects.
+                      %li You can only transfer the project to namespaces you manage.
+                      %li You will need to update your local repositories to point to the new location.
+                .form-actions
+                  = f.submit 'Transfer', class: "btn btn-remove"
+        - else
+          .nothing-here-block Only the project owner can transfer a project
 
-      - if can?(current_user, :change_namespace, @project)
         .ui-box.ui-box-danger
-          .title Transfer project
+          .title Rename repository
           .errors-holder
           .form-holder
-            = form_for(@project, url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'transfer-project form-horizontal' }) do |f|
+            = form_for(@project, html: { class: 'form-horizontal' }) do |f|
               .form-group
-                = f.label :namespace_id, class: 'control-label' do
-                  %span Namespace
-                .col-sm-10
+                = f.label :path, class: 'control-label' do
+                  %span Path
+                .col-sm-9
                   .form-group
-                    = f.select :namespace_id, namespaces_options(@project.namespace_id), { prompt: 'Choose a project namespace' }, { class: 'select2' }
+                    .input-group
+                      = f.text_field :path, class: 'form-control'
+                      %span.input-group-addon .git
                   %ul
-                    %li Be careful. Changing the project's namespace can have unintended side effects.
-                    %li You can only transfer the project to namespaces you manage.
+                    %li Be careful. Renaming a project's repository can have unintended side effects.
                     %li You will need to update your local repositories to point to the new location.
               .form-actions
-                = f.submit 'Transfer', class: "btn btn-remove"
-      - else
-        %p.nothing_here_message Only the project owner can transfer a project
+                = f.submit 'Rename', class: "btn btn-remove"
 
-      .ui-box.ui-box-danger
-        .title Rename repository
-        .errors-holder
-        .form-holder
-          = form_for(@project, html: { class: 'form-horizontal' }) do |f|
-            .form-group
-              = f.label :path, class: 'control-label' do
-                %span Path
-              .col-sm-9
-                .form-group
-                  .input-group
-                    = f.text_field :path, class: 'form-control'
-                    %span.input-group-addon .git
-                %ul
-                  %li Be careful. Renaming a project's repository can have unintended side effects.
-                  %li You will need to update your local repositories to point to the new location.
-            .form-actions
-              = f.submit 'Rename', class: "btn btn-remove"
+        - if can?(current_user, :remove_project, @project)
+          .ui-box.ui-box-danger
+            .title Remove project
+            .body
+              %p
+                Removing the project will delete its repository and all related resources including issues, merge requests etc.
+                %br
+                %strong Removed projects cannot be restored!
 
-      - if can?(current_user, :remove_project, @project)
-        .ui-box.ui-box-danger
-          .title Remove project
-          .body
-            %p
-              Removing the project will delete its repository and all related resources including issues, merge requests etc.
-              %br
-              %strong Removed projects cannot be restored!
-
-            = link_to 'Remove project', @project, data: { confirm: remove_project_message(@project) }, method: :delete, class: "btn btn-remove"
-      - else
-        %p.nothing_here_message Only project owner can remove a project
+              = link_to 'Remove project', @project, data: { confirm: remove_project_message(@project) }, method: :delete, class: "btn btn-remove"
+        - else
+          .nothing-here-block Only project owner can remove a project
 
 .save-project-loader.hide
   %center
diff --git a/app/views/projects/edit_tree/show.html.haml b/app/views/projects/edit_tree/show.html.haml
index 433131640a..3f2e98f3a7 100644
--- a/app/views/projects/edit_tree/show.html.haml
+++ b/app/views/projects/edit_tree/show.html.haml
@@ -11,7 +11,7 @@
             %strong= @ref
         %span.options
           .btn-group.tree-btn-group
-            = link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-tiny btn-cancel", data: { confirm: leave_edit_message }
+            = link_to "Cancel", @after_edit_path, class: "btn btn-tiny btn-cancel", data: { confirm: leave_edit_message }
       .file-content.code
         %pre#editor= @blob.data
 
@@ -23,12 +23,13 @@
     .form-actions
       = hidden_field_tag 'last_commit', @last_commit
       = hidden_field_tag 'content', '', id: "file-content"
+      = hidden_field_tag 'from_merge_request_id', params[:from_merge_request_id]
       .commit-button-annotation
         = button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-primary'
         .message
           to branch
           %strong= @ref
-      = link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-cancel", data: { confirm: leave_edit_message}
+      = link_to "Cancel", @after_edit_path, class: "btn btn-cancel", data: { confirm: leave_edit_message}
 
 :javascript
   ace.config.set("modePath", gon.relative_url_root + "#{Gitlab::Application.config.assets.prefix}/ace")
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index 489b9b0e95..97dc73bce1 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -1,46 +1,34 @@
 = render "home_panel"
 
-- if @project.import? && !@project.imported
-  .save-project-loader
-    %center
-      %h2
-        %i.icon-spinner.icon-spin
-        Importing repository.
-      %p.monospace git clone --bare #{@project.import_url}
-      %p Please wait while we import the repository for you. Refresh at will.
-      :javascript
-        new ProjectImport();
+%div.git-empty
+  %fieldset
+    %legend Git global setup:
+    %pre.dark
+      :preserve
+        git config --global user.name "#{git_user_name}"
+        git config --global user.email "#{git_user_email}"
 
-- else
-  %div.git-empty
-    %fieldset
-      %legend Git global setup:
-      %pre.dark
-        :preserve
-          git config --global user.name "#{git_user_name}"
-          git config --global user.email "#{git_user_email}"
+  %fieldset
+    %legend Create Repository
+    %pre.dark
+      :preserve
+        mkdir #{@project.path}
+        cd #{@project.path}
+        git init
+        touch README
+        git add README
+        git commit -m 'first commit'
+        git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')}
+        git push -u origin master
 
-    %fieldset
-      %legend Create Repository
-      %pre.dark
-        :preserve
-          mkdir #{@project.path}
-          cd #{@project.path}
-          git init
-          touch README
-          git add README
-          git commit -m 'first commit'
-          git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')}
-          git push -u origin master
+  %fieldset
+    %legend Existing Git Repo?
+    %pre.dark
+      :preserve
+        cd existing_git_repo
+        git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')}
+        git push -u origin master
 
-    %fieldset
-      %legend Existing Git Repo?
-      %pre.dark
-        :preserve
-          cd existing_git_repo
-          git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')}
-          git push -u origin master
-
-  - if can? current_user, :remove_project, @project
-    .prepend-top-20
-      = link_to 'Remove project', @project, data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right"
+- if can? current_user, :remove_project, @project
+  .prepend-top-20
+    = link_to 'Remove project', @project, data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right"
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index a095fd06d2..866fd6f606 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -26,6 +26,13 @@
             %strong Push events
           %p.light
             This url will be triggered by a push to the repository
+      %div
+        = f.check_box :tag_push_events, class: 'pull-left'
+        .prepend-left-20
+          = f.label :tag_push_events, class: 'list-label' do
+            %strong Tag push events
+          %p.light
+            This url will be triggered when a new tag is pushed to the repository
       %div
         = f.check_box :issues_events, class: 'pull-left'
         .prepend-left-20
@@ -51,11 +58,11 @@
       - @hooks.each do |hook|
         %li
           .pull-right
-            = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped"
-            = link_to 'Remove', project_hook_path(@project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-small grouped"
+            = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small btn-grouped"
+            = link_to 'Remove', project_hook_path(@project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-small btn-grouped"
           .clearfix
             %span.monospace= hook.url
           %p
-            - %w(push_events issues_events merge_requests_events).each do |trigger|
+            - %w(push_events tag_push_events issues_events merge_requests_events).each do |trigger|
               - if hook.send(trigger)
                 %span.label.label-gray= trigger.titleize
diff --git a/app/views/projects/import.html.haml b/app/views/projects/import.html.haml
new file mode 100644
index 0000000000..d11372be61
--- /dev/null
+++ b/app/views/projects/import.html.haml
@@ -0,0 +1,30 @@
+- if @project.import_in_progress?
+  .save-project-loader
+    %center
+      %h2
+        %i.icon-spinner.icon-spin
+        Import in progress.
+      %p.monospace git clone --bare #{@project.import_url}
+      %p Please wait while we import the repository for you. Refresh at will.
+      :javascript
+        new ProjectImport();
+
+- elsif @project.import_failed?
+  .save-project-loader
+    %center
+      %h2
+        Import failed. Retry?
+  %hr
+  - if can?(current_user, :admin_project, @project)
+    = form_for @project, url: retry_import_project_path(@project), method: :put, html: { class: 'form-horizontal' } do |f|
+      .form-group.import-url-data
+        = f.label :import_url, class: 'control-label' do
+          %span Import existing repo
+        .col-sm-10
+          = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git'
+          .bs-callout.bs-callout-info
+            This url must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git.
+            %br
+            The import will time out after 2 minutes. For big repositories, use a clone/push combination.
+      .form-actions
+        = f.submit 'Retry import', class: "btn btn-create", tabindex: 4
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index f725db57ad..dd091302c8 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -1,6 +1,10 @@
 %div.issue-form-holder
   %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.iid}"
   %hr
+  - if @repository.contribution_guide && !@issue.persisted?
+    - contribution_guide_url = project_blob_path(@project, tree_join(@repository.root_ref, @repository.contribution_guide.name))
+    .alert.alert-info.col-sm-10.col-sm-offset-2
+      ="Please review the <strong>#{link_to "guidelines for contribution", contribution_guide_url}</strong> to this repository.".html_safe
   = form_for [@project, @issue], html: { class: 'form-horizontal issue-form' } do |f|
     -if @issue.errors.any?
       .alert.alert-danger
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index 1bd93b774f..3fc04c26cf 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -38,10 +38,10 @@
   .issue-actions
     - if can? current_user, :modify_issue, issue
       - if issue.closed?
-        = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn btn-small grouped reopen_issue", remote: true
+        = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn btn-small btn-grouped reopen_issue", remote: true
       - else
-        = link_to 'Close', project_issue_path(issue.project, issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-small grouped close_issue", remote: true
-      = link_to edit_project_issue_path(issue.project, issue), class: "btn btn-small edit-issue-link grouped" do
+        = link_to 'Close', project_issue_path(issue.project, issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-small btn-grouped close_issue", remote: true
+      = link_to edit_project_issue_path(issue.project, issue), class: "btn btn-small edit-issue-link btn-grouped" do
         %i.icon-edit
         Edit
 
diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml
index 2d69af0b2d..3b5e398c32 100644
--- a/app/views/projects/issues/_issues.html.haml
+++ b/app/views/projects/issues/_issues.html.haml
@@ -66,7 +66,7 @@
     = render @issues
     - if @issues.blank?
       %li
-        %h4.nothing_here_message No issues to show
+        .nothing-here-block No issues to show
 
 - if @issues.present?
   .pull-right
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 7aa37eda96..124eb53571 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -3,16 +3,16 @@
 
   %span.pull-right
     - if can?(current_user, :write_issue, @project)
-      = link_to new_project_issue_path(@project), class: "btn grouped", title: "New Issue", id: "new_issue_link" do
+      = link_to new_project_issue_path(@project), class: "btn btn-grouped", title: "New Issue", id: "new_issue_link" do
         %i.icon-plus
         New Issue
     - if can?(current_user, :modify_issue, @issue)
       - if @issue.closed?
-        = link_to 'Reopen', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn grouped btn-reopen"
+        = link_to 'Reopen', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn btn-grouped btn-reopen"
       - else
-        = link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close Issue"
+        = link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close", title: "Close Issue"
 
-      = link_to edit_project_issue_path(@project, @issue), class: "btn grouped" do
+      = link_to edit_project_issue_path(@project, @issue), class: "btn btn-grouped" do
         %i.icon-edit
         Edit
 
@@ -29,12 +29,13 @@
       = link_to project_milestone_path(@project, @issue.milestone) do
         = @issue.milestone.title
 
-.issue-box
-  .state{ class: issue_alert_class(@issue) }
-    - if @issue.closed?
-      %span.state-label.state-label-red Closed
-    - else
-      %span.state-label.state-label-green Open
+.issue-box{ class: issue_box_class(@issue) }
+  .state
+    %span.state-label
+      - if @issue.closed?
+        Closed
+      - else
+        Open
 
     %span.creator
       Created by #{link_to_member(@project, @issue.author)} #{time_ago_with_tooltip(@issue.created_at)}
@@ -55,9 +56,9 @@
 - content_for :note_actions do
   - if can?(current_user, :modify_issue, @issue)
     - if @issue.closed?
-      = link_to 'Reopen Issue', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn grouped btn-reopen"
+      = link_to 'Reopen Issue', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn btn-grouped btn-reopen"
     - else
-      = link_to 'Close Issue', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close Issue"
+      = link_to 'Close Issue', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close", title: "Close Issue"
 
 .participants
   %cite.cgray #{@issue.participants.count} participants
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index a058d09a1c..329cf9ceba 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -7,4 +7,4 @@
 
 - else
   .light-well
-    %h3.nothing_here_message Add first label to your issues or #{link_to 'generate', generate_project_labels_path(@project), method: :post} default set of labels
+    .nothing-here-block Add first label to your issues or #{link_to 'generate', generate_project_labels_path(@project), method: :post} default set of labels
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 9502ff95d8..51fa29ddcb 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -1,3 +1,7 @@
+- if @repository.contribution_guide && !@merge_request.persisted?
+  - contribution_guide_url = project_blob_path(@project, tree_join(@repository.root_ref, @repository.contribution_guide.name))
+  .alert.alert-info.col-sm-10.col-sm-offset-2
+    ="Please review the <strong>#{link_to "guidelines for contribution", contribution_guide_url}</strong> to this repository.".html_safe
 = form_for [@project, @merge_request], html: { class: "merge-request-form form-horizontal" } do |f|
   -if @merge_request.errors.any?
     .alert.alert-danger
@@ -25,7 +29,7 @@
         .clearfix
           .pull-left
             - projects =  @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]
-            = f.select(:target_project_id, options_from_collection_for_select(projects, 'id', 'path_with_namespace'), {}, { class: 'target_project select2 span3', disabled: @merge_request.persisted? })
+            = f.select(:target_project_id, options_from_collection_for_select(projects, 'id', 'path_with_namespace', f.object.target_project_id), {}, { class: 'target_project select2 span3', disabled: @merge_request.persisted? })
           .pull-left
             &nbsp;
             = f.select(:target_branch, @merge_request.target_branches, { include_blank: "Select branch" }, {class: 'target_branch select2 span2'})
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index ec9249be00..809b01918c 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -2,7 +2,7 @@
   = render "projects/merge_requests/show/mr_title"
   = render "projects/merge_requests/show/how_to_merge"
   = render "projects/merge_requests/show/mr_box"
-  - if @merge_request.opened?
+  - if @merge_request.open?
     - if @merge_request.source_branch_exists? && @merge_request.target_branch_exists?
       = render "projects/merge_requests/show/mr_accept"
     - else
@@ -24,9 +24,10 @@
 
   - content_for :note_actions do
     - if can?(current_user, :modify_merge_request, @merge_request)
-      - unless @merge_request.closed?
-        = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn grouped btn-close", title: "Close merge request"
-
+      - unless @merge_request.closed? || @merge_request.merged?
+        = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close close-mr-link", title: "Close merge request"
+      - if @merge_request.closed?
+        = link_to 'Reopen', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "Close merge request"
 
   .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
     = render "projects/notes/notes_with_form"
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index d45bec3a23..34faebf619 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -65,7 +65,7 @@
         = render @merge_requests
         - if @merge_requests.blank?
           %li
-            %h4.nothing_here_message No merge requests to show
+            .nothing-here-block No merge requests to show
     - if @merge_requests.present?
       .pull-right
         %span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml
index 8ca1326c96..9b4271bbff 100644
--- a/app/views/projects/merge_requests/show/_commits.html.haml
+++ b/app/views/projects/merge_requests/show/_commits.html.haml
@@ -29,7 +29,7 @@
             = render "projects/commits/commit", commit: commit, project: @merge_request.source_project
 
 - else
-  %h4.nothing_here_message
+  .nothing-here-block
     Nothing to merge from
     %span.label-branch #{@merge_request.source_branch}
     to
diff --git a/app/views/projects/merge_requests/show/_diffs.html.haml b/app/views/projects/merge_requests/show/_diffs.html.haml
index 2917accdb5..7c4f43d2d8 100644
--- a/app/views/projects/merge_requests/show/_diffs.html.haml
+++ b/app/views/projects/merge_requests/show/_diffs.html.haml
@@ -1,7 +1,7 @@
 - if @merge_request_diff.collected?
   = render "projects/commits/diffs", diffs: @merge_request.diffs, project: @merge_request.source_project
 - elsif @merge_request_diff.empty?
-  %h4.nothing_here_message Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}
+  .nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}
 - else
   .bs-callout.bs-callout-warning
     %h4
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index a9cbe43fb1..97706a5a4b 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -15,18 +15,19 @@
             = link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
           for instructions.
 
-          %br
-          If you want to modify merge commit message -
-          %strong
-            = link_to "click here", "#", class: "modify-merge-commit-link js-toggle-visibility-link", title: "Modify merge commit message"
 
-        .js-toggle-visibility-container.hide
-          .form-group
-            = label_tag :merge_commit_message, "Commit message", class: 'control-label'
-            .col-sm-10
-              = text_area_tag :merge_commit_message, @merge_request.merge_commit_message, class: "form-control js-gfm-input", rows: 14, required: true
-              %p.hint
-                The recommended maximum line length is 52 characters for the first line and 72 characters for all following lines.
+        .js-toggle-container
+          %p
+            If you want to modify merge commit message -
+            %strong
+              = link_to "click here", "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message"
+          .js-toggle-content.hide
+            .form-group
+              = label_tag :merge_commit_message, "Commit message", class: 'control-label'
+              .col-sm-10
+                = text_area_tag :merge_commit_message, @merge_request.merge_commit_message, class: "form-control js-gfm-input", rows: 14, required: true
+                %p.hint
+                  The recommended maximum line length is 52 characters for the first line and 72 characters for all following lines.
 
         .accept-group
           .pull-left
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml
index 803e00292b..38db4363ad 100644
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_box.html.haml
@@ -1,14 +1,13 @@
-.issue-box
-  .state{ class: merge_request_alert_class(@merge_request) }
-    - if @merge_request.merged?
-      %span.state-label.state-label-blue
+.issue-box{ class: issue_box_class(@merge_request) }
+  .state
+    %span.state-label
+      - if @merge_request.merged?
         Merged
-    - elsif @merge_request.closed?
-      %span.state-label.state-label-red
+      - elsif @merge_request.closed?
         Closed
-    - else
-      %span.state-label.state-label-green
+      - else
         Open
+
     %span.creator
       Created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)}
 
@@ -37,7 +36,7 @@
       %i.icon-ok
       Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
       #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}.
-- if !@closes_issues.empty? && @merge_request.opened?
+- if !@closes_issues.empty? && @merge_request.open?
   .alert.alert-info.alert-info
     %span
       %i.icon-ok
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index b27522e46a..7676fc137c 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -3,9 +3,9 @@
 
   %span.pull-right
     - if can?(current_user, :modify_merge_request, @merge_request)
-      - if @merge_request.opened?
-        .left.btn-group
-          %a.btn.grouped.dropdown-toggle{ data: {toggle: :dropdown} }
+      - if @merge_request.open?
+        .btn-group.pull-left
+          %a.btn.btn-grouped.dropdown-toggle{ data: {toggle: :dropdown} }
             %i.icon-download-alt
             Download as
             %span.caret
@@ -13,11 +13,13 @@
             %li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch)
             %li= link_to "Plain Diff",    project_merge_request_path(@project, @merge_request, format: :diff)
 
-        = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: { state_event: :close }), method: :put, class: "btn grouped btn-close", title: "Close merge request"
+        = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: { state_event: :close }), method: :put, class: "btn btn-grouped btn-close", title: "Close merge request"
 
-        = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped", id:"edit_merge_request" do
+        = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn btn-grouped", id:"edit_merge_request" do
           %i.icon-edit
           Edit
+      - if @merge_request.closed?
+        = link_to 'Reopen', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "Close merge request"
 
 .votes-holder.hidden-sm.hidden-xs
   #votes= render 'votes/votes_block', votable: @merge_request
diff --git a/app/views/projects/milestones/_milestone.html.haml b/app/views/projects/milestones/_milestone.html.haml
index 4dec3838d9..5579659d60 100644
--- a/app/views/projects/milestones/_milestone.html.haml
+++ b/app/views/projects/milestones/_milestone.html.haml
@@ -1,7 +1,7 @@
 %li{class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: dom_id(milestone) }
   .pull-right
     - if can?(current_user, :admin_milestone, milestone.project) and milestone.active?
-      = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
+      = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link btn-grouped" do
         %i.icon-edit
         Edit
       = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-small btn-remove"
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index 6cfe4d2877..3537650ad4 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -26,6 +26,6 @@
 
           - if @milestones.blank?
             %li
-              %h3.nothing_here_message No milestones to show
+              .nothing-here-block No milestones to show
 
       = paginate @milestones, theme: "gitlab"
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 31eb5765fa..06cf994678 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -3,21 +3,15 @@
   Milestone ##{@milestone.iid}
   %small
     = @milestone.expires_at
-  - if @milestone.closed?
-    %span.state-label.state-label-red Closed
-  - elsif @milestone.expired?
-    %span.state-label.state-label-red Expired
-  - else
-    %span.state-label.state-label-green Open
   .pull-right
     - if can?(current_user, :admin_milestone, @project)
-      = link_to edit_project_milestone_path(@project, @milestone), class: "btn grouped" do
+      = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-grouped" do
         %i.icon-edit
         Edit
       - if @milestone.active?
-        = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-remove grouped"
+        = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-remove btn-grouped"
       - else
-        = link_to 'Reopen Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn grouped"
+        = link_to 'Reopen Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-grouped"
 
 - if @milestone.issues.any? && @milestone.can_be_closed?
   .alert.alert-success
@@ -28,7 +22,16 @@
     &larr; To milestones list
 
 
-.issue-box
+.issue-box{ class: issue_box_class(@milestone) }
+  .state
+    %span.state-label
+      - if @milestone.closed?
+        Closed
+      - elsif @milestone.expired?
+        Expired
+      - else
+        Open
+
   %h4.title
     = gfm escape_once(@milestone.title)
 
@@ -63,10 +66,10 @@
       %span.badge= @users.count
 
   .pull-right
-    = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
+    = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small btn-grouped", title: "New Issue" do
       %i.icon-plus
       New Issue
-    = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn btn-small edit-milestone-link grouped"
+    = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn btn-small edit-milestone-link btn-grouped"
 
 .tab-content
   .tab-pane.active#tab-issues
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 9ee54fef06..5d5637c158 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -9,18 +9,6 @@
           %strong Project name
         .col-sm-10
           = f.text_field :name, placeholder: "Example Project", class: "form-control", tabindex: 1, autofocus: true
-          .help-inline
-            = link_to "#", class: 'js-toggle-visibility-link' do
-              %span Customize repository name?
-
-      .form-group.js-toggle-visibility-container.hide
-        = f.label :path, class: 'control-label' do
-          %span Repository name
-        .col-sm-10
-          .input-group
-            = f.text_field :path, class: 'form-control'
-            %span.input-group-addon .git
-
 
       - if current_user.can_select_namespace?
         .form-group
@@ -29,19 +17,42 @@
           .col-sm-10
             = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'select2', tabindex: 2}
 
-      .form-group
-        .col-sm-2
-        .col-sm-10
-          = link_to "#", class: 'appear-link' do
-            %i.icon-upload-alt
-            %span Import existing repository?
-      .form-group.appear-data.import-url-data
-        = f.label :import_url, class: 'control-label' do
-          %span Import existing repo
-        .col-sm-10
-          = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git'
-          .light
-            URL must be cloneable
+      %hr
+      .js-toggle-container
+        .form-group
+          .col-sm-2
+          .col-sm-10
+            = link_to "#", class: 'js-toggle-button' do
+              %i.icon-edit
+              %span Customize repository name?
+        .js-toggle-content.hide
+          .form-group
+            = f.label :path, class: 'control-label' do
+              %span Repository name
+            .col-sm-10
+              .input-group
+                = f.text_field :path, class: 'form-control'
+                %span.input-group-addon .git
+
+      .js-toggle-container
+        .form-group
+          .col-sm-2
+          .col-sm-10
+            = link_to "#", class: 'js-toggle-button' do
+              %i.icon-upload-alt
+              %span Import existing repository?
+        .js-toggle-content.hide
+          .form-group.import-url-data
+            = f.label :import_url, class: 'control-label' do
+              %span Import existing repo
+            .col-sm-10
+              = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git'
+              .bs-callout.bs-callout-info
+                This url must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git.
+                %br
+                The import will time out after 2 minutes. For big repositories, use a clone/push combination.
+      %hr
+
       .form-group
         = f.label :description, class: 'control-label' do
           Description
diff --git a/app/views/projects/notes/_diff_notes_with_reply.html.haml b/app/views/projects/notes/_diff_notes_with_reply.html.haml
index 9537ab18ca..9acadc6a14 100644
--- a/app/views/projects/notes/_diff_notes_with_reply.html.haml
+++ b/app/views/projects/notes/_diff_notes_with_reply.html.haml
@@ -1,7 +1,7 @@
 - note = notes.first # example note
 -# Check if line want not changed since comment was left
 - if !defined?(line) || line == note.diff_line
-  %tr.notes_holder
+  %tr.notes_holder.js-toggle-content
     %td.notes_line{ colspan: 2 }
       %span.btn.disabled
         %i.icon-comment
diff --git a/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml b/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
index 936dbb354c..2012aa021b 100644
--- a/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
+++ b/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
@@ -1,6 +1,6 @@
 - note1 = notes1.first # example note
 - note2 = notes2.first # example note
-%tr.notes_holder
+%tr.notes_holder.js-toggle-content
   -# Check if line want not changed since comment was left
   /- if !defined?(line1) || line1 == note1.diff_line
   - if note1
diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml
index ee65ae1e2f..9b1f4d7758 100644
--- a/app/views/projects/notes/_discussion.html.haml
+++ b/app/views/projects/notes/_discussion.html.haml
@@ -36,21 +36,17 @@
   .discussion-body
     - if note.for_diff_line?
       - if note.active?
-        .content
-          .file= render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
+        = render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
       - else
         = link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion'
         %div.hide.outdated-discussion
-          .content
-            .notes{ rel: discussion_notes.first.discussion_id }
-              = render discussion_notes
-
+          .notes{ rel: discussion_notes.first.discussion_id }
+            = render discussion_notes
 
     - else
-      .content
-        .notes{ rel: discussion_notes.first.discussion_id }
-          = render discussion_notes
-        = render "projects/notes/discussion_reply_button", note: discussion_notes.first
+      .notes{ rel: discussion_notes.first.discussion_id }
+        = render discussion_notes
+      = render "projects/notes/discussion_reply_button", note: discussion_notes.first
 
     -# will be shown when the other one is hidden
     .discussion-hidden.content.hide
@@ -59,4 +55,3 @@
         = link_to "javascript:;", class: "js-details-target js-toggler-target" do
           %i.icon-eye-open
           Show
-
diff --git a/app/views/projects/notes/_discussion_diff.html.haml b/app/views/projects/notes/_discussion_diff.html.haml
index c3f41a1b6b..687fac0497 100644
--- a/app/views/projects/notes/_discussion_diff.html.haml
+++ b/app/views/projects/notes/_discussion_diff.html.haml
@@ -1,24 +1,25 @@
 - diff = note.diff
-.header
-  - if diff.deleted_file
-    %span= diff.old_path
-  - else
-    %span= diff.new_path
-    - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
-      %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
-  %br/
-.content
-  %table
-    - each_diff_line_near(diff, note.diff_file_index, note.line_code) do |line, type, line_code, line_new, line_old|
-      %tr.line_holder{ id: line_code }
-        - if type == "match"
-          %td.old_line= "..."
-          %td.new_line= "..."
-          %td.line_content.matched= line
-        - else
-          %td.old_line= raw(type == "new" ? "&nbsp;" : line_old)
-          %td.new_line= raw(type == "old" ? "&nbsp;" : line_new)
-          %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} &nbsp;"
+.diff-file
+  .diff-header
+    - if diff.deleted_file
+      %span= diff.old_path
+    - else
+      %span= diff.new_path
+      - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
+        %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
+    %br/
+  .diff-content
+    %table
+      - each_diff_line_near(diff, note.diff_file_index, note.line_code) do |line, type, line_code, line_new, line_old|
+        %tr.line_holder{ id: line_code }
+          - if type == "match"
+            %td.old_line= "..."
+            %td.new_line= "..."
+            %td.line_content.matched= line
+          - else
+            %td.old_line= raw(type == "new" ? "&nbsp;" : line_old)
+            %td.new_line= raw(type == "old" ? "&nbsp;" : line_new)
+            %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} &nbsp;"
 
-          - if line_code == note.line_code
-            = render "projects/notes/diff_notes_with_reply", notes: discussion_notes
+            - if line_code == note.line_code
+              = render "projects/notes/diff_notes_with_reply", notes: discussion_notes
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml
index bcaedc8bd7..3db551e993 100644
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
@@ -22,7 +22,7 @@
 
   .note-form-actions
     .buttons
-      = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
+      = f.submit 'Add Comment', class: "btn comment-btn btn-grouped js-comment-button"
       = yield(:note_actions)
 
       %a.btn.grouped.js-close-discussion-note-form Cancel
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index a32679a18d..8b100766e9 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -9,7 +9,7 @@
       %ul
         %li keep stable branches secured
         %li forced code review before merge to protected branches
-      %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined_link"}
+      %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined-link"}
 
     - if can? current_user, :admin_project, @project
       = form_for [@project, @protected_branch], html: { class: 'form-horizontal' } do |f|
diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml
index c40f63d05b..e60f9a4432 100644
--- a/app/views/projects/snippets/index.html.haml
+++ b/app/views/projects/snippets/index.html.haml
@@ -12,4 +12,4 @@
   = render partial: "projects/snippets/snippet", collection: @snippets
   - if @snippets.empty?
     %li
-      %h3.nothing_here_message Nothing here.
+      .nothing-here-block Nothing here.
diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml
index 70dedcf915..6629e47ad3 100644
--- a/app/views/projects/tags/_tag.html.haml
+++ b/app/views/projects/tags/_tag.html.haml
@@ -15,7 +15,7 @@
 
     %span.pull-right
       - if can? current_user, :download_code, @project
-        = render 'projects/repositories/download_archive', ref: tag.name, btn_class: 'grouped btn-group-small'
+        = render 'projects/repositories/download_archive', ref: tag.name, btn_class: 'btn-grouped btn-group-small'
       - if can?(current_user, :admin_project, @project)
         = link_to project_tag_path(@project, tag.name), class: 'btn btn-small remove-row grouped', method: :delete, data: { confirm: 'Removed tag cannot be restored. Are you sure?'}, remote: true do
           %i.icon-trash
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index 2d53a5dd66..53f3e67ff2 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -18,7 +18,7 @@
   = paginate @tags, theme: 'gitlab'
 
 - else
-  %h3.nothing_here_message
+  .nothing-here-block
     Repository has no tags yet.
     %br
     %small
diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml
index acbe82919f..6eccaafe3d 100644
--- a/app/views/projects/team_members/index.html.haml
+++ b/app/views/projects/team_members/index.html.haml
@@ -3,9 +3,9 @@
 
   - if can? current_user, :admin_team_member, @project
     %span.pull-right
-      = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New project member" do
+      = link_to new_project_team_member_path(@project), class: "btn btn-new btn-grouped", title: "New project member" do
         New project member
-      = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import members from another project" do
+      = link_to import_project_team_members_path(@project), class: "btn btn-grouped", title: "Import members from another project" do
         Import members
 
 %p.light
diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml
index 16a9602ac9..0c19109445 100644
--- a/app/views/projects/tree/_readme.html.haml
+++ b/app/views/projects/tree/_readme.html.haml
@@ -1,7 +1,7 @@
 .readme-holder#README
   %h4.readme-file-title
     %i.icon-file
-      = readme.name
+    = readme.name
   .wiki
     - if gitlab_markdown?(readme.name)
       = preserve do
diff --git a/app/views/projects/walls/show.html.haml b/app/views/projects/walls/show.html.haml
index c6afec443f..3e3c7c4f8d 100644
--- a/app/views/projects/walls/show.html.haml
+++ b/app/views/projects/walls/show.html.haml
@@ -9,7 +9,7 @@
           = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
         .note-form-actions
           .buttons
-            = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
+            = f.submit 'Add Comment', class: "btn comment-btn btn-grouped js-comment-button"
 
           .note-form-option
             %a.choose-btn.btn.btn-small.js-choose-note-attachment-button
diff --git a/app/views/projects/wikis/_main_links.html.haml b/app/views/projects/wikis/_main_links.html.haml
index 1001bb10c4..5dd769dcfe 100644
--- a/app/views/projects/wikis/_main_links.html.haml
+++ b/app/views/projects/wikis/_main_links.html.haml
@@ -1,8 +1,8 @@
 %span.pull-right
   - if (@wiki && @wiki.persisted?)
-    = link_to history_project_wiki_path(@project, @wiki), class: "btn grouped" do
+    = link_to history_project_wiki_path(@project, @wiki), class: "btn btn-grouped" do
       Page History
     - if can?(current_user, :write_wiki, @project)
-      = link_to edit_project_wiki_path(@project, @wiki), class: "btn grouped" do
+      = link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-grouped" do
         %i.icon-edit
         Edit
diff --git a/app/views/public/projects/index.html.haml b/app/views/public/projects/index.html.haml
index 2fc93c5b74..624ec0b9b9 100644
--- a/app/views/public/projects/index.html.haml
+++ b/app/views/public/projects/index.html.haml
@@ -63,6 +63,6 @@
             %i.icon-warning-sign
             Empty repository
     - unless @projects.present?
-      %h3.nothing_here_message No public projects
+      .nothing-here-block No public projects
 
   = paginate @projects, theme: "gitlab"
diff --git a/app/views/shared/_filter.html.haml b/app/views/shared/_filter.html.haml
index 6063b4a073..0becf531cc 100644
--- a/app/views/shared/_filter.html.haml
+++ b/app/views/shared/_filter.html.haml
@@ -1,16 +1,17 @@
 .side-filters.hidden-xs.hidden-sm
   = form_tag filter_path(entity), method: 'get' do
-    %fieldset.scope-filter
-      %ul.nav.nav-pills.nav-stacked
-        %li{class: ("active" if params[:scope] == 'assigned-to-me')}
-          = link_to filter_path(entity, scope: 'assigned-to-me') do
-            Assigned to me
-        %li{class: ("active" if params[:scope] == 'authored')}
-          = link_to filter_path(entity, scope: 'authored') do
-            Created by me
-        %li{class: ("active" if params[:scope] == 'all')}
-          = link_to filter_path(entity, scope: 'all') do
-            Everyone's
+    - if current_user
+      %fieldset.scope-filter
+        %ul.nav.nav-pills.nav-stacked
+          %li{class: ("active" if params[:scope] == 'assigned-to-me')}
+            = link_to filter_path(entity, scope: 'assigned-to-me') do
+              Assigned to me
+          %li{class: ("active" if params[:scope] == 'authored')}
+            = link_to filter_path(entity, scope: 'authored') do
+              Created by me
+          %li{class: ("active" if params[:scope] == 'all')}
+            = link_to filter_path(entity, scope: 'all') do
+              Everyone's
 
     %fieldset.status-filter
       %legend State
diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml
index 199000656f..087b6632e8 100644
--- a/app/views/shared/_issues.html.haml
+++ b/app/views/shared/_issues.html.haml
@@ -11,5 +11,5 @@
           = render 'projects/issues/issue', issue: issue
   = paginate @issues, theme: "gitlab"
 - else
-  %p.nothing_here_message No issues to show
+  .nothing-here-block No issues to show
 
diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml
index ddad28339c..f40b7be486 100644
--- a/app/views/shared/_merge_requests.html.haml
+++ b/app/views/shared/_merge_requests.html.haml
@@ -11,4 +11,4 @@
   = paginate @merge_requests, theme: "gitlab"
 
 - else
-  %h3.nothing_here_message No merge requests to show
+  .nothing-here-block No merge requests to show
diff --git a/app/views/shared/_project_filter.html.haml b/app/views/shared/_project_filter.html.haml
index 1315c76fbb..d82b08eeaa 100644
--- a/app/views/shared/_project_filter.html.haml
+++ b/app/views/shared/_project_filter.html.haml
@@ -40,6 +40,12 @@
                   .pull-right
                     %i.icon-remove
 
+          - if issue_label_names.empty?
+            .light-well
+              Add first label to your issues
+              %br
+              or #{link_to 'generate', generate_project_labels_path(@project), method: :post} default set of labels
+
     %fieldset
       - if %w(state scope milestone_id assignee_id label_name).select { |k| params[k].present? }.any?
         = link_to project_entities_path, class: 'cgray pull-right' do
diff --git a/app/views/shared/_promo.html.haml b/app/views/shared/_promo.html.haml
index c97f8ba0f0..7dec48e658 100644
--- a/app/views/shared/_promo.html.haml
+++ b/app/views/shared/_promo.html.haml
@@ -1,4 +1,4 @@
 .gitlab-promo
-  = link_to "Homepage", "http://gitlab.org"
-  = link_to "Blog", "http://blog.gitlab.org"
+  = link_to "Homepage", "https://www.gitlab.com/"
+  = link_to "Blog", "https://www.gitlab.com/blog/"
   = link_to "@gitlabhq", "https://twitter.com/gitlabhq"
diff --git a/app/views/snippets/_blob_content.html.haml b/app/views/snippets/_blob_content.html.haml
index 81055451b6..8cec6168ab 100644
--- a/app/views/snippets/_blob_content.html.haml
+++ b/app/views/snippets/_blob_content.html.haml
@@ -11,4 +11,4 @@
       = render 'shared/file_hljs', blob: @snippet
 - else
   .file-content.code
-    %p.nothing_here_message Empty file
+    .nothing-here-block Empty file
diff --git a/app/views/snippets/_snippets.html.haml b/app/views/snippets/_snippets.html.haml
index 05365dd8b8..40df42b6cf 100644
--- a/app/views/snippets/_snippets.html.haml
+++ b/app/views/snippets/_snippets.html.haml
@@ -2,6 +2,6 @@
   = render partial: 'snippet', collection: @snippets
   - if @snippets.empty?
     %li
-      %h3.nothing_here_message Nothing here.
+      .nothing-here-block Nothing here.
 
 = paginate @snippets, theme: 'gitlab'
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index bf712b2c7e..90ddc7198f 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -1,9 +1,9 @@
 %h3.page-title
   My Snippets
   .pull-right
-    = link_to new_snippet_path, class: "btn btn-new grouped", title: "New Snippet" do
+    = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
       Add new snippet
-    = link_to snippets_path, class: "btn grouped"  do
+    = link_to snippets_path, class: "btn btn-grouped"  do
       Discover snippets
 
 %p.light
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 2f6c914a15..cea2517a8e 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -2,9 +2,9 @@
   Public snippets
 
   .pull-right
-    = link_to new_snippet_path, class: "btn btn-new grouped", title: "New Snippet" do
+    = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
       Add new snippet
-    = link_to user_snippets_path(current_user), class: "btn grouped"  do
+    = link_to user_snippets_path(current_user), class: "btn btn-grouped"  do
       My snippets
 
 %p.light
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 98210af1e3..edcaf3acf9 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -14,10 +14,10 @@
       %small member since #{@user.created_at.stamp("Nov 12, 2031")}
     .clearfix
     %h4 Groups:
-    = render 'groups', groups: @user.groups 
+    = render 'groups', groups: @groups
     %hr
     %h4 User Activity:
     = render @events
   .col-md-4
     = render 'profile', user: @user
-    = render 'projects', user: @user
+    = render 'projects'
diff --git a/app/views/users_groups/_users_group.html.haml b/app/views/users_groups/_users_group.html.haml
index b66b486fbc..1784dab35b 100644
--- a/app/views/users_groups/_users_group.html.haml
+++ b/app/views/users_groups/_users_group.html.haml
@@ -1,5 +1,6 @@
 - user = member.user
 - return unless user
+- show_roles = true if show_roles.nil?
 %li{class: "#{dom_class(member)} js-toggle-container", id: dom_id(member)}
   = image_tag avatar_icon(user.email, 16), class: "avatar s16"
   %strong= user.name
@@ -7,22 +8,23 @@
   - if user == current_user
     %span.label.label-success It's you
 
-  %span.pull-right
-    %strong= member.human_access
-    - if show_controls
-      - if can?(current_user, :modify, member)
-        = link_to '#', class: "btn-tiny btn js-toggle-button", title: 'Edit access level' do
-          %i.icon-edit
-      - if can?(current_user, :destroy, member)
-        - if current_user == member.user
-          = link_to leave_profile_group_path(@group), data: { confirm: leave_group_message(@group.name)}, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
-            %i.icon-minus.icon-white
-        - else
-          = link_to group_users_group_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
-            %i.icon-minus.icon-white
-
-  .edit-member.hide.js-toggle-content
-    = form_for [@group, member], remote: true do |f|
-      .alert.prepend-top-20
-        = f.select :group_access, options_for_select(UsersGroup.group_access_roles, member.group_access)
-        = f.submit 'Save', class: 'btn btn-save btn-small'
+  - if show_roles
+    %span.pull-right
+      %strong= member.human_access
+      - if show_controls
+        - if can?(current_user, :modify, member)
+          = link_to '#', class: "btn-tiny btn js-toggle-button", title: 'Edit access level' do
+            %i.icon-edit
+        - if can?(current_user, :destroy, member)
+          - if current_user == member.user
+            = link_to leave_profile_group_path(@group), data: { confirm: leave_group_message(@group.name)}, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
+              %i.icon-minus.icon-white
+          - else
+            = link_to group_users_group_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
+              %i.icon-minus.icon-white
+  
+    .edit-member.hide.js-toggle-content
+      = form_for [@group, member], remote: true do |f|
+        .alert.prepend-top-20
+          = f.select :group_access, options_for_select(UsersGroup.group_access_roles, member.group_access)
+          = f.submit 'Save', class: 'btn btn-save btn-small'
diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb
index 6416aa608e..3b0cf77d42 100644
--- a/app/workers/post_receive.rb
+++ b/app/workers/post_receive.rb
@@ -29,10 +29,20 @@ class PostReceive
       return false
     end
 
-    GitPushService.new.execute(project, user, oldrev, newrev, ref)
+    if tag?(ref)
+      GitTagPushService.new.execute(project, user, oldrev, newrev, ref)
+    else
+      GitPushService.new.execute(project, user, oldrev, newrev, ref)
+    end
   end
 
   def log(message)
     Gitlab::GitLogger.error("POST-RECEIVE: #{message}")
   end
+
+  private
+
+  def tag?(ref)
+    !!(/refs\/tags\/(.*)/.match(ref))
+  end
 end
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index 95b80bca7c..e66df8c4db 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -11,11 +11,11 @@ class RepositoryImportWorker
                                project.import_url)
 
     if result
-      project.imported = true
+      project.import_finish
       project.save
       project.satellite.create unless project.satellite.exists?
     else
-      project.imported = false
+      project.import_fail
     end
   end
 end
diff --git a/bin/bundle b/bin/bundle
old mode 100644
new mode 100755
diff --git a/bin/rails b/bin/rails
old mode 100644
new mode 100755
diff --git a/bin/rake b/bin/rake
old mode 100644
new mode 100755
diff --git a/bin/rspec b/bin/rspec
old mode 100644
new mode 100755
diff --git a/bin/spinach b/bin/spinach
old mode 100644
new mode 100755
diff --git a/bin/spring b/bin/spring
old mode 100644
new mode 100755
diff --git a/config/application.rb b/config/application.rb
index c53257090c..4d7c1415c8 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -12,7 +12,7 @@ module Gitlab
     # -- all .rb files in that directory are automatically loaded.
 
     # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W(#{config.root}/lib #{config.root}/app/models/concerns #{config.root}/app/models/project_services)
+    config.autoload_paths += %W(#{config.root}/lib #{config.root}/app/finders #{config.root}/app/models/concerns #{config.root}/app/models/project_services)
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
@@ -64,7 +64,7 @@ module Gitlab
     config.assets.enabled = true
     config.assets.paths << Emoji.images_path
     config.assets.precompile << "emoji/*.png"
-    
+
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
 
diff --git a/config/database.yml.mysql b/config/database.yml.mysql
index 55ac088bc1..6943aaca45 100644
--- a/config/database.yml.mysql
+++ b/config/database.yml.mysql
@@ -7,6 +7,7 @@ production:
   reconnect: false
   database: gitlabhq_production
   pool: 10
+  reaping_frequency: 10
   username: git
   password: "secure password"
   # host: localhost
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 764bf19f3d..469badcf2f 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -236,6 +236,10 @@ production: &base
     ## Google analytics. Uncomment if you want it
     # google_analytics_id: '_your_tracking_id'
 
+    ## Piwik analytics.
+    # piwik_url: '_your_piwik_url'
+    # piwik_site_id: '_your_piwik_site_id'
+
     ## Text under sign-in page (Markdown enabled)
     # sign_in_text: |
     #   ![Company Logo](http://www.companydomain.com/logo.png)
@@ -246,6 +250,11 @@ development:
 
 test:
   <<: *base
+  gravatar:
+    enabled: true
+  gitlab:
+    host: localhost
+    port: 80
   issues_tracker:
     redmine:
       title: "Redmine"
diff --git a/config/initializers/2_app.rb b/config/initializers/2_app.rb
index e2f9800234..655590dff0 100644
--- a/config/initializers/2_app.rb
+++ b/config/initializers/2_app.rb
@@ -1,6 +1,6 @@
 module Gitlab
   VERSION = File.read(Rails.root.join("VERSION")).strip
-  REVISION = `git log --pretty=format:'%h' -n 1`
+  REVISION = Gitlab::Popen.popen(%W(git log --pretty=format:%h -n 1)).first.chomp
 
   def self.config
     Settings
diff --git a/config/initializers/6_rack_profiler.rb b/config/initializers/6_rack_profiler.rb
new file mode 100644
index 0000000000..a7ee3c5982
--- /dev/null
+++ b/config/initializers/6_rack_profiler.rb
@@ -0,0 +1,6 @@
+if Rails.env == 'development'
+  require 'rack-mini-profiler'
+
+  # initialization is skipped so trigger it
+  Rack::MiniProfilerRails.initialize!(Rails.application)
+end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a02bf9d4ae..50669ece7a 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -4,7 +4,7 @@ Devise.setup do |config|
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = Gitlab.config.gitlab.email_from
+  config.mailer_sender = "GitLab <#{Gitlab.config.gitlab.email_from}>"
 
 
   # Configure the class responsible to send e-mails.
diff --git a/config/routes.rb b/config/routes.rb
index e47d577a76..64365baee9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -187,6 +187,8 @@ Gitlab::Application.routes.draw do
       post :archive
       post :unarchive
       get :autocomplete_sources
+      get :import
+      put :retry_import
     end
 
     scope module: :projects do
diff --git a/db/fixtures/development/01_admin.rb b/db/fixtures/development/01_admin.rb
index 3e76d76e83..42d1843534 100644
--- a/db/fixtures/development/01_admin.rb
+++ b/db/fixtures/development/01_admin.rb
@@ -8,8 +8,7 @@ User.seed(:id, [
     password_confirmation: "5iveL!fe",
     admin: true,
     projects_limit: 100,
-    theme_id: Gitlab::Theme::MARS
+    theme_id: Gitlab::Theme::MARS,
+    confirmed_at: DateTime.now
   }
 ])
-
-User.find(1).confirm!
diff --git a/db/fixtures/development/04_project.rb b/db/fixtures/development/04_project.rb
index 50726a5a51..9303ab9330 100644
--- a/db/fixtures/development/04_project.rb
+++ b/db/fixtures/development/04_project.rb
@@ -1,51 +1,55 @@
-project_urls = [
-  'https://github.com/documentcloud/underscore.git',
-  'https://github.com/diaspora/diaspora.git',
-  'https://github.com/diaspora/diaspora-project-site.git',
-  'https://github.com/diaspora/diaspora-client.git',
-  'https://github.com/brightbox/brightbox-cli.git',
-  'https://github.com/brightbox/puppet.git',
-  'https://github.com/gitlabhq/gitlabhq.git',
-  'https://github.com/gitlabhq/gitlab-ci.git',
-  'https://github.com/gitlabhq/gitlab-recipes.git',
-  'https://github.com/gitlabhq/gitlab-shell.git',
-  'https://github.com/gitlabhq/grack.git',
-  'https://github.com/twitter/flight.git',
-  'https://github.com/twitter/typeahead.js.git',
-  'https://github.com/h5bp/html5-boilerplate.git',
-  'https://github.com/h5bp/mobile-boilerplate.git',
-]
+Gitlab::Seeder.quiet do
+  project_urls = [
+    'https://github.com/documentcloud/underscore.git',
+    'https://github.com/diaspora/diaspora.git',
+    'https://github.com/diaspora/diaspora-project-site.git',
+    'https://github.com/diaspora/diaspora-client.git',
+    'https://github.com/brightbox/brightbox-cli.git',
+    'https://github.com/brightbox/puppet.git',
+    'https://github.com/gitlabhq/gitlabhq.git',
+    'https://github.com/gitlabhq/gitlab-ci.git',
+    'https://github.com/gitlabhq/gitlab-recipes.git',
+    'https://github.com/gitlabhq/gitlab-shell.git',
+    'https://github.com/gitlabhq/grack.git',
+    'https://github.com/gitlabhq/testme.git',
+    'https://github.com/twitter/flight.git',
+    'https://github.com/twitter/typeahead.js.git',
+    'https://github.com/h5bp/html5-boilerplate.git',
+    'https://github.com/h5bp/mobile-boilerplate.git',
+  ]
 
-project_urls.each_with_index do |url, i|
-  group_path, project_path = url.split('/')[-2..-1]
+  project_urls.each_with_index do |url, i|
+    group_path, project_path = url.split('/')[-2..-1]
 
-  group = Group.find_by(path: group_path)
+    group = Group.find_by(path: group_path)
 
-  unless group
-    group = Group.new(
-      name: group_path.titleize,
-      path: group_path
-    )
-    group.description = Faker::Lorem.sentence
-    group.owner = User.first
-    group.save
-  end
+    unless group
+      group = Group.new(
+        name: group_path.titleize,
+        path: group_path
+      )
+      group.description = Faker::Lorem.sentence
+      group.save
 
-  project_path.gsub!(".git", "")
+      group.add_owner(User.first)
+    end
 
-  params = {
-    import_url: url,
-    namespace_id: group.id,
-    name: project_path.titleize,
-    description: Faker::Lorem.sentence
-  }
+    project_path.gsub!(".git", "")
 
-  project = Projects::CreateService.new(User.first, params).execute
+    params = {
+      import_url: url,
+      namespace_id: group.id,
+      name: project_path.titleize,
+      description: Faker::Lorem.sentence
+    }
 
-  if project.valid?
-    print '.'
-  else
-    puts project.errors.full_messages
-    print 'F'
+    project = Projects::CreateService.new(User.first, params).execute
+
+    if project.valid?
+      print '.'
+    else
+      puts project.errors.full_messages
+      print 'F'
+    end
   end
 end
diff --git a/db/fixtures/development/05_users.rb b/db/fixtures/development/05_users.rb
index 3440a64540..d736408dbf 100644
--- a/db/fixtures/development/05_users.rb
+++ b/db/fixtures/development/05_users.rb
@@ -6,6 +6,7 @@ Gitlab::Seeder.quiet do
         username: Faker::Internet.user_name,
         name: Faker::Name.name,
         email: Faker::Internet.email,
+        confirmed_at: DateTime.now
       }])
       print '.'
     rescue ActiveRecord::RecordNotSaved
diff --git a/db/fixtures/development/06_teams.rb b/db/fixtures/development/06_teams.rb
index a1e01879db..dfbe75fd20 100644
--- a/db/fixtures/development/06_teams.rb
+++ b/db/fixtures/development/06_teams.rb
@@ -1,5 +1,3 @@
-ActiveRecord::Base.observers.disable :all
-
 Gitlab::Seeder.quiet do
   Group.all.each do |group|
     User.all.sample(4).each do |user|
diff --git a/db/fixtures/development/09_issues.rb b/db/fixtures/development/09_issues.rb
index 2b81d7a259..635878622d 100644
--- a/db/fixtures/development/09_issues.rb
+++ b/db/fixtures/development/09_issues.rb
@@ -1,5 +1,3 @@
-ActiveRecord::Base.observers.disable :all
-
 Gitlab::Seeder.quiet do
   (1..300).each  do |i|
     # Random Project
@@ -12,9 +10,7 @@ Gitlab::Seeder.quiet do
 
     user_id = user.id
 
-    begin
-      Thread.current[:current_user] = user
-
+    Gitlab::Seeder.by_user(user) do
       Issue.seed(:id, [{
         id: i,
         project_id: project.id,
@@ -25,8 +21,6 @@ Gitlab::Seeder.quiet do
         title: Faker::Lorem.sentence(6),
         description: Faker::Lorem.sentence
       }])
-    ensure
-      Thread.current[:current_user] = nil
     end
     print('.')
   end
diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb
index 2b1f416021..cb08a7c253 100644
--- a/db/fixtures/development/10_merge_requests.rb
+++ b/db/fixtures/development/10_merge_requests.rb
@@ -1,5 +1,3 @@
-ActiveRecord::Base.observers.disable :all
-
 Gitlab::Seeder.quiet do
   (1..100).each  do |i|
     # Random Project
@@ -17,9 +15,8 @@ Gitlab::Seeder.quiet do
     next if branches.uniq.size < 2
 
     user_id = user.id
-    begin
-      Thread.current[:current_user] = user
 
+    Gitlab::Seeder.by_user(user) do
       MergeRequest.seed(:id, [{
         id: i,
         source_branch: branches.first,
@@ -31,8 +28,6 @@ Gitlab::Seeder.quiet do
         milestone: project.milestones.sample,
         title: Faker::Lorem.sentence(6)
       }])
-    ensure
-      Thread.current[:current_user] = nil
     end
     print('.')
   end
diff --git a/db/fixtures/development/11_keys.rb b/db/fixtures/development/11_keys.rb
index 4b53ff411f..42171393d1 100644
--- a/db/fixtures/development/11_keys.rb
+++ b/db/fixtures/development/11_keys.rb
@@ -1,5 +1,3 @@
-ActiveRecord::Base.observers.enable :all
-
 Gitlab::Seeder.quiet do
   User.first(30).each_with_index do |user, i|
     Key.seed(:id, [
diff --git a/db/fixtures/development/12_snippets.rb b/db/fixtures/development/12_snippets.rb
index 4ca8afe294..dced270626 100644
--- a/db/fixtures/development/12_snippets.rb
+++ b/db/fixtures/development/12_snippets.rb
@@ -1,5 +1,3 @@
-ActiveRecord::Base.observers.disable :all
-
 Gitlab::Seeder.quiet do
   contents = [
     `curl https://gist.github.com/randx/4275756/raw/da2f262920c96d1a970d48bf2e99147954b1f4bd/glus1204.sh`,
diff --git a/db/fixtures/development/13_comments.rb b/db/fixtures/development/13_comments.rb
new file mode 100644
index 0000000000..626aba200d
--- /dev/null
+++ b/db/fixtures/development/13_comments.rb
@@ -0,0 +1,19 @@
+Gitlab::Seeder.quiet do
+  Issue.all.limit(10).each_with_index do |issue, i|
+    5.times do
+      user = issue.project.team.users.sample
+
+      Gitlab::Seeder.by_user(user) do
+        Note.seed(:id, [{
+          project_id: issue.project.id,
+          author_id: user.id,
+          note: Faker::Lorem.sentence,
+          noteable_id: issue.id,
+          noteable_type: 'Issue'
+        }])
+
+        print '.'
+      end
+    end
+  end
+end
diff --git a/db/migrate/20140214102325_add_api_key_to_services.rb b/db/migrate/20140214102325_add_api_key_to_services.rb
new file mode 100644
index 0000000000..30eeca2c1f
--- /dev/null
+++ b/db/migrate/20140214102325_add_api_key_to_services.rb
@@ -0,0 +1,5 @@
+class AddApiKeyToServices < ActiveRecord::Migration
+  def change
+    add_column :services, :api_key, :string
+  end
+end
diff --git a/db/migrate/20140304005354_add_index_merge_request_diffs_on_merge_request_id.rb b/db/migrate/20140304005354_add_index_merge_request_diffs_on_merge_request_id.rb
new file mode 100644
index 0000000000..65d28e8cb0
--- /dev/null
+++ b/db/migrate/20140304005354_add_index_merge_request_diffs_on_merge_request_id.rb
@@ -0,0 +1,5 @@
+class AddIndexMergeRequestDiffsOnMergeRequestId < ActiveRecord::Migration
+  def change
+    add_index :merge_request_diffs, :merge_request_id, unique: true
+  end
+end
diff --git a/db/migrate/20140305193308_add_tag_push_hooks_to_project_hook.rb b/db/migrate/20140305193308_add_tag_push_hooks_to_project_hook.rb
new file mode 100644
index 0000000000..7017148702
--- /dev/null
+++ b/db/migrate/20140305193308_add_tag_push_hooks_to_project_hook.rb
@@ -0,0 +1,5 @@
+class AddTagPushHooksToProjectHook < ActiveRecord::Migration
+  def change
+    add_column :web_hooks, :tag_push_events, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20140312145357_add_import_status_to_project.rb b/db/migrate/20140312145357_add_import_status_to_project.rb
new file mode 100644
index 0000000000..ef972e8342
--- /dev/null
+++ b/db/migrate/20140312145357_add_import_status_to_project.rb
@@ -0,0 +1,5 @@
+class AddImportStatusToProject < ActiveRecord::Migration
+  def change
+    add_column :projects, :import_status, :string
+  end
+end
diff --git a/db/migrate/20140313092127_migrate_already_imported_projects.rb b/db/migrate/20140313092127_migrate_already_imported_projects.rb
new file mode 100644
index 0000000000..f4392c0f05
--- /dev/null
+++ b/db/migrate/20140313092127_migrate_already_imported_projects.rb
@@ -0,0 +1,12 @@
+class MigrateAlreadyImportedProjects < ActiveRecord::Migration
+  def up
+    Project.where(imported: true).update_all(import_status: "finished")
+    Project.where(imported: false).update_all(import_status: "none")
+    remove_column :projects, :imported
+  end
+
+  def down
+    add_column :projects, :imported, :boolean, default: false
+    Project.where(import_status: 'finished').update_all(imported: true)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a77ed335d0..6f9af5c82d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,15 +11,18 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140209025651) do
+ActiveRecord::Schema.define(version: 20140313092127) do
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
 
   create_table "broadcast_messages", force: true do |t|
     t.text     "message",    null: false
     t.datetime "starts_at"
     t.datetime "ends_at"
     t.integer  "alert_type"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "color"
     t.string   "font"
   end
@@ -27,8 +30,8 @@ ActiveRecord::Schema.define(version: 20140209025651) do
   create_table "deploy_keys_projects", force: true do |t|
     t.integer  "deploy_key_id", null: false
     t.integer  "project_id",    null: false
-    t.datetime "created_at",    null: false
-    t.datetime "updated_at",    null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "deploy_keys_projects", ["project_id"], name: "index_deploy_keys_projects_on_project_id", using: :btree
@@ -49,8 +52,8 @@ ActiveRecord::Schema.define(version: 20140209025651) do
     t.string   "title"
     t.text     "data"
     t.integer  "project_id"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer  "action"
     t.integer  "author_id"
   end
@@ -65,8 +68,8 @@ ActiveRecord::Schema.define(version: 20140209025651) do
   create_table "forked_project_links", force: true do |t|
     t.integer  "forked_to_project_id",   null: false
     t.integer  "forked_from_project_id", null: false
-    t.datetime "created_at",             null: false
-    t.datetime "updated_at",             null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "forked_project_links", ["forked_to_project_id"], name: "index_forked_project_links_on_forked_to_project_id", unique: true, using: :btree
@@ -106,14 +109,16 @@ ActiveRecord::Schema.define(version: 20140209025651) do
   add_index "keys", ["user_id"], name: "index_keys_on_user_id", using: :btree
 
   create_table "merge_request_diffs", force: true do |t|
-    t.string   "state",                               default: "collected", null: false
-    t.text     "st_commits",       limit: 2147483647
-    t.text     "st_diffs",         limit: 2147483647
-    t.integer  "merge_request_id",                                          null: false
+    t.string   "state",            default: "collected", null: false
+    t.text     "st_commits"
+    t.text     "st_diffs"
+    t.integer  "merge_request_id",                       null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "merge_request_diffs", ["merge_request_id"], name: "index_merge_request_diffs_on_merge_request_id", unique: true, using: :btree
+
   create_table "merge_requests", force: true do |t|
     t.string   "target_branch",     null: false
     t.string   "source_branch",     null: false
@@ -136,7 +141,7 @@ ActiveRecord::Schema.define(version: 20140209025651) do
   add_index "merge_requests", ["created_at"], name: "index_merge_requests_on_created_at", using: :btree
   add_index "merge_requests", ["milestone_id"], name: "index_merge_requests_on_milestone_id", using: :btree
   add_index "merge_requests", ["source_branch"], name: "index_merge_requests_on_source_branch", using: :btree
-  add_index "merge_requests", ["source_project_id"], name: "index_merge_requests_on_project_id", using: :btree
+  add_index "merge_requests", ["source_project_id"], name: "index_merge_requests_on_source_project_id", using: :btree
   add_index "merge_requests", ["target_branch"], name: "index_merge_requests_on_target_branch", using: :btree
   add_index "merge_requests", ["title"], name: "index_merge_requests_on_title", using: :btree
 
@@ -145,8 +150,8 @@ ActiveRecord::Schema.define(version: 20140209025651) do
     t.integer  "project_id",  null: false
     t.text     "description"
     t.date     "due_date"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "state"
     t.integer  "iid"
   end
@@ -158,8 +163,8 @@ ActiveRecord::Schema.define(version: 20140209025651) do
     t.string   "name",                     null: false
     t.string   "path",                     null: false
     t.integer  "owner_id"
-    t.datetime "created_at",               null: false
-    t.datetime "updated_at",               null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "type"
     t.string   "description", default: "", null: false
     t.string   "ldap_cn"
@@ -183,8 +188,8 @@ ActiveRecord::Schema.define(version: 20140209025651) do
     t.string   "line_code"
     t.string   "commit_id"
     t.integer  "noteable_id"
-    t.text     "st_diff"
     t.boolean  "system",        default: false, null: false
+    t.text     "st_diff"
   end
 
   add_index "notes", ["author_id"], name: "index_notes_on_author_id", using: :btree
@@ -198,8 +203,8 @@ ActiveRecord::Schema.define(version: 20140209025651) do
   create_table "project_group_links", force: true do |t|
     t.integer  "project_id",                null: false
     t.integer  "group_id",                  null: false
-    t.datetime "created_at",                null: false
-    t.datetime "updated_at",                null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer  "group_access", default: 30, null: false
   end
 
@@ -219,21 +224,21 @@ ActiveRecord::Schema.define(version: 20140209025651) do
     t.string   "issues_tracker_id"
     t.boolean  "snippets_enabled",       default: true,     null: false
     t.datetime "last_activity_at"
-    t.boolean  "imported",               default: false,    null: false
     t.string   "import_url"
     t.integer  "visibility_level",       default: 0,        null: false
     t.boolean  "archived",               default: false,    null: false
+    t.string   "import_status"
   end
 
-  add_index "projects", ["creator_id"], name: "index_projects_on_owner_id", using: :btree
+  add_index "projects", ["creator_id"], name: "index_projects_on_creator_id", using: :btree
   add_index "projects", ["last_activity_at"], name: "index_projects_on_last_activity_at", using: :btree
   add_index "projects", ["namespace_id"], name: "index_projects_on_namespace_id", using: :btree
 
   create_table "protected_branches", force: true do |t|
     t.integer  "project_id", null: false
     t.string   "name",       null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree
@@ -243,27 +248,28 @@ ActiveRecord::Schema.define(version: 20140209025651) do
     t.string   "title"
     t.string   "token"
     t.integer  "project_id",                  null: false
-    t.datetime "created_at",                  null: false
-    t.datetime "updated_at",                  null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.boolean  "active",      default: false, null: false
     t.string   "project_url"
     t.string   "subdomain"
     t.string   "room"
     t.text     "recipients"
+    t.string   "api_key"
   end
 
   add_index "services", ["project_id"], name: "index_services_on_project_id", using: :btree
 
   create_table "snippets", force: true do |t|
     t.string   "title"
-    t.text     "content",    limit: 2147483647
-    t.integer  "author_id",                                    null: false
+    t.text     "content"
+    t.integer  "author_id",                 null: false
     t.integer  "project_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "file_name"
     t.datetime "expires_at"
-    t.boolean  "private",                       default: true, null: false
+    t.boolean  "private",    default: true, null: false
     t.string   "type"
   end
 
@@ -282,17 +288,20 @@ ActiveRecord::Schema.define(version: 20140209025651) do
     t.datetime "created_at"
   end
 
+  add_index "taggings", ["tag_id"], name: "index_taggings_on_tag_id", using: :btree
+  add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree
+
   create_table "tags", force: true do |t|
     t.string "name"
   end
 
   create_table "users", force: true do |t|
-    t.string   "email",                                default: "",    null: false
-    t.string   "encrypted_password",       limit: 128, default: "",    null: false
+    t.string   "email",                    default: "",    null: false
+    t.string   "encrypted_password",       default: "",    null: false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                        default: 0
+    t.integer  "sign_in_count",            default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
@@ -300,24 +309,24 @@ ActiveRecord::Schema.define(version: 20140209025651) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "name"
-    t.boolean  "admin",                                default: false, null: false
-    t.integer  "projects_limit",                       default: 10
-    t.string   "skype",                                default: "",    null: false
-    t.string   "linkedin",                             default: "",    null: false
-    t.string   "twitter",                              default: "",    null: false
+    t.boolean  "admin",                    default: false, null: false
+    t.integer  "projects_limit",           default: 10
+    t.string   "skype",                    default: "",    null: false
+    t.string   "linkedin",                 default: "",    null: false
+    t.string   "twitter",                  default: "",    null: false
     t.string   "authentication_token"
-    t.integer  "theme_id",                             default: 1,     null: false
+    t.integer  "theme_id",                 default: 1,     null: false
     t.string   "bio"
-    t.integer  "failed_attempts",                      default: 0
+    t.integer  "failed_attempts",          default: 0
     t.datetime "locked_at"
     t.string   "extern_uid"
     t.string   "provider"
     t.string   "username"
-    t.boolean  "can_create_group",                     default: true,  null: false
-    t.boolean  "can_create_team",                      default: true,  null: false
+    t.boolean  "can_create_group",         default: true,  null: false
+    t.boolean  "can_create_team",          default: true,  null: false
     t.string   "state"
-    t.integer  "color_scheme_id",                      default: 1,     null: false
-    t.integer  "notification_level",                   default: 1,     null: false
+    t.integer  "color_scheme_id",          default: 1,     null: false
+    t.integer  "notification_level",       default: 1,     null: false
     t.datetime "password_expires_at"
     t.integer  "created_by_id"
     t.datetime "last_credential_check_at"
@@ -326,14 +335,15 @@ ActiveRecord::Schema.define(version: 20140209025651) do
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
     t.string   "unconfirmed_email"
-    t.boolean  "hide_no_ssh_key",                      default: false
-    t.string   "website_url",                          default: "",    null: false
+    t.boolean  "hide_no_ssh_key",          default: false
+    t.string   "website_url",              default: "",    null: false
   end
 
   add_index "users", ["admin"], name: "index_users_on_admin", using: :btree
   add_index "users", ["authentication_token"], name: "index_users_on_authentication_token", unique: true, using: :btree
   add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
   add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+  add_index "users", ["extern_uid", "provider"], name: "index_users_on_extern_uid_and_provider", unique: true, using: :btree
   add_index "users", ["name"], name: "index_users_on_name", using: :btree
   add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
   add_index "users", ["username"], name: "index_users_on_username", using: :btree
@@ -342,8 +352,8 @@ ActiveRecord::Schema.define(version: 20140209025651) do
     t.integer  "group_access",                   null: false
     t.integer  "group_id",                       null: false
     t.integer  "user_id",                        null: false
-    t.datetime "created_at",                     null: false
-    t.datetime "updated_at",                     null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer  "notification_level", default: 3, null: false
   end
 
@@ -372,6 +382,7 @@ ActiveRecord::Schema.define(version: 20140209025651) do
     t.boolean  "push_events",           default: true,          null: false
     t.boolean  "issues_events",         default: false,         null: false
     t.boolean  "merge_requests_events", default: false,         null: false
+    t.boolean  "tag_push_events",       default: false
   end
 
   add_index "web_hooks", ["project_id"], name: "index_web_hooks_on_project_id", using: :btree
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 60c1b37e6b..c1e0abc1bf 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -148,6 +148,16 @@ Parameters:
     "path": "diaspora",
     "updated_at": "2013-09-30T13: 46: 02Z"
   }
+  "permissions": {
+    "project_access": {
+      "access_level": 10,
+      "notification_level": 3
+    },
+    "group_access": {
+      "access_level": 50,
+      "notification_level": 3
+    }
+  }
 }
 ```
 
diff --git a/doc/development/architecture.md b/doc/development/architecture.md
index 8a772344b7..ab74af4faf 100644
--- a/doc/development/architecture.md
+++ b/doc/development/architecture.md
@@ -3,7 +3,7 @@
 
 # Software delivery
 
-There are two editions of GitLab: [Enterprise Edition](https://www.gitlab.com/features/) (EE) and [Community Edition](http://gitlab.org/gitlab-ce/) (CE).
+There are two editions of GitLab: [Enterprise Edition](https://www.gitlab.com/gitlab-ee/) (EE) and [Community Edition](https://www.gitlab.com/gitlab-ce/) (CE).
 GitLab CE is delivered via git from the [gitlabhq repository](https://gitlab.com/gitlab-org/gitlab-ce/tree/master).
 New versions of GitLab are released in stable branches and the master branch is for bleeding edge development.
 
diff --git a/doc/development/shell_commands.md b/doc/development/shell_commands.md
new file mode 100644
index 0000000000..57b1172d5e
--- /dev/null
+++ b/doc/development/shell_commands.md
@@ -0,0 +1,111 @@
+# Guidelines for shell commands in the GitLab codebase
+
+## Use File and FileUtils instead of shell commands
+
+Sometimes we invoke basic Unix commands via the shell when there is also a Ruby API for doing it.
+Use the Ruby API if it exists.
+http://www.ruby-doc.org/stdlib-2.0.0/libdoc/fileutils/rdoc/FileUtils.html#module-FileUtils-label-Module+Functions
+
+```ruby
+# Wrong
+system "mkdir -p tmp/special/directory"
+# Better (separate tokens)
+system *%W(mkdir -p tmp/special/directory)
+# Best (do not use a shell command)
+FileUtils.mkdir_p "tmp/special/directory"
+
+# Wrong
+contents = `cat #{filename}`
+# Correct
+contents = File.read(filename)
+```
+
+This coding style could have prevented CVE-2013-4490.
+
+## Bypass the shell by splitting commands into separate tokens
+
+When we pass shell commands as a single string to Ruby, Ruby will let `/bin/sh` evaluate the entire string.
+Essentially, we are asking the shell to evaluate a one-line script.
+This creates a risk for shell injection attacks.
+It is better to split the shell command into tokens ourselves.
+Sometimes we use the scripting capabilities of the shell to change the working directory or set environment variables.
+All of this can also be achieved securely straight from Ruby
+
+```ruby
+# Wrong
+system "cd /home/git/gitlab && bundle exec rake db:#{something} RAILS_ENV=production"
+# Correct
+system({'RAILS_ENV' => 'production'}, *%W(bundle exec rake db:#{something}), chdir: '/home/git/gitlab')
+
+# Wrong
+system "touch #{myfile}"
+# Better
+system "touch", myfile
+# Best (do not run a shell command at all)
+FileUtils.touch myfile
+```
+
+This coding style could have prevented CVE-2013-4546.
+
+## Separate options from arguments with --
+
+Make the difference between options and arguments clear to the argument parsers of system commands with `--`.
+This is supported by many but not all Unix commands.
+
+To understand what `--` does, consider the problem below.
+
+```
+# Example
+$ echo hello > -l
+$ cat -l
+cat: illegal option -- l
+usage: cat [-benstuv] [file ...]
+```
+
+In the example above, the argument parser of `cat` assumes that `-l` is an option.
+The solution in the example above is to make it clear to `cat` that `-l` is really an argument, not an option.
+Many Unix command line tools follow the convention of separating options from arguments with `--`.
+
+```
+# Example (continued)
+$ cat -- -l
+hello
+```
+
+In the GitLab codebase, we avoid the option/argument ambiguity by _always_ using `--`.
+
+```ruby
+# Wrong
+system(*%W(git branch -d #{branch_name}))
+# Correct
+system(*%W(git branch -d -- #{branch_name}))
+```
+
+This coding style could have prevented CVE-2013-4582.
+
+## Do not use the backticks
+
+Capturing the output of shell commands with backticks reads nicely, but you are forced to pass the command as one string to the shell.
+We explained above that this is unsafe.
+In the main GitLab codebase, the solution is to use `Gitlab::Popen.popen` instead.
+
+```ruby
+# Wrong
+logs = `cd #{repo_dir} && git log`
+# Correct
+logs, exit_status = Gitlab::Popen.popen(%W(git log), repo_dir)
+
+# Wrong
+user = `whoami`
+# Correct
+user, exit_status = Gitlab::Popen.popen(%W(whoami))
+```
+
+In other repositories, such as gitlab-shell you can also use `IO.popen`.
+
+```ruby
+# Safe IO.popen example
+logs = IO.popen(%W(git log), chdir: repo_dir).read
+```
+
+Note that unlike `Gitlab::Popen.popen`, `IO.popen` does not capture standard error.
diff --git a/doc/install/installation.md b/doc/install/installation.md
index d69e1b7b5a..32cb8f8de8 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -4,7 +4,7 @@ this should be the highest numbered stable branch (example shown below).
 
 ![capture](https://f.cloud.github.com/assets/1192780/564911/2f9f3e1e-c5b7-11e2-9f89-98e527d1adec.png)
 
-If this is unclear check the [GitLab Blog](http://blog.gitlab.org/) for installation guide links by version.
+If this is unclear check the [GitLab Blog](https://www.gitlab.com/blog/) for installation guide links by version.
 
 # Important notes
 
@@ -144,7 +144,7 @@ GitLab Shell is an ssh access and repository management software developed speci
 
 # 5. Database
 
-We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](doc/install/database_mysql.md).
+We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](database_mysql.md).
 
     # Install the database packages
     sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev
@@ -351,7 +351,7 @@ If all items are green, then congratulations on successfully installing GitLab!
 Visit YOUR_SERVER in your web browser for your first GitLab login.
 The setup has created an admin account for you. You can use it to log in:
 
-    admin@local.host
+    root
     5iveL!fe
 
 **Important Note:**
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index ea172733b1..56a2a5efeb 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -2,26 +2,24 @@
 
 GitLab is developed for the Linux operating system. For the installations options and instructions please see [the installation section of the readme](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/README.md#installation).
 
-## GitLab officially supports
+## Supported Linux distributions
 
-- Ubuntu Linux
-- Debian/GNU Linux
-
-## GitLab.com offers paid support for
-
-- Red Hat Enterprise Linux (RHEL)
+- Ubuntu
+- Debian
 - CentOS
+- RedHat Enterprise Linux
+- Scientific Linux
 - Oracle Linux
 
-## Not officially supported are
+## Unsupported Linux distributions
 
 - Arch Linux
 - Fedora
 - Gentoo
 
-But on the above distributions it is pretty easy to install GitLab yourself.
+But on the above unsupported distributions is stll possible to install GitLab yourself with the [manual installation guide](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md).
 
-## Unsupported Unix Systems
+## Unsupported Unix operating systems
 
 There is nothing that prevents GitLab from running on other Unix operating systems.
 This means you may get it to work on systems running FreeBSD or OS X.
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index f49f09756a..e7ebc61343 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -8,23 +8,38 @@ Table of Contents
 **[GitLab Flavored Markdown](#gitlab-flavored-markdown-gfm)**
 
 [Newlines](#newlines)
+
 [Multiple underscores in words](#multiple-underscores-in-words)
+
 [URL autolinking](#url-autolinking)
+
 [Code and Syntax Highlighting](#code-and-syntax-highlighting)
+
 [Emoji](#emoji)
+
 [Special GitLab references](#special-gitlab-references)
 
+
 **[Standard Markdown](#standard-markdown)**
 
 [Headers](#headers)
+
 [Emphasis](#emphasis)
+
 [Lists](#lists)
+
 [Links](#links)
+
 [Images](#images)
+
 [Blockquotes](#blockquotes)
+
 [Inline HTML](#inline-html)
+
 [Horizontal Rule](#horizontal-rule)
+
 [Line Breaks](#line-breaks)
+
 [Tables](#tables)
 
 **[References](#references)**
@@ -33,7 +48,8 @@ Table of Contents
 
 GitLab Flavored Markdown (GFM)
 ==============================
-For GitLab we developed something we call "GitLab Flavored Markdown" (GFM). It extends the standard Markdown in a few significant ways to add some useful functionality.
+For GitLab we developed something we call "GitLab Flavored Markdown" (GFM).
+It extends the standard Markdown in a few significant ways to add some useful functionality.
 
 You can use GFM in
 
@@ -51,16 +67,20 @@ Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#mar
 
 Newlines
 --------
-The biggest difference that GFM introduces is in the handling of linebreaks. With traditional Markdown you can hard wrap paragraphs of text and they will be combined into a single paragraph. We find this to be the cause of a huge number of unintentional formatting errors. GFM treats newlines in paragraph-like content as real line breaks, which is probably what you intended.
+GFM honors the markdown specification in how [paragraphs and line breaks are handled](http://daringfireball.net/projects/markdown/syntax#p).
 
-The next paragraph contains two phrases separated by a single newline character:
+A paragraph is simply one or more consecutive lines of text, separated by one or more blank lines.:
 
     Roses are red
     Violets are blue
 
+    Sugar is sweet
+
 Roses are red
 Violets are blue
 
+Sugar is sweet
+
 Multiple underscores in words
 -----------------------------
 It is not reasonable to italicize just _part_ of a word, especially when you're dealing with code and names that often appear with multiple underscores. Therefore, GFM ignores multiple underscores in words.
@@ -319,13 +339,13 @@ Strikethrough uses two tildes. ~~Scratch this.~~
 
 ## Links
 
-There are two ways to create links.
+There are two ways to create links, inline-style and reference-style.
 
     [I'm an inline-style link](https://www.google.com)
 
     [I'm a reference-style link][Arbitrary case-insensitive reference text]
 
-    [I'm a relative reference to a repository file](../blob/master/LICENSE)
+    [I'm a relative reference to a repository file](LICENSE)
 
     [You can use numbers for reference-style link definitions][1]
 
@@ -341,7 +361,7 @@ There are two ways to create links.
 
 [I'm a reference-style link][Arbitrary case-insensitive reference text]
 
-[I'm a relative reference to a repository file](../blob/master/LICENSE)
+[I'm a relative reference to a repository file](LICENSE)
 
 [You can use numbers for reference-style link definitions][1]
 
@@ -353,6 +373,15 @@ Some text to show that the reference links can follow later.
 [1]: http://slashdot.org
 [link text itself]: http://www.reddit.com
 
+**Note**
+
+Relative links do not allow referencing project files in a wiki page or wiki page in a project file.
+The reason for this is that, in GitLab, wiki is always a separate git repository. For example:
+
+`[I'm a reference-style link][style]`
+
+will point the link to `wikis/style` when the link is inside of a wiki markdown file.
+
 ## Images
 
     Here's our logo (hover to see the title text):
@@ -365,15 +394,15 @@ Some text to show that the reference links can follow later.
 
     [logo]: assets/logo-white.png
 
-Here's our logo (hover to see the title text):
+Here's our logo:
 
 Inline-style:
-![alt text](/assets/logo-white.png "Logo Title Text 1")
+![alt text](/assets/logo-white.png)
 
 Reference-style:
 ![alt text][logo]
 
-[logo]: /assets/logo-white.png "Logo Title Text 2"
+[logo]: /assets/logo-white.png
 
 ## Blockquotes
 
diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md
new file mode 100644
index 0000000000..73e1728a55
--- /dev/null
+++ b/doc/permissions/permissions.md
@@ -0,0 +1,45 @@
+Users have different abilities depending on the access level they have in a particular group or project.
+If a user is both in a project group and in the project itself, the highest permission level is used.
+If a user is a GitLab administrator they receive all permissions.
+
+---
+
+#### Project:
+
+
+| Action| Guest | Reporter | Developer | Master | Owner|
+|-------|-------|----------|-----------|--------|------|
+|Create new issue|✓|✓|✓|✓|✓|
+|Leave comments|✓|✓|✓|✓|✓|
+|Write on project wall|✓|✓|✓|✓|✓|
+|Pull project code| |✓|✓|✓|✓|
+|Download project| |✓|✓|✓|✓|
+|Create code snippets| |✓|✓|✓|✓|
+|Create new merge request| ||✓|✓|✓|
+|Create new branches| ||✓|✓|✓|
+|Push to non-protected branches| ||✓|✓|✓|
+|Remove non-protected branches| ||✓|✓|✓|
+|Add tags| ||✓|✓|✓|
+|Write a wiki| ||✓|✓|✓|
+|Manage issue tracker| ||✓|✓|✓|
+|Add new team members| |||✓|✓|
+|Push to protected branches| |||✓|✓|
+|Remove protected branches| |||✓|✓|
+|Edit project| |||✓|✓|
+|Add Deploy Keys to project| |||✓|✓|
+|Confiure Project Hooks| |||✓|✓|
+|Switch visibility level| ||||✓|
+|Transfer project to another namespace| ||||✓|
+|Remove project| ||||✓|
+
+#### Group
+
+|Action|Guest|Reporter|Developer|Master|Owner|
+|------|-----|--------|---------|------|-----|
+|Browse group|✓|✓|✓|✓|✓|
+|Edit group|||||✓|
+|create project in group|||||✓|
+|Manage group members|||||✓|
+|Remove group|||||✓|
+
+Any user can remove himself from a group, unless he is the last Owner of the group.
diff --git a/doc/public_access/public_access.md b/doc/public_access/public_access.md
new file mode 100644
index 0000000000..bf9d2784af
--- /dev/null
+++ b/doc/public_access/public_access.md
@@ -0,0 +1,28 @@
+Gitlab allows you to open selected projects to be accessed **publicly** or **internally**.
+Projects with either of these visibility levels will be listen in the [public access directory](/public).
+Internal projects will only be available to authenticated users.
+
+#### Public projects
+Public projects can be cloned **without any** authentication.
+It will also be listen on the [public access directory](/public).
+**Any logged in user** will have [Guest](/help/permissions) permissions on the repository.
+
+#### Internal projects
+Internal projects can be cloned by any logged in user.
+It will also be listed on the [public access directory](/public) for logged in users.
+Any logged in user will have [Guest](/help/permissions) permissions on the repository.
+
+#### How to change project visibility
+1. Go to your project dashboard
+2. Click on the "Edit" tab
+3. Change "Visibility Level"
+
+#### Visibility of users
+The public page of users, located at `/u/username` is visible if either:
+
+* You are logged in.
+* You are logged out, and the target user is authorized to (is Guest, Reporter, etc.) at least one public project.
+
+Otherwise, you will be redirected to the sign in page.
+
+When visiting the public page of an user, you will only see listed projects which you can view yourself.
diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md
index 3847410485..e823208291 100644
--- a/doc/raketasks/user_management.md
+++ b/doc/raketasks/user_management.md
@@ -15,7 +15,7 @@ Notes:
 bundle exec rake gitlab:import:all_users_to_all_projects
 ```
 
-### Add user as a developer to all projects
+### Add user as a developer to all groups
 
 ```
 bundle exec rake gitlab:import:user_to_groups[username@domain.tld]
diff --git a/doc/release/security.md b/doc/release/security.md
index 7ec3991de8..8e5a7e3209 100644
--- a/doc/release/security.md
+++ b/doc/release/security.md
@@ -15,7 +15,7 @@ Please report suspected security vulnerabilities in private to support@gitlab.co
 1. Acknowledge the issue to the researcher that disclosed it
 1. Fix the issue on a feature branch, do this on the private GitLab development server and update the VERSION and CHANGELOG in this branch
 1. Consider creating and testing workarounds
-1. Create feature branches for the blog posts on GitLab.org and GitLab.com and link them from the code branch
+1. Create feature branches for the blog post on GitLab.com and link them from the code branch
 1. Merge the code feature branch into master
 1. Cherry-pick the code into the latest stable branch
 1. Create a git tag vX.X.X for CE and another patch release for EE
diff --git a/doc/ssh/ssh.md b/doc/ssh/ssh.md
new file mode 100644
index 0000000000..0a38bc16b4
--- /dev/null
+++ b/doc/ssh/ssh.md
@@ -0,0 +1,24 @@
+SSH key allows you to establish a secure connection between your computer and GitLab
+
+
+Before generating an SSH key, check if your system already has one by running `cat ~/.ssh/id_rsa.pub`
+If your see a long string starting with `ssh-rsa` or `ssh-dsa`, you can skip the ssh-keygen step.
+
+
+To generate a new SSH key just open your terminal and use code below. The ssh-keygen command prompts you for a location and filename to store the key pair and for a password. 
+When prompted for the location and filename you can press enter to use the default. 
+It is a best practice to use a password for an SSH key but it is not required and you can skip creating a password by pressing enter. 
+Note that the password you choose here can't be altered or retrieved.
+
+```bash
+ssh-keygen -t rsa -C "$your_email"
+```
+
+Use the code below to show your public key.
+
+```bash
+cat ~/.ssh/id_rsa.pub
+```
+
+Copy-paste the key to the 'My SSH Keys' section under the 'SSH' tab in your user profile. 
+Please copy the complete key starting with `ssh-` and ending with your username and host.
diff --git a/doc/system_hooks/system_hooks.md b/doc/system_hooks/system_hooks.md
new file mode 100644
index 0000000000..76ca2a5991
--- /dev/null
+++ b/doc/system_hooks/system_hooks.md
@@ -0,0 +1,89 @@
+Your GitLab instance can perform HTTP POST requests on the following events: `create_project`, `delete_project`, `create_user`, `delete_user` and `change_team_member`.
+
+System hooks can be used, e.g. for logging or changing information in a LDAP server.
+
+#### Hooks request example:
+
+**Project created:**
+
+```json
+{
+          "created_at": "2012-07-21T07:30:54Z",
+          "event_name": "project_create",
+                "name": "StoreCloud",
+         "owner_email": "johnsmith@gmail.com",
+          "owner_name": "John Smith",
+                "path": "stormcloud",
+ "path_with_namespace": "jsmith/stormcloud",
+          "project_id": 74,
+}
+```
+
+**Project destroyed:**
+
+```json
+{
+          "created_at": "2012-07-21T07:30:58Z",
+          "event_name": "project_destroy",
+                "name": "Underscore",
+         "owner_email": "johnsmith@gmail.com",
+          "owner_name": "John Smith",
+                "path": "underscore",
+ "path_with_namespace": "jsmith/underscore",
+          "project_id": 73,
+}
+```
+
+**New Team Member:**
+
+```json
+{
+     "created_at": "2012-07-21T07:30:56Z",
+     "event_name": "user_add_to_team",
+ "project_access": "Master",
+     "project_id": 74, 
+   "project_name": "StoreCloud",
+   "project_path": "storecloud", 
+    "user_email": "johnsmith@gmail.com",
+     "user_name": "John Smith",
+}
+```
+
+**Team Member Removed:**
+
+```json
+{
+     "created_at": "2012-07-21T07:30:56Z",
+     "event_name": "user_remove_from_team",
+ "project_access": "Master",
+     "project_id": 74, 
+   "project_name": "StoreCloud",
+   "project_path": "storecloud", 
+    "user_email": "johnsmith@gmail.com",
+     "user_name": "John Smith",
+}
+```
+
+**User created:**
+
+```json
+{ 
+   "created_at": "2012-07-21T07:44:07Z",
+        "email": "js@gitlabhq.com",
+   "event_name": "user_create",
+         "name": "John Smith", 
+      "user_id": 41 
+}
+```
+
+**User removed:**
+
+```json
+{ 
+   "created_at": "2012-07-21T07:44:07Z",
+        "email": "js@gitlabhq.com",
+   "event_name": "user_destroy",
+         "name": "John Smith",
+      "user_id": 41 
+}
+```
diff --git a/doc/update/6.6-to-6.7.md b/doc/update/6.6-to-6.7.md
new file mode 100644
index 0000000000..e4a0cafa91
--- /dev/null
+++ b/doc/update/6.6-to-6.7.md
@@ -0,0 +1,98 @@
+# From 6.6 to 6.7
+
+### 0. Backup
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
+```
+
+### 1. Stop server
+
+    sudo service gitlab stop
+
+### 2. Get latest code
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H git fetch --all
+```
+
+For Gitlab Community Edition:
+
+```bash
+sudo -u git -H git checkout 6-7-stable
+```
+
+OR
+
+For GitLab Enterprise Edition:
+
+```bash
+sudo -u git -H git checkout 6-7-stable-ee
+```
+
+### 3. Update gitlab-shell (and its config)
+
+```bash
+cd /home/git/gitlab-shell
+sudo -u git -H git fetch
+sudo -u git -H git checkout v1.8.0
+```
+
+### 4. Install libs, migrations, etc.
+
+```bash
+cd /home/git/gitlab
+
+# MySQL installations (note: the line below states '--without ... postgres')
+sudo -u git -H bundle install --without development test postgres --deployment
+
+# PostgreSQL installations (note: the line below states '--without ... mysql')
+sudo -u git -H bundle install --without development test mysql --deployment
+
+
+# Run database migrations
+sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
+
+# Clean up assets and cache
+sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
+
+# Update init.d script
+sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+
+# Update the logrotate configuration (keep logs for 90 days instead of 52 weeks)
+sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
+```
+
+
+### 5. Start application
+
+    sudo service gitlab start
+    sudo service nginx restart
+
+### 6. Check application status
+
+Check if GitLab and its environment are configured correctly:
+
+    sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
+
+To make sure you didn't miss anything run a more thorough check with:
+
+    sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
+
+If all items are green, then congratulations upgrade is complete!
+
+## Things went south? Revert to previous version (6.6)
+
+### 1. Revert the code to the previous version
+Follow the [`upgrade guide from 6.5 to 6.6`](6.5-to-6.6.md), except for the database migration 
+(The backup is already migrated to the previous version)
+
+### 2. Restore from the backup:
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
+```
+If you have more than one backup *.tar file(s) please add `BACKUP=timestamp_of_backup` to the command above.
diff --git a/doc/update/mysql-to-postgresql.md b/doc/update/mysql-to-postgresql.md
new file mode 100644
index 0000000000..9a324545eb
--- /dev/null
+++ b/doc/update/mysql-to-postgresql.md
@@ -0,0 +1,9 @@
+# Use the shell commands below to convert a MySQL GitLab database to a PostgreSQL one.
+
+```
+git clone https://github.com/lanyrd/mysql-postgresql-converter.git
+cd mysql-postgresql-converter
+mysqldump --compatible=postgresql --default-character-set=utf8 -r databasename.mysql -u root gitlabhq_production
+python db_converter.py databasename.mysql databasename.psql
+psql -f databasename.psql -d gitlabhq_production
+```
diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md
index b284ff4836..2b947adaa1 100644
--- a/doc/update/patch_versions.md
+++ b/doc/update/patch_versions.md
@@ -18,10 +18,11 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
 
 ```bash
 cd /home/git/gitlab
-sudo -u git -H git pull origin STABLE_BRANCH
+sudo -u git -H git fetch --all
+sudo -u git -H git checkout LATEST_TAG
 ```
 
-Replace STABLE_BRANCH with the minor version you want to upgrade to, for example `6-3-stable`.
+Replace LATEST_TAG with the latest GitLab tag you want to upgrade to, for example `v6.6.3`.
 
 ### 3. Update gitlab-shell if it is not the latest version
 
@@ -38,12 +39,12 @@ Replace LATEST_TAG with the latest GitLab Shell tag you want to upgrade to, for
 ```bash
 cd /home/git/gitlab
 
-# MySQL
-sudo -u git -H bundle install --without development test postgres --deployment
-
 #PostgreSQL
 sudo -u git -H bundle install --without development test mysql --deployment
 
+# MySQL
+sudo -u git -H bundle install --without development test postgres --deployment
+
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
 sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
diff --git a/doc/update/ruby.md b/doc/update/ruby.md
index f6f2fd5856..ea90390cae 100644
--- a/doc/update/ruby.md
+++ b/doc/update/ruby.md
@@ -41,7 +41,7 @@ Just to be sure we will reinstall the gems used by GitLab. Note that the `bundle
 ```bash
 cd /home/git/gitlab
 sudo -u git -H rm -rf vendor/bundle  # remove existing Gem bundle
-sudo -u git -H bundle install --deployment --without development test postgres aws # Assuming MySQL
+sudo -u git -H bundle install --deployment --without development test mysql aws # Assuming PostgreSQL
 ```
 
 ### 6. Start GitLab
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
new file mode 100644
index 0000000000..64cce45945
--- /dev/null
+++ b/doc/web_hooks/web_hooks.md
@@ -0,0 +1,113 @@
+Project web hooks allow you to trigger an URL if new code is pushed or a new issue is created.
+
+---
+
+You can configure web hook to listen for specific events like pushes, issues, merge requests.
+GitLab will send POST request with data to web hook URL.
+Web Hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
+
+---
+
+#### Push events
+
+Triggered when you push to the repository except pushing tags.
+
+**Request body:**
+
+```json
+{
+  "before": "95790bf891e76fee5e1747ab589903a6a1f80f22",
+  "after": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+  "ref": "refs/heads/master",
+  "user_id": 4,
+  "user_name": "John Smith",
+  "project_id": 15,
+  "repository": {
+    "name": "Diaspora",
+    "url": "git@localhost:diaspora.git",
+    "description": "",
+    "homepage": "http://localhost/diaspora"
+  },
+  "commits": [
+    {
+      "id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
+      "message": "Update Catalan translation to e38cb41.",
+      "timestamp": "2011-12-12T14:27:31+02:00",
+      "url": "http://localhost/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
+      "author": {
+        "name": "Jordi Mallach",
+        "email": "jordi@softcatala.org"
+      }
+    },
+    {
+      "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+      "message": "fixed readme",
+      "timestamp": "2012-01-03T23:36:29+02:00",
+      "url": "http://localhost/diaspora/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+      "author": {
+        "name": "GitLab dev user",
+        "email": "gitlabdev@dv6700.(none)"
+      }
+    }
+  ],
+  "total_commits_count": 4
+}
+```
+
+#### Issues events
+
+Triggered when a new issue is created or an existing issue was updated/closed/reopened.
+
+**Request body:**
+
+```json
+{
+  "object_kind": "issue",
+  "object_attributes": {
+    "id": 301,
+    "title": "New API: create/update/delete file",
+    "assignee_id": 51,
+    "author_id": 51,
+    "project_id": 14,
+    "created_at": "2013-12-03T17:15:43Z",
+    "updated_at": "2013-12-03T17:15:43Z",
+    "position": 0,
+    "branch_name": null,
+    "description": "Create new API for manipulations with repository",
+    "milestone_id": null,
+    "state": "opened",
+    "iid": 23
+  }
+}
+```
+
+#### Merge request events
+
+Triggered when a new merge request is created or an existing merge request was updated/merges/closed.
+
+**Request body:**
+
+```json
+{
+  "object_kind": "merge_request",
+  "object_attributes": {
+    "id": 99,
+    "target_branch": "master",
+    "source_branch": "ms-viewport",
+    "source_project_id": 14,
+    "author_id": 51,
+    "assignee_id": 6,
+    "title": "MS-Viewport",
+    "created_at": "2013-12-03T17:23:34Z",
+    "updated_at": "2013-12-03T17:23:34Z",
+    "st_commits": null,
+    "st_diffs": null,
+    "milestone_id": null,
+    "state": "opened",
+    "merge_status": "unchecked",
+    "target_project_id": 14,
+    "iid": 1,
+    "description": ""
+  }
+}
+```
diff --git a/doc/workflow/workflow.md b/doc/workflow/workflow.md
new file mode 100644
index 0000000000..1c238f7495
--- /dev/null
+++ b/doc/workflow/workflow.md
@@ -0,0 +1,26 @@
+1. Clone project
+
+  ```bash
+  git clone git@example.com:project-name.git
+  ```
+2. Create branch with your feature
+
+  ```bash
+  git checkout -b $feature_name
+  ```
+
+3. Write code. Comit changes
+
+  ```bash
+  git commit -am "My feature is ready"
+  ```
+
+4. Push your branch to GitLab
+  
+  ```bash
+  git push origin $feature_name
+  ```
+
+5. Review your code on Commits page
+6. Create a merge request
+7. Your team lead will review the code &amp; merge it to the main branch
diff --git a/features/admin/users.feature b/features/admin/users.feature
index 7f503cf923..ce9f32f50d 100644
--- a/features/admin/users.feature
+++ b/features/admin/users.feature
@@ -14,3 +14,9 @@ Feature: Admin Users
     And Click save
     Then See username error message
     And Not changed form action url
+
+  Scenario: Edit my user attributes
+    Given I visit admin users page
+    And click edit on my user
+    When I submit modified user
+    Then I see user attributes changed
diff --git a/features/group.feature b/features/group.feature
index aa49056fee..4e11bcba93 100644
--- a/features/group.feature
+++ b/features/group.feature
@@ -74,7 +74,7 @@ Feature: Groups
     When I visit group "Owned" members page
     Then I should see user "John Doe" in team list
     Then I should see user "Mary Jane" in team list
-    Then I should not see the "Remove User From Group" button for "Mary Jane"
+    Then I should not see the "Remove User From Group" button for "John Doe"
 
   @javascript
   Scenario: Guest should be able to remove himself from group
@@ -97,7 +97,6 @@ Feature: Groups
 
   # Remove others
 
-  @javascript
   Scenario: Owner should be able to remove other users from group
     Given "Mary Jane" is owner of group "Owned"
     When I visit group "Owned" members page
diff --git a/features/project/archived_projects.feature b/features/project/archived.feature
similarity index 100%
rename from features/project/archived_projects.feature
rename to features/project/archived.feature
diff --git a/features/project/commits/commit_comments.feature b/features/project/commits/comments.feature
similarity index 100%
rename from features/project/commits/commit_comments.feature
rename to features/project/commits/comments.feature
diff --git a/features/project/commits/commit_diff_comments.feature b/features/project/commits/diff_comments.feature
similarity index 100%
rename from features/project/commits/commit_diff_comments.feature
rename to features/project/commits/diff_comments.feature
diff --git a/features/project/commits/commits_user_lookup.feature b/features/project/commits/user_lookup.feature
similarity index 100%
rename from features/project/commits/commits_user_lookup.feature
rename to features/project/commits/user_lookup.feature
diff --git a/features/project/create_project.feature b/features/project/create.feature
similarity index 91%
rename from features/project/create_project.feature
rename to features/project/create.feature
index 395a3218b2..bb8e3a368e 100644
--- a/features/project/create_project.feature
+++ b/features/project/create.feature
@@ -3,6 +3,7 @@ Feature: Create Project
   A user with ability to create a project
   Should be able to create a new one
 
+  @javascript
   Scenario: User create a project
     Given I sign in as a user
     When I visit new project page
@@ -19,4 +20,4 @@ Feature: Create Project
     And I click on HTTP
     Then Remote url should update to http link
     And If I click on SSH
-    Then Remote url should update to ssh link
\ No newline at end of file
+    Then Remote url should update to ssh link
diff --git a/features/project/fork_project.feature b/features/project/fork.feature
similarity index 100%
rename from features/project/fork_project.feature
rename to features/project/fork.feature
diff --git a/features/project/forked_merge_requests.feature b/features/project/forked_merge_requests.feature
index 966905645a..2d94b98c90 100644
--- a/features/project/forked_merge_requests.feature
+++ b/features/project/forked_merge_requests.feature
@@ -32,3 +32,9 @@ Feature: Project Forked Merge Requests
     And I fill out an invalid "Merge Request On Forked Project" merge request
     And I submit the merge request
     Then I should see validation errors
+
+  @javascript
+  Scenario: Merge request should target fork repository by default
+    Given I visit project "Forked Shop" merge requests page
+    And I click link "New Merge Request"
+    Then the target repository should be the original repository
\ No newline at end of file
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 556b96338d..6a2ba7e3b2 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -29,6 +29,13 @@ Feature: Project Merge Requests
     And I click link "Close"
     Then I should see closed merge request "Bug NS-04"
 
+  Scenario: I reopen merge request page
+    Given I click link "Bug NS-04"
+    And I click link "Close"
+    Then I should see closed merge request "Bug NS-04"
+    When I click link "Reopen"
+    Then I should see reopened merge request "Bug NS-04"
+
   Scenario: I submit new unassigned merge request
     Given I click link "New Merge Request"
     And I submit new merge request "Wiki Feature"
@@ -88,3 +95,47 @@ Feature: Project Merge Requests
     Given I visit merge request page "Bug NS-04"
     And I leave a comment with a header containing "Comment with a header"
     Then The comment with the header should not have an ID
+
+  # Toggling inline comments
+
+  @javascript
+  Scenario: I hide comments on a merge request diff with comments in a single file
+    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
+    And I visit merge request page "Bug NS-05"
+    And I switch to the diff tab
+    And I leave a comment like "Line is wrong" on line 39 of the second file
+    And I click link "Hide inline discussion" of the second file
+    Then I should not see a comment like "Line is wrong" in the second file
+
+  @javascript
+  Scenario: I show comments on a merge request diff with comments in a single file
+    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
+    And I visit merge request page "Bug NS-05"
+    And I switch to the diff tab
+    And I leave a comment like "Line is wrong" on line 39 of the second file
+    And I click link "Hide inline discussion" of the second file
+    And I click link "Show inline discussion" of the second file
+    Then I should see a comment like "Line is wrong" in the second file
+
+  @javascript
+  Scenario: I hide comments on a merge request diff with comments in multiple files
+    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
+    And I visit merge request page "Bug NS-05"
+    And I switch to the diff tab
+    And I leave a comment like "Line is correct" on line 12 of the first file
+    And I leave a comment like "Line is wrong" on line 39 of the second file
+    And I click link "Hide inline discussion" of the second file
+    Then I should not see a comment like "Line is wrong" in the second file
+    And I should still see a comment like "Line is correct" in the first file
+
+  @javascript
+  Scenario: I show comments on a merge request diff with comments in multiple files
+    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
+    And I visit merge request page "Bug NS-05"
+    And I switch to the diff tab
+    And I leave a comment like "Line is correct" on line 12 of the first file
+    And I leave a comment like "Line is wrong" on line 39 of the second file
+    And I click link "Hide inline discussion" of the second file
+    And I click link "Show inline discussion" of the second file
+    Then I should see a comment like "Line is wrong" in the second file
+    And I should still see a comment like "Line is correct" in the first file
diff --git a/features/project/public_projects.feature b/features/project/public.feature
similarity index 100%
rename from features/project/public_projects.feature
rename to features/project/public.feature
diff --git a/features/project/source/markdown_render.feature b/features/project/source/markdown_render.feature
index 42d6ebcb1c..970a9e5786 100644
--- a/features/project/source/markdown_render.feature
+++ b/features/project/source/markdown_render.feature
@@ -4,9 +4,7 @@ Feature: Project markdown render
     And I own project "Delta"
     Given I visit project source page
 
-  # -------------------------------------------
-  # README
-  # -------------------------------------------
+  # Tree README
 
   Scenario: Tree view should have correct links in README
     Given I go directory which contains README file
@@ -41,9 +39,7 @@ Feature: Project markdown render
     Then I should see rendered README which contains correct links
     And Header "Application details" should have correct id and link
 
-  # -------------------------------------------
-  # File content
-  # -------------------------------------------
+  # Blob
 
   Scenario: I navigate to doc directory to view documentation in master
     And I navigate to the doc/api/README
@@ -61,9 +57,7 @@ Feature: Project markdown render
     And I navigate to the doc/api/README
     And Header "GitLab API" should have correct id and link
 
-  # -------------------------------------------
-  # Markdown branch README
-  # -------------------------------------------
+  # Markdown branch
 
   Scenario: I browse files from markdown branch
     When I visit markdown branch
@@ -93,9 +87,31 @@ Feature: Project markdown render
     And I click on raketasks in doc/api/README
     Then I should see correct directory rendered for markdown branch
 
-  # -------------------------------------------
+  Scenario: Tree markdown links view empty urls should have correct urls
+    When I visit markdown branch
+    Then The link with text "empty" should have url "tree/markdown"
+    When I visit markdown branch "README.md" blob
+    Then The link with text "empty" should have url "blob/markdown/README.md"
+    When I visit markdown branch "d" tree
+    Then The link with text "empty" should have url "tree/markdown/d"
+    When I visit markdown branch "d/README.md" blob
+    Then The link with text "empty" should have url "blob/markdown/d/README.md"
+
+  # "ID" means "#id" on the tests below, because we are unable to escape the hash sign.
+  # which Spinach interprets as the start of a comment.
+  Scenario: All markdown links with ids should have correct urls
+    When I visit markdown branch
+    Then The link with text "ID" should have url "tree/markdownID"
+    Then The link with text "/ID" should have url "tree/markdownID"
+    Then The link with text "README.mdID" should have url "blob/markdown/README.mdID"
+    Then The link with text "d/README.mdID" should have url "blob/markdown/d/README.mdID"
+    When I visit markdown branch "README.md" blob
+    Then The link with text "ID" should have url "blob/markdown/README.mdID"
+    Then The link with text "/ID" should have url "blob/markdown/README.mdID"
+    Then The link with text "README.mdID" should have url "blob/markdown/README.mdID"
+    Then The link with text "d/README.mdID" should have url "blob/markdown/d/README.mdID"
+
   # Wiki
-  # -------------------------------------------
 
   Scenario: I create a wiki page with different links
     Given I go to wiki page
diff --git a/features/public/public_projects.feature b/features/public/projects.feature
similarity index 100%
rename from features/public/public_projects.feature
rename to features/public/projects.feature
diff --git a/features/public/public_groups.feature b/features/public/public_groups.feature
new file mode 100644
index 0000000000..7f1ec718e3
--- /dev/null
+++ b/features/public/public_groups.feature
@@ -0,0 +1,118 @@
+Feature: Public Projects Feature
+  Background:
+    Given group "TestGroup" has private project "Enterprise"
+
+  Scenario: I should not see group with private projects as visitor
+    When I visit group "TestGroup" page
+    Then I should be redirected to sign in page
+
+  Scenario: I should not see group with private projects group as user
+    When I sign in as a user
+    And I visit group "TestGroup" page
+    Then page status code should be 404
+
+  Scenario: I should not see group with private and internal projects as visitor
+    Given group "TestGroup" has internal project "Internal"
+    When I visit group "TestGroup" page
+    Then I should be redirected to sign in page
+
+  Scenario: I should see group with private and internal projects as user
+    Given group "TestGroup" has internal project "Internal"
+    When I sign in as a user
+    And I visit group "TestGroup" page
+    Then I should see project "Internal" items
+    And I should not see project "Enterprise" items
+
+  Scenario: I should see group issues for internal project as user
+    Given group "TestGroup" has internal project "Internal"
+    When I sign in as a user
+    And I visit group "TestGroup" issues page
+    And I change filter to Everyone's
+    Then I should see project "Internal" items
+    And I should not see project "Enterprise" items
+
+  Scenario: I should see group merge requests for internal project as user
+    Given group "TestGroup" has internal project "Internal"
+    When I sign in as a user
+    And I visit group "TestGroup" merge requests page
+    And I change filter to Everyone's
+    Then I should see project "Internal" items
+    And I should not see project "Enterprise" items
+
+  Scenario: I should see group's members as user
+    Given group "TestGroup" has internal project "Internal"
+    And "John Doe" is owner of group "TestGroup"
+    When I sign in as a user
+    And I visit group "TestGroup" members page
+    Then I should see group member "John Doe"
+    And I should not see member roles
+
+  Scenario: I should see group with private, internal and public projects as visitor
+    Given group "TestGroup" has internal project "Internal"
+    Given group "TestGroup" has public project "Community"
+    When I visit group "TestGroup" page
+    Then I should see project "Community" items
+    And I should not see project "Internal" items
+    And I should not see project "Enterprise" items
+
+  Scenario: I should see group issues for public project as visitor
+    Given group "TestGroup" has internal project "Internal"
+    Given group "TestGroup" has public project "Community"
+    When I visit group "TestGroup" issues page
+    Then I should see project "Community" items
+    And I should not see project "Internal" items
+    And I should not see project "Enterprise" items
+
+  Scenario: I should see group merge requests for public project as visitor
+    Given group "TestGroup" has internal project "Internal"
+    Given group "TestGroup" has public project "Community"
+    When I visit group "TestGroup" merge requests page
+    Then I should see project "Community" items
+    And I should not see project "Internal" items
+    And I should not see project "Enterprise" items
+
+  Scenario: I should see group's members as visitor
+    Given group "TestGroup" has internal project "Internal"
+    Given group "TestGroup" has public project "Community"
+    And "John Doe" is owner of group "TestGroup"
+    When I visit group "TestGroup" members page
+    Then I should see group member "John Doe"
+    And I should not see member roles
+
+  Scenario: I should see group with private, internal and public projects as user
+    Given group "TestGroup" has internal project "Internal"
+    Given group "TestGroup" has public project "Community"
+    When I sign in as a user
+    And I visit group "TestGroup" page
+    Then I should see project "Community" items
+    And I should see project "Internal" items
+    And I should not see project "Enterprise" items
+
+  Scenario: I should see group issues for internal and public projects as user
+    Given group "TestGroup" has internal project "Internal"
+    Given group "TestGroup" has public project "Community"
+    When I sign in as a user
+    And I visit group "TestGroup" issues page
+    And I change filter to Everyone's
+    Then I should see project "Community" items
+    And I should see project "Internal" items
+    And I should not see project "Enterprise" items
+
+  Scenario: I should see group merge requests for internal and public projects as user
+    Given group "TestGroup" has internal project "Internal"
+    Given group "TestGroup" has public project "Community"
+    When I sign in as a user
+    And I visit group "TestGroup" merge requests page
+    And I change filter to Everyone's
+    Then I should see project "Community" items
+    And I should see project "Internal" items
+    And I should not see project "Enterprise" items
+
+  Scenario: I should see group's members as user
+    Given group "TestGroup" has internal project "Internal"
+    Given group "TestGroup" has public project "Community"
+    And "John Doe" is owner of group "TestGroup"
+    When I sign in as a user
+    And I visit group "TestGroup" members page
+    Then I should see group member "John Doe"
+    And I should not see member roles
diff --git a/features/snippets/discover_snippets.feature b/features/snippets/discover.feature
similarity index 100%
rename from features/snippets/discover_snippets.feature
rename to features/snippets/discover.feature
diff --git a/features/snippets/user_snippets.feature b/features/snippets/user.feature
similarity index 100%
rename from features/snippets/user_snippets.feature
rename to features/snippets/user.feature
diff --git a/features/steps/admin/admin_active_tab.rb b/features/steps/admin/active_tab.rb
similarity index 100%
rename from features/steps/admin/admin_active_tab.rb
rename to features/steps/admin/active_tab.rb
diff --git a/features/steps/admin/admin_broadcast_messages.rb b/features/steps/admin/broadcast_messages.rb
similarity index 100%
rename from features/steps/admin/admin_broadcast_messages.rb
rename to features/steps/admin/broadcast_messages.rb
diff --git a/features/steps/admin/admin_groups.rb b/features/steps/admin/groups.rb
similarity index 100%
rename from features/steps/admin/admin_groups.rb
rename to features/steps/admin/groups.rb
diff --git a/features/steps/admin/admin_logs.rb b/features/steps/admin/logs.rb
similarity index 100%
rename from features/steps/admin/admin_logs.rb
rename to features/steps/admin/logs.rb
diff --git a/features/steps/admin/admin_projects.rb b/features/steps/admin/projects.rb
similarity index 100%
rename from features/steps/admin/admin_projects.rb
rename to features/steps/admin/projects.rb
diff --git a/features/steps/admin/admin_users.rb b/features/steps/admin/users.rb
similarity index 71%
rename from features/steps/admin/admin_users.rb
rename to features/steps/admin/users.rb
index 33c1344eae..659008dd87 100644
--- a/features/steps/admin/admin_users.rb
+++ b/features/steps/admin/users.rb
@@ -31,4 +31,17 @@ class AdminUsers < Spinach::FeatureSteps
   And 'Not changed form action url' do
     page.should have_selector %(form[action="/admin/users/#{@user.username}"])
   end
+
+  step 'I submit modified user' do
+    check :user_can_create_group
+    click_button 'Save'
+  end
+
+  step 'I see user attributes changed' do
+    page.should have_content 'Can create groups: Yes'
+  end
+
+  step 'click edit on my user' do
+    find("#edit_user_#{current_user.id}").click
+  end
 end
diff --git a/features/steps/dashboard/dashboard_active_tab.rb b/features/steps/dashboard/active_tab.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_active_tab.rb
rename to features/steps/dashboard/active_tab.rb
diff --git a/features/steps/dashboard/dashboard_event_filters.rb b/features/steps/dashboard/event_filters.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_event_filters.rb
rename to features/steps/dashboard/event_filters.rb
diff --git a/features/steps/dashboard/dashboard_issues.rb b/features/steps/dashboard/issues.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_issues.rb
rename to features/steps/dashboard/issues.rb
diff --git a/features/steps/dashboard/dashboard_merge_requests.rb b/features/steps/dashboard/merge_requests.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_merge_requests.rb
rename to features/steps/dashboard/merge_requests.rb
diff --git a/features/steps/dashboard/dashboard_projects.rb b/features/steps/dashboard/projects.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_projects.rb
rename to features/steps/dashboard/projects.rb
diff --git a/features/steps/dashboard/dashboard_search.rb b/features/steps/dashboard/search.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_search.rb
rename to features/steps/dashboard/search.rb
diff --git a/features/steps/dashboard/dashboard_with_archived_projects.rb b/features/steps/dashboard/with_archived_projects.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_with_archived_projects.rb
rename to features/steps/dashboard/with_archived_projects.rb
diff --git a/features/steps/profile/profile_active_tab.rb b/features/steps/profile/active_tab.rb
similarity index 100%
rename from features/steps/profile/profile_active_tab.rb
rename to features/steps/profile/active_tab.rb
diff --git a/features/steps/profile/profile_emails.rb b/features/steps/profile/emails.rb
similarity index 100%
rename from features/steps/profile/profile_emails.rb
rename to features/steps/profile/emails.rb
diff --git a/features/steps/profile/profile_notifications.rb b/features/steps/profile/notifications.rb
similarity index 100%
rename from features/steps/profile/profile_notifications.rb
rename to features/steps/profile/notifications.rb
diff --git a/features/steps/profile/profile_ssh_keys.rb b/features/steps/profile/ssh_keys.rb
similarity index 100%
rename from features/steps/profile/profile_ssh_keys.rb
rename to features/steps/profile/ssh_keys.rb
diff --git a/features/steps/project/project_active_tab.rb b/features/steps/project/active_tab.rb
similarity index 100%
rename from features/steps/project/project_active_tab.rb
rename to features/steps/project/active_tab.rb
diff --git a/features/steps/project/project_archived.rb b/features/steps/project/archived.rb
similarity index 100%
rename from features/steps/project/project_archived.rb
rename to features/steps/project/archived.rb
diff --git a/features/steps/project/browse_branches.rb b/features/steps/project/browse_branches.rb
new file mode 100644
index 0000000000..30c8cef80c
--- /dev/null
+++ b/features/steps/project/browse_branches.rb
@@ -0,0 +1,51 @@
+class ProjectBrowseBranches < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedProject
+  include SharedPaths
+
+  step 'I should see "Shop" recent branches list' do
+    page.should have_content "Branches"
+    page.should have_content "master"
+  end
+
+  step 'I click link "All"' do
+    click_link "All"
+  end
+
+  step 'I should see "Shop" all branches list' do
+    page.should have_content "Branches"
+    page.should have_content "master"
+  end
+
+  step 'I click link "Protected"' do
+    click_link "Protected"
+  end
+
+  step 'I should see "Shop" protected branches list' do
+    within ".protected-branches-list" do
+      page.should have_content "stable"
+      page.should_not have_content "master"
+    end
+  end
+
+  step 'project "Shop" has protected branches' do
+    project = Project.find_by(name: "Shop")
+    project.protected_branches.create(name: "stable")
+  end
+
+  step 'I click new branch link' do
+    click_link "New branch"
+  end
+
+  step 'I submit new branch form' do
+    fill_in 'branch_name', with: 'deploy_keys'
+    fill_in 'ref', with: 'master'
+    click_button 'Create branch'
+  end
+
+  step 'I should see new branch created' do
+    within '.all-branches' do
+      page.should have_content 'deploy_keys'
+    end
+  end
+end
diff --git a/features/steps/project/project_browse_commits.rb b/features/steps/project/browse_commits.rb
similarity index 100%
rename from features/steps/project/project_browse_commits.rb
rename to features/steps/project/browse_commits.rb
diff --git a/features/steps/project/project_browse_commits_user_lookup.rb b/features/steps/project/browse_commits_user_lookup.rb
similarity index 100%
rename from features/steps/project/project_browse_commits_user_lookup.rb
rename to features/steps/project/browse_commits_user_lookup.rb
diff --git a/features/steps/project/project_browse_files.rb b/features/steps/project/browse_files.rb
similarity index 100%
rename from features/steps/project/project_browse_files.rb
rename to features/steps/project/browse_files.rb
diff --git a/features/steps/project/project_browse_git_repo.rb b/features/steps/project/browse_git_repo.rb
similarity index 100%
rename from features/steps/project/project_browse_git_repo.rb
rename to features/steps/project/browse_git_repo.rb
diff --git a/features/steps/project/project_browse_tags.rb b/features/steps/project/browse_tags.rb
similarity index 100%
rename from features/steps/project/project_browse_tags.rb
rename to features/steps/project/browse_tags.rb
diff --git a/features/steps/project/create_project.rb b/features/steps/project/create.rb
similarity index 100%
rename from features/steps/project/create_project.rb
rename to features/steps/project/create.rb
index b59345e707..b42e5bd362 100644
--- a/features/steps/project/create_project.rb
+++ b/features/steps/project/create.rb
@@ -8,8 +8,8 @@ class CreateProject < Spinach::FeatureSteps
   end
 
   Then 'I should see project page' do
-    current_path.should == project_path(Project.last)
     page.should have_content "Empty"
+    current_path.should == project_path(Project.last)
   end
 
   And 'I should see empty project instuctions' do
diff --git a/features/steps/project/project_filter_labels.rb b/features/steps/project/filter_labels.rb
similarity index 100%
rename from features/steps/project/project_filter_labels.rb
rename to features/steps/project/filter_labels.rb
diff --git a/features/steps/project/project_fork.rb b/features/steps/project/fork.rb
similarity index 100%
rename from features/steps/project/project_fork.rb
rename to features/steps/project/fork.rb
diff --git a/features/steps/project/project_forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb
similarity index 96%
rename from features/steps/project/project_forked_merge_requests.rb
rename to features/steps/project/forked_merge_requests.rb
index 4cc99f8af5..df69cb7543 100644
--- a/features/steps/project/project_forked_merge_requests.rb
+++ b/features/steps/project/forked_merge_requests.rb
@@ -159,8 +159,11 @@ class ProjectForkedMergeRequests < Spinach::FeatureSteps
   step 'I fill out an invalid "Merge Request On Forked Project" merge request' do
     #If this isn't filled in the rest of the validations won't be triggered
     fill_in "merge_request_title", with: "Merge Request On Forked Project"
+
+    select "Select branch", from: "merge_request_target_branch"
+
     find(:select, "merge_request_source_project_id", {}).value.should == @forked_project.id.to_s
-    find(:select, "merge_request_target_project_id", {}).value.should == @forked_project.id.to_s
+    find(:select, "merge_request_target_project_id", {}).value.should == project.id.to_s
     find(:select, "merge_request_source_branch", {}).value.should == ""
     find(:select, "merge_request_target_branch", {}).value.should == ""
   end
@@ -168,7 +171,10 @@ class ProjectForkedMergeRequests < Spinach::FeatureSteps
   step 'I should see validation errors' do
     page.should have_content "Source branch can't be blank"
     page.should have_content "Target branch can't be blank"
-    page.should have_content "Branch conflict You can not use same project/branch for source and target"
+  end
+
+  step 'the target repository should be the original repository' do
+    page.should have_select("merge_request_target_project_id", selected: project.path_with_namespace)
   end
 
   def project
diff --git a/features/steps/project/project_graph.rb b/features/steps/project/graph.rb
similarity index 100%
rename from features/steps/project/project_graph.rb
rename to features/steps/project/graph.rb
diff --git a/features/steps/project/project_hooks.rb b/features/steps/project/hooks.rb
similarity index 100%
rename from features/steps/project/project_hooks.rb
rename to features/steps/project/hooks.rb
diff --git a/features/steps/project/project_issue_tracker.rb b/features/steps/project/issue_tracker.rb
similarity index 100%
rename from features/steps/project/project_issue_tracker.rb
rename to features/steps/project/issue_tracker.rb
diff --git a/features/steps/project/project_issues.rb b/features/steps/project/issues.rb
similarity index 100%
rename from features/steps/project/project_issues.rb
rename to features/steps/project/issues.rb
diff --git a/features/steps/project/project_labels.rb b/features/steps/project/labels.rb
similarity index 100%
rename from features/steps/project/project_labels.rb
rename to features/steps/project/labels.rb
diff --git a/features/steps/project/project_markdown_render.rb b/features/steps/project/markdown_render.rb
similarity index 67%
rename from features/steps/project/project_markdown_render.rb
rename to features/steps/project/markdown_render.rb
index 89fbb7408c..c94de28306 100644
--- a/features/steps/project/project_markdown_render.rb
+++ b/features/steps/project/markdown_render.rb
@@ -1,3 +1,6 @@
+# If you need to modify the existing seed repository for your tests,
+# it is recommended that you make the changes on the `markdown` branch of the seed project repository,
+# which should only be used by tests in this file. See `/spec/factories.rb#project` for more info.
 class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
@@ -50,7 +53,7 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps
   end
 
   Then 'I should see correct doc/api directory rendered' do
-    current_path.should == project_tree_path(@project, "master/doc/api/")
+    current_path.should == project_tree_path(@project, "master/doc/api")
     page.should have_content "README.md"
     page.should have_content "users.md"
   end
@@ -64,6 +67,18 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps
     page.should have_content "bundle exec rake gitlab:env:info RAILS_ENV=production"
   end
 
+  And 'I click on link "empty" in the README' do
+    within('.readme-holder') do
+      click_link "empty"
+    end
+  end
+
+  And 'I click on link "id" in the README' do
+    within('.readme-holder') do
+      click_link "#id"
+    end
+  end
+
   And 'I navigate to the doc/api/README' do
     click_link "doc"
     click_link "api"
@@ -90,10 +105,24 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps
     click_link "Rake tasks"
   end
 
+  # Markdown branch
+
   When 'I visit markdown branch' do
     visit project_tree_path(@project, "markdown")
   end
 
+  When 'I visit markdown branch "README.md" blob' do
+    visit project_blob_path(@project, "markdown/README.md")
+  end
+
+  When 'I visit markdown branch "d" tree' do
+    visit project_tree_path(@project, "markdown/d")
+  end
+
+  When 'I visit markdown branch "d/README.md" blob' do
+    visit project_blob_path(@project, "markdown/d/README.md")
+  end
+
   Then 'I should see files from repository in markdown branch' do
     current_path.should == project_tree_path(@project, "markdown")
     page.should have_content "Gemfile"
@@ -124,13 +153,57 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps
     page.should have_content "Get a list of users."
   end
 
+  # Expected link contents
+
+  Then 'The link with text "empty" should have url "tree/markdown"' do
+    find('a', text: /^empty$/)['href'] == current_host + project_tree_path(@project, "markdown")
+  end
+
+  Then 'The link with text "empty" should have url "blob/markdown/README.md"' do
+    find('a', text: /^empty$/)['href'] == current_host + project_blob_path(@project, "markdown/README.md")
+  end
+
+  Then 'The link with text "empty" should have url "tree/markdown/d"' do
+    find('a', text: /^empty$/)['href'] == current_host + project_tree_path(@project, "markdown/d")
+  end
+
+  Then 'The link with text "empty" should have url "blob/markdown/d/README.md"' do
+    find('a', text: /^empty$/)['href'] == current_host + project_blob_path(@project, "markdown/d/README.md")
+  end
+
+  Then 'The link with text "ID" should have url "tree/markdownID"' do
+    find('a', text: /^#id$/)['href'] == current_host + project_tree_path(@project, "markdown") + '#id'
+  end
+
+  Then 'The link with text "/ID" should have url "tree/markdownID"' do
+    find('a', text: /^\/#id$/)['href'] == current_host + project_tree_path(@project, "markdown") + '#id'
+  end
+
+  Then 'The link with text "README.mdID" should have url "blob/markdown/README.mdID"' do
+    find('a', text: /^README.md#id$/)['href'] == current_host + project_blob_path(@project, "markdown/README.md") + '#id'
+  end
+
+  Then 'The link with text "d/README.mdID" should have url "blob/markdown/d/README.mdID"' do
+    find('a', text: /^d\/README.md#id$/)['href'] == current_host + project_blob_path(@project, "d/markdown/README.md") + '#id'
+  end
+
+  Then 'The link with text "ID" should have url "blob/markdown/README.mdID"' do
+    find('a', text: /^#id$/)['href'] == current_host + project_blob_path(@project, "markdown/README.md") + '#id'
+  end
+
+  Then 'The link with text "/ID" should have url "blob/markdown/README.mdID"' do
+    find('a', text: /^\/#id$/)['href'] == current_host + project_blob_path(@project, "markdown/README.md") + '#id'
+  end
+
+  # Wiki
+
   Given 'I go to wiki page' do
     click_link "Wiki"
     current_path.should == project_wiki_path(@project, "home")
   end
 
   And 'I add various links to the wiki page' do
-    fill_in "wiki[content]", with: "[test](test)\n[GitLab API doc](doc/api/README.md)\n[Rake tasks](doc/raketasks)\n"
+    fill_in "wiki[content]", with: "[test](test)\n[GitLab API doc](api)\n[Rake tasks](raketasks)\n"
     fill_in "wiki[message]", with: "Adding links to wiki"
     click_button "Create page"
   end
@@ -169,8 +242,8 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps
   end
 
   Then 'I see Gitlab API document' do
-    current_path.should == project_blob_path(@project, "master/doc/api/README.md")
-    page.should have_content "Status codes"
+    current_path.should == project_wiki_path(@project, "api")
+    page.should have_content "Editing"
   end
 
   And 'I click on Rake tasks link' do
@@ -178,9 +251,8 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps
   end
 
   Then 'I see Rake tasks directory' do
-    current_path.should == project_tree_path(@project, "master/doc/raketasks")
-    page.should have_content "backup_restore.md"
-    page.should have_content "maintenance.md"
+    current_path.should == project_wiki_path(@project, "raketasks")
+    page.should have_content "Editing"
   end
 
   Given 'I go directory which contains README file' do
diff --git a/features/steps/project/project_merge_requests.rb b/features/steps/project/merge_requests.rb
similarity index 71%
rename from features/steps/project/project_merge_requests.rb
rename to features/steps/project/merge_requests.rb
index adf9e77e13..f42eb6377c 100644
--- a/features/steps/project/project_merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -170,6 +170,74 @@ class ProjectMergeRequests < Spinach::FeatureSteps
     end
   end
 
+  step 'I click link "Reopen"' do
+    within '.page-title' do
+      click_link "Reopen"
+    end
+  end
+
+  step 'I should see reopened merge request "Bug NS-04"' do
+    within '.state-label' do
+      page.should have_content "Open"
+    end
+  end
+
+  step 'I click link "Hide inline discussion" of the second file' do
+    within '.files [id^=diff]:nth-child(2)' do
+      click_link "Diff comments"
+    end
+  end
+
+  step 'I click link "Show inline discussion" of the second file' do
+    within '.files [id^=diff]:nth-child(2)' do
+      click_link "Diff comments"
+    end
+  end
+
+  step 'I should not see a comment like "Line is wrong" in the second file' do
+    within '.files [id^=diff]:nth-child(2)' do
+      page.should_not have_visible_content "Line is wrong"
+    end
+  end
+
+  step 'I should see a comment like "Line is wrong" in the second file' do
+    within '.files [id^=diff]:nth-child(2) .note-text' do
+      page.should have_visible_content "Line is wrong"
+    end
+  end
+
+  step 'I leave a comment like "Line is correct" on line 12 of the first file' do
+    init_diff_note_first_file
+
+    within(".js-discussion-note-form") do
+      fill_in "note_note", with: "Line is correct"
+      click_button "Add Comment"
+    end
+
+    within ".files [id^=diff]:nth-child(1) .note-text" do
+      page.should have_content "Line is correct"
+    end
+  end
+
+  step 'I leave a comment like "Line is wrong" on line 39 of the second file' do
+    init_diff_note_second_file
+
+    within(".js-discussion-note-form") do
+      fill_in "note_note", with: "Line is wrong"
+      click_button "Add Comment"
+    end
+
+    within ".files [id^=diff]:nth-child(2) .note-text" do
+      page.should have_content "Line is wrong"
+    end
+  end
+
+  step 'I should still see a comment like "Line is correct" in the first file' do
+    within '.files [id^=diff]:nth-child(1) .note-text' do
+      page.should have_visible_content "Line is correct"
+    end
+  end
+
   def project
     @project ||= Project.find_by!(name: "Shop")
   end
@@ -192,4 +260,16 @@ class ProjectMergeRequests < Spinach::FeatureSteps
       page.should have_content message
     end
   end
+
+  def init_diff_note_first_file
+    find('a[data-line-code="a5cc2925ca8258af241be7e5b0381edf30266302_12_12"]').click
+  end
+
+  def init_diff_note_second_file
+    find('a[data-line-code="8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_28_39"]').click
+  end
+
+  def have_visible_content (text)
+    have_css("*", text: text, visible: true)
+  end
 end
diff --git a/features/steps/project/project_milestones.rb b/features/steps/project/milestones.rb
similarity index 100%
rename from features/steps/project/project_milestones.rb
rename to features/steps/project/milestones.rb
diff --git a/features/steps/project/project_multiselect_blob.rb b/features/steps/project/multiselect_blob.rb
similarity index 100%
rename from features/steps/project/project_multiselect_blob.rb
rename to features/steps/project/multiselect_blob.rb
diff --git a/features/steps/project/project_network_graph.rb b/features/steps/project/network_graph.rb
similarity index 100%
rename from features/steps/project/project_network_graph.rb
rename to features/steps/project/network_graph.rb
diff --git a/features/steps/project/public_projects.rb b/features/steps/project/public.rb
similarity index 100%
rename from features/steps/project/public_projects.rb
rename to features/steps/project/public.rb
diff --git a/features/steps/project/project_search_code.rb b/features/steps/project/search_code.rb
similarity index 100%
rename from features/steps/project/project_search_code.rb
rename to features/steps/project/search_code.rb
diff --git a/features/steps/project/project_services.rb b/features/steps/project/services.rb
similarity index 100%
rename from features/steps/project/project_services.rb
rename to features/steps/project/services.rb
diff --git a/features/steps/project/project_snippets.rb b/features/steps/project/snippets.rb
similarity index 100%
rename from features/steps/project/project_snippets.rb
rename to features/steps/project/snippets.rb
diff --git a/features/steps/project/project_team_management.rb b/features/steps/project/team_management.rb
similarity index 100%
rename from features/steps/project/project_team_management.rb
rename to features/steps/project/team_management.rb
diff --git a/features/steps/project/project_wall.rb b/features/steps/project/wall.rb
similarity index 100%
rename from features/steps/project/project_wall.rb
rename to features/steps/project/wall.rb
diff --git a/features/steps/project/project_wiki.rb b/features/steps/project/wiki.rb
similarity index 100%
rename from features/steps/project/project_wiki.rb
rename to features/steps/project/wiki.rb
diff --git a/features/steps/public/groups_feature.rb b/features/steps/public/groups_feature.rb
new file mode 100644
index 0000000000..015deca542
--- /dev/null
+++ b/features/steps/public/groups_feature.rb
@@ -0,0 +1,93 @@
+class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedPaths
+  include SharedGroup
+  include SharedProject
+
+  step 'group "TestGroup" has private project "Enterprise"' do
+    group_has_project("TestGroup", "Enterprise", Gitlab::VisibilityLevel::PRIVATE)
+  end
+
+  step 'group "TestGroup" has internal project "Internal"' do
+    group_has_project("TestGroup", "Internal", Gitlab::VisibilityLevel::INTERNAL)
+  end
+
+  step 'group "TestGroup" has public project "Community"' do
+    group_has_project("TestGroup", "Community", Gitlab::VisibilityLevel::PUBLIC)
+  end
+  
+  step '"John Doe" is owner of group "TestGroup"' do
+    group = Group.find_by(name: "TestGroup") || create(:group, name: "TestGroup")
+    user = create(:user, name: "John Doe")
+    group.add_user(user, Gitlab::Access::OWNER)
+  end
+
+  step 'I visit group "TestGroup" page' do
+    visit group_path(Group.find_by(name: "TestGroup"))
+  end
+
+  step 'I visit group "TestGroup" issues page' do
+    visit issues_group_path(Group.find_by(name: "TestGroup"))
+  end
+
+  step 'I visit group "TestGroup" merge requests page' do
+    visit merge_requests_group_path(Group.find_by(name: "TestGroup"))
+  end
+
+  step 'I visit group "TestGroup" members page' do
+    visit members_group_path(Group.find_by(name: "TestGroup"))
+  end
+  
+  step 'I should not see project "Enterprise" items' do
+    page.should_not have_content "Enterprise"
+  end
+  
+  step 'I should see project "Internal" items' do
+    page.should have_content "Internal"
+  end
+  
+  step 'I should not see project "Internal" items' do
+    page.should_not have_content "Internal"
+  end
+  
+  step 'I should see project "Community" items' do
+    page.should have_content "Community"
+  end
+  
+  step 'I change filter to Everyone\'s' do
+    click_link "Everyone's"
+  end
+  
+  step 'I should see group member "John Doe"' do
+    page.should have_content "John Doe"
+  end
+  
+  step 'I should not see member roles' do
+    page.body.should_not match(%r{owner|developer|reporter|guest}i)
+  end
+
+  protected
+
+  def group_has_project(groupname, projectname, visibility_level)
+    group = Group.find_by(name: groupname) || create(:group, name: groupname)
+    project = create(:project,
+      namespace: group,
+      name: projectname,
+      path: "#{groupname}-#{projectname}",
+      visibility_level: visibility_level
+    )
+    create(:issue,
+      title: "#{projectname} feature",
+      project: project
+    )
+    create(:merge_request,
+      title: "#{projectname} feature implemented",
+      source_project: project,
+      target_project: project
+    )
+    create(:closed_issue_event,
+      project: project
+    )
+  end
+end
+
diff --git a/features/steps/public/projects_feature.rb b/features/steps/public/projects.rb
similarity index 100%
rename from features/steps/public/projects_feature.rb
rename to features/steps/public/projects.rb
diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index 9c39a226e1..f80d8d0647 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -2,7 +2,7 @@ module SharedDiffNote
   include Spinach::DSL
 
   Given 'I cancel the diff comment' do
-    within(".file") do
+    within(".diff-file") do
       find(".js-close-discussion-note-form").click
     end
   end
@@ -13,14 +13,14 @@ module SharedDiffNote
   end
 
   Given 'I haven\'t written any diff comment text' do
-    within(".file") do
+    within(".diff-file") do
       fill_in "note[note]", with: ""
     end
   end
 
   Given 'I leave a diff comment like "Typo, please fix"' do
     find('a[data-line-code="586fb7c4e1add2d4d24e27566ed7064680098646_29_14"]').click
-    within(".file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_29_14']") do
+    within(".diff-file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_29_14']") do
       fill_in "note[note]", with: "Typo, please fix"
       find(".js-comment-button").trigger("click")
       sleep 0.05
@@ -29,7 +29,7 @@ module SharedDiffNote
 
   Given 'I preview a diff comment text like "Should fix it :smile:"' do
     find('a[data-line-code="586fb7c4e1add2d4d24e27566ed7064680098646_29_14"]').click
-    within(".file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_29_14']") do
+    within(".diff-file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_29_14']") do
       fill_in "note[note]", with: "Should fix it :smile:"
       find(".js-note-preview-button").trigger("click")
     end
@@ -38,7 +38,7 @@ module SharedDiffNote
   Given 'I preview another diff comment text like "DRY this up"' do
     find('a[data-line-code="586fb7c4e1add2d4d24e27566ed7064680098646_57_41"]').click
 
-    within(".file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_57_41']") do
+    within(".diff-file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_57_41']") do
       fill_in "note[note]", with: "DRY this up"
       find(".js-note-preview-button").trigger("click")
     end
@@ -53,13 +53,13 @@ module SharedDiffNote
   end
 
   Given 'I write a diff comment like ":-1: I don\'t like this"' do
-    within(".file") do
+    within(".diff-file") do
       fill_in "note[note]", with: ":-1: I don\'t like this"
     end
   end
 
   Given 'I submit the diff comment' do
-    within(".file") do
+    within(".diff-file") do
       click_button("Add Comment")
     end
   end
@@ -67,49 +67,49 @@ module SharedDiffNote
 
 
   Then 'I should not see the diff comment form' do
-    within(".file") do
+    within(".diff-file") do
       page.should_not have_css("form.new_note")
     end
   end
 
   Then 'I should not see the diff comment preview button' do
-    within(".file") do
+    within(".diff-file") do
       page.should have_css(".js-note-preview-button", visible: false)
     end
   end
 
   Then 'I should not see the diff comment text field' do
-    within(".file") do
+    within(".diff-file") do
       page.should have_css(".js-note-text", visible: false)
     end
   end
 
   Then 'I should only see one diff form' do
-    within(".file") do
+    within(".diff-file") do
       page.should have_css("form.new_note", count: 1)
     end
   end
 
   Then 'I should see a diff comment form with ":-1: I don\'t like this"' do
-    within(".file") do
+    within(".diff-file") do
       page.should have_field("note[note]", with: ":-1: I don\'t like this")
     end
   end
 
   Then 'I should see a diff comment saying "Typo, please fix"' do
-    within(".file .note") do
+    within(".diff-file .note") do
       page.should have_content("Typo, please fix")
     end
   end
 
   Then 'I should see a discussion reply button' do
-    within(".file") do
+    within(".diff-file") do
       page.should have_link("Reply")
     end
   end
 
   Then 'I should see a temporary diff comment form' do
-    within(".file") do
+    within(".diff-file") do
       page.should have_css(".js-temp-notes-holder form.new_note")
     end
   end
@@ -119,37 +119,37 @@ module SharedDiffNote
   end
 
   Then 'I should see an empty diff comment form' do
-    within(".file") do
+    within(".diff-file") do
       page.should have_field("note[note]", with: "")
     end
   end
 
   Then 'I should see the cancel comment button' do
-    within(".file form") do
+    within(".diff-file form") do
       page.should have_css(".js-close-discussion-note-form", text: "Cancel")
     end
   end
 
   Then 'I should see the diff comment preview' do
-    within(".file form") do
+    within(".diff-file form") do
       page.should have_css(".js-note-preview", visible: false)
     end
   end
 
   Then 'I should see the diff comment edit button' do
-    within(".file") do
+    within(".diff-file") do
       page.should have_css(".js-note-edit-button", visible: true)
     end
   end
 
   Then 'I should see the diff comment preview button' do
-    within(".file") do
+    within(".diff-file") do
       page.should have_css(".js-note-preview-button", visible: true)
     end
   end
 
   Then 'I should see two separate previews' do
-    within(".file") do
+    within(".diff-file") do
       page.should have_css(".js-note-preview", visible: true, count: 2)
       page.should have_content("Should fix it")
       page.should have_content("DRY this up")
diff --git a/features/steps/snippets/discover_snippets.rb b/features/steps/snippets/discover.rb
similarity index 100%
rename from features/steps/snippets/discover_snippets.rb
rename to features/steps/snippets/discover.rb
diff --git a/features/steps/snippets/user_snippets.rb b/features/steps/snippets/user.rb
similarity index 100%
rename from features/steps/snippets/user_snippets.rb
rename to features/steps/snippets/user.rb
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 1af0285e7c..1b57b2780a 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -38,6 +38,7 @@ module API
     mount Internal
     mount SystemHooks
     mount ProjectSnippets
+    mount ProjectMembers
     mount DeployKeys
     mount ProjectHooks
     mount Ldap
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 49746824a1..916839decc 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -15,7 +15,7 @@ module API
     end
 
     class UserSafe < Grape::Entity
-      expose :name
+      expose :name, :username
     end
 
     class UserBasic < Grape::Entity
@@ -44,7 +44,7 @@ module API
       expose :id, :description, :default_branch
       expose :public?, as: :public
       expose :visibility_level, :ssh_url_to_repo, :http_url_to_repo, :web_url
-      expose :owner, using: Entities::UserBasic
+      expose :owner, using: Entities::UserBasic, unless: ->(project, options) { project.group }
       expose :name, :name_with_namespace
       expose :path, :path_with_namespace
       expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at
@@ -58,18 +58,6 @@ module API
       end
     end
 
-    class TeamMember < UserBasic
-      expose :permission, as: :access_level do |user, options|
-        options[:user_team].user_team_user_relationships.find_by(user_id: user.id).permission
-      end
-    end
-
-    class TeamProject < Project
-      expose :greatest_access, as: :greatest_access_level do |project, options|
-        options[:user_team].user_team_project_relationships.find_by(project_id: project.id).greatest_access
-      end
-    end
-
     class Group < Grape::Entity
       expose :id, :name, :path, :owner_id, :ldap_cn, :ldap_access
     end
@@ -144,7 +132,7 @@ module API
     end
 
     class MergeRequest < ProjectEntity
-      expose :target_branch, :source_branch, :title, :state, :upvotes, :downvotes
+      expose :target_branch, :source_branch, :title, :state, :upvotes, :downvotes, :description
       expose :author, :assignee, using: Entities::UserBasic
       expose :source_project_id, :target_project_id
     end
@@ -183,5 +171,29 @@ module API
     class Namespace < Grape::Entity
       expose :id, :path, :kind
     end
+
+    class ProjectAccess < Grape::Entity
+      expose :project_access, as: :access_level
+      expose :notification_level
+    end
+
+    class GroupAccess < Grape::Entity
+      expose :group_access, as: :access_level
+      expose :notification_level
+    end
+
+    class ProjectWithAccess < Project
+      expose :permissions do
+        expose :project_access, using: Entities::ProjectAccess do |project, options|
+          project.users_projects.find_by(user_id: options[:user].id)
+        end
+
+        expose :group_access, using: Entities::GroupAccess do |project, options|
+          if project.group
+            project.group.users_groups.find_by(user_id: options[:user].id)
+          end
+        end
+      end
+    end
   end
 end
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index f8c48e2f3b..fc309f65a5 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -47,7 +47,7 @@ module API
     end
 
     def find_project(id)
-      project = Project.find_by(id: id) || Project.find_with_namespace(id)
+      project = Project.find_with_namespace(id) || Project.find_by(id: id)
 
       if project && can?(current_user, :read_project, project)
         project
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 58d2f79faf..e245819841 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -64,6 +64,7 @@ module API
       #   target_project           - The target project of the merge request defaults to the :id of the project
       #   assignee_id              - Assignee user ID
       #   title (required)         - Title of MR
+      #   description              - Description of MR
       #
       # Example:
       #   POST /projects/:id/merge_requests
@@ -72,7 +73,7 @@ module API
         set_current_user_for_thread do
           authorize! :write_merge_request, user_project
           required_attributes! [:source_branch, :target_branch, :title]
-          attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :target_project_id]
+          attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :target_project_id, :description]
           merge_request = user_project.merge_requests.new(attrs)
           merge_request.author = current_user
           merge_request.source_project = user_project
@@ -105,12 +106,13 @@ module API
       #   assignee_id                 - Assignee user ID
       #   title                       - Title of MR
       #   state_event                 - Status of MR. (close|reopen|merge)
+      #   description                 - Description of MR
       # Example:
       #   PUT /projects/:id/merge_request/:merge_request_id
       #
       put ":id/merge_request/:merge_request_id" do
         set_current_user_for_thread do
-          attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :state_event]
+          attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :state_event, :description]
           merge_request = user_project.merge_requests.find(params[:merge_request_id])
 
           authorize! :modify_merge_request, merge_request
diff --git a/lib/api/project_hooks.rb b/lib/api/project_hooks.rb
index c271dd8b61..79c3d122d3 100644
--- a/lib/api/project_hooks.rb
+++ b/lib/api/project_hooks.rb
@@ -5,15 +5,6 @@ module API
     before { authorize_admin_project }
 
     resource :projects do
-      helpers do
-        def handle_project_member_errors(errors)
-          if errors[:project_access].any?
-            error!(errors[:project_access], 422)
-          end
-          not_found!
-        end
-      end
-
       # Get project hooks
       #
       # Parameters:
diff --git a/lib/api/project_members.rb b/lib/api/project_members.rb
new file mode 100644
index 0000000000..47c4ddce16
--- /dev/null
+++ b/lib/api/project_members.rb
@@ -0,0 +1,114 @@
+module API
+  # Projects members API
+  class ProjectMembers < Grape::API
+    before { authenticate! }
+
+    resource :projects do
+      helpers do
+        def handle_project_member_errors(errors)
+          if errors[:project_access].any?
+            error!(errors[:project_access], 422)
+          end
+          not_found!
+        end
+      end
+
+      # Get a project team members
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   query         - Query string
+      # Example Request:
+      #   GET /projects/:id/members
+      get ":id/members" do
+        if params[:query].present?
+          @members = paginate user_project.users.where("username LIKE ?", "%#{params[:query]}%")
+        else
+          @members = paginate user_project.users
+        end
+        present @members, with: Entities::ProjectMember, project: user_project
+      end
+
+      # Get a project team members
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   user_id (required) - The ID of a user
+      # Example Request:
+      #   GET /projects/:id/members/:user_id
+      get ":id/members/:user_id" do
+        @member = user_project.users.find params[:user_id]
+        present @member, with: Entities::ProjectMember, project: user_project
+      end
+
+      # Add a new project team member
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   user_id (required) - The ID of a user
+      #   access_level (required) - Project access level
+      # Example Request:
+      #   POST /projects/:id/members
+      post ":id/members" do
+        authorize! :admin_project, user_project
+        required_attributes! [:user_id, :access_level]
+
+        # either the user is already a team member or a new one
+        team_member = user_project.team_member_by_id(params[:user_id])
+        if team_member.nil?
+          team_member = user_project.users_projects.new(
+            user_id: params[:user_id],
+            project_access: params[:access_level]
+          )
+        end
+
+        if team_member.save
+          @member = team_member.user
+          present @member, with: Entities::ProjectMember, project: user_project
+        else
+          handle_project_member_errors team_member.errors
+        end
+      end
+
+      # Update project team member
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   user_id (required) - The ID of a team member
+      #   access_level (required) - Project access level
+      # Example Request:
+      #   PUT /projects/:id/members/:user_id
+      put ":id/members/:user_id" do
+        authorize! :admin_project, user_project
+        required_attributes! [:access_level]
+
+        team_member = user_project.users_projects.find_by(user_id: params[:user_id])
+        not_found!("User can not be found") if team_member.nil?
+
+        if team_member.update_attributes(project_access: params[:access_level])
+          @member = team_member.user
+          present @member, with: Entities::ProjectMember, project: user_project
+        else
+          handle_project_member_errors team_member.errors
+        end
+      end
+
+      # Remove a team member from project
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   user_id (required) - The ID of a team member
+      # Example Request:
+      #   DELETE /projects/:id/members/:user_id
+      delete ":id/members/:user_id" do
+        authorize! :admin_project, user_project
+        team_member = user_project.users_projects.find_by(user_id: params[:user_id])
+        unless team_member.nil?
+          team_member.destroy
+        else
+          {message: "Access revoked", id: params[:user_id].to_i}
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 80a3f41f3d..fd4b009693 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -5,13 +5,6 @@ module API
 
     resource :projects do
       helpers do
-        def handle_project_member_errors(errors)
-          if errors[:project_access].any?
-            error!(errors[:project_access], 422)
-          end
-          not_found!
-        end
-
         def map_public_to_visibility_level(attrs)
           publik = attrs.delete(:public)
           publik = [ true, 1, '1', 't', 'T', 'true', 'TRUE', 'on', 'ON' ].include?(publik)
@@ -55,7 +48,7 @@ module API
       # Example Request:
       #   GET /projects/:id
       get ":id" do
-        present user_project, with: Entities::Project
+        present user_project, with: Entities::ProjectWithAccess, user: current_user
       end
 
       # Get a single project events
@@ -197,103 +190,6 @@ module API
         end
       end
 
-      # Get a project team members
-      #
-      # Parameters:
-      #   id (required) - The ID of a project
-      #   query         - Query string
-      # Example Request:
-      #   GET /projects/:id/members
-      get ":id/members" do
-        if params[:query].present?
-          @members = paginate user_project.users.where("username LIKE ?", "%#{params[:query]}%")
-        else
-          @members = paginate user_project.users
-        end
-        present @members, with: Entities::ProjectMember, project: user_project
-      end
-
-      # Get a project team members
-      #
-      # Parameters:
-      #   id (required) - The ID of a project
-      #   user_id (required) - The ID of a user
-      # Example Request:
-      #   GET /projects/:id/members/:user_id
-      get ":id/members/:user_id" do
-        @member = user_project.users.find params[:user_id]
-        present @member, with: Entities::ProjectMember, project: user_project
-      end
-
-      # Add a new project team member
-      #
-      # Parameters:
-      #   id (required) - The ID of a project
-      #   user_id (required) - The ID of a user
-      #   access_level (required) - Project access level
-      # Example Request:
-      #   POST /projects/:id/members
-      post ":id/members" do
-        authorize! :admin_project, user_project
-        required_attributes! [:user_id, :access_level]
-
-        # either the user is already a team member or a new one
-        team_member = user_project.team_member_by_id(params[:user_id])
-        if team_member.nil?
-          team_member = user_project.users_projects.new(
-            user_id: params[:user_id],
-            project_access: params[:access_level]
-          )
-        end
-
-        if team_member.save
-          @member = team_member.user
-          present @member, with: Entities::ProjectMember, project: user_project
-        else
-          handle_project_member_errors team_member.errors
-        end
-      end
-
-      # Update project team member
-      #
-      # Parameters:
-      #   id (required) - The ID of a project
-      #   user_id (required) - The ID of a team member
-      #   access_level (required) - Project access level
-      # Example Request:
-      #   PUT /projects/:id/members/:user_id
-      put ":id/members/:user_id" do
-        authorize! :admin_project, user_project
-        required_attributes! [:access_level]
-
-        team_member = user_project.users_projects.find_by(user_id: params[:user_id])
-        not_found!("User can not be found") if team_member.nil?
-
-        if team_member.update_attributes(project_access: params[:access_level])
-          @member = team_member.user
-          present @member, with: Entities::ProjectMember, project: user_project
-        else
-          handle_project_member_errors team_member.errors
-        end
-      end
-
-      # Remove a team member from project
-      #
-      # Parameters:
-      #   id (required) - The ID of a project
-      #   user_id (required) - The ID of a team member
-      # Example Request:
-      #   DELETE /projects/:id/members/:user_id
-      delete ":id/members/:user_id" do
-        authorize! :admin_project, user_project
-        team_member = user_project.users_projects.find_by(user_id: params[:user_id])
-        unless team_member.nil?
-          team_member.destroy
-        else
-          {message: "Access revoked", id: params[:user_id].to_i}
-        end
-      end
-
       # Share project with group
       #
       # Parameters:
diff --git a/lib/backup/database.rb b/lib/backup/database.rb
index ebb4f289c5..6552f45ff0 100644
--- a/lib/backup/database.rb
+++ b/lib/backup/database.rb
@@ -29,6 +29,8 @@ module Backup
         print "Restoring MySQL database #{config['database']} ... "
         system('mysql', *mysql_args, config['database'], in: db_file_name)
       when "postgresql" then
+        puts "Destructively rebuilding database schema for RAILS_ENV #{Rails.env}"
+        Rake::Task["db:schema:load"].invoke
         print "Restoring PostgreSQL database #{config['database']} ... "
         pg_env
         system('psql', config['database'], '-f', db_file_name)
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index efaefa4ce4..05814fc78f 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -7,8 +7,8 @@ module Backup
       s = {}
       s[:db_version]         = "#{ActiveRecord::Migrator.current_version}"
       s[:backup_created_at]  = Time.now
-      s[:gitlab_version]     = %x{git rev-parse HEAD}.gsub(/\n/,"")
-      s[:tar_version]        = %x{tar --version | head -1}.gsub(/\n/,"")
+      s[:gitlab_version]     = Gitlab::VERSION
+      s[:tar_version]        = tar_version
 
       Dir.chdir(Gitlab.config.backup.path)
 
@@ -87,22 +87,21 @@ module Backup
       settings = YAML.load_file("backup_information.yml")
       ENV["VERSION"] = "#{settings[:db_version]}" if settings[:db_version].to_i > 0
 
-      # backups directory is not always sub of Rails root and able to execute the git rev-parse below
-      begin
-        Dir.chdir(Rails.root)
-
-        # restoring mismatching backups can lead to unexpected problems
-        if settings[:gitlab_version] != %x{git rev-parse HEAD}.gsub(/\n/, "")
-          puts "GitLab version mismatch:".red
-          puts "  Your current HEAD differs from the HEAD in the backup!".red
-          puts "  Please switch to the following revision and try again:".red
-          puts "  revision: #{settings[:gitlab_version]}".red
-          exit 1
-        end
-      ensure
-        # chdir back to original intended dir
-        Dir.chdir(Gitlab.config.backup.path)
+      # restoring mismatching backups can lead to unexpected problems
+      if settings[:gitlab_version] != Gitlab::VERSION
+        puts "GitLab version mismatch:".red
+        puts "  Your current GitLab version (#{Gitlab::VERSION}) differs from the GitLab version in the backup!".red
+        puts "  Please switch to the following version and try again:".red
+        puts "  version: #{settings[:gitlab_version]}".red
+        puts
+        puts "Hint: git checkout v#{settings[:gitlab_version]}"
+        exit 1
       end
     end
+
+    def tar_version
+      tar_version, _ = Gitlab::Popen.popen(%W(tar --version))
+      tar_version.split("\n").first
+    end
   end
 end
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 20fd5ba92a..552f7eaa5c 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -72,8 +72,7 @@ module Backup
       end
 
       print 'Put GitLab hooks in repositories dirs'.yellow
-      gitlab_shell_user_home = File.expand_path("~#{Gitlab.config.gitlab_shell.ssh_user}")
-      if system("#{gitlab_shell_user_home}/gitlab-shell/support/rewrite-hooks.sh", Gitlab.config.gitlab_shell.repos_path)
+      if system("#{Gitlab.config.gitlab_shell.path}/support/rewrite-hooks.sh", Gitlab.config.gitlab_shell.repos_path)
         puts " [DONE]".green
       else
         puts " [FAILED]".red
diff --git a/lib/backup/uploads.rb b/lib/backup/uploads.rb
index e79da7e8fd..e50e1ff4f1 100644
--- a/lib/backup/uploads.rb
+++ b/lib/backup/uploads.rb
@@ -3,7 +3,7 @@ module Backup
     attr_reader :app_uploads_dir, :backup_uploads_dir, :backup_dir
 
     def initialize
-      @app_uploads_dir = Rails.root.join('public', 'uploads')
+      @app_uploads_dir = File.realpath(Rails.root.join('public', 'uploads'))
       @backup_dir = Gitlab.config.backup.path
       @backup_uploads_dir = File.join(Gitlab.config.backup.path, 'uploads')
     end
@@ -21,8 +21,9 @@ module Backup
     end
 
     def backup_existing_uploads_dir
+      timestamped_uploads_path = File.join(app_uploads_dir, '..', "uploads.#{Time.now.to_i}")
       if File.exists?(app_uploads_dir)
-        FileUtils.mv(app_uploads_dir, Rails.root.join('public', "uploads.#{Time.now.to_i}"))
+        FileUtils.mv(app_uploads_dir, timestamped_uploads_path)
       end
     end
   end
diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb
index 7121c8e40d..b93800e235 100644
--- a/lib/gitlab/backend/shell.rb
+++ b/lib/gitlab/backend/shell.rb
@@ -2,6 +2,12 @@ module Gitlab
   class Shell
     class AccessDenied < StandardError; end
 
+    class KeyAdder < Struct.new(:io)
+      def add_key(id, key)
+        io.puts("#{id}\t#{key.strip}")
+      end
+    end
+
     # Init new repository
     #
     # name - project path with namespace
@@ -130,6 +136,16 @@ module Gitlab
       system "#{gitlab_shell_path}/bin/gitlab-keys", "add-key", key_id, key_content
     end
 
+    # Batch-add keys to authorized_keys
+    #
+    # Ex.
+    #   batch_add_keys { |adder| adder.add_key("key-42", "sha-rsa ...") }
+    def batch_add_keys(&block)
+      IO.popen(%W(#{gitlab_shell_path}/bin/gitlab-keys batch-add-keys), 'w') do |io|
+        block.call(KeyAdder.new(io))
+      end
+    end
+
     # Remove ssh key from gitlab shell
     #
     # Ex.
diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
index 389eef3395..64cf3303ea 100644
--- a/lib/gitlab/logger.rb
+++ b/lib/gitlab/logger.rb
@@ -11,12 +11,14 @@ module Gitlab
     def self.read_latest
       path = Rails.root.join("log", file_name)
       self.build unless File.exist?(path)
-      logs = `tail -n 2000 #{path}`.split("\n")
+      tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path}))
+      tail_output.split("\n")
     end
 
     def self.read_latest_for filename
       path = Rails.root.join("log", filename)
-      logs = `tail -n 2000 #{path}`.split("\n")
+      tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path}))
+      tail_output.split("\n")
     end
 
     def self.build
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index dc9c0e0ab2..e72f4f5d0c 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -98,7 +98,7 @@ module Gitlab
       (?<prefix>\W)?                         # Prefix
       (                                      # Reference
          @(?<user>[a-zA-Z][a-zA-Z0-9_\-\.]*) # User name
-        |\#(?<issue>([a-zA-Z]+-)?\d+)        # Issue ID
+        |\#(?<issue>([a-zA-Z\-]+-)?\d+)      # Issue ID
         |!(?<merge_request>\d+)              # MR ID
         |\$(?<snippet>\d+)                   # Snippet ID
         |(?<commit>[\h]{6,40})               # Commit ID
diff --git a/lib/gitlab/popen.rb b/lib/gitlab/popen.rb
index 5283cf0b82..e2fbafb389 100644
--- a/lib/gitlab/popen.rb
+++ b/lib/gitlab/popen.rb
@@ -1,8 +1,16 @@
 require 'fileutils'
+require 'open3'
 
 module Gitlab
   module Popen
-    def popen(cmd, path)
+    extend self
+
+    def popen(cmd, path=nil)
+      unless cmd.is_a?(Array)
+        raise "System commands must be given as an array of strings"
+      end
+
+      path ||= Dir.pwd
       vars = { "PWD" => path }
       options = { chdir: path }
 
@@ -12,10 +20,10 @@ module Gitlab
 
       @cmd_output = ""
       @cmd_status = 0
-      Open3.popen3(vars, cmd, options) do |stdin, stdout, stderr, wait_thr|
-        @cmd_status = wait_thr.value.exitstatus
+      Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|
         @cmd_output << stdout.read
         @cmd_output << stderr.read
+        @cmd_status = wait_thr.value.exitstatus
       end
 
       return @cmd_output, @cmd_status
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index d18fc8bf2c..e932b64f4f 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -7,7 +7,7 @@ module Gitlab
     end
 
     def project_name_regex
-      /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/
+      /\A[a-zA-Z0-9_][a-zA-Z0-9_\-\. ]*\z/
     end
 
     def name_regex
@@ -49,7 +49,7 @@ module Gitlab
     protected
 
     def default_regex
-      /\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z/
+      /\A[.?]?[a-zA-Z0-9_][a-zA-Z0-9_\-\.]*(?<!\.git)\z/
     end
   end
 end
diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb
index 353c3024aa..bcf3012bd9 100644
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
@@ -33,7 +33,7 @@ module Gitlab
       end
 
       def create
-        output, status = popen("git clone #{project.repository.path_to_repo} #{path}",
+        output, status = popen(%W(git clone -- #{project.repository.path_to_repo} #{path}),
                                Gitlab.config.satellites.path)
 
         log("PID: #{project.id}: git clone #{project.repository.path_to_repo} #{path}")
diff --git a/lib/gitlab/seeder.rb b/lib/gitlab/seeder.rb
index 3aa3b2ba1e..39de1223b1 100644
--- a/lib/gitlab/seeder.rb
+++ b/lib/gitlab/seeder.rb
@@ -1,10 +1,29 @@
 module Gitlab
   class Seeder
     def self.quiet
+      mute_mailer
       SeedFu.quiet = true
       yield
       SeedFu.quiet = false
       puts "\nOK".green
     end
+
+    def self.by_user(user)
+      begin
+        Thread.current[:current_user] = user
+        yield
+      ensure
+        Thread.current[:current_user] = nil
+      end
+    end
+
+    def self.mute_mailer
+      code = <<-eos
+def Notify.delay
+  self
+end
+      eos
+      eval(code)
+    end
   end
 end
diff --git a/lib/gitlab/upgrader.rb b/lib/gitlab/upgrader.rb
index 3d0955f8ea..8b202ddc95 100644
--- a/lib/gitlab/upgrader.rb
+++ b/lib/gitlab/upgrader.rb
@@ -42,28 +42,33 @@ module Gitlab
     end
 
     def latest_version_raw
-      git_tags = `git ls-remote --tags origin | grep tags\/v#{current_version.major}`
-      git_tags = git_tags.lines.to_a.select { |version| version =~ /v\d\.\d\.\d-ee\Z/ }
+      remote_tags, _ = Gitlab::Popen.popen(%W(git ls-remote --tags origin))
+      git_tags = remote_tags.split("\n").grep(/tags\/v#{current_version.major}/)
+      git_tags = git_tags.select { |version| version =~ /v\d\.\d\.\d-ee\Z/ }
       last_tag = git_tags.last.match(/v\d\.\d\.\d-ee/).to_s
     end
 
     def update_commands
       {
-        "Stash changed files" => "git stash",
-        "Get latest code" => "git fetch",
-        "Switch to new version" => "git checkout v#{latest_version}-ee",
-        "Install gems" => "bundle",
-        "Migrate DB" => "bundle exec rake db:migrate RAILS_ENV=production",
-        "Recompile assets" => "bundle exec rake assets:clean assets:precompile RAILS_ENV=production",
-        "Clear cache" => "bundle exec rake cache:clear RAILS_ENV=production"
+        "Stash changed files" => %W(git stash),
+        "Get latest code" => %W(git fetch),
+        "Switch to new version" => %W(git checkout v#{latest_version}-ee),
+        "Install gems" => %W(bundle),
+        "Migrate DB" => %W(bundle exec rake db:migrate),
+        "Recompile assets" => %W(bundle exec rake assets:clean assets:precompile),
+        "Clear cache" => %W(bundle exec rake cache:clear)
       }
     end
 
+    def env
+      {'RAILS_ENV' => 'production'}
+    end
+
     def upgrade
       update_commands.each do |title, cmd|
         puts title
-        puts " -> #{cmd}"
-        if system(cmd)
+        puts " -> #{cmd.join(' ')}"
+        if system(env, *cmd)
           puts " -> OK"
         else
           puts " -> FAILED"
diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb
index 42f6316910..86d8b69b0e 100644
--- a/lib/redcarpet/render/gitlab_html.rb
+++ b/lib/redcarpet/render/gitlab_html.rb
@@ -24,7 +24,7 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
 
 <div class="highlighted-data #{h.user_color_scheme_class}">
   <div class="highlight">
-    <pre><code class="#{language}">#{code}</code></pre>
+    <pre><code class="#{language}">#{h.send(:html_escape, code)}</code></pre>
   </div>
 </div>
 
@@ -46,8 +46,10 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
   end
 
   def preprocess(full_document)
-    if @project
-      h.create_relative_links(full_document, @project, @ref, @request_path, is_wiki?)
+    if is_wiki?
+      full_document
+    elsif @project
+      h.create_relative_links(full_document, @project, @ref, @request_path)
     else
       full_document
     end
diff --git a/lib/support/deploy/deploy.sh b/lib/support/deploy/deploy.sh
index b96f73058b..4684957233 100755
--- a/lib/support/deploy/deploy.sh
+++ b/lib/support/deploy/deploy.sh
@@ -28,7 +28,7 @@ sudo -u git -H git pull origin master
 echo 'Deploy: Bundle and migrate'
 
 # change it to your needs
-sudo -u git -H bundle --without aws development test postgres --deployment
+sudo -u git -H bundle --without aws development test mysql --deployment
 
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
@@ -42,4 +42,4 @@ echo 'Deploy: Starting GitLab server...'
 sudo service gitlab start
 
 sudo -u git -H rm /home/git/gitlab/public/index.html
-echo 'Deploy: Done'
\ No newline at end of file
+echo 'Deploy: Done'
diff --git a/lib/support/logrotate/gitlab b/lib/support/logrotate/gitlab
index df9398d079..d9b07b61ec 100644
--- a/lib/support/logrotate/gitlab
+++ b/lib/support/logrotate/gitlab
@@ -2,21 +2,19 @@
 # based on: http://stackoverflow.com/a/4883967
 
 /home/git/gitlab/log/*.log {
-    weekly
+    daily
     missingok
-    rotate 52
+    rotate 90
     compress
-    delaycompress
     notifempty
     copytruncate
 }
 
 /home/git/gitlab-shell/gitlab-shell.log {
-    weekly
+    daily
     missingok
-    rotate 52
+    rotate 90
     compress
-    delaycompress
     notifempty
     copytruncate
 }
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index 882f038604..7a0f3efbb5 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -27,7 +27,7 @@ server {
   
   # Increase this if you want to upload large attachments
   # Or if you want to accept large git objects over http
-  client_max_body_size 5m;
+  client_max_body_size 20m;
 
   # individual nginx logs for this gitlab vhost
   access_log  /var/log/nginx/gitlab_access.log;
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 7d3602211c..058c741704 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -1,10 +1,10 @@
+task dev: ["dev:setup"]
+
 namespace :dev do
   desc "GITLAB | Setup developer environment (db, fixtures)"
   task :setup => :environment do
     ENV['force'] = 'yes'
-    Rake::Task["db:setup"].invoke
-    Rake::Task["db:seed_fu"].invoke
+    Rake::Task["gitlab:setup"].invoke
     Rake::Task["gitlab:shell:setup"].invoke
   end
 end
-
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index c91dedf74c..64ff7330d7 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -17,6 +17,7 @@ namespace :gitlab do
       check_database_config_exists
       check_database_is_not_sqlite
       check_migrations_are_up
+      check_orphaned_users_groups
       check_gitlab_config_exists
       check_gitlab_config_not_outdated
       check_log_writable
@@ -168,7 +169,7 @@ namespace :gitlab do
     def check_migrations_are_up
       print "All migrations up? ... "
 
-      migration_status =  `bundle exec rake db:migrate:status`
+      migration_status, _ = Gitlab::Popen.popen(%W(bundle exec rake db:migrate:status))
 
       unless migration_status =~ /down\s+\d{14}/
         puts "yes".green
@@ -181,6 +182,19 @@ namespace :gitlab do
       end
     end
 
+    def check_orphaned_users_groups
+      print "Database contains orphaned UsersGroups? ... "
+      if UsersGroup.where("user_id not in (select id from users)").count > 0
+        puts "yes".red
+        try_fixing_it(
+          "You can delete the orphaned records using something along the lines of:",
+          sudo_gitlab("bundle exec rails runner -e production 'UsersGroup.where(\"user_id NOT IN (SELECT id FROM users)\").delete_all'")
+        )
+      else
+        puts "no".green
+      end
+    end
+
     def check_satellites_exist
       print "Projects have satellites? ... "
 
@@ -255,7 +269,7 @@ namespace :gitlab do
     def check_redis_version
       print "Redis version >= 2.0.0? ... "
 
-      if run_and_match("redis-cli --version", /redis-cli 2.\d.\d/)
+      if run_and_match(%W(redis-cli --version), /redis-cli 2.\d.\d/)
         puts "yes".green
       else
         puts "no".red
@@ -295,7 +309,7 @@ namespace :gitlab do
         "user.email" => Gitlab.config.gitlab.email_from
       }
       correct_options = options.map do |name, value|
-        run("git config --global --get #{name}").try(:squish) == value
+        run(%W(git config --global --get #{name})).try(:squish) == value
       end
 
       if correct_options.all?
@@ -489,7 +503,7 @@ namespace :gitlab do
               "sudo -u #{gitlab_shell_ssh_user} ln -sf #{gitlab_shell_hook_file} #{project_hook_file}"
             )
             for_more_information(
-              "#{gitlab_shell_user_home}/gitlab-shell/support/rewrite-hooks.sh"
+              "#{gitlab_shell_path}/support/rewrite-hooks.sh"
             )
             fix_and_rerun
             next
@@ -513,7 +527,7 @@ namespace :gitlab do
     end
 
     def check_gitlab_shell_self_test
-      gitlab_shell_repo_base = File.expand_path('gitlab-shell', gitlab_shell_user_home)
+      gitlab_shell_repo_base = gitlab_shell_path
       check_cmd = File.expand_path('bin/check', gitlab_shell_repo_base)
       puts "Running #{check_cmd}"
       if system(check_cmd, chdir: gitlab_shell_repo_base)
@@ -559,8 +573,8 @@ namespace :gitlab do
     # Helper methods
     ########################
 
-    def gitlab_shell_user_home
-      File.expand_path("~#{Gitlab.config.gitlab_shell.ssh_user}")
+    def gitlab_shell_path
+      Gitlab.config.gitlab_shell.path
     end
 
     def gitlab_shell_version
@@ -628,7 +642,8 @@ namespace :gitlab do
     end
 
     def sidekiq_process_count
-      `ps ux`.scan(/sidekiq \d+\.\d+\.\d+/).count
+      ps_ux, _ = Gitlab::Popen.popen(%W(ps ux))
+      ps_ux.scan(/sidekiq \d+\.\d+\.\d+/).count
     end
   end
 
@@ -726,7 +741,7 @@ namespace :gitlab do
   end
 
   def check_gitlab_shell
-    required_version = Gitlab::VersionInfo.new(1, 7, 9)
+    required_version = Gitlab::VersionInfo.new(1, 8, 5)
     current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
 
     print "GitLab Shell version >= #{required_version} ? ... "
@@ -739,7 +754,7 @@ namespace :gitlab do
 
   def check_git_version
     required_version = Gitlab::VersionInfo.new(1, 7, 10)
-    current_version = Gitlab::VersionInfo.parse(run("#{Gitlab.config.git.bin_path} --version"))
+    current_version = Gitlab::VersionInfo.parse(run(%W(#{Gitlab.config.git.bin_path} --version)))
 
     puts "Your git bin path is \"#{Gitlab.config.git.bin_path}\""
     print "Git version >= #{required_version} ? ... "
diff --git a/lib/tasks/gitlab/generate_docs.rake b/lib/tasks/gitlab/generate_docs.rake
index 58795fac4a..332cd61f84 100644
--- a/lib/tasks/gitlab/generate_docs.rake
+++ b/lib/tasks/gitlab/generate_docs.rake
@@ -1,7 +1,7 @@
 namespace :gitlab do
   desc "GITLAB | Generate sdocs for project"
   task generate_docs: :environment do
-    system("bundle exec sdoc -o doc/code app lib")
+    system(*%W(bundle exec sdoc -o doc/code app lib))
   end
 end
 
diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake
index ea83efcd88..690f414f3b 100644
--- a/lib/tasks/gitlab/info.rake
+++ b/lib/tasks/gitlab/info.rake
@@ -4,20 +4,20 @@ namespace :gitlab do
     task info: :environment  do
 
       # check if there is an RVM environment
-      rvm_version = run_and_match("rvm --version", /[\d\.]+/).try(:to_s)
+      rvm_version = run_and_match(%W(rvm --version), /[\d\.]+/).try(:to_s)
       # check Ruby version
-      ruby_version = run_and_match("ruby --version", /[\d\.p]+/).try(:to_s)
+      ruby_version = run_and_match(%W(ruby --version), /[\d\.p]+/).try(:to_s)
       # check Gem version
-      gem_version = run("gem --version")
+      gem_version = run(%W(gem --version))
       # check Bundler version
-      bunder_version = run_and_match("bundle --version", /[\d\.]+/).try(:to_s)
+      bunder_version = run_and_match(%W(bundle --version), /[\d\.]+/).try(:to_s)
       # check Bundler version
-      rake_version = run_and_match("rake --version", /[\d\.]+/).try(:to_s)
+      rake_version = run_and_match(%W(rake --version), /[\d\.]+/).try(:to_s)
 
       puts ""
       puts "System information".yellow
       puts "System:\t\t#{os_name || "unknown".red}"
-      puts "Current User:\t#{`whoami`}"
+      puts "Current User:\t#{run(%W(whoami))}"
       puts "Using RVM:\t#{rvm_version.present? ? "yes".green : "no"}"
       puts "RVM Version:\t#{rvm_version}" if rvm_version.present?
       puts "Ruby Version:\t#{ruby_version || "unknown".red}"
diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake
index 2b730774e0..853994dd67 100644
--- a/lib/tasks/gitlab/setup.rake
+++ b/lib/tasks/gitlab/setup.rake
@@ -15,6 +15,14 @@ namespace :gitlab do
     end
 
     Rake::Task["db:setup"].invoke
+
+    config = YAML.load_file(File.join(Rails.root,'config','database.yml'))[Rails.env]
+    success = case config["adapter"]
+              when /^mysql/ then
+                Rake::Task["add_limits_mysql"].invoke
+              when "postgresql" then
+              end
+
     Rake::Task["db:seed_fu"].invoke
   rescue Gitlab::TaskAbortedByUserError
     puts "Quitting...".red
diff --git a/lib/tasks/gitlab/shell.rake b/lib/tasks/gitlab/shell.rake
index 0d7a390bc9..08de0f2dd5 100644
--- a/lib/tasks/gitlab/shell.rake
+++ b/lib/tasks/gitlab/shell.rake
@@ -34,14 +34,18 @@ namespace :gitlab do
 
     Gitlab::Shell.new.remove_all_keys
 
-    Key.find_each(batch_size: 1000) do |key|
-      if Gitlab::Shell.new.add_key(key.shell_id, key.key)
+    Gitlab::Shell.new.batch_add_keys do |adder|
+      Key.find_each(batch_size: 1000) do |key|
+        adder.add_key(key.shell_id, key.key)
         print '.'
-      else
-        print 'F'
       end
     end
 
+    unless $?.success?
+      puts "Failed to add keys...".red
+      exit 1
+    end
+
   rescue Gitlab::TaskAbortedByUserError
     puts "Quitting...".red
     exit 1
diff --git a/lib/tasks/gitlab/task_helpers.rake b/lib/tasks/gitlab/task_helpers.rake
index c46d5855fa..da61c6e007 100644
--- a/lib/tasks/gitlab/task_helpers.rake
+++ b/lib/tasks/gitlab/task_helpers.rake
@@ -28,7 +28,7 @@ namespace :gitlab do
   # It will primarily use lsb_relase to determine the OS.
   # It has fallbacks to Debian, SuSE, OS X and systems running systemd.
   def os_name
-    os_name = run("lsb_release -irs")
+    os_name = run(%W(lsb_release -irs))
     os_name ||= if File.readable?('/etc/system-release')
                   File.read('/etc/system-release')
                 end
@@ -39,7 +39,7 @@ namespace :gitlab do
     os_name ||= if File.readable?('/etc/SuSE-release')
                   File.read('/etc/SuSE-release')
                 end
-    os_name ||= if os_x_version = run("sw_vers -productVersion")
+    os_name ||= if os_x_version = run(%W(sw_vers -productVersion))
                   "Mac OS X #{os_x_version}"
                 end
     os_name ||= if File.readable?('/etc/os-release')
@@ -80,13 +80,14 @@ namespace :gitlab do
   #
   # see also #run_and_match
   def run(command)
-    unless `#{command} 2>/dev/null`.blank?
-      `#{command}`
-    end
+    output, _ = Gitlab::Popen.popen(command)
+    output
+  rescue Errno::ENOENT
+    '' # if the command does not exist, return an empty string
   end
 
   def uid_for(user_name)
-    run("id -u #{user_name}").chomp.to_i
+    run(%W(id -u #{user_name})).chomp.to_i
   end
 
   def gid_for(group_name)
@@ -100,7 +101,7 @@ namespace :gitlab do
   def warn_user_is_not_gitlab
     unless @warned_user_not_gitlab
       gitlab_user = Gitlab.config.gitlab.user
-      current_user = run("whoami").chomp
+      current_user = run(%W(whoami)).chomp
       unless current_user == gitlab_user
         puts "#{Colored.color(:black)+Colored.color(:on_yellow)} Warning #{Colored.extra(:clear)}"
         puts "  You are running as user #{current_user.magenta}, we hope you know what you are doing."
diff --git a/lib/tasks/gitlab/test.rake b/lib/tasks/gitlab/test.rake
index 011748c971..2c9b997893 100644
--- a/lib/tasks/gitlab/test.rake
+++ b/lib/tasks/gitlab/test.rake
@@ -2,15 +2,13 @@ namespace :gitlab do
   desc "GITLAB | Run all tests"
   task :test do
     cmds = [
-      "rake db:setup",
-      "rake db:seed_fu",
-      "rake spinach",
-      "rake spec",
-      "rake jasmine:ci"
+      %W(rake spinach),
+      %W(rake spec),
+      %W(rake jasmine:ci)
     ]
 
     cmds.each do |cmd|
-      system(cmd + " RAILS_ENV=test")
+      system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
 
       raise "#{cmd} failed!" unless $?.exitstatus.zero?
     end
diff --git a/lib/tasks/migrate/add_limits_mysql.rake b/lib/tasks/migrate/add_limits_mysql.rake
new file mode 100644
index 0000000000..46b6451752
--- /dev/null
+++ b/lib/tasks/migrate/add_limits_mysql.rake
@@ -0,0 +1,14 @@
+desc "GITLAB | Add limits to strings in mysql database"
+task add_limits_mysql: :environment do
+  puts "Adding limits to schema.rb for mysql"
+  LimitsToMysql.new.up
+end
+
+class LimitsToMysql < ActiveRecord::Migration
+  def up
+    change_column :merge_request_diffs, :st_commits, :text, limit: 2147483647
+    change_column :merge_request_diffs, :st_diffs, :text, limit: 2147483647
+    change_column :snippets, :content, :text, limit: 2147483647
+    change_column :notes, :st_diff, :text, limit: 2147483647
+  end
+end
diff --git a/lib/tasks/sidekiq.rake b/lib/tasks/sidekiq.rake
index e91678473a..ba806e53cc 100644
--- a/lib/tasks/sidekiq.rake
+++ b/lib/tasks/sidekiq.rake
@@ -1,21 +1,21 @@
 namespace :sidekiq do
   desc "GITLAB | Stop sidekiq"
   task :stop do
-    system "script/background_jobs stop"
+    system *%W(script/background_jobs stop)
   end
 
   desc "GITLAB | Start sidekiq"
   task :start do
-    system "script/background_jobs start"
+    system *%W(script/background_jobs start)
   end
 
   desc 'GitLab | Restart sidekiq'
   task :restart do
-    system "script/background_jobs restart"
+    system *%W(script/background_jobs restart)
   end
 
   desc "GITLAB | Start sidekiq with launchd on Mac OS X"
   task :launchd do
-    system "script/background_jobs start_no_deamonize"
+    system *%W(script/background_jobs start_no_deamonize)
   end
 end
diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake
new file mode 100644
index 0000000000..90a1809914
--- /dev/null
+++ b/lib/tasks/spec.rake
@@ -0,0 +1,14 @@
+Rake::Task["spec"].clear if Rake::Task.task_defined?('spec')
+
+desc "GITLAB | Run specs"
+task :spec do
+  cmds = [
+    %W(rake gitlab:setup),
+    %W(rspec spec),
+  ]
+
+  cmds.each do |cmd|
+    system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
+    raise "#{cmd} failed!" unless $?.exitstatus.zero?
+  end
+end
diff --git a/lib/tasks/spinach.rake b/lib/tasks/spinach.rake
new file mode 100644
index 0000000000..c23d0e0e18
--- /dev/null
+++ b/lib/tasks/spinach.rake
@@ -0,0 +1,14 @@
+Rake::Task["spinach"].clear if Rake::Task.task_defined?('spinach')
+
+desc "GITLAB | Run spinach"
+task :spinach do
+  cmds = [
+    %W(rake gitlab:setup),
+    %W(spinach),
+  ]
+
+  cmds.each do |cmd|
+    system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
+    raise "#{cmd} failed!" unless $?.exitstatus.zero?
+  end
+end
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
new file mode 100644
index 0000000000..f19da1bb43
--- /dev/null
+++ b/lib/tasks/test.rake
@@ -0,0 +1,6 @@
+Rake::Task["test"].clear
+
+desc "GITLAB | Run all tests"
+task :test do
+  Rake::Task["gitlab:test"].invoke
+end
diff --git a/spec/factories.rb b/spec/factories.rb
index 37436e53b9..7fc2b7c5e9 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -34,6 +34,16 @@ FactoryGirl.define do
     creator
   end
 
+  # Generates a test repository from the repository stored under `spec/seed_project.tar.gz`.
+  # Once you run `rake gitlab:setup`, you can see what the repository looks like under `tmp/repositories/gitlabhq`.
+  # In order to modify files in the repository, you must untar the seed, modify and remake the tar.
+  # Before recompressing, do not forget to `git checkout master`.
+  # After recompressing, you need to run `RAILS_ENV=test bundle exec rake gitlab:setup` to regenerate the seeds under tmp.
+  #
+  # If you want to modify the repository only for an specific type of tests, e.g., markdown tests,
+  # consider using a feature branch to reduce the chances of collision with other tests.
+  # Create a new commit, and use the same commit message that you will use for the change in the main repo.
+  # Changing the commig message and SHA of branch `master` may break tests.
   factory :project, parent: :empty_project do
     path { 'gitlabhq' }
 
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index ffe6d02d2f..b9dab7846b 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -43,6 +43,31 @@ describe "Issues" do
         page.should have_content project.name
       end
     end
+
+  end
+
+  describe "Editing issue assignee" do
+    let!(:issue) do
+      create(:issue,
+             author: @user,
+             assignee: @user,
+             project: project)
+    end
+
+    it 'allows user to select unasigned', :js => true do
+      visit edit_project_issue_path(project, issue)
+
+      page.should have_content "Assign to #{@user.name}"
+
+      page.first('#s2id_issue_assignee_id').click
+      sleep 2 # wait for ajax stuff to complete
+      page.first('.user-result').click
+
+      click_button "Save changes"
+
+      page.should have_content "Assignee: Select assignee"
+      issue.reload.assignee.should be_nil
+    end
   end
 
   describe "Filter issue" do
@@ -245,6 +270,28 @@ describe "Issues" do
         page.should have_content milestone.title
       end
     end
+
+    describe 'removing assignee' do
+      let(:user2) { create(:user) }
+
+      before :each do
+        issue.assignee = user2
+        issue.save
+      end
+
+      it 'allows user to remove assignee', :js => true do
+        visit project_issue_path(project, issue)
+        page.should have_content "Assignee: #{user2.name}"
+
+        page.first('#s2id_issue_assignee_id').click
+        sleep 2 # wait for ajax stuff to complete
+        page.first('.user-result').click
+
+        page.should have_content "Assignee: Unassigned"
+        sleep 2 # wait for ajax stuff to complete
+        issue.reload.assignee.should be_nil
+      end
+    end
   end
 
   def first_issue
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index da723ae39b..a3d8c462bf 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -166,7 +166,7 @@ describe "On a merge request diff", js: true, focus: true do
       end
 
       it "should be removed when canceled" do
-        within(".file form[rel$='4735dfc552ad7bf15ca468adc3cad9d05b624490_172_185']") do
+        within(".diff-file form[rel$='4735dfc552ad7bf15ca468adc3cad9d05b624490_172_185']") do
           find(".js-close-discussion-note-form").trigger("click")
         end
 
diff --git a/spec/features/security/group_access_spec.rb b/spec/features/security/group/group_access_spec.rb
similarity index 98%
rename from spec/features/security/group_access_spec.rb
rename to spec/features/security/group/group_access_spec.rb
index dea957962a..c262d76ab5 100644
--- a/spec/features/security/group_access_spec.rb
+++ b/spec/features/security/group/group_access_spec.rb
@@ -14,6 +14,7 @@ describe "Group access" do
     let(:master)   { create(:user) }
     let(:reporter) { create(:user) }
     let(:guest)    { create(:user) }
+    let(:nonmember)  { create(:user) }
 
     before do
       group.add_user(owner, Gitlab::Access::OWNER)
diff --git a/spec/features/security/group/internal_group_access_spec.rb b/spec/features/security/group/internal_group_access_spec.rb
new file mode 100644
index 0000000000..0c354f0245
--- /dev/null
+++ b/spec/features/security/group/internal_group_access_spec.rb
@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe "Group with internal project access" do
+  describe "Group" do
+    let(:group) { create(:group) }
+
+    let(:owner)   { create(:owner) }
+    let(:master)   { create(:user) }
+    let(:reporter) { create(:user) }
+    let(:guest)    { create(:user) }
+    let(:nonmember)  { create(:user) }
+
+    before do
+      group.add_user(owner, Gitlab::Access::OWNER)
+      group.add_user(master, Gitlab::Access::MASTER)
+      group.add_user(reporter, Gitlab::Access::REPORTER)
+      group.add_user(guest, Gitlab::Access::GUEST)
+
+      create(:project, group: group, visibility_level: Gitlab::VisibilityLevel::INTERNAL)
+    end
+
+    describe "GET /groups/:path" do
+      subject { group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for guest }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /groups/:path/issues" do
+      subject { issues_group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for guest }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /groups/:path/merge_requests" do
+      subject { merge_requests_group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for guest }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /groups/:path/members" do
+      subject { members_group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for guest }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /groups/:path/edit" do
+      subject { edit_group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_denied_for master }
+      it { should be_denied_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+  end
+end
diff --git a/spec/features/security/group/mixed_group_access_spec.rb b/spec/features/security/group/mixed_group_access_spec.rb
new file mode 100644
index 0000000000..82e816e388
--- /dev/null
+++ b/spec/features/security/group/mixed_group_access_spec.rb
@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+describe "Group access" do
+  describe "Group" do
+    let(:group) { create(:group) }
+
+    let(:owner)   { create(:owner) }
+    let(:master)   { create(:user) }
+    let(:reporter) { create(:user) }
+    let(:guest)    { create(:user) }
+    let(:nonmember)  { create(:user) }
+
+    before do
+      group.add_user(owner, Gitlab::Access::OWNER)
+      group.add_user(master, Gitlab::Access::MASTER)
+      group.add_user(reporter, Gitlab::Access::REPORTER)
+      group.add_user(guest, Gitlab::Access::GUEST)
+
+      create(:project, path: "internal_project", group: group, visibility_level: Gitlab::VisibilityLevel::INTERNAL)
+      create(:project, path: "public_project", group: group, visibility_level: Gitlab::VisibilityLevel::PUBLIC)
+    end
+
+    describe "GET /groups/:path" do
+      subject { group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for guest }
+      it { should be_allowed_for :user }
+      it { should be_allowed_for :visitor }
+    end
+
+    describe "GET /groups/:path/issues" do
+      subject { issues_group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for guest }
+      it { should be_allowed_for :user }
+      it { should be_allowed_for :visitor }
+    end
+
+    describe "GET /groups/:path/merge_requests" do
+      subject { merge_requests_group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for guest }
+      it { should be_allowed_for :user }
+      it { should be_allowed_for :visitor }
+    end
+
+    describe "GET /groups/:path/members" do
+      subject { members_group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for guest }
+      it { should be_allowed_for :user }
+      it { should be_allowed_for :visitor }
+    end
+
+    describe "GET /groups/:path/edit" do
+      subject { edit_group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_denied_for master }
+      it { should be_denied_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+  end
+end
diff --git a/spec/features/security/group/public_group_access_spec.rb b/spec/features/security/group/public_group_access_spec.rb
new file mode 100644
index 0000000000..a9c0afbb60
--- /dev/null
+++ b/spec/features/security/group/public_group_access_spec.rb
@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe "Group with public project access" do
+  describe "Group" do
+    let(:group) { create(:group) }
+
+    let(:owner)   { create(:owner) }
+    let(:master)   { create(:user) }
+    let(:reporter) { create(:user) }
+    let(:guest)    { create(:user) }
+    let(:nonmember)  { create(:user) }
+
+    before do
+      group.add_user(owner, Gitlab::Access::OWNER)
+      group.add_user(master, Gitlab::Access::MASTER)
+      group.add_user(reporter, Gitlab::Access::REPORTER)
+      group.add_user(guest, Gitlab::Access::GUEST)
+
+      create(:project, group: group, visibility_level: Gitlab::VisibilityLevel::PUBLIC)
+    end
+
+    describe "GET /groups/:path" do
+      subject { group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for guest }
+      it { should be_allowed_for :user }
+      it { should be_allowed_for :visitor }
+    end
+
+    describe "GET /groups/:path/issues" do
+      subject { issues_group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for guest }
+      it { should be_allowed_for :user }
+      it { should be_allowed_for :visitor }
+    end
+
+    describe "GET /groups/:path/merge_requests" do
+      subject { merge_requests_group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for guest }
+      it { should be_allowed_for :user }
+      it { should be_allowed_for :visitor }
+    end
+
+    describe "GET /groups/:path/members" do
+      subject { members_group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for guest }
+      it { should be_allowed_for :user }
+      it { should be_allowed_for :visitor }
+    end
+
+    describe "GET /groups/:path/edit" do
+      subject { edit_group_path(group) }
+
+      it { should be_allowed_for owner }
+      it { should be_denied_for master }
+      it { should be_denied_for reporter }
+      it { should be_allowed_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+  end
+end
diff --git a/spec/services/filtering_service_spec.rb b/spec/finders/issues_finder_spec.rb
similarity index 51%
rename from spec/services/filtering_service_spec.rb
rename to spec/finders/issues_finder_spec.rb
index 92971d0be1..7489e56f42 100644
--- a/spec/services/filtering_service_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -1,13 +1,10 @@
 require 'spec_helper'
 
-describe FilteringService do
+describe IssuesFinder do
   let(:user) { create :user }
   let(:user2) { create :user }
   let(:project1) { create(:project) }
   let(:project2) { create(:project) }
-  let(:merge_request1) { create(:merge_request, author: user, source_project: project1, target_project: project2) }
-  let(:merge_request2) { create(:merge_request, author: user, source_project: project2, target_project: project1) }
-  let(:merge_request3) { create(:merge_request, author: user, source_project: project2, target_project: project2) }
   let(:issue1) { create(:issue, assignee: user, project: project1) }
   let(:issue2) { create(:issue, assignee: user, project: project2) }
   let(:issue3) { create(:issue, assignee: user2, project: project2) }
@@ -18,27 +15,7 @@ describe FilteringService do
     project2.team << [user2, :developer]
   end
 
-  describe 'merge requests' do
-    before :each do
-      merge_request1
-      merge_request2
-      merge_request3
-    end
-
-    it 'should filter by scope' do
-      params = { scope: 'authored', state: 'opened' }
-      merge_requests = FilteringService.new.execute(MergeRequest, user, params)
-      merge_requests.size.should == 3
-    end
-
-    it 'should filter by project' do
-      params = { project_id: project1.id, scope: 'authored', state: 'opened' }
-      merge_requests = FilteringService.new.execute(MergeRequest, user, params)
-      merge_requests.size.should == 1
-    end
-  end
-
-  describe 'issues' do
+  describe :execute do
     before :each do
       issue1
       issue2
@@ -47,31 +24,31 @@ describe FilteringService do
 
     it 'should filter by all' do
       params = { scope: "all", state: 'opened' }
-      issues = FilteringService.new.execute(Issue, user, params)
+      issues = IssuesFinder.new.execute(user, params)
       issues.size.should == 3
     end
 
     it 'should filter by assignee' do
       params = { scope: "assigned-to-me", state: 'opened' }
-      issues = FilteringService.new.execute(Issue, user, params)
+      issues = IssuesFinder.new.execute(user, params)
       issues.size.should == 2
     end
 
     it 'should filter by project' do
       params = { scope: "assigned-to-me", state: 'opened', project_id: project1.id }
-      issues = FilteringService.new.execute(Issue, user, params)
+      issues = IssuesFinder.new.execute(user, params)
       issues.size.should == 1
     end
 
     it 'should be empty for unauthorized user' do
       params = { scope: "all", state: 'opened' }
-      issues = FilteringService.new.execute(Issue, nil, params)
+      issues = IssuesFinder.new.execute(nil, params)
       issues.size.should be_zero
     end
 
     it 'should not include unauthorized issues' do
       params = { scope: "all", state: 'opened' }
-      issues = FilteringService.new.execute(Issue, user2, params)
+      issues = IssuesFinder.new.execute(user2, params)
       issues.size.should == 2
       issues.should_not include(issue1)
       issues.should include(issue2)
diff --git a/spec/finders/merge_requests_finder_spec.rb b/spec/finders/merge_requests_finder_spec.rb
new file mode 100644
index 0000000000..76f9e753dd
--- /dev/null
+++ b/spec/finders/merge_requests_finder_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe MergeRequestsFinder do
+  let(:user) { create :user }
+  let(:user2) { create :user }
+  let(:project1) { create(:project) }
+  let(:project2) { create(:project) }
+  let(:merge_request1) { create(:merge_request, author: user, source_project: project1, target_project: project2) }
+  let(:merge_request2) { create(:merge_request, author: user, source_project: project2, target_project: project1) }
+  let(:merge_request3) { create(:merge_request, author: user, source_project: project2, target_project: project2) }
+
+  before do
+    project1.team << [user, :master]
+    project2.team << [user, :developer]
+    project2.team << [user2, :developer]
+  end
+
+  describe :execute do
+    before :each do
+      merge_request1
+      merge_request2
+      merge_request3
+    end
+
+    it 'should filter by scope' do
+      params = { scope: 'authored', state: 'opened' }
+      merge_requests = MergeRequestsFinder.new.execute(user, params)
+      merge_requests.size.should == 3
+    end
+
+    it 'should filter by project' do
+      params = { project_id: project1.id, scope: 'authored', state: 'opened' }
+      merge_requests = MergeRequestsFinder.new.execute(user, params)
+      merge_requests.size.should == 1
+    end
+  end
+end
diff --git a/spec/finders/projects_finder_spec.rb b/spec/finders/projects_finder_spec.rb
new file mode 100644
index 0000000000..cc6ee82ab7
--- /dev/null
+++ b/spec/finders/projects_finder_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe ProjectsFinder do
+  let(:user) { create :user }
+  let(:group) { create :group }
+
+  let(:project1) { create(:empty_project, group: group, visibility_level: Project::PUBLIC) }
+  let(:project2) { create(:empty_project, group: group, visibility_level: Project::INTERNAL) }
+  let(:project3) { create(:empty_project, group: group, visibility_level: Project::PRIVATE) }
+  let(:project4) { create(:empty_project, group: group, visibility_level: Project::PRIVATE) }
+
+  context 'non authenticated' do
+    subject { ProjectsFinder.new.execute(nil, group: group) }
+
+    it { should include(project1) }
+    it { should_not include(project2) }
+    it { should_not include(project3) }
+    it { should_not include(project4) }
+  end
+
+  context 'authenticated' do
+    subject { ProjectsFinder.new.execute(user, group: group) }
+
+    it { should include(project1) }
+    it { should include(project2) }
+    it { should_not include(project3) }
+    it { should_not include(project4) }
+  end
+
+  context 'authenticated, project member' do
+    before { project3.team << [user, :developer] }
+
+    subject { ProjectsFinder.new.execute(user, group: group) }
+
+    it { should include(project1) }
+    it { should include(project2) }
+    it { should include(project3) }
+    it { should_not include(project4) }
+  end
+
+  context 'authenticated, group member' do
+    before { group.add_user(user, Gitlab::Access::DEVELOPER) }
+
+    subject { ProjectsFinder.new.execute(user, group: group) }
+
+    it { should include(project1) }
+    it { should include(project2) }
+    it { should include(project3) }
+    it { should include(project4) }
+  end
+end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index c58c83a297..61c561335e 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -52,7 +52,7 @@ describe ApplicationHelper do
     it "should give default avatar_icon when no avatar is present" do
       group = create(:group)
       group.save!
-      group_icon(group.path).to_s.should == "/assets/no_group_avatar.png"
+      group_icon(group.path).should match("group_avatar.png")
     end
   end
 
@@ -116,7 +116,45 @@ describe ApplicationHelper do
       allow(self).to receive(:request).and_return(double(:ssl? => false))
       gravatar_icon(user_email).should == gravatar_icon(user_email.upcase + " ")
     end
+  end
 
+  describe "grouped_options_refs" do
+    # Override Rails' grouped_options_for_select helper since HTML is harder to work with
+    def grouped_options_for_select(options, *args)
+      options
+    end
+
+    let(:options) { grouped_options_refs }
+
+    before do
+      # Must be an instance variable
+      @project = create(:project)
+    end
+
+    it "includes a list of branch names" do
+      options[0][0].should == 'Branches'
+      options[0][1].should include('master', 'stable')
+    end
+
+    it "includes a list of tag names" do
+      options[1][0].should == 'Tags'
+      options[1][1].should include('v0.9.4','v1.2.0')
+    end
+
+    it "includes a specific commit ref if defined" do
+      # Must be an instance variable
+      @ref = '2ed06dc41dbb5936af845b87d79e05bbf24c73b8'
+
+      options[2][0].should == 'Commit'
+      options[2][1].should == [@ref]
+    end
+
+    it "sorts tags in a natural order" do
+      # Stub repository.tag_names to make sure we get some valid testing data
+      expect(@project.repository).to receive(:tag_names).and_return(["v1.0.9", "v1.0.10", "v2.0", "v3.1.4.2", "v1.0.9a"])
+
+      options[1][1].should == ["v3.1.4.2", "v2.0", "v1.0.10", "v1.0.9a", "v1.0.9"]
+    end
   end
 
   describe "user_color_scheme_class" do
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index a445c18f00..5bd16d1c16 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -440,12 +440,6 @@ describe GitlabMarkdownHelper do
       markdown(actual).should match(expected)
     end
 
-    it "should handle wiki urls" do
-      actual = "[Link](test/link)\n"
-      expected = "<p><a href=\"/#{project.path_with_namespace}/wikis/test/link\">Link</a></p>\n"
-      markdown(actual).should match(expected)
-    end
-
     it "should handle relative urls in reference links for a file in master" do
       actual = "[GitLab API doc][GitLab readme]\n [GitLab readme]: doc/api/README.md\n"
       expected = "<p><a href=\"/#{project.path_with_namespace}/blob/master/doc/api/README.md\">GitLab API doc</a></p>\n"
@@ -454,7 +448,7 @@ describe GitlabMarkdownHelper do
 
     it "should handle relative urls in reference links for a directory in master" do
       actual = "[GitLab API doc directory][GitLab readmes]\n [GitLab readmes]: doc/api/\n"
-      expected = "<p><a href=\"/#{project.path_with_namespace}/tree/master/doc/api/\">GitLab API doc directory</a></p>\n"
+      expected = "<p><a href=\"/#{project.path_with_namespace}/tree/master/doc/api\">GitLab API doc directory</a></p>\n"
       markdown(actual).should match(expected)
     end
 
diff --git a/spec/lib/gitlab/popen_spec.rb b/spec/lib/gitlab/popen_spec.rb
index 4791be4161..76d506eb3c 100644
--- a/spec/lib/gitlab/popen_spec.rb
+++ b/spec/lib/gitlab/popen_spec.rb
@@ -10,7 +10,7 @@ describe 'Gitlab::Popen', no_db: true do
 
   context 'zero status' do
     before do
-      @output, @status = @klass.new.popen('ls', path)
+      @output, @status = @klass.new.popen(%W(ls), path)
     end
 
     it { @status.should be_zero }
@@ -19,11 +19,27 @@ describe 'Gitlab::Popen', no_db: true do
 
   context 'non-zero status' do
     before do
-      @output, @status = @klass.new.popen('cat NOTHING', path)
+      @output, @status = @klass.new.popen(%W(cat NOTHING), path)
     end
 
     it { @status.should == 1 }
     it { @output.should include('No such file or directory') }
   end
+
+  context 'unsafe string command' do
+    it 'raises an error when it gets called with a string argument' do
+      expect { @klass.new.popen('ls', path) }.to raise_error
+    end
+  end
+
+  context 'without a directory argument' do
+    before do
+      @output, @status = @klass.new.popen(%W(ls))
+    end
+
+    it { @status.should be_zero }
+    it { @output.should include('spec') }
+  end
+
 end
 
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 88cae0bb75..f990ed659b 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -4,6 +4,7 @@ describe Notify do
   include EmailSpec::Helpers
   include EmailSpec::Matchers
 
+  let(:gitlab_sender) { Gitlab.config.gitlab.email_from }
   let(:recipient) { create(:user, email: 'recipient@example.com') }
   let(:project) { create(:project) }
 
@@ -13,18 +14,28 @@ describe Notify do
     end
   end
 
+  shared_examples 'an email sent from GitLab' do
+    it 'is sent from GitLab' do
+      sender = subject.header[:from].addrs[0]
+      sender.display_name.should eq('GitLab')
+      sender.address.should eq(gitlab_sender)
+    end
+  end
+
   describe 'for new users, the email' do
     let(:example_site_path) { root_path }
     let(:new_user) { create(:user, email: 'newguy@example.com', created_by_id: 1) }
 
     subject { Notify.new_user_email(new_user.id, new_user.password) }
 
+    it_behaves_like 'an email sent from GitLab'
+
     it 'is sent to the new user' do
       should deliver_to new_user.email
     end
 
     it 'has the correct subject' do
-      should have_subject /^gitlab \| Account was created for you$/i
+      should have_subject /^Account was created for you$/i
     end
 
     it 'contains the new user\'s login name' do
@@ -47,12 +58,14 @@ describe Notify do
 
     subject { Notify.new_user_email(new_user.id, new_user.password) }
 
+    it_behaves_like 'an email sent from GitLab'
+
     it 'is sent to the new user' do
       should deliver_to new_user.email
     end
 
     it 'has the correct subject' do
-      should have_subject /^gitlab \| Account was created for you$/i
+      should have_subject /^Account was created for you$/i
     end
 
     it 'contains the new user\'s login name' do
@@ -73,12 +86,14 @@ describe Notify do
 
     subject { Notify.new_ssh_key_email(key.id) }
 
+    it_behaves_like 'an email sent from GitLab'
+
     it 'is sent to the new user' do
       should deliver_to key.user.email
     end
 
     it 'has the correct subject' do
-      should have_subject /^gitlab \| SSH key was added to your account$/i
+      should have_subject /^SSH key was added to your account$/i
     end
 
     it 'contains the new ssh key title' do
@@ -100,7 +115,7 @@ describe Notify do
     end
 
     it 'has the correct subject' do
-      should have_subject /^gitlab \| Email was added to your account$/i
+      should have_subject /^Email was added to your account$/i
     end
 
     it 'contains the new email address' do
@@ -114,17 +129,25 @@ describe Notify do
 
   context 'for a project' do
     describe 'items that are assignable, the email' do
+      let(:current_user) { create(:user, email: "current@email.com") }
       let(:assignee) { create(:user, email: 'assignee@example.com') }
       let(:previous_assignee) { create(:user, name: 'Previous Assignee') }
 
       shared_examples 'an assignee email' do
+        it 'is sent as the author' do
+          sender = subject.header[:from].addrs[0]
+          sender.display_name.should eq(current_user.name)
+          sender.address.should eq(gitlab_sender)
+        end
+
         it 'is sent to the assignee' do
           should deliver_to assignee.email
         end
       end
 
       context 'for issues' do
-        let(:issue) { create(:issue, assignee: assignee, project: project ) }
+        let(:issue) { create(:issue, author: current_user, assignee: assignee, project: project) }
+        let(:issue_with_description) { create(:issue, author: current_user, assignee: assignee, project: project, description: Faker::Lorem.sentence) }
 
         describe 'that are new' do
           subject { Notify.new_issue_email(issue.assignee_id, issue.id) }
@@ -132,7 +155,7 @@ describe Notify do
           it_behaves_like 'an assignee email'
 
           it 'has the correct subject' do
-            should have_subject /#{project.name} \| New issue ##{issue.iid} \| #{issue.title}/
+            should have_subject /#{project.name} \| #{issue.title} \(##{issue.iid}\)/
           end
 
           it 'contains a link to the new issue' do
@@ -140,15 +163,27 @@ describe Notify do
           end
         end
 
-        describe 'that have been reassigned' do
-          before(:each) { issue.stub(:assignee_id_was).and_return(previous_assignee.id) }
+        describe 'that are new with a description' do
+          subject { Notify.new_issue_email(issue_with_description.assignee_id, issue_with_description.id) }
 
-          subject { Notify.reassigned_issue_email(recipient.id, issue.id, previous_assignee.id) }
+          it 'contains the description' do
+            should have_body_text /#{issue_with_description.description}/
+          end
+        end
+
+        describe 'that have been reassigned' do
+          subject { Notify.reassigned_issue_email(recipient.id, issue.id, previous_assignee.id, current_user) }
 
           it_behaves_like 'a multiple recipients email'
 
+          it 'is sent as the author' do
+            sender = subject.header[:from].addrs[0]
+            sender.display_name.should eq(current_user.name)
+            sender.address.should eq(gitlab_sender)
+          end
+
           it 'has the correct subject' do
-            should have_subject /Changed issue ##{issue.iid} \| #{issue.title}/
+            should have_subject /#{issue.title} \(##{issue.iid}\)/
           end
 
           it 'contains the name of the previous assignee' do
@@ -165,12 +200,17 @@ describe Notify do
         end
 
         describe 'status changed' do
-          let(:current_user) { create(:user, email: "current@email.com") }
           let(:status) { 'closed' }
           subject { Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user) }
 
+          it 'is sent as the author' do
+            sender = subject.header[:from].addrs[0]
+            sender.display_name.should eq(current_user.name)
+            sender.address.should eq(gitlab_sender)
+          end
+
           it 'has the correct subject' do
-            should have_subject /Changed issue ##{issue.iid} \| #{issue.title}/i
+            should have_subject /#{issue.title} \(##{issue.iid}\)/i
           end
 
           it 'contains the new status' do
@@ -189,7 +229,8 @@ describe Notify do
       end
 
       context 'for merge requests' do
-        let(:merge_request) { create(:merge_request, assignee: assignee, source_project: project, target_project: project) }
+        let(:merge_request) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project) }
+        let(:merge_request_with_description) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project, description: Faker::Lorem.sentence) }
 
         describe 'that are new' do
           subject { Notify.new_merge_request_email(merge_request.assignee_id, merge_request.id) }
@@ -197,7 +238,7 @@ describe Notify do
           it_behaves_like 'an assignee email'
 
           it 'has the correct subject' do
-            should have_subject /New merge request ##{merge_request.iid}/
+            should have_subject /#{merge_request.title} \(!#{merge_request.iid}\)/
           end
 
           it 'contains a link to the new merge request' do
@@ -213,15 +254,27 @@ describe Notify do
           end
         end
 
-        describe 'that are reassigned' do
-          before(:each) { merge_request.stub(:assignee_id_was).and_return(previous_assignee.id) }
+        describe 'that are new with a description' do
+          subject { Notify.new_merge_request_email(merge_request_with_description.assignee_id, merge_request_with_description.id) }
 
-          subject { Notify.reassigned_merge_request_email(recipient.id, merge_request.id, previous_assignee.id) }
+          it 'contains the description' do
+            should have_body_text /#{merge_request_with_description.description}/
+          end
+        end
+
+        describe 'that are reassigned' do
+          subject { Notify.reassigned_merge_request_email(recipient.id, merge_request.id, previous_assignee.id, current_user.id) }
 
           it_behaves_like 'a multiple recipients email'
 
+          it 'is sent as the author' do
+            sender = subject.header[:from].addrs[0]
+            sender.display_name.should eq(current_user.name)
+            sender.address.should eq(gitlab_sender)
+          end
+
           it 'has the correct subject' do
-            should have_subject /Changed merge request ##{merge_request.iid}/
+            should have_subject /#{merge_request.title} \(!#{merge_request.iid}\)/
           end
 
           it 'contains the name of the previous assignee' do
@@ -245,6 +298,8 @@ describe Notify do
       let(:user) { create(:user) }
       subject { Notify.project_was_moved_email(project.id, user.id) }
 
+      it_behaves_like 'an email sent from GitLab'
+
       it 'has the correct subject' do
         should have_subject /Project was moved/
       end
@@ -265,6 +320,9 @@ describe Notify do
                                    project: project,
                                    user: user) }
       subject { Notify.project_access_granted_email(users_project.id) }
+
+      it_behaves_like 'an email sent from GitLab'
+
       it 'has the correct subject' do
         should have_subject /Access to project was granted/
       end
@@ -285,12 +343,14 @@ describe Notify do
       end
 
       shared_examples 'a note email' do
-        it 'is sent to the given recipient' do
-          should deliver_to recipient.email
+        it 'is sent as the author' do
+          sender = subject.header[:from].addrs[0]
+          sender.display_name.should eq(note_author.name)
+          sender.address.should eq(gitlab_sender)
         end
 
-        it 'contains the name of the note\'s author' do
-          should have_body_text /#{note_author.name}/
+        it 'is sent to the given recipient' do
+          should deliver_to recipient.email
         end
 
         it 'contains the message from the note' do
@@ -324,7 +384,7 @@ describe Notify do
         it_behaves_like 'a note email'
 
         it 'has the correct subject' do
-          should have_subject /Note for commit #{commit.short_id}/
+          should have_subject /#{commit.title} \(#{commit.short_id}\)/
         end
 
         it 'contains a link to the commit' do
@@ -342,7 +402,7 @@ describe Notify do
         it_behaves_like 'a note email'
 
         it 'has the correct subject' do
-          should have_subject /Note for merge request ##{merge_request.iid}/
+          should have_subject /#{merge_request.title} \(!#{merge_request.iid}\)/
         end
 
         it 'contains a link to the merge request note' do
@@ -360,7 +420,7 @@ describe Notify do
         it_behaves_like 'a note email'
 
         it 'has the correct subject' do
-          should have_subject /Note for issue ##{issue.iid}/
+          should have_subject /#{issue.title} \(##{issue.iid}\)/
         end
 
         it 'contains a link to the issue note' do
@@ -377,6 +437,8 @@ describe Notify do
 
     subject { Notify.group_access_granted_email(membership.id) }
 
+    it_behaves_like 'an email sent from GitLab'
+
     it 'has the correct subject' do
       should have_subject /Access to group was granted/
     end
@@ -401,6 +463,8 @@ describe Notify do
 
     subject { ActionMailer::Base.deliveries.last }
 
+    it_behaves_like 'an email sent from GitLab'
+
     it 'is sent to the new user' do
       should deliver_to 'new-email@mail.com'
     end
@@ -418,9 +482,17 @@ describe Notify do
     let(:example_site_path) { root_path }
     let(:user) { create(:user) }
     let(:compare) { Gitlab::Git::Compare.new(project.repository.raw_repository, 'cd5c4bac', 'b1e6a9db') }
+    let(:commits) { Commit.decorate(compare.commits) }
+    let(:diff_path) { project_compare_path(project, from: commits.first, to: commits.last) }
 
     subject { Notify.repository_push_email(project.id, 'devs@company.name', user.id, 'master', compare) }
 
+    it 'is sent as the author' do
+      sender = subject.header[:from].addrs[0]
+      sender.display_name.should eq(user.name)
+      sender.address.should eq(gitlab_sender)
+    end
+
     it 'is sent to recipient' do
       should deliver_to 'devs@company.name'
     end
@@ -436,5 +508,9 @@ describe Notify do
     it 'includes diffs' do
       should have_body_text /Checkout wiki pages for installation information/
     end
+
+    it 'contains a link to the diff' do
+      should have_body_text /#{diff_path}/
+    end
   end
 end
diff --git a/spec/models/assembla_service_spec.rb b/spec/models/assembla_service_spec.rb
index 395aa4a444..1730a64283 100644
--- a/spec/models/assembla_service_spec.rb
+++ b/spec/models/assembla_service_spec.rb
@@ -13,6 +13,7 @@
 #  project_url :string(255)
 #  subdomain   :string(255)
 #  room        :string(255)
+#  api_key     :string(255)
 #
 
 require 'spec_helper'
diff --git a/spec/models/flowdock_service_spec.rb b/spec/models/flowdock_service_spec.rb
index cd553b33ad..9741458533 100644
--- a/spec/models/flowdock_service_spec.rb
+++ b/spec/models/flowdock_service_spec.rb
@@ -13,6 +13,7 @@
 #  project_url :string(255)
 #  subdomain   :string(255)
 #  room        :string(255)
+#  api_key     :string(255)
 #
 
 require 'spec_helper'
diff --git a/spec/models/gemnasium_service_spec.rb b/spec/models/gemnasium_service_spec.rb
new file mode 100644
index 0000000000..dfc99849d6
--- /dev/null
+++ b/spec/models/gemnasium_service_spec.rb
@@ -0,0 +1,47 @@
+# == Schema Information
+#
+# Table name: services
+#
+#  id          :integer          not null, primary key
+#  type        :string(255)
+#  title       :string(255)
+#  token       :string(255)
+#  project_id  :integer          not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  active      :boolean          default(FALSE), not null
+#  project_url :string(255)
+#  subdomain   :string(255)
+#  room        :string(255)
+#  api_key     :string(255)
+#
+
+require 'spec_helper'
+
+describe GemnasiumService do
+  describe "Associations" do
+    it { should belong_to :project }
+    it { should have_one :service_hook }
+  end
+
+  describe "Execute" do
+    let(:user)    { create(:user) }
+    let(:project) { create(:project) }
+
+    before do
+      @gemnasium_service = GemnasiumService.new
+      @gemnasium_service.stub(
+        project_id: project.id,
+        project: project,
+        service_hook: true,
+        token: 'verySecret',
+        api_key: 'GemnasiumUserApiKey'
+      )
+      @sample_data = GitPushService.new.sample_data(project, user)
+    end
+    it "should call Gemnasium service" do
+      Gemnasium::GitlabService.should_receive(:execute).with(an_instance_of(Hash)).once
+      @gemnasium_service.execute(@sample_data)
+    end
+  end
+end
diff --git a/spec/models/gitlab_ci_service_spec.rb b/spec/models/gitlab_ci_service_spec.rb
index 56efa9df45..8ec15cb346 100644
--- a/spec/models/gitlab_ci_service_spec.rb
+++ b/spec/models/gitlab_ci_service_spec.rb
@@ -13,6 +13,7 @@
 #  project_url :string(255)
 #  subdomain   :string(255)
 #  room        :string(255)
+#  api_key     :string(255)
 #
 
 require 'spec_helper'
diff --git a/spec/models/gollum_wiki_spec.rb b/spec/models/gollum_wiki_spec.rb
index 9e07d9ee19..9b9d15b4ff 100644
--- a/spec/models/gollum_wiki_spec.rb
+++ b/spec/models/gollum_wiki_spec.rb
@@ -2,12 +2,6 @@ require "spec_helper"
 
 describe GollumWiki do
 
-  def create_temp_repo(path)
-    FileUtils.mkdir_p path
-    command = "git init --quiet #{path};"
-    system(command)
-  end
-
   def remove_temp_repo(path)
     FileUtils.rm_rf path
   end
diff --git a/spec/models/project_hook_spec.rb b/spec/models/project_hook_spec.rb
new file mode 100644
index 0000000000..7bd7c431bc
--- /dev/null
+++ b/spec/models/project_hook_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe ProjectHook do
+  describe '.push_hooks' do
+    it 'should return hooks for push events only' do
+      hook = create(:project_hook, push_events: true)
+      hook2 = create(:project_hook, push_events: false)
+      expect(ProjectHook.push_hooks).to eq([hook])
+    end
+  end
+
+  describe '.tag_push_hooks' do
+    it 'should return hooks for tag push events only' do
+      hook = create(:project_hook, tag_push_events: true)
+      hook2 = create(:project_hook, tag_push_events: false)
+      expect(ProjectHook.tag_push_hooks).to eq([hook])
+    end
+  end
+end
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index 46b3bf39ae..9454207496 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -13,6 +13,7 @@
 #  project_url :string(255)
 #  subdomain   :string(255)
 #  room        :string(255)
+#  api_key     :string(255)
 #
 
 require 'spec_helper'
diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb
index 67f2a6da42..1c70edf0d4 100644
--- a/spec/models/wiki_page_spec.rb
+++ b/spec/models/wiki_page_spec.rb
@@ -2,12 +2,6 @@ require "spec_helper"
 
 describe WikiPage do
 
-  def create_temp_repo(path)
-    FileUtils.mkdir_p path
-    command = "git init --quiet #{path};"
-    system(command)
-  end
-
   def remove_temp_repo(path)
     FileUtils.rm_rf path
   end
diff --git a/spec/observers/users_project_observer_spec.rb b/spec/observers/users_project_observer_spec.rb
index dea90b2bfa..be277b4dbd 100644
--- a/spec/observers/users_project_observer_spec.rb
+++ b/spec/observers/users_project_observer_spec.rb
@@ -47,30 +47,6 @@ describe UsersProjectObserver do
   end
 
   describe "#after_create" do
-    context 'wiki_enabled creates repository directory' do
-      context 'wiki_enabled true creates wiki repository directory' do
-        before do
-          @project = create(:project, wiki_enabled: true)
-          @path = GollumWiki.new(@project, user).send(:path_to_repo)
-        end
-
-        after do
-          FileUtils.rm_rf(@path)
-        end
-
-        it { File.exists?(@path).should be_true }
-      end
-
-      context 'wiki_enabled false does not create wiki repository directory' do
-        before do
-          @project = create(:project, wiki_enabled: false)
-          @path = GollumWiki.new(@project, user).send(:path_to_repo)
-        end
-
-        it { File.exists?(@path).should be_false }
-      end
-    end
-
     it "should send email to user" do
       subject.should_receive(:notification)
       Event.stub(create: true)
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 412b6c95ff..1a9e4809e7 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -92,9 +92,10 @@ describe API::API do
 
       it "should return merge_request" do
         post api("/projects/#{fork_project.id}/merge_requests", user2),
-        title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user2, target_project_id: project.id
+        title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user2, target_project_id: project.id, description: 'Test description for Test merge_request'
         response.status.should == 201
         json_response['title'].should == 'Test merge_request'
+        json_response['description'].should == 'Test description for Test merge_request'
       end
 
       it "should not return 422 when source_branch equals target_branch" do
@@ -168,6 +169,12 @@ describe API::API do
       json_response['title'].should == 'New title'
     end
 
+    it "should return merge_request" do
+      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), description: "New description"
+      response.status.should == 200
+      json_response['description'].should == 'New description'
+    end
+
     it "should return 422 when source_branch and target_branch are renamed the same" do
       put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user),
       source_branch: "master", target_branch: "master"
diff --git a/spec/requests/api/project_members_spec.rb b/spec/requests/api/project_members_spec.rb
new file mode 100644
index 0000000000..f3c0529da9
--- /dev/null
+++ b/spec/requests/api/project_members_spec.rb
@@ -0,0 +1,156 @@
+require 'spec_helper'
+
+describe API::API do
+  include ApiHelpers
+  before(:each) { enable_observers }
+  after(:each) { disable_observers }
+
+  let(:user) { create(:user) }
+  let(:user2) { create(:user) }
+  let(:user3) { create(:user) }
+  let(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
+  let(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
+  let(:users_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) }
+
+  describe "GET /projects/:id/members" do
+    before { users_project }
+    before { users_project2 }
+
+    it "should return project team members" do
+      get api("/projects/#{project.id}/members", user)
+      response.status.should == 200
+      json_response.should be_an Array
+      json_response.count.should == 2
+      json_response.map { |u| u['email'] }.should include user.email
+    end
+
+    it "finds team members with query string" do
+      get api("/projects/#{project.id}/members", user), query: user.username
+      response.status.should == 200
+      json_response.should be_an Array
+      json_response.count.should == 1
+      json_response.first['email'].should == user.email
+    end
+
+    it "should return a 404 error if id not found" do
+      get api("/projects/9999/members", user)
+      response.status.should == 404
+    end
+  end
+
+  describe "GET /projects/:id/members/:user_id" do
+    before { users_project }
+
+    it "should return project team member" do
+      get api("/projects/#{project.id}/members/#{user.id}", user)
+      response.status.should == 200
+      json_response['email'].should == user.email
+      json_response['access_level'].should == UsersProject::MASTER
+    end
+
+    it "should return a 404 error if user id not found" do
+      get api("/projects/#{project.id}/members/1234", user)
+      response.status.should == 404
+    end
+  end
+
+  describe "POST /projects/:id/members" do
+    it "should add user to project team" do
+      expect {
+        post api("/projects/#{project.id}/members", user), user_id: user2.id,
+          access_level: UsersProject::DEVELOPER
+      }.to change { UsersProject.count }.by(1)
+
+      response.status.should == 201
+      json_response['email'].should == user2.email
+      json_response['access_level'].should == UsersProject::DEVELOPER
+    end
+
+    it "should return a 201 status if user is already project member" do
+      post api("/projects/#{project.id}/members", user), user_id: user2.id,
+        access_level: UsersProject::DEVELOPER
+      expect {
+        post api("/projects/#{project.id}/members", user), user_id: user2.id,
+          access_level: UsersProject::DEVELOPER
+      }.not_to change { UsersProject.count }.by(1)
+
+      response.status.should == 201
+      json_response['email'].should == user2.email
+      json_response['access_level'].should == UsersProject::DEVELOPER
+    end
+
+    it "should return a 400 error when user id is not given" do
+      post api("/projects/#{project.id}/members", user), access_level: UsersProject::MASTER
+      response.status.should == 400
+    end
+
+    it "should return a 400 error when access level is not given" do
+      post api("/projects/#{project.id}/members", user), user_id: user2.id
+      response.status.should == 400
+    end
+
+    it "should return a 422 error when access level is not known" do
+      post api("/projects/#{project.id}/members", user), user_id: user2.id, access_level: 1234
+      response.status.should == 422
+    end
+  end
+
+  describe "PUT /projects/:id/members/:user_id" do
+    before { users_project2 }
+
+    it "should update project team member" do
+      put api("/projects/#{project.id}/members/#{user3.id}", user), access_level: UsersProject::MASTER
+      response.status.should == 200
+      json_response['email'].should == user3.email
+      json_response['access_level'].should == UsersProject::MASTER
+    end
+
+    it "should return a 404 error if user_id is not found" do
+      put api("/projects/#{project.id}/members/1234", user), access_level: UsersProject::MASTER
+      response.status.should == 404
+    end
+
+    it "should return a 400 error when access level is not given" do
+      put api("/projects/#{project.id}/members/#{user3.id}", user)
+      response.status.should == 400
+    end
+
+    it "should return a 422 error when access level is not known" do
+      put api("/projects/#{project.id}/members/#{user3.id}", user), access_level: 123
+      response.status.should == 422
+    end
+  end
+
+  describe "DELETE /projects/:id/members/:user_id" do
+    before { users_project }
+    before { users_project2 }
+
+    it "should remove user from project team" do
+      expect {
+        delete api("/projects/#{project.id}/members/#{user3.id}", user)
+      }.to change { UsersProject.count }.by(-1)
+    end
+
+    it "should return 200 if team member is not part of a project" do
+      delete api("/projects/#{project.id}/members/#{user3.id}", user)
+      expect {
+        delete api("/projects/#{project.id}/members/#{user3.id}", user)
+      }.to_not change { UsersProject.count }.by(1)
+    end
+
+    it "should return 200 if team member already removed" do
+      delete api("/projects/#{project.id}/members/#{user3.id}", user)
+      delete api("/projects/#{project.id}/members/#{user3.id}", user)
+      response.status.should == 200
+    end
+
+    it "should return 200 OK when the user was not member" do
+      expect {
+        delete api("/projects/#{project.id}/members/1000000", user)
+      }.to change { UsersProject.count }.by(0)
+      response.status.should == 200
+      json_response['message'].should == "Access revoked"
+      json_response['id'].should == 1000000
+    end
+  end
+end
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 6ea2ccb446..69088799c3 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -259,6 +259,7 @@ describe API::API do
 
   describe "GET /projects/:id" do
     before { project }
+    before { users_project }
 
     it "should return a project by id" do
       get api("/projects/#{project.id}", user)
@@ -284,6 +285,28 @@ describe API::API do
       get api("/projects/#{project.id}", other_user)
       response.status.should == 404
     end
+
+    describe 'permissions' do
+      context 'personal project' do
+        before { get api("/projects/#{project.id}", user) }
+
+        it { response.status.should == 200 }
+        it { json_response['permissions']["project_access"]["access_level"].should == Gitlab::Access::MASTER }
+        it { json_response['permissions']["group_access"].should be_nil }
+      end
+
+      context 'group project' do
+        before do
+          project2 = create(:project, group: create(:group))
+          project2.group.add_owner(user)
+          get api("/projects/#{project2.id}", user)
+        end
+
+        it { response.status.should == 200 }
+        it { json_response['permissions']["project_access"].should be_nil }
+        it { json_response['permissions']["group_access"]["access_level"].should == Gitlab::Access::OWNER }
+      end
+    end
   end
 
   describe "GET /projects/:id/events" do
@@ -311,148 +334,6 @@ describe API::API do
     end
   end
 
-  describe "GET /projects/:id/members" do
-    before { users_project }
-    before { users_project2 }
-
-    it "should return project team members" do
-      get api("/projects/#{project.id}/members", user)
-      response.status.should == 200
-      json_response.should be_an Array
-      json_response.count.should == 2
-      json_response.map { |u| u['email'] }.should include user.email
-    end
-
-    it "finds team members with query string" do
-      get api("/projects/#{project.id}/members", user), query: user.username
-      response.status.should == 200
-      json_response.should be_an Array
-      json_response.count.should == 1
-      json_response.first['email'].should == user.email
-    end
-
-    it "should return a 404 error if id not found" do
-      get api("/projects/9999/members", user)
-      response.status.should == 404
-    end
-  end
-
-  describe "GET /projects/:id/members/:user_id" do
-    before { users_project }
-
-    it "should return project team member" do
-      get api("/projects/#{project.id}/members/#{user.id}", user)
-      response.status.should == 200
-      json_response['email'].should == user.email
-      json_response['access_level'].should == UsersProject::MASTER
-    end
-
-    it "should return a 404 error if user id not found" do
-      get api("/projects/#{project.id}/members/1234", user)
-      response.status.should == 404
-    end
-  end
-
-  describe "POST /projects/:id/members" do
-    it "should add user to project team" do
-      expect {
-        post api("/projects/#{project.id}/members", user), user_id: user2.id,
-          access_level: UsersProject::DEVELOPER
-      }.to change { UsersProject.count }.by(1)
-
-      response.status.should == 201
-      json_response['email'].should == user2.email
-      json_response['access_level'].should == UsersProject::DEVELOPER
-    end
-
-    it "should return a 201 status if user is already project member" do
-      post api("/projects/#{project.id}/members", user), user_id: user2.id,
-        access_level: UsersProject::DEVELOPER
-      expect {
-        post api("/projects/#{project.id}/members", user), user_id: user2.id,
-          access_level: UsersProject::DEVELOPER
-      }.not_to change { UsersProject.count }.by(1)
-
-      response.status.should == 201
-      json_response['email'].should == user2.email
-      json_response['access_level'].should == UsersProject::DEVELOPER
-    end
-
-    it "should return a 400 error when user id is not given" do
-      post api("/projects/#{project.id}/members", user), access_level: UsersProject::MASTER
-      response.status.should == 400
-    end
-
-    it "should return a 400 error when access level is not given" do
-      post api("/projects/#{project.id}/members", user), user_id: user2.id
-      response.status.should == 400
-    end
-
-    it "should return a 422 error when access level is not known" do
-      post api("/projects/#{project.id}/members", user), user_id: user2.id, access_level: 1234
-      response.status.should == 422
-    end
-  end
-
-  describe "PUT /projects/:id/members/:user_id" do
-    before { users_project2 }
-
-    it "should update project team member" do
-      put api("/projects/#{project.id}/members/#{user3.id}", user), access_level: UsersProject::MASTER
-      response.status.should == 200
-      json_response['email'].should == user3.email
-      json_response['access_level'].should == UsersProject::MASTER
-    end
-
-    it "should return a 404 error if user_id is not found" do
-      put api("/projects/#{project.id}/members/1234", user), access_level: UsersProject::MASTER
-      response.status.should == 404
-    end
-
-    it "should return a 400 error when access level is not given" do
-      put api("/projects/#{project.id}/members/#{user3.id}", user)
-      response.status.should == 400
-    end
-
-    it "should return a 422 error when access level is not known" do
-      put api("/projects/#{project.id}/members/#{user3.id}", user), access_level: 123
-      response.status.should == 422
-    end
-  end
-
-  describe "DELETE /projects/:id/members/:user_id" do
-    before { users_project }
-    before { users_project2 }
-
-    it "should remove user from project team" do
-      expect {
-        delete api("/projects/#{project.id}/members/#{user3.id}", user)
-      }.to change { UsersProject.count }.by(-1)
-    end
-
-    it "should return 200 if team member is not part of a project" do
-      delete api("/projects/#{project.id}/members/#{user3.id}", user)
-      expect {
-        delete api("/projects/#{project.id}/members/#{user3.id}", user)
-      }.to_not change { UsersProject.count }.by(1)
-    end
-
-    it "should return 200 if team member already removed" do
-      delete api("/projects/#{project.id}/members/#{user3.id}", user)
-      delete api("/projects/#{project.id}/members/#{user3.id}", user)
-      response.status.should == 200
-    end
-
-    it "should return 200 OK when the user was not member" do
-      expect {
-        delete api("/projects/#{project.id}/members/1000000", user)
-      }.to change { UsersProject.count }.by(0)
-      response.status.should == 200
-      json_response['message'].should == "Access revoked"
-      json_response['id'].should == 1000000
-    end
-  end
-
   describe "GET /projects/:id/snippets" do
     before { snippet }
 
diff --git a/spec/seed_project.tar.gz b/spec/seed_project.tar.gz
index ee8c3f23c7..92b9587e3f 100644
Binary files a/spec/seed_project.tar.gz and b/spec/seed_project.tar.gz differ
diff --git a/spec/services/git_tag_push_service_spec.rb b/spec/services/git_tag_push_service_spec.rb
new file mode 100644
index 0000000000..e65a8204c5
--- /dev/null
+++ b/spec/services/git_tag_push_service_spec.rb
@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe GitTagPushService do
+  let (:user) { create :user }
+  let (:project) { create :project }
+  let (:service) { GitTagPushService.new }
+
+  before do
+    @ref = 'refs/tags/super-tag'
+    @oldrev = 'b98a310def241a6fd9c9a9a3e7934c48e498fe81'
+    @newrev = 'b19a04f53caeebf4fe5ec2327cb83e9253dc91bb'
+  end
+
+  describe 'Git Tag Push Data' do
+    before do
+      service.execute(project, user, @oldrev, @newrev, @ref)
+      @push_data = service.push_data
+    end
+
+    subject { @push_data }
+
+    it { should include(ref: @ref) }
+    it { should include(before: @oldrev) }
+    it { should include(after: @newrev) }
+    it { should include(user_id: user.id) }
+    it { should include(user_name: user.name) }
+    it { should include(project_id: project.id) }
+
+    context 'With repository data' do
+      subject { @push_data[:repository] }
+
+      it { should include(name: project.name) }
+      it { should include(url: project.url_to_repo) }
+      it { should include(description: project.description) }
+      it { should include(homepage: project.web_url) }
+    end
+  end
+
+  describe "Web Hooks" do
+    context "execute web hooks" do
+      it "when pushing tags" do
+        project.should_receive(:execute_hooks)
+        service.execute(project, user, 'oldrev', 'newrev', 'refs/tags/v1.0.0')
+      end
+    end
+  end
+end
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index e378be0425..077ad8b6e1 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -137,11 +137,11 @@ describe NotificationService do
       end
 
       def should_email(user_id)
-        Notify.should_receive(:reassigned_issue_email).with(user_id, issue.id, issue.assignee_id)
+        Notify.should_receive(:reassigned_issue_email).with(user_id, issue.id, issue.assignee_id, @u_disabled.id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:reassigned_issue_email).with(user_id, issue.id, issue.assignee_id)
+        Notify.should_not_receive(:reassigned_issue_email).with(user_id, issue.id, issue.assignee_id, @u_disabled.id)
       end
     end
 
@@ -201,11 +201,11 @@ describe NotificationService do
       end
 
       def should_email(user_id)
-        Notify.should_receive(:reassigned_merge_request_email).with(user_id, merge_request.id, merge_request.assignee_id)
+        Notify.should_receive(:reassigned_merge_request_email).with(user_id, merge_request.id, merge_request.assignee_id, merge_request.author_id)
       end
 
       def should_not_email(user_id)
-        Notify.should_not_receive(:reassigned_merge_request_email).with(user_id, merge_request.id, merge_request.assignee_id)
+        Notify.should_not_receive(:reassigned_merge_request_email).with(user_id, merge_request.id, merge_request.assignee_id, merge_request.author_id)
       end
     end
 
diff --git a/spec/services/projects_create_service_spec.rb b/spec/services/projects_create_service_spec.rb
index 0a41832a21..f2a784df10 100644
--- a/spec/services/projects_create_service_spec.rb
+++ b/spec/services/projects_create_service_spec.rb
@@ -38,6 +38,27 @@ describe Projects::CreateService do
       it { @project.namespace.should == @group }
     end
 
+    context 'wiki_enabled creates repository directory' do
+      context 'wiki_enabled true creates wiki repository directory' do
+        before do
+          @project = create_project(@user, @opts)
+          @path = GollumWiki.new(@project, @user).send(:path_to_repo)
+        end
+
+        it { File.exists?(@path).should be_true }
+      end
+
+      context 'wiki_enabled false does not create wiki repository directory' do
+        before do
+          @opts.merge!(wiki_enabled: false)
+          @project = create_project(@user, @opts)
+          @path = GollumWiki.new(@project, @user).send(:path_to_repo)
+        end
+
+        it { File.exists?(@path).should be_false }
+      end
+    end
+
     context 'respect configured visibility setting' do
       before(:each) do
         @settings = double("settings")
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 43aec1cd43..e2c3f648cc 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -104,10 +104,12 @@ module TestEnv
 
   def reset_satellite_dir
     setup_stubs
-    FileUtils.cd(seed_satellite_path) do
-      `git reset --hard --quiet`
-      `git clean -fx`
-      `git checkout --quiet origin/master`
+    [
+      %W(git reset --hard --quiet),
+      %W(git clean -fx --quiet),
+      %W(git checkout --quiet origin/master)
+    ].each do |git_cmd|
+      system(*git_cmd, chdir: seed_satellite_path)
     end
   end
 
@@ -117,7 +119,7 @@ module TestEnv
     repo = repo(namespace, name)
 
     # Symlink tmp/repositories/gitlabhq to tmp/test-git-base-path/gitlabhq
-    system("ln -s -f #{seed_repo_path()} #{repo}")
+    FileUtils.ln_sf(seed_repo_path, repo)
     create_satellite(repo, namespace, name)
   end
 
@@ -181,12 +183,11 @@ module TestEnv
     # Symlink tmp/satellite/gitlabhq to tmp/test-git-base-path/satellite/gitlabhq, create the directory if it doesn't exist already
     satellite_dir = File.dirname(satellite_repo)
     FileUtils.mkdir_p(satellite_dir) unless File.exists?(satellite_dir)
-    system("ln -s -f #{seed_satellite_path} #{satellite_repo}")
+    FileUtils.ln_sf(seed_satellite_path, satellite_repo)
   end
 
   def create_temp_repo(path)
     FileUtils.mkdir_p path
-    command = "git init --quiet --bare #{path};"
-    system(command)
+    system(*%W(git init --quiet --bare -- #{path}))
   end
 end
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index a5541bee87..71a45eb2fa 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -32,10 +32,10 @@ describe 'gitlab:app namespace rake task' do
         Rake::Task["gitlab:shell:setup"].stub invoke: true
       end
 
-      let(:gitlab_version) { %x{git rev-parse HEAD}.gsub(/\n/,"") }
+      let(:gitlab_version) { Gitlab::VERSION }
 
       it 'should fail on mismatch' do
-        YAML.stub load_file: {gitlab_version: gitlab_version.reverse}
+        YAML.stub load_file: {gitlab_version: "not #{gitlab_version}" }
         expect { run_rake_task }.to raise_error SystemExit
       end