Merge branch 'master' into request/relative_submodules

Conflicts: CHANGELOG

Merge branch 'master' into request/relative_submodules
Conflicts: CHANGELOG
Timm Drevensek
2 parents c0744e5b 24e9c5e8
Showing 457 changed files with 8091 additions and 6375 deletions Show diff stats
.gitignore
.rspec
CHANGELOG
CONTRIBUTING.md
Gemfile
Gemfile.lock
PROCESS.md
Procfile
README.md
VERSION
app/assets/images/authbuttons/github_32.png
app/assets/images/authbuttons/github_64.png
app/assets/images/authbuttons/google_32.png
app/assets/images/authbuttons/google_64.png
app/assets/images/authbuttons/twitter_32.png
app/assets/images/authbuttons/twitter_64.png
app/assets/images/bg_fallback.png
app/assets/images/icon_sprite.png
app/assets/images/progress_bar.gif
app/assets/images/slider_handles.png
@@ -35,3 +35,4 @@ doc/code/*
 *.log
 public/uploads.*
 public/assets/
+.envrc
---color --drb
+--color
+v 6.8.0
+  - Ability to at mention users that are participating in issue and merge req. discussion
+  - Enabled GZip Compression for assets in example Nginx, make sure that Nginx is compiled with --with-http_gzip_static_module flag (this is default in Ubuntu)
+  - Add support for relative submodules
+
+v 6.7.2
+  - Fix upgrader script
+
+v 6.7.1
+  - Fix GitLab CI integration
+
 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)
-  - Add support for relative submodules
+  - 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)
+  - New page load indicator that includes a spinner that scrolls with the page
+  - 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
+  - Added Slack service integration (Federico Ravasio)
+  - Better API responses for access_levels (sponsored by O'Reilly Media)
+  - Requires at least 2 unicorn workers
+  - Requires gitlab-shell v1.9+
+  - Replaced gemoji(due to closed licencing problem) with Phantom Open Emoji library(combined SIL Open Font License, MIT License and the CC 3.0 License)
+  - Fix `/:username.keys` response content type (Dmitry Medvinsky)
+
+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
@@ -25,7 +75,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)
@@ -34,7 +84,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
-  - Blob and tree gfm links to anchors work
+  - Fixed attachment identifier displaying underneath note text (Jason Blanchard)
  
 v 6.5.1
   - Fix branch selectbox when create merge request from fork
@@ -22,11 +22,14 @@ 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.
+The [issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues) is only for obvious errors in the latest [stable or development release of GitLab](MAINTENANCE.md).
+If something is wrong but it is not a regression compared to older versions of GitLab please do not open an issue but a feature request.
+When submitting an issue please conform to the issue submission guidelines listed below.
+Not all issues will be addressed and your issue is more likely to be addressed if you submit a merge request which partially or fully addresses the issue.
  
-Do not use the issue tracker for feature requests. We have a specific [feedback and suggestions forum](http://feedback.gitlab.com) for this purpose.
+Do not use the issue tracker for feature requests. We have a specific [feature request forum](http://feedback.gitlab.com) for this purpose.
  
 Please send a merge request with a tested solution or a merge request with a failing test instead of opening an issue if you can. If you're unsure where to post, post to the [mailing list](https://groups.google.com/forum/#!forum/gitlabhq) or [Stack Overflow](http://stackoverflow.com/questions/tagged/gitlab) first. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there.
  
@@ -48,7 +51,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 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.
+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 feature request 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
  
@@ -64,7 +67,7 @@ If you can, please submit a merge request with the fix or improvements including
 1. The MR title should describes the change you want to make
 1. The MR description should give a motive for your change and the method you used to achieve it
 1. If the MR changes the UI it should include before and after screenshots
-1. Link relevant [issues](https://gitlab.com/gitlab-org/gitlab-ce/issues) and/or [feedback items](http://feedback.gitlab.com/) from the merge request description and leave a comment on them with a link back to the MR
+1. Link relevant [issues](https://gitlab.com/gitlab-org/gitlab-ce/issues) and/or [feature requests](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).
  
@@ -74,6 +77,14 @@ Please keep the change in a single MR **as small as possible**. If you want to c
  
 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.
  
+**Please format your merge request description as follows:**
+
+1. What does this MR do?
+2. Are there points in the code the reviewer needs to double check?
+3. Why was this MR needed?
+4. What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
+5. Screenshots (If appropiate)
+
 ## Contribution acceptance criteria
  
 1. The change is as small as possible (see the above paragraph for details)
@@ -15,6 +15,9 @@ gem &#39;rails-observers&#39;
 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 &#39;omniauth-github&#39;
  
 # 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'
@@ -45,7 +48,8 @@ gem &quot;gitlab-linguist&quot;, &quot;~&gt; 3.0.0&quot;, require: &quot;linguist&quot;
  
 # 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
@@ -111,6 +115,7 @@ gem &#39;settingslogic&#39;
  
 # Misc
 gem "foreman"
+gem 'version_sorter'
  
 # Cache
 gem "redis-rails"
@@ -127,6 +132,9 @@ gem &quot;gitlab-flowdock-git-hook&quot;, &quot;~&gt; 0.4.2&quot;
 # Gemnasium integration
 gem "gemnasium-gitlab-service", "~> 0.2"
  
+# Slack integration
+gem "slack-notifier", "~> 0.2.0"
+
 # d3
 gem "d3_rails", "~> 3.1.4"
  
@@ -157,14 +165,15 @@ gem &quot;modernizr&quot;,        &quot;2.6.2&quot;
 gem "raphael-rails", "~> 2.1.2"
 gem 'bootstrap-sass', '~> 3.0'
 gem "font-awesome-rails", '~> 3.2'
-gem "gemoji", "~> 1.3.0"
+gem "gitlab_emoji", "~> 0.0.1.1"
 gem "gon", '~> 5.0.0'
+gem 'nprogress-rails'
  
 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'
@@ -209,7 +218,6 @@ group :development, :test do
   # PhantomJS driver for Capybara
   gem 'poltergeist', '~> 1.4.1'
  
-  gem 'spork', '~> 1.0rc'
   gem 'jasmine', '2.0.0.rc5'
  
   gem "spring", '1.1.1'
@@ -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)
@@ -117,6 +128,8 @@ GEM
       mail (~> 2.2)
     email_validator (1.4.0)
       activemodel
+    emoji (1.0.1)
+      json
     enumerize (0.7.0)
       activesupport (>= 3.2)
     equalizer (0.0.8)
@@ -154,7 +167,6 @@ GEM
     formatador (0.2.4)
     gemnasium-gitlab-service (0.2.1)
       rugged (~> 0.19)
-    gemoji (1.3.1)
     gherkin-ruby (0.3.1)
       racc
     github-markdown (0.5.5)
@@ -179,7 +191,9 @@ GEM
       charlock_holmes (~> 0.6.6)
       escape_utils (~> 0.2.4)
       mime-types (~> 1.19)
-    gitlab_git (5.4.0)
+    gitlab_emoji (0.0.1.1)
+      emoji (~> 1.0.1)
+    gitlab_git (5.7.1)
       activesupport (~> 4.0.0)
       charlock_holmes (~> 0.6.9)
       gitlab-grit (~> 2.6.1)
@@ -204,9 +218,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)
@@ -233,7 +244,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)
@@ -289,6 +300,7 @@ GEM
       net-ssh (>= 1.99.1)
     net-ssh (2.7.0)
     nokogiri (1.5.10)
+    nprogress-rails (0.1.2.3)
     oauth (0.4.7)
     oauth2 (0.8.1)
       faraday (~> 0.8)
@@ -460,6 +472,7 @@ GEM
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     six (0.2.0)
+    slack-notifier (0.2.0)
     slim (2.0.2)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
@@ -471,7 +484,6 @@ GEM
       capybara (>= 2.0.0)
       railties (>= 3)
       spinach (>= 0.4)
-    spork (1.0.0rc4)
     spring (1.1.1)
     spring-commands-rspec (1.0.1)
       spring (>= 0.9.1)
@@ -535,6 +547,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)
@@ -570,6 +583,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
@@ -581,18 +595,18 @@ DEPENDENCIES
   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_emoji (~> 0.0.1.1)
+  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
@@ -610,6 +624,7 @@ DEPENDENCIES
   minitest (~> 4.7.0)
   modernizr (= 2.6.2)
   mysql2
+  nprogress-rails
   omniauth (~> 1.1.3)
   omniauth-github
   omniauth-google-oauth2
@@ -642,9 +657,9 @@ DEPENDENCIES
   simplecov
   sinatra
   six
+  slack-notifier (~> 0.2.0)
   slim
   spinach-rails
-  spork (~> 1.0rc)
   spring (= 1.1.1)
   spring-commands-rspec (= 1.0.1)
   spring-commands-spinach (= 1.0.0)
@@ -659,4 +674,5 @@ DEPENDENCIES
   underscore-rails (~> 1.4.4)
   unicorn (~> 4.6.3)
   unicorn-worker-killer
+  version_sorter
   webmock
@@ -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
@@ -24,8 +24,6 @@ Below we describe the contributing process to GitLab for two reasons. So that co
 - Monitors for new merge requests (at least once a week)
 - Manages their work queue by looking at issues and merge requests assigned to them
 - Close fixed issues (via commit messages or manually)
-- Codes [new features](http://feedback.gitlab.com/forums/176466-general/filters/top)!
-- Response guidelines
 - Be kind to people trying to contribute. Be aware that people can be a non-native or a native English speaker, they might not understand thing or they might be very sensitive to how your word things. Use emoji to express your feelings (heart, star, smile, etc.). Some good tips about giving feedback to merge requests is in the [Thoughtbot code review guide](https://github.com/thoughtbot/guides/tree/master/code-review).
  
 ## Priorities of the issue team
@@ -37,7 +35,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
  
@@ -73,7 +71,7 @@ Thanks for the issue report. Please reformat your issue to conform to the issue 
  
 ### Feature requests
  
-Thanks for your interest in GitLab. We don't use the issue tracker for feature requests. Please use http://feedback.gitlab.com/ for this purpose or create a merge request implementing this feature. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) for more information.
+Thank you for your interest in improving GitLab. We don't use the issue tracker for feature requests. Things that are wrong but are not a regression compared to older versions of GitLab are considered feature requests and not issues. Please the [feature request forum](http://feedback.gitlab.com/) for this purpose or create a merge request implementing this feature. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) for more information.
  
 ### Issue report for old version
  
@@ -89,7 +87,7 @@ Please use ``` to format console output, logs, and code as it&#39;s very hard to rea
  
 ### Issue fixed in newer version
  
-Thanks for the issue report. This issue has already been fixed in newer versions of GitLab. Due to the size of this project and our limited resources we are only able to support the latest stable release as outlined in our \[contributing guidelines\]\(https://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
  
-web: bundle exec unicorn_rails -p $PORT -E development
+web: bundle exec unicorn_rails -p $PORT -E development -c config/unicorn_development.rb
 worker: bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,common,default,gitlab_shell
@@ -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.
  
@@ -73,7 +71,7 @@ Since 2011 GitLab is released on the 22nd of every month. Every new release incl
  
 It is recommended to follow a monthly upgrade schedule. Security releases come out when needed. For more information about the release process see the documentation for [monthly](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/release/monthly.md) and [security](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/release/security.md) releases.
  
-* Features that will be in the next releases are listed on [the feedback and suggestions forum](http://feedback.gitlab.com/forums/176466-general) with the status [started](http://feedback.gitlab.com/forums/176466-general/status/796456) and [completed](http://feedback.gitlab.com/forums/176466-general/status/796457).
+* Features that will be in the next releases are listed on the [feature request forum](http://feedback.gitlab.com/forums/176466-general) with the status [started](http://feedback.gitlab.com/forums/176466-general/status/796456) and [completed](http://feedback.gitlab.com/forums/176466-general/status/796457).
  
 ### Run in production mode
  
@@ -98,14 +96,9 @@ or start each component separately
  
 ### Run the tests
  
-* Seed the database
-
-        bundle exec rake db:setup RAILS_ENV=test
-        bundle exec rake db:seed_fu RAILS_ENV=test
-
 * Run all tests
  
-        bundle exec rake gitlab:test RAILS_ENV=test
+        bundle exec rake test
  
 * [RSpec](http://rspec.info/) unit and functional tests
  
@@ -142,7 +135,7 @@ or start each component separately
  
 * [Mailing list](https://groups.google.com/forum/#!forum/gitlabhq) and [Stack Overflow](http://stackoverflow.com/questions/tagged/gitlab) are the best places to ask questions. For example you can use it if you have questions about: permission denied errors, invisible repos, can't clone/pull/push or with web hooks that don't fire. Please search for similar issues before posting your own, there's a good chance somebody else had the same issue you have now and has resolved it. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there to a fix.
  
-* [Feedback and suggestions forum](http://feedback.gitlab.com) is the place to propose and discuss new features for GitLab.
+* [Feature request forum](http://feedback.gitlab.com) is the place to propose and discuss new features for GitLab.
  
 * [Contributing guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) describes how to submit merge requests and issues. Pull requests and issues not in line with the guidelines in this document will be closed.
  
@@ -155,12 +148,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/)
-6.7.0.pre
+6.8.0.pre
@@ -1,31 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-//= require jquery
-//= require jquery.ui.all
-//= require jquery_ujs
-//= require jquery.cookie
-//= require jquery.endless-scroll
-//= require jquery.highlight
-//= require jquery.history
-//= require jquery.waitforimages
-//= require jquery.atwho
-//= require jquery.scrollto
-//= require jquery.blockUI
-//= require turbolinks
-//= require jquery.turbolinks
-//= require bootstrap
-//= require modernizr
-//= require select2
-//= require raphael
-//= require g.raphael-min
-//= require g.bar-min
-//= require branch-graph
-//= require highlightjs.min
-//= require ace/ace
-//= require_tree .
-//= require d3
-//= require underscore
@@ -0,0 +1,154 @@
+# This is a manifest file that'll be compiled into including all the files listed below.
+# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+# be included in the compiled file accessible from http://example.com/assets/application.js
+# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+# the compiled file.
+#
+#= require jquery
+#= require jquery.ui.all
+#= require jquery_ujs
+#= require jquery.cookie
+#= require jquery.endless-scroll
+#= require jquery.highlight
+#= require jquery.history
+#= require jquery.waitforimages
+#= require jquery.atwho
+#= require jquery.scrollto
+#= require jquery.blockUI
+#= require turbolinks
+#= require jquery.turbolinks
+#= require bootstrap
+#= require modernizr
+#= require select2
+#= require raphael
+#= require g.raphael-min
+#= require g.bar-min
+#= require branch-graph
+#= require highlightjs.min
+#= require ace/ace
+#= require d3
+#= require underscore
+#= require nprogress
+#= require nprogress-turbolinks
+#= require_tree .
+
+window.slugify = (text) ->
+  text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase()
+
+window.ajaxGet = (url) ->
+  $.ajax({type: "GET", url: url, dataType: "script"})
+
+window.showAndHide = (selector) ->
+
+window.errorMessage = (message) ->
+  ehtml = $("<p>")
+  ehtml.addClass("error_message")
+  ehtml.html(message)
+  ehtml
+
+window.split = (val) ->
+  return val.split( /,\s*/ )
+
+window.extractLast = (term) ->
+  return split( term ).pop()
+
+# Disable button if text field is empty
+window.disableButtonIfEmptyField = (field_selector, button_selector) ->
+  field = $(field_selector)
+  closest_submit = field.closest("form").find(button_selector)
+
+  closest_submit.disable() if field.val() is ""
+
+  field.on "input", ->
+    if $(@).val() is ""
+      closest_submit.disable()
+    else
+      closest_submit.enable()
+
+window.sanitize = (str) ->
+  return str.replace(/<(?:.|\n)*?>/gm, '')
+
+window.linkify = (str) ->
+  exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig
+  return str.replace(exp,"<a href='$1'>$1</a>")
+
+window.simpleFormat = (str) ->
+  linkify(sanitize(str).replace(/\n/g, '<br />'))
+
+window.unbindEvents = ->
+  $(document).unbind('scroll')
+  $(document).off('scroll')
+
+document.addEventListener("page:fetch", unbindEvents)
+
+$ ->
+  # Click a .one_click_select field, select the contents
+  $(".one_click_select").on 'click', -> $(@).select()
+
+  $('.remove-row').bind 'ajax:success', ->
+    $(this).closest('li').fadeOut()
+
+  # Initialize select2 selects
+  $('select.select2').select2(width: 'resolve', dropdownAutoWidth: true)
+
+  # Initialize tooltips
+  $('.has_tooltip').tooltip()
+
+  # Bottom tooltip
+  $('.has_bottom_tooltip').tooltip(placement: 'bottom')
+
+  # Form submitter
+  $('.trigger-submit').on 'change', ->
+    $(@).parents('form').submit()
+
+  $("abbr.timeago").timeago()
+  $('.js-timeago').timeago()
+
+  # Flash
+  if (flash = $(".flash-container")).length > 0
+    flash.click -> $(@).fadeOut()
+    flash.show()
+    setTimeout (-> flash.fadeOut()), 5000
+
+  # Disable form buttons while a form is submitting
+  $('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->
+    buttons = $('[type="submit"]', @)
+
+    switch e.type
+      when 'ajax:beforeSend', 'submit'
+        buttons.disable()
+      else
+        buttons.enable()
+
+  # Show/Hide the profile menu when hovering the account box
+  $('.account-box').hover -> $(@).toggleClass('hover')
+
+  # Focus search field by pressing 's' key
+  $(document).keypress (e) ->
+    # Don't do anything if typing in an input
+    return if $(e.target).is(":input")
+
+    switch e.which
+      when 115
+        $("#search").focus()
+        e.preventDefault()
+      when 63
+        new Shortcuts()
+        e.preventDefault()
+
+
+  # Commit show suppressed diff
+  $(".diff-content").on "click", ".supp_diff_link", ->
+    $(@).next('table').show()
+    $(@).remove()
+
+(($) ->
+  # Disable an element and add the 'disabled' Bootstrap class
+  $.fn.extend disable: ->
+    $(@).attr('disabled', 'disabled').addClass('disabled')
+
+  # Enable an element and remove the 'disabled' Bootstrap class
+  $.fn.extend enable: ->
+    $(@).removeAttr('disabled').removeClass('disabled')
+
+)(jQuery)
 $ ->
   $("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()
 $ ->
   $("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()
@@ -6,13 +6,13 @@ GitLab.GfmAutoComplete =
   dataSource: ''
   # Emoji
   Emoji:
-    assetBase: ''
     template: '<li data-value="${insert}">${name} <img alt="${name}" height="20" src="${image}" width="20" /></li>'
  
   # Team Members
   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>'
  
@@ -26,7 +26,7 @@ GitLab.GfmAutoComplete =
       tpl: @Emoji.template
       callbacks:
         before_save: (emojis) =>
-          $.map emojis, (em) => name: em, insert: em+ ':', image: "#{@Emoji.assetBase}/#{em}.png"
+          $.map emojis, (em) => name: em.name, insert: em.name+ ':', image: em.path
  
     # Team Members
     input.atwho
@@ -46,11 +46,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
@@ -1,137 +0,0 @@
-window.slugify = (text) ->
-  text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase()
-
-window.ajaxGet = (url) ->
-  $.ajax({type: "GET", url: url, dataType: "script"})
-
-window.showAndHide = (selector) ->
-
-window.errorMessage = (message) ->
-  ehtml = $("<p>")
-  ehtml.addClass("error_message")
-  ehtml.html(message)
-  ehtml
-
-window.split = (val) ->
-  return val.split( /,\s*/ )
-
-window.extractLast = (term) ->
-  return split( term ).pop()
-
-# Disable button if text field is empty
-window.disableButtonIfEmptyField = (field_selector, button_selector) ->
-  field = $(field_selector)
-  closest_submit = field.closest("form").find(button_selector)
-
-  closest_submit.disable() if field.val() is ""
-
-  field.on "input", ->
-    if $(@).val() is ""
-      closest_submit.disable()
-    else
-      closest_submit.enable()
-
-window.sanitize = (str) ->
-  return str.replace(/<(?:.|\n)*?>/gm, '')
-
-window.linkify = (str) ->
-  exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig
-  return str.replace(exp,"<a href='$1'>$1</a>")
-
-window.simpleFormat = (str) ->
-  linkify(sanitize(str).replace(/\n/g, '<br />'))
-
-window.startSpinner = ->
-  $('.turbolink-spinner').fadeIn()
-
-window.stopSpinner = ->
-  $('.turbolink-spinner').fadeOut()
-
-window.unbindEvents = ->
-  $(document).unbind('scroll')
-  $(document).off('scroll')
-
-document.addEventListener("page:fetch", startSpinner)
-document.addEventListener("page:fetch", unbindEvents)
-document.addEventListener("page:change", stopSpinner)
-
-$ ->
-  # Click a .one_click_select field, select the contents
-  $(".one_click_select").on 'click', -> $(@).select()
-
-  $('.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)
-
-  # Initialize tooltips
-  $('.has_tooltip').tooltip()
-
-  # Bottom tooltip
-  $('.has_bottom_tooltip').tooltip(placement: 'bottom')
-
-  # Form submitter
-  $('.trigger-submit').on 'change', ->
-    $(@).parents('form').submit()
-
-  $("abbr.timeago").timeago()
-  $('.js-timeago').timeago()
-
-  # Flash
-  if (flash = $(".flash-container")).length > 0
-    flash.click -> $(@).fadeOut()
-    flash.show()
-    setTimeout (-> flash.fadeOut()), 5000
-
-  # Disable form buttons while a form is submitting
-  $('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->
-    buttons = $('[type="submit"]', @)
-
-    switch e.type
-      when 'ajax:beforeSend', 'submit'
-        buttons.disable()
-      else
-        buttons.enable()
-
-  # Show/Hide the profile menu when hovering the account box
-  $('.account-box').hover -> $(@).toggleClass('hover')
-
-  # Focus search field by pressing 's' key
-  $(document).keypress (e) ->
-    # Don't do anything if typing in an input
-    return if $(e.target).is(":input")
-
-    switch e.which
-      when 115
-        $("#search").focus()
-        e.preventDefault()
-      when 63
-        new Shortcuts()
-        e.preventDefault()
-
-
-  # Commit show suppressed diff
-  $(".diff-content").on "click", ".supp_diff_link", ->
-    $(@).next('table').show()
-    $(@).remove()
-
-  $(".diff-content").on "click", ".js-details-expand", ->
-    $(@).next('.js-details-contain').removeClass("hide")
-    $(@).remove()
-
-(($) ->
-  # Disable an element and add the 'disabled' Bootstrap class
-  $.fn.extend disable: ->
-    $(@).attr('disabled', 'disabled').addClass('disabled')
-
-  # Enable an element and remove the 'disabled' Bootstrap class
-  $.fn.extend enable: ->
-    $(@).removeAttr('disabled').removeClass('disabled')
-
-)(jQuery)
@@ -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>"
@@ -7,6 +7,8 @@
  *= require select2
  *= require highlightjs.min
  *= require_self
+ *= require nprogress
+ *= require nprogress-bootstrap
 */
  
 @import "main/variables.scss";
@@ -70,7 +72,7 @@
 @import "sections/groups.scss";
  
 /**
- * Code ighlight
+ * Code highlight
  */
 @import "highlight/white.scss";
 @import "highlight/dark.scss";
@@ -298,10 +298,6 @@ img.emoji {
   width: 20px;
 }
  
-.appear-data {
-  display: none;
-}
-
 .chart {
   overflow: hidden;
   height: 220px;
@@ -359,3 +355,7 @@ table {
 @media (max-width: $screen-xs-max) {
   .container .content { margin-top: 20px; }
 }
+
+.wiki .highlight, .note-body .highlight {
+  margin-bottom: 9px;
+}
 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;
@@ -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;
   }
@@ -51,24 +103,10 @@
  
   .state-label {
     font-size: 14px;
-    padding: 9px 25px;
+    padding: 1px 25px;
     text-align: center;
     text-shadow: none;
     margin-right: 20px;
-
-    &.state-label-blue {
-      background: #31708f;
-      color: #FFF;
-    }
-
-    &.state-label-green {
-      background: #4A4;
-      color: #FFF;
-    }
-
-    &.state-label-red {
-      background: #DA4E49;
-      color: #FFF;
-    }
+    display: inline-block;
   }
 }
@@ -88,9 +88,6 @@ a:focus {
 .wiki {
   @include md-typography;
  
-  font-size: 14px;
-  line-height: 1.6;
-
   /* Link to current header. */
   h1, h2, h3, h4, h5, h6 {
     position: relative;
@@ -105,7 +102,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;
     }
@@ -120,3 +117,11 @@ a:focus {
 .md {
   @include md-typography;
 }
+
+/**
+ * Textareas intended for GFM
+ *
+ */
+textarea.js-gfm-input {
+  font-family: $monospace_font;
+}
@@ -178,3 +178,9 @@
 .shadow {
   @include box-shadow(0 5px 15px #000);
 }
+
+.wiki, .note-body {
+  .highlight {
+    border: 1px solid #DDD;
+  }
+}
@@ -5,9 +5,7 @@ html {
 }
  
 body {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  margin-bottom: 20px;
+  padding-bottom: 20px;
 }
  
 .container {
@@ -84,6 +84,9 @@
 }
  
 @mixin md-typography {
+  font-size: 14px;
+  line-height: 1.6;
+
   img {
     max-width: 100%;
   }
@@ -0,0 +1,13 @@
+/* Generic print styles */
+header, nav, nav.main-nav, nav.navbar-collapse, nav.navbar-collapse.collapse {display: none!important;}
+.profiler-results {display: none;}
+
+/* Styles targeted specifically at printing files */
+.tree-ref-holder, .tree-holder .breadcrumb, .blob-commit-info {display: none;}
+.file-title {display: none;}
+.file-holder {border: none;}
+
+.wiki h1, .wiki h2, .wiki h3, .wiki h4, .wiki h5, .wiki h6 {margin-top: 17px; }
+.wiki h1 {font-size: 30px;}
+.wiki h2 {font-size: 22px;}
+.wiki h3 {font-size: 18px; font-weight: bold; }
@@ -73,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;
@@ -168,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 {
@@ -61,7 +61,7 @@
 }
  
 .project-row, .group-row {
-  padding: 10px 12px !important;
+  padding: 8px 12px !important;
   font-size: 14px;
   line-height: 24px;
  
@@ -144,7 +144,7 @@
       line-height: 0;
       img{
         border: 1px solid #FFF;
-        background: url('trans_bg.gif');
+        background: image-url('trans_bg.gif');
         max-width: 100%;
       }
       &.deleted {
@@ -209,7 +209,7 @@
           width: 15px;
           position: absolute;
           top: 0px;
-          background: url('swipemode_sprites.gif') 0 3px no-repeat;
+          background: image-url('swipemode_sprites.gif') 0 3px no-repeat;
         }
         .bottom-handle{
           display: block;
@@ -217,7 +217,7 @@
           width: 15px;
           position: absolute;
           bottom: 0px;
-          background: url('swipemode_sprites.gif') 0 -11px no-repeat;
+          background: image-url('swipemode_sprites.gif') 0 -11px no-repeat;
         }
       }
     } //.view.swipe
@@ -249,7 +249,7 @@
           left: 12px;
           height: 10px;
           width: 276px;
-          background: url('onion_skin_sprites.gif') -4px -20px repeat-x;
+          background: image-url('onion_skin_sprites.gif') -4px -20px repeat-x;
         }
  
         .dragger {
@@ -259,7 +259,7 @@
           top: 0px;
           height: 14px;
           width: 14px;
-          background: url('onion_skin_sprites.gif') 0px -34px repeat-x;
+          background: image-url('onion_skin_sprites.gif') 0px -34px repeat-x;
           cursor: pointer;
         }
  
@@ -270,7 +270,7 @@
           right: 0px;
           height: 10px;
           width: 10px;
-          background: url('onion_skin_sprites.gif') -2px 0px no-repeat;
+          background: image-url('onion_skin_sprites.gif') -2px 0px no-repeat;
         }
  
         .opaque {
@@ -280,7 +280,7 @@
           left: 0px;
           height: 10px;
           width: 10px;
-          background: url('onion_skin_sprites.gif') -2px -10px no-repeat;
+          background: image-url('onion_skin_sprites.gif') -2px -10px no-repeat;
         }
       }
     } //.view.onion-skin
@@ -42,7 +42,7 @@
     }
   }
  
-  padding: 14px 0px;
+  padding: 12px 0px;
   border-bottom: 1px solid #eee;
   .event-title {
     color: #333;
@@ -63,6 +63,10 @@
       color: #666;
       margin-top: 5px;
  
+      .md {
+        font-size: 13px;
+      }
+
       pre {
         border: none;
         background: #f9f9f9;
@@ -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;
           }
         }
@@ -272,3 +273,9 @@ header {
     }
   }
 }
+
+@media (max-width: $screen-xs-max) {
+  #nprogress .spinner {
+    right: 35px !important;
+  }
+}
@@ -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;
+}
@@ -27,11 +27,15 @@ ul.notes {
  
     .discussion-last-update,
     .note-last-update {
-      font-style: italic;
+      &:before {
+        content: "\00b7";
+      }
+      font-size: 13px;
     }
     .author {
-      color: $style_color;
+      color: #555;
       font-weight: bold;
+      font-size: 14px;
       &:hover {
         color: $primary_color;
       }
@@ -87,7 +91,6 @@ ul.notes {
     }
     .attachment {
       font-size: 14px;
-      margin-top: -20px;
     }
     .note-body {
       @include md-typography;
@@ -190,14 +193,13 @@ ul.notes {
 }
  
  
-
 /**
  * Line note button on the side of diffs
  */
  
 .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;
@@ -305,6 +307,7 @@ ul.notes {
   @extend .col-md-4;
   @extend .thumbnail;
   margin-left: 45px;
+  float: none;
 }
  
  
 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
@@ -6,6 +6,7 @@ class ApplicationController &lt; ActionController::Base
   before_filter :check_password_expiration
   around_filter :set_current_user_for_thread
   before_filter :add_abilities
+  before_filter :ldap_security_check
   before_filter :dev_tools if Rails.env == 'development'
   before_filter :default_headers
   before_filter :add_gon_variables
@@ -179,11 +180,30 @@ class ApplicationController &lt; ActionController::Base
     end
   end
  
+  def ldap_security_check
+    if current_user && current_user.requires_ldap_check?
+      gitlab_ldap_access do |access|
+        if access.allowed?(current_user)
+          current_user.last_credential_check_at = Time.now
+          current_user.save
+        else
+          sign_out current_user
+          flash[:alert] = "Access denied for your LDAP account."
+          redirect_to new_user_session_path
+        end
+      end
+    end
+  end
+
   def event_filter
     filters = cookies['event_filter'].split(',') if cookies['event_filter'].present?
     @event_filter ||= EventFilter.new(filters)
   end
  
+  def gitlab_ldap_access(&block)
+    Gitlab::LDAP::Access.open { |access| block.call(access) }
+  end
+
   # JSON for infinite scroll via Pager object
   def pager_json(partial, count)
     html = render_to_string(
@@ -210,4 +230,8 @@ class ApplicationController &lt; 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
@@ -22,6 +22,8 @@ class DashboardController &lt; 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) }
@@ -100,7 +100,7 @@ class GroupsController &lt; ApplicationController
   end
  
   def projects
-    @projects ||= ProjectsFinder.new.execute(current_user, group: group)
+    @projects ||= ProjectsFinder.new.execute(current_user, group: group).sorted_by_activity.non_archived
   end
  
   def project_ids
@@ -0,0 +1,18 @@
+class PasswordsController < Devise::PasswordsController
+
+  def create
+    email = resource_params[:email]
+    resource_found = resource_class.find_by_email(email)
+    if resource_found && resource_found.ldap_user?
+      flash[:alert] = "Cannot reset password for LDAP user."
+      respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name)) and return
+    end
+
+    self.resource = resource_class.send_reset_password_instructions(resource_params)
+    if successfully_sent?(resource)
+      respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name))
+    else
+      respond_with(resource)
+    end
+  end
+end
@@ -41,7 +41,7 @@ class Profiles::KeysController &lt; ApplicationController
       begin
         user = User.find_by_username(params[:username])
         if user.present?
-          render text: user.all_ssh_keys.join("\n")
+          render text: user.all_ssh_keys.join("\n"), content_type: "text/plain"
         else
           render_404 and return
         end
@@ -2,6 +2,8 @@ class Projects::EditTreeController &lt; 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
@@ -13,15 +15,11 @@ class Projects::EditTreeController &lt; Projects::BaseTreeController
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
  
-      # If blob edit was initiated from merge request page
-      from_merge_request = MergeRequest.find_by(id: params[:from_merge_request_id])
-
       if from_merge_request
         from_merge_request.reload_code
-        redirect_to diffs_project_merge_request_path(from_merge_request.target_project, from_merge_request)
-      else
-        redirect_to project_blob_path(@project, @id)
       end
+
+      redirect_to after_edit_path
     else
       flash[:alert] = result[:error]
       render :show
@@ -33,4 +31,19 @@ class Projects::EditTreeController &lt; 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
@@ -76,7 +76,7 @@ class Projects::IssuesController &lt; Projects::ApplicationController
   end
  
   def update
-    @issue.update_attributes(params[:issue].merge(author_id_of_changes: current_user.id))
+    @issue.update_attributes(params[:issue])
     @issue.reset_events_cache
  
     respond_to do |format|
@@ -60,7 +60,11 @@ class Projects::MergeRequestsController &lt; 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
@@ -105,7 +109,7 @@ class Projects::MergeRequestsController &lt; Projects::ApplicationController
     params[:merge_request].delete(:source_project_id)
     params[:merge_request].delete(:target_project_id)
  
-    if @merge_request.update_attributes(params[:merge_request].merge(author_id_of_changes: current_user.id))
+    if @merge_request.update_attributes(params[:merge_request])
       @merge_request.reset_events_cache
  
       respond_to do |format|
@@ -131,7 +135,7 @@ class Projects::MergeRequestsController &lt; 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 &lt; 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 &lt; 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?
@@ -38,7 +38,6 @@ class Projects::MilestonesController &lt; Projects::ApplicationController
  
   def create
     @milestone = @project.milestones.new(params[:milestone])
-    @milestone.author_id_of_changes = current_user.id
  
     if @milestone.save
       redirect_to project_milestone_path(@project, @milestone)
@@ -48,7 +47,7 @@ class Projects::MilestonesController &lt; Projects::ApplicationController
   end
  
   def update
-    @milestone.update_attributes(params[:milestone].merge(author_id_of_changes: current_user.id))
+    @milestone.update_attributes(params[:milestone])
  
     respond_to do |format|
       format.js
@@ -5,7 +5,7 @@ class ProjectsController &lt; 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 &lt; 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 &lt; 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 &lt; 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 &lt; 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)
  
@@ -105,10 +123,20 @@ class ProjectsController &lt; ApplicationController
   end
  
   def autocomplete_sources
+    note_type = params['type']
+    note_id = params['type_id']
+    participating = if note_type && note_id
+                      participants_in(note_type, note_id)
+                    else
+                      []
+                    end
+    team_members = sorted(@project.team.members)
+    participants = team_members + participating
     @suggestions = {
-      emojis: Emoji.names,
+      emojis: Emoji.names.map { |e| { name: e, path: view_context.image_url("emoji/#{e}.png") } },
       issues: @project.issues.select([:iid, :title, :description]),
-      members: @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } }
+      mergerequests: @project.merge_requests.select([:iid, :title, :description]),
+      members: participants.uniq
     }
  
     respond_to do |format|
@@ -143,4 +171,25 @@ class ProjectsController &lt; ApplicationController
   def user_layout
     current_user ? "projects" : "public_projects"
   end
+
+  def participants_in(type, id)
+    users = case type
+            when "Issue"
+              issue = @project.issues.find_by_iid(id)
+              issue ? issue.participants : []
+            when "MergeRequest"
+              merge_request = @project.merge_requests.find_by_iid(id)
+              merge_request ? merge_request.participants : []
+            when "Commit"
+              author_ids = Note.for_commit_id(id).pluck(:author_id).uniq
+              User.where(id: author_ids)
+            else
+              []
+            end
+    sorted(users)
+  end
+
+  def sorted(users)
+    users.uniq.sort_by(&:username).map { |user| { username: user.username, name: user.name } }
+  end
 end
@@ -7,6 +7,7 @@ class SearchController &lt; 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
@@ -19,6 +19,9 @@ class SnippetsController &lt; 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
@@ -47,9 +47,9 @@ class BaseFinder
         []
       end
     elsif current_user && params[:authorized_only].presence
-      klass.of_projects(current_user.authorized_projects)
+      klass.of_projects(current_user.authorized_projects).references(:project)
     else
-      klass.of_projects(Project.accessible_to(current_user))
+      klass.of_projects(Project.accessible_to(current_user)).references(:project)
     end
   end
  
@@ -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)
@@ -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)
@@ -135,12 +133,12 @@ module GitlabMarkdownHelper
   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
  
@@ -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
 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
  
@@ -19,7 +20,7 @@ module MergeRequestsHelper
       target_project_id: target_project.id,
       source_branch: event.branch_name,
       target_branch: target_project.repository.root_ref,
-      title: event.branch_name.titleize
+      title: event.branch_name.humanize
     }
   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
@@ -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?
@@ -40,7 +40,7 @@ module TreeHelper
   # Returns boolean
   def markup?(filename)
     filename.downcase.end_with?(*%w(.textile .rdoc .org .creole
-                                    .mediawiki .rst .asciidoc .pod))
+                                    .mediawiki .rst .adoc .asciidoc .pod))
   end
  
   def gitlab_markdown?(filename)
@@ -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
@@ -3,6 +3,7 @@ module Emails
     def new_issue_email(recipient_id, issue_id)
       @issue = Issue.find(issue_id)
       @project = @issue.project
+      @target_url = project_issue_url(@project, @issue)
       mail(from: sender(@issue.author_id),
            to: recipient(recipient_id),
            subject: subject("#{@issue.title} (##{@issue.iid})"))
@@ -12,6 +13,7 @@ module Emails
       @issue = Issue.find(issue_id)
       @previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
       @project = @issue.project
+      @target_url = project_issue_url(@project, @issue)
       mail(from: sender(updated_by_user_id),
            to: recipient(recipient_id),
            subject: subject("#{@issue.title} (##{@issue.iid})"))
@@ -21,6 +23,7 @@ module Emails
       @issue = Issue.find issue_id
       @project = @issue.project
       @updated_by = User.find updated_by_user_id
+      @target_url = project_issue_url(@project, @issue)
       mail(from: sender(updated_by_user_id),
            to: recipient(recipient_id),
            subject: subject("#{@issue.title} (##{@issue.iid})"))
@@ -31,6 +34,7 @@ module Emails
       @issue_status = status
       @project = @issue.project
       @updated_by = User.find updated_by_user_id
+      @target_url = project_issue_url(@project, @issue)
       mail(from: sender(updated_by_user_id),
            to: recipient(recipient_id),
            subject: subject("#{@issue.title} (##{@issue.iid})"))
@@ -3,6 +3,7 @@ module Emails
     def new_merge_request_email(recipient_id, merge_request_id)
       @merge_request = MergeRequest.find(merge_request_id)
       @project = @merge_request.project
+      @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})"))
@@ -12,6 +13,7 @@ module Emails
       @merge_request = MergeRequest.find(merge_request_id)
       @previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
       @project = @merge_request.project
+      @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})"))
@@ -21,15 +23,17 @@ module Emails
       @merge_request = MergeRequest.find(merge_request_id)
       @updated_by = User.find updated_by_user_id
       @project = @merge_request.project
+      @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)
+    def merged_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
       @merge_request = MergeRequest.find(merge_request_id)
       @project = @merge_request.project
-      mail(from: sender(@merge_request.author_id_of_changes),
+      @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
@@ -4,6 +4,7 @@ module Emails
       @note = Note.find(note_id)
       @commit = @note.noteable
       @project = @note.project
+      @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})"))
@@ -13,6 +14,7 @@ module Emails
       @note = Note.find(note_id)
       @issue = @note.noteable
       @project = @note.project
+      @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})"))
@@ -22,6 +24,7 @@ module Emails
       @note = Note.find(note_id)
       @merge_request = @note.noteable
       @project = @note.project
+      @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})"))
@@ -30,6 +33,7 @@ module Emails
     def note_wall_email(recipient_id, note_id)
       @note = Note.find(note_id)
       @project = @note.project
+      @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"))
@@ -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
@@ -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,6 +23,11 @@ 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(from: sender(author_id),
            to: recipient,
@@ -240,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
@@ -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.
@@ -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,
@@ -36,8 +37,6 @@ module Issuable
              allow_nil: true,
              prefix: true
  
-    attr_accessor :author_id_of_changes
-
     attr_mentionable :title, :description
   end
  
@@ -47,14 +47,6 @@ class Event &lt; ActiveRecord::Base
   scope :in_projects, ->(project_ids) { where(project_id: project_ids).recent }
  
   class << self
-    def determine_action(record)
-      if [Issue, MergeRequest].include? record.class
-        Event::CREATED
-      elsif record.kind_of? Note
-        Event::COMMENTED
-      end
-    end
-
     def create_ref_event(project, user, ref, action = 'add', prefix = 'refs/heads')
       commit = project.repository.commit(ref.target)
  
@@ -28,12 +28,9 @@ class Issue &lt; 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,
-                  :state_event
+                  :milestone_id, :label_list, :state_event
  
   acts_as_taggable_on :labels
  
@@ -50,9 +47,7 @@ class Issue &lt; ActiveRecord::Base
     end
  
     state :opened
-
     state :reopened
-
     state :closed
   end
  
@@ -53,7 +53,7 @@ class Key &lt; 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?
@@ -38,7 +38,7 @@ class MergeRequest &lt; ActiveRecord::Base
  
   delegate :commits, :diffs, :last_commit, :last_commit_short_sha, to: :merge_request_diff, prefix: nil
  
-  attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :author_id_of_changes, :state_event, :description
+  attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :state_event, :description
  
   attr_accessor :should_remove_source_branch
  
@@ -100,8 +100,6 @@ class MergeRequest &lt; 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 &lt; 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 &lt; 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
@@ -69,12 +69,6 @@ class MergeRequestDiff &lt; 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
@@ -16,8 +16,7 @@
 class Milestone < ActiveRecord::Base
   include InternalId
  
-  attr_accessible :title, :description, :due_date, :state_event, :author_id_of_changes
-  attr_accessor :author_id_of_changes
+  attr_accessible :title, :description, :due_date, :state_event
  
   belongs_to :project
   has_many :issues
@@ -89,6 +88,6 @@ class Milestone &lt; ActiveRecord::Base
   end
  
   def author_id
-    author_id_of_changes
+    nil
   end
 end
@@ -199,7 +199,8 @@ class Note &lt; ActiveRecord::Base
   def downvote?
     votable? && (note.start_with?('-1') ||
                  note.start_with?(':-1:') ||
-                 note.start_with?(':thumbsdown:')
+                 note.start_with?(':thumbsdown:') ||
+                 note.start_with?(':thumbs_down_sign:')
                 )
   end
  
@@ -249,7 +250,8 @@ class Note &lt; ActiveRecord::Base
   def upvote?
     votable? && (note.start_with?('+1') ||
                  note.start_with?(':+1:') ||
-                 note.start_with?(':thumbsup:')
+                 note.start_with?(':thumbsup:') ||
+                 note.start_with?(':thumbs_up_sign:')
                 )
   end
  
@@ -28,6 +28,8 @@ class Project &lt; 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,
@@ -54,15 +56,13 @@ class Project &lt; ActiveRecord::Base
   has_one :flowdock_service, dependent: :destroy
   has_one :assembla_service, dependent: :destroy
   has_one :gemnasium_service, dependent: :destroy
+  has_one :slack_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
@@ -71,10 +71,8 @@ class Project &lt; 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
  
@@ -94,15 +92,12 @@ class Project &lt; 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
@@ -115,14 +110,36 @@ class Project &lt; 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: 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]
@@ -161,15 +178,13 @@ class Project &lt; 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
-
-        where(namespace_id: namespace.id).find_by(path: id.second)
-      else
-        where(path: id, namespace_id: nil).last
-      end
+      return nil unless id.include?("/")
+
+      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
@@ -199,12 +214,28 @@ class Project &lt; 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
@@ -274,7 +305,7 @@ class Project &lt; ActiveRecord::Base
   end
  
   def available_services_names
-    %w(gitlab_ci campfire hipchat pivotaltracker flowdock assembla emails_on_push gemnasium)
+    %w(gitlab_ci campfire hipchat pivotaltracker flowdock assembla emails_on_push gemnasium slack)
   end
  
   def gitlab_ci?
@@ -358,18 +389,17 @@ class Project &lt; ActiveRecord::Base
     branch_name = ref.gsub("refs/heads/", "")
     c_ids = self.repository.commits_between(oldrev, newrev).map(&:id)
  
+    # 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 }
  
-    # 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) }
-
     true
   end
  
@@ -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
@@ -37,7 +37,7 @@ class GitlabCiService &lt; 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"]
@@ -0,0 +1,95 @@
+require 'slack-notifier'
+
+class SlackMessage
+  def initialize(params)
+    @after = params.fetch(:after)
+    @before = params.fetch(:before)
+    @commits = params.fetch(:commits, [])
+    @project_name = params.fetch(:project_name)
+    @project_url = params.fetch(:project_url)
+    @ref = params.fetch(:ref).gsub('refs/heads/', '')
+    @username = params.fetch(:user_name)
+  end
+
+  def compose
+    format(message)
+  end
+
+  private
+
+  attr_reader :after
+  attr_reader :before
+  attr_reader :commits
+  attr_reader :project_name
+  attr_reader :project_url
+  attr_reader :ref
+  attr_reader :username
+
+  def message
+    if new_branch?
+      new_branch_message
+    elsif removed_branch?
+      removed_branch_message
+    else
+      push_message << commit_messages
+    end
+  end
+
+  def format(string)
+    Slack::Notifier::LinkFormatter.format(string)
+  end
+
+  def new_branch_message
+    "#{username} pushed new branch #{branch_link} to #{project_link}"
+  end
+
+  def removed_branch_message
+    "#{username} removed branch #{ref} from #{project_link}"
+  end
+
+  def push_message
+    "#{username} pushed to branch #{branch_link} of #{project_link} (#{compare_link})"
+  end
+
+  def commit_messages
+    commits.each_with_object('') do |commit, str|
+      str << compose_commit_message(commit)
+    end
+  end
+
+  def compose_commit_message(commit)
+    id = commit.fetch(:id)[0..5]
+    message = commit.fetch(:message)
+    url = commit.fetch(:url)
+
+    "\n - #{message} ([#{id}](#{url}))"
+  end
+
+  def new_branch?
+    before =~ /000000/
+  end
+
+  def removed_branch?
+    after =~ /000000/
+  end
+
+  def branch_url
+    "#{project_url}/commits/#{ref}"
+  end
+
+  def compare_url
+    "#{project_url}/compare/#{before}...#{after}"
+  end
+
+  def branch_link
+    "[#{ref}](#{branch_url})"
+  end
+
+  def project_link
+    "[#{project_name}](#{project_url})"
+  end
+
+  def compare_link
+    "[Compare changes](#{compare_url})"
+  end
+end
@@ -0,0 +1,68 @@
+# == 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)
+#
+
+class SlackService < Service
+  attr_accessible :room
+  attr_accessible :subdomain
+
+  validates :room, presence: true, if: :activated?
+  validates :subdomain, presence: true, if: :activated?
+  validates :token, presence: true, if: :activated?
+
+  def title
+    'Slack'
+  end
+
+  def description
+    'A team communication tool for the 21st century'
+  end
+
+  def to_param
+    'slack'
+  end
+
+  def fields
+    [
+      { type: 'text', name: 'subdomain', placeholder: '' },
+      { type: 'text', name: 'token',     placeholder: '' },
+      { type: 'text', name: 'room',      placeholder: 'Ex. #general' },
+    ]
+  end
+
+  def execute(push_data)
+    message = SlackMessage.new(push_data.merge(
+      project_url: project_url,
+      project_name: project_name
+    ))
+
+    notifier = Slack::Notifier.new(subdomain, token)
+    notifier.channel = room
+    notifier.username = 'GitLab'
+    notifier.ping(message.compose)
+  end
+
+  private
+
+  def project_name
+    project.name_with_namespace.gsub(/\s/, '')
+  end
+
+  def project_url
+    project.web_url
+  end
+end
@@ -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
@@ -19,6 +19,8 @@
 # To add new service you should build a class inherited from Service
 # and implement a set of methods
 class Service < ActiveRecord::Base
+  default_value_for :active, false
+
   attr_accessible :title, :token, :type, :active, :api_key
  
   belongs_to :project
@@ -20,6 +20,8 @@ class Snippet &lt; 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
 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
@@ -185,7 +185,7 @@ class User &lt; ActiveRecord::Base
         where(conditions).first
       end
     end
-    
+
     def find_for_commit(email, name)
       # Prefer email match over name match
       User.where(email: email).first ||
@@ -249,7 +249,7 @@ class User &lt; ActiveRecord::Base
   def namespace_uniq
     namespace_name = self.username
     if Namespace.find_by(path: namespace_name)
-      self.errors.add :username, "already exist"
+      self.errors.add :username, "already exists"
     end
   end
  
@@ -275,7 +275,9 @@ class User &lt; ActiveRecord::Base
   # Projects user has access to
   def authorized_projects
     @authorized_projects ||= begin
-                               project_ids = (personal_projects.pluck(:id) + groups_projects.pluck(:id) + projects.pluck(:id)).uniq
+                               project_ids = personal_projects.pluck(:id)
+                               project_ids += groups_projects.pluck(:id)
+                               project_ids += projects.pluck(:id).uniq
                                Project.where(id: project_ids).joins(:namespace).order('namespaces.name ASC')
                              end
   end
@@ -406,6 +408,14 @@ class User &lt; ActiveRecord::Base
     end
   end
  
+  def requires_ldap_check?
+    if ldap_user?
+      !last_credential_check_at || (last_credential_check_at + 1.hour) < Time.now
+    else
+      false
+    end
+  end
+
   def solo_owned_groups
     @solo_owned_groups ||= owned_groups.select do |group|
       group.owners == [self]
@@ -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
@@ -1,39 +0,0 @@
-class ActivityObserver < BaseObserver
-  observe :issue, :note, :milestone
-
-  def after_create(record)
-    event_author_id = record.author_id
-
-    if record.kind_of?(Note)
-      # Skip system notes, like status changes and cross-references.
-      return true if record.system?
-
-      # Skip wall notes to prevent spamming of dashboard
-      return true if record.noteable_type.blank?
-    end
-
-    if event_author_id
-      create_event(record, Event.determine_action(record))
-    end
-  end
-
-  def after_close(record, transition)
-    create_event(record, Event::CLOSED)
-  end
-
-  def after_reopen(record, transition)
-    create_event(record, Event::REOPENED)
-  end
-
-  protected
-
-  def create_event(record, status)
-    Event.create(
-      project: record.project,
-      target_id: record.id,
-      target_type: record.class.name,
-      action: status,
-      author_id: current_user.id
-    )
-  end
-end
@@ -3,6 +3,10 @@ class BaseObserver &lt; ActiveRecord::Observer
     NotificationService.new
   end
  
+  def event_service
+    EventCreateService.new
+  end
+
   def log_info message
     Gitlab::AppLogger.info message
   end
 class IssueObserver < BaseObserver
   def after_create(issue)
     notification.new_issue(issue, current_user)
+    event_service.open_issue(issue, current_user)
     issue.create_cross_references!(issue.project, current_user)
     execute_hooks(issue)
   end
  
   def after_close(issue, transition)
     notification.close_issue(issue, current_user)
+    event_service.close_issue(issue, current_user)
     create_note(issue)
     execute_hooks(issue)
   end
  
   def after_reopen(issue, transition)
+    event_service.reopen_issue(issue, current_user)
     create_note(issue)
     execute_hooks(issue)
   end
-class MergeRequestObserver < ActivityObserver
-  observe :merge_request
-
+class MergeRequestObserver < BaseObserver
   def after_create(merge_request)
-    if merge_request.author_id
-      create_event(merge_request, Event.determine_action(merge_request))
-    end
-
+    event_service.open_mr(merge_request, current_user)
     notification.new_merge_request(merge_request, current_user)
     merge_request.create_cross_references!(merge_request.project, current_user)
     execute_hooks(merge_request)
   end
  
   def after_close(merge_request, transition)
-    create_event(merge_request, Event::CLOSED)
+    event_service.close_mr(merge_request, current_user)
     notification.close_mr(merge_request, current_user)
     create_note(merge_request)
     execute_hooks(merge_request)
   end
  
   def after_reopen(merge_request, transition)
-    create_event(merge_request, Event::REOPENED)
+    event_service.reopen_mr(merge_request, current_user)
     create_note(merge_request)
     execute_hooks(merge_request)
+    merge_request.reload_code
+    merge_request.mark_as_unchecked
   end
  
   def after_update(merge_request)
@@ -31,16 +28,6 @@ class MergeRequestObserver &lt; ActivityObserver
     execute_hooks(merge_request)
   end
  
-  def create_event(record, status)
-    Event.create(
-      project: record.target_project,
-      target_id: record.id,
-      target_type: record.class.name,
-      action: status,
-      author_id: current_user.id
-    )
-  end
-
   private
  
   # Create merge request note with service comment like 'Status changed to closed'
@@ -0,0 +1,13 @@
+class MilestoneObserver < BaseObserver
+  def after_create(milestone)
+    event_service.open_milestone(milestone, current_user)
+  end
+
+  def after_close(milestone, transition)
+    event_service.close_milestone(milestone, current_user)
+  end
+
+  def after_reopen(milestone, transition)
+    event_service.reopen_milestone(milestone, current_user)
+  end
+end
@@ -2,6 +2,12 @@ class NoteObserver &lt; BaseObserver
   def after_create(note)
     notification.new_note(note)
  
+    # Skip system notes, like status changes and cross-references.
+    # Skip wall notes to prevent spamming of dashboard
+    if note.noteable_type.present? && !note.system
+      event_service.leave_note(note, current_user)
+    end
+
     unless note.system?
       # Create a cross-reference note if this Note contains GFM that names an
       # issue, merge request, or commit.
 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)
@@ -0,0 +1,64 @@
+# EventCreateService class
+#
+# Used for creating events feed on dashboard after certain user action
+#
+# Ex.
+#   EventCreateService.new.new_issue(issue, current_user)
+#
+class EventCreateService
+  def open_issue(issue, current_user)
+    create_event(issue, current_user, Event::CREATED)
+  end
+
+  def close_issue(issue, current_user)
+    create_event(issue, current_user, Event::CLOSED)
+  end
+
+  def reopen_issue(issue, current_user)
+    create_event(issue, current_user, Event::REOPENED)
+  end
+
+  def open_mr(merge_request, current_user)
+    create_event(merge_request, current_user, Event::CREATED)
+  end
+
+  def close_mr(merge_request, current_user)
+    create_event(merge_request, current_user, Event::CLOSED)
+  end
+
+  def reopen_mr(merge_request, current_user)
+    create_event(merge_request, current_user, Event::REOPENED)
+  end
+
+  def merge_mr(merge_request, current_user)
+    create_event(merge_request, current_user, Event::MERGED)
+  end
+
+  def open_milestone(milestone, current_user)
+    create_event(milestone, current_user, Event::CREATED)
+  end
+
+  def close_milestone(milestone, current_user)
+    create_event(milestone, current_user, Event::CLOSED)
+  end
+
+  def reopen_milestone(milestone, current_user)
+    create_event(milestone, current_user, Event::REOPENED)
+  end
+
+  def leave_note(note, current_user)
+    create_event(note, current_user, Event::COMMENTED)
+  end
+
+  private
+
+  def create_event(record, current_user, status)
+    Event.create(
+      project: record.project,
+      target_id: record.id,
+      target_type: record.class.name,
+      action: status,
+      author_id: current_user.id
+    )
+  end
+end
...	...	@@ -35,3 +35,4 @@ doc/code/*
35	35	*.log
36	36	public/uploads.*
37	37	public/assets/
	38	+.envrc
...	...
	1	+v 6.8.0
	2	+ - Ability to at mention users that are participating in issue and merge req. discussion
	3	+ - Enabled GZip Compression for assets in example Nginx, make sure that Nginx is compiled with --with-http_gzip_static_module flag (this is default in Ubuntu)
	4	+ - Add support for relative submodules
	5	+
	6	+v 6.7.2
	7	+ - Fix upgrader script
	8	+
	9	+v 6.7.1
	10	+ - Fix GitLab CI integration
	11	+
1	12	v 6.7.0
	13	+ - Increased the example Nginx client_max_body_size from 5MB to 20MB, consider updating it manually on existing installations
2	14	- Add support for Gemnasium as a Project Service (Olivier Gonzalez)
3	15	- Add edit file button to MergeRequest diff
4	16	- Public groups (Jason Hollingsworth)
5	17	- Cleaner headers in Notification Emails (Pierre de La Morinerie)
6		- - Add support for relative submodules
	18	+ - Blob and tree gfm links to anchors work
	19	+ - Piwik Integration (Sebastian Winkler)
	20	+ - Show contribution guide link for new issue form (Jeroen van Baarsen)
	21	+ - Fix CI status for merge requests from fork
	22	+ - Added option to remove issue assignee on project issue page and issue edit page (Jason Blanchard)
	23	+ - New page load indicator that includes a spinner that scrolls with the page
	24	+ - Converted all the help sections into markdown
	25	+ - LDAP user filters
	26	+ - Streamline the content of notification emails (Pierre de La Morinerie)
	27	+ - Fixes a bug with group member administration (Matt DeTullio)
	28	+ - Sort tag names using VersionSorter (Robert Speicher)
	29	+ - Add GFM autocompletion for MergeRequests (Robert Speicher)
	30	+ - Add webhook when a new tag is pushed (Jeroen van Baarsen)
	31	+ - Add button for toggling inline comments in diff view
	32	+ - Add retry feature for repository import
	33	+ - Reuse the GitLab LDAP connection within each request
	34	+ - Changed markdown new line behaviour to conform to markdown standards
	35	+ - Fix global search
	36	+ - Faster authorized_keys rebuilding in `rake gitlab:shell:setup` (requires gitlab-shell 1.8.5)
	37	+ - Create and Update MR calls now support the description parameter (Greg Messner)
	38	+ - Markdown relative links in the wiki link to wiki pages, markdown relative links in repositories link to files in the repository
	39	+ - Added Slack service integration (Federico Ravasio)
	40	+ - Better API responses for access_levels (sponsored by O'Reilly Media)
	41	+ - Requires at least 2 unicorn workers
	42	+ - Requires gitlab-shell v1.9+
	43	+ - Replaced gemoji(due to closed licencing problem) with Phantom Open Emoji library(combined SIL Open Font License, MIT License and the CC 3.0 License)
	44	+ - Fix `/:username.keys` response content type (Dmitry Medvinsky)
	45	+
	46	+v 6.6.5
	47	+ - Added option to remove issue assignee on project issue page and issue edit page (Jason Blanchard)
	48	+ - Hide mr close button for comment form if merge request was closed or inline comment
	49	+ - Adds ability to reopen closed merge request
	50	+
	51	+v 6.6.4
	52	+ - Add missing html escape for highlighted code blocks in comments, issues
	53	+
	54	+v 6.6.3
	55	+ - Fix 500 error when edit yourself from admin area
	56	+ - Hide private groups for public profiles
7	57
8	58	v 6.6.2
9	59	- Fix 500 error on branch/tag create or remove via UI
...	...	@@ -25,7 +75,7 @@ v 6.6.0
25	75	- Remove snippet expiration
26	76	- Mobile UI improvements (Drew Blessing)
27	77	- Fix block/remove UI for admin::users#show page
28		- - Show users' group membership on users' activity page
	78	+ - Show users' group membership on users' activity page (Robert Djurasaj)
29	79	- User pages are visible without login if user is authorized to a public project
30	80	- Markdown rendered headers have id derived from their name and link to their id
31	81	- Improve application to work faster with large groups (100+ members)
...	...	@@ -34,7 +84,7 @@ v 6.6.0
34	84	- Restyle Issue#show page and MR#show page
35	85	- Ability to filter by multiple labels for Issues page
36	86	- Rails version to 4.0.3
37		- - Blob and tree gfm links to anchors work
	87	+ - Fixed attachment identifier displaying underneath note text (Jason Blanchard)
38	88
39	89	v 6.5.1
40	90	- Fix branch selectbox when create merge request from fork
...	...
...	...	@@ -22,11 +22,14 @@ Issues and merge requests should be in English and contain appropriate language
22	22
23	23	## Issue tracker
24	24
25		-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/).
	25	+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/).
26	26
27		-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.
	27	+The [issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues) is only for obvious errors in the latest [stable or development release of GitLab](MAINTENANCE.md).
	28	+If something is wrong but it is not a regression compared to older versions of GitLab please do not open an issue but a feature request.
	29	+When submitting an issue please conform to the issue submission guidelines listed below.
	30	+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.
28	31
29		-Do not use the issue tracker for feature requests. We have a specific [feedback and suggestions forum](http://feedback.gitlab.com) for this purpose.
	32	+Do not use the issue tracker for feature requests. We have a specific [feature request forum](http://feedback.gitlab.com) for this purpose.
30	33
31	34	Please send a merge request with a tested solution or a merge request with a failing test instead of opening an issue if you can. If you're unsure where to post, post to the [mailing list](https://groups.google.com/forum/#!forum/gitlabhq) or [Stack Overflow](http://stackoverflow.com/questions/tagged/gitlab) first. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there.
32	35
...	...	@@ -48,7 +51,7 @@ Please send a merge request with a tested solution or a merge request with a fai
48	51
49	52	## Merge requests
50	53
51		-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.
	54	+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 feature request 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.
52	55
53	56	### Merge request guidelines
54	57
...	...	@@ -64,7 +67,7 @@ If you can, please submit a merge request with the fix or improvements including
64	67	1. The MR title should describes the change you want to make
65	68	1. The MR description should give a motive for your change and the method you used to achieve it
66	69	1. If the MR changes the UI it should include before and after screenshots
67		-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
	70	+1. Link relevant [issues](https://gitlab.com/gitlab-org/gitlab-ce/issues) and/or [feature requests](http://feedback.gitlab.com/) from the merge request description and leave a comment on them with a link back to the MR
68	71	1. Be prepared to answer questions and incorporate feedback even if requests for this arrive weeks or months after your MR submittion
69	72	1. If your MR touches code that executes shell commands, make sure it adheres to the [shell command guidelines]( doc/development/shell_commands.md).
70	73
...	...	@@ -74,6 +77,14 @@ Please keep the change in a single MR as small as possible. If you want to c
74	77
75	78	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.
76	79
	80	+Please format your merge request description as follows:
	81	+
	82	+1. What does this MR do?
	83	+2. Are there points in the code the reviewer needs to double check?
	84	+3. Why was this MR needed?
	85	+4. What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
	86	+5. Screenshots (If appropiate)
	87	+
77	88	## Contribution acceptance criteria
78	89
79	90	1. The change is as small as possible (see the above paragraph for details)
...	...
...	...	@@ -15,6 +15,9 @@ gem 'rails-observers'
15	15	gem 'actionpack-page_caching'
16	16	gem 'actionpack-action_caching'
17	17
	18	+# Default values for AR models
	19	+gem "default_value_for", "~> 3.0.0"
	20	+
18	21	# Supported DBs
19	22	gem "mysql2", group: :mysql
20	23	gem "pg", group: :postgres
...	...	@@ -29,7 +32,7 @@ gem 'omniauth-github'
29	32
30	33	# Extracting information from a git repository
31	34	# Provide access to Gitlab::Git library
32		-gem "gitlab_git", '~> 5.4.0'
	35	+gem "gitlab_git", '~> 5.7.1'
33	36
34	37	# Ruby/Rack Git Smart-HTTP Server Handler
35	38	gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
...	...	@@ -45,7 +48,8 @@ gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
45	48
46	49	# API
47	50	gem "grape", "~> 0.6.1"
48		-gem "grape-entity", "~> 0.3.0"
	51	+# Replace with rubygems when nesteted entities get released
	52	+gem "grape-entity", "~> 0.4.1", ref: 'd904381c951e86250c3f44213b349a3dd8e83fb1', git: 'https://github.com/intridea/grape-entity.git'
49	53	gem 'rack-cors', require: 'rack/cors'
50	54
51	55	# Email validation
...	...	@@ -111,6 +115,7 @@ gem 'settingslogic'
111	115
112	116	# Misc
113	117	gem "foreman"
	118	+gem 'version_sorter'
114	119
115	120	# Cache
116	121	gem "redis-rails"
...	...	@@ -127,6 +132,9 @@ gem "gitlab-flowdock-git-hook", "~> 0.4.2"
127	132	# Gemnasium integration
128	133	gem "gemnasium-gitlab-service", "~> 0.2"
129	134
	135	+# Slack integration
	136	+gem "slack-notifier", "~> 0.2.0"
	137	+
130	138	# d3
131	139	gem "d3_rails", "~> 3.1.4"
132	140
...	...	@@ -157,14 +165,15 @@ gem "modernizr", "2.6.2"
157	165	gem "raphael-rails", "~> 2.1.2"
158	166	gem 'bootstrap-sass', '~> 3.0'
159	167	gem "font-awesome-rails", '~> 3.2'
160		-gem "gemoji", "~> 1.3.0"
	168	+gem "gitlab_emoji", "~> 0.0.1.1"
161	169	gem "gon", '~> 5.0.0'
	170	+gem 'nprogress-rails'
162	171
163	172	group :development do
164	173	gem "annotate", "~> 2.6.0.beta2"
165	174	gem "letter_opener"
166	175	gem 'quiet_assets', '~> 1.0.1'
167		- gem 'rack-mini-profiler'
	176	+ gem 'rack-mini-profiler', require: false
168	177
169	178	# Better errors handler
170	179	gem 'better_errors'
...	...	@@ -209,7 +218,6 @@ group :development, :test do
209	218	# PhantomJS driver for Capybara
210	219	gem 'poltergeist', '~> 1.4.1'
211	220
212		- gem 'spork', '~> 1.0rc'
213	221	gem 'jasmine', '2.0.0.rc5'
214	222
215	223	gem "spring", '1.1.1'
...	...
...	...	@@ -5,6 +5,15 @@ GIT
5	5	specs:
6	6	github-markup (0.7.6)
7	7
	8	+GIT
	9	+ remote: https://github.com/intridea/grape-entity.git
	10	+ revision: d904381c951e86250c3f44213b349a3dd8e83fb1
	11	+ ref: d904381c951e86250c3f44213b349a3dd8e83fb1
	12	+ specs:
	13	+ grape-entity (0.4.1)
	14	+ activesupport
	15	+ multi_json (>= 1.3.2)
	16	+
8	17	GEM
9	18	remote: https://rubygems.org/
10	19	specs:
...	...	@@ -101,6 +110,8 @@ GEM
101	110	daemons (1.1.9)
102	111	database_cleaner (1.2.0)
103	112	debug_inspector (0.0.2)
	113	+ default_value_for (3.0.0)
	114	+ activerecord (>= 3.2.0, < 5.0)
104	115	descendants_tracker (0.0.3)
105	116	devise (3.0.4)
106	117	bcrypt-ruby (~> 3.0)
...	...	@@ -117,6 +128,8 @@ GEM
117	128	mail (~> 2.2)
118	129	email_validator (1.4.0)
119	130	activemodel
	131	+ emoji (1.0.1)
	132	+ json
120	133	enumerize (0.7.0)
121	134	activesupport (>= 3.2)
122	135	equalizer (0.0.8)
...	...	@@ -154,7 +167,6 @@ GEM
154	167	formatador (0.2.4)
155	168	gemnasium-gitlab-service (0.2.1)
156	169	rugged (~> 0.19)
157		- gemoji (1.3.1)
158	170	gherkin-ruby (0.3.1)
159	171	racc
160	172	github-markdown (0.5.5)
...	...	@@ -179,7 +191,9 @@ GEM
179	191	charlock_holmes (~> 0.6.6)
180	192	escape_utils (~> 0.2.4)
181	193	mime-types (~> 1.19)
182		- gitlab_git (5.4.0)
	194	+ gitlab_emoji (0.0.1.1)
	195	+ emoji (~> 1.0.1)
	196	+ gitlab_git (5.7.1)
183	197	activesupport (~> 4.0.0)
184	198	charlock_holmes (~> 0.6.9)
185	199	gitlab-grit (~> 2.6.1)
...	...	@@ -204,9 +218,6 @@ GEM
204	218	rack-accept
205	219	rack-mount
206	220	virtus (>= 1.0.0)
207		- grape-entity (0.3.0)
208		- activesupport
209		- multi_json (>= 1.3.2)
210	221	growl (1.0.3)
211	222	guard (2.2.4)
212	223	formatador (>= 0.2.4)
...	...	@@ -233,7 +244,7 @@ GEM
233	244	httparty
234	245	httparty
235	246	http_parser.rb (0.5.3)
236		- httparty (0.12.0)
	247	+ httparty (0.13.0)
237	248	json (~> 1.8)
238	249	multi_xml (>= 0.5.2)
239	250	httpauth (0.2.0)
...	...	@@ -289,6 +300,7 @@ GEM
289	300	net-ssh (>= 1.99.1)
290	301	net-ssh (2.7.0)
291	302	nokogiri (1.5.10)
	303	+ nprogress-rails (0.1.2.3)
292	304	oauth (0.4.7)
293	305	oauth2 (0.8.1)
294	306	faraday (~> 0.8)
...	...	@@ -460,6 +472,7 @@ GEM
460	472	rack-protection (~> 1.4)
461	473	tilt (~> 1.3, >= 1.3.4)
462	474	six (0.2.0)
	475	+ slack-notifier (0.2.0)
463	476	slim (2.0.2)
464	477	temple (~> 0.6.6)
465	478	tilt (>= 1.3.3, < 2.1)
...	...	@@ -471,7 +484,6 @@ GEM
471	484	capybara (>= 2.0.0)
472	485	railties (>= 3)
473	486	spinach (>= 0.4)
474		- spork (1.0.0rc4)
475	487	spring (1.1.1)
476	488	spring-commands-rspec (1.0.1)
477	489	spring (>= 0.9.1)
...	...	@@ -535,6 +547,7 @@ GEM
535	547	raindrops (~> 0.7)
536	548	unicorn-worker-killer (0.4.2)
537	549	unicorn (~> 4)
	550	+ version_sorter (1.1.0)
538	551	virtus (1.0.1)
539	552	axiom-types (~> 0.0.5)
540	553	coercible (~> 1.0)
...	...	@@ -570,6 +583,7 @@ DEPENDENCIES
570	583	coveralls
571	584	d3_rails (~> 3.1.4)
572	585	database_cleaner
	586	+ default_value_for (~> 3.0.0)
573	587	devise (= 3.0.4)
574	588	devise-async (= 0.8.0)
575	589	email_spec
...	...	@@ -581,18 +595,18 @@ DEPENDENCIES
581	595	font-awesome-rails (~> 3.2)
582	596	foreman
583	597	gemnasium-gitlab-service (~> 0.2)
584		- gemoji (~> 1.3.0)
585	598	github-markup (~> 0.7.4)!
586	599	gitlab-flowdock-git-hook (~> 0.4.2)
587	600	gitlab-gollum-lib (~> 1.1.0)
588	601	gitlab-grack (~> 2.0.0.pre)
589	602	gitlab-linguist (~> 3.0.0)
590		- gitlab_git (~> 5.4.0)
	603	+ gitlab_emoji (~> 0.0.1.1)
	604	+ gitlab_git (~> 5.7.1)
591	605	gitlab_meta (= 6.0)
592	606	gitlab_omniauth-ldap (= 1.0.4)
593	607	gon (~> 5.0.0)
594	608	grape (~> 0.6.1)
595		- grape-entity (~> 0.3.0)
	609	+ grape-entity (~> 0.4.1)!
596	610	growl
597	611	guard-rspec
598	612	guard-spinach
...	...	@@ -610,6 +624,7 @@ DEPENDENCIES
610	624	minitest (~> 4.7.0)
611	625	modernizr (= 2.6.2)
612	626	mysql2
	627	+ nprogress-rails
613	628	omniauth (~> 1.1.3)
614	629	omniauth-github
615	630	omniauth-google-oauth2
...	...	@@ -642,9 +657,9 @@ DEPENDENCIES
642	657	simplecov
643	658	sinatra
644	659	six
	660	+ slack-notifier (~> 0.2.0)
645	661	slim
646	662	spinach-rails
647		- spork (~> 1.0rc)
648	663	spring (= 1.1.1)
649	664	spring-commands-rspec (= 1.0.1)
650	665	spring-commands-spinach (= 1.0.0)
...	...	@@ -659,4 +674,5 @@ DEPENDENCIES
659	674	underscore-rails (~> 1.4.4)
660	675	unicorn (~> 4.6.3)
661	676	unicorn-worker-killer
	677	+ version_sorter
662	678	webmock
...	...
...	...	@@ -12,7 +12,7 @@ Below we describe the contributing process to GitLab for two reasons. So that co
12	12	- 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.)
13	13	- Assigns appropriate [labels](#how-we-handle-issues)
14	14	- Asks for feedback from issue reporter/merge request initiator ([invalid issue reports](#improperly-formatted-issue), [format code](#code-format), etc.)
15		-- Asks for feedback from the relevant developer(s) based on the [list of members and their specialities](http://gitlab.org/team/)
	15	+- Asks for feedback from the relevant developer(s) based on the [list of members and their specialities](https://www.gitlab.com/core-team/)
16	16	- Monitors all issues/merge requests for feedback (but especially ones commented on since automatically watching them):
17	17	- Closes issues with no feedback from the reporter for two weeks
18	18	- Closes stale merge requests
...	...	@@ -24,8 +24,6 @@ Below we describe the contributing process to GitLab for two reasons. So that co
24	24	- Monitors for new merge requests (at least once a week)
25	25	- Manages their work queue by looking at issues and merge requests assigned to them
26	26	- Close fixed issues (via commit messages or manually)
27		-- Codes [new features](http://feedback.gitlab.com/forums/176466-general/filters/top)!
28		-- Response guidelines
29	27	- Be kind to people trying to contribute. Be aware that people can be a non-native or a native English speaker, they might not understand thing or they might be very sensitive to how your word things. Use emoji to express your feelings (heart, star, smile, etc.). Some good tips about giving feedback to merge requests is in the [Thoughtbot code review guide](https://github.com/thoughtbot/guides/tree/master/code-review).
30	28
31	29	## Priorities of the issue team
...	...	@@ -37,7 +35,7 @@ Below we describe the contributing process to GitLab for two reasons. So that co
37	35
38	36	## Mentioning people
39	37
40		-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.
	38	+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.
41	39
42	40	## Workflow labels
43	41
...	...	@@ -73,7 +71,7 @@ Thanks for the issue report. Please reformat your issue to conform to the issue
73	71
74	72	### Feature requests
75	73
76		-Thanks for your interest in GitLab. We don't use the issue tracker for feature requests. Please use http://feedback.gitlab.com/ for this purpose or create a merge request implementing this feature. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) for more information.
	74	+Thank you for your interest in improving GitLab. We don't use the issue tracker for feature requests. Things that are wrong but are not a regression compared to older versions of GitLab are considered feature requests and not issues. Please the [feature request forum](http://feedback.gitlab.com/) for this purpose or create a merge request implementing this feature. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) for more information.
77	75
78	76	### Issue report for old version
79	77
...	...	@@ -89,7 +87,7 @@ Please use ``` to format console output, logs, and code as it's very hard to rea
89	87
90	88	### Issue fixed in newer version
91	89
92		-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).
	90	+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).
93	91
94	92	### Improperly formatted merge request
95	93
...	...
1		-web: bundle exec unicorn_rails -p $PORT -E development
	1	+web: bundle exec unicorn_rails -p $PORT -E development -c config/unicorn_development.rb
2	2	worker: bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,common,default,gitlab_shell
...	...
...	...	@@ -23,19 +23,17 @@
23	23
24	24	### Resources
25	25
26		-* 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)
	26	+* [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/).
27	27
28		-* 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/)
	28	+* [GitLab Enterprise Edition](https://www.gitlab.com/gitlab-ce/) offers additional features that are useful for larger organizations (100+ users).
29	29
30		-* [GitLab Enterprise Edition](https://www.gitlab.com/features/) offers additional features that are useful for larger organizations (100+ users).
31		-
32		-* [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.
	30	+* [GitLab CI](https://www.gitlab.com/gitlab-ci/) is a continuous integration (CI) server that is easy to integrate with GitLab.
33	31
34	32	* 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
35	33
36	34	### Requirements
37	35
38		-* Ubuntu/Debian**
	36	+* Ubuntu/Debian/CentOS/RHEL**
39	37	* ruby 1.9.3+
40	38	* git 1.7.10+
41	39	* redis 2.0+
...	...	@@ -47,7 +45,7 @@
47	45
48	46	#### Official installation methods
49	47
50		-* [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.
	48	+* [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.
51	49
52	50	* [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.
53	51
...	...	@@ -73,7 +71,7 @@ Since 2011 GitLab is released on the 22nd of every month. Every new release incl
73	71
74	72	It is recommended to follow a monthly upgrade schedule. Security releases come out when needed. For more information about the release process see the documentation for [monthly](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/release/monthly.md) and [security](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/release/security.md) releases.
75	73
76		-* Features that will be in the next releases are listed on [the feedback and suggestions forum](http://feedback.gitlab.com/forums/176466-general) with the status [started](http://feedback.gitlab.com/forums/176466-general/status/796456) and [completed](http://feedback.gitlab.com/forums/176466-general/status/796457).
	74	+* Features that will be in the next releases are listed on the [feature request forum](http://feedback.gitlab.com/forums/176466-general) with the status [started](http://feedback.gitlab.com/forums/176466-general/status/796456) and [completed](http://feedback.gitlab.com/forums/176466-general/status/796457).
77	75
78	76	### Run in production mode
79	77
...	...	@@ -98,14 +96,9 @@ or start each component separately
98	96
99	97	### Run the tests
100	98
101		-* Seed the database
102		-
103		- bundle exec rake db:setup RAILS_ENV=test
104		- bundle exec rake db:seed_fu RAILS_ENV=test
105		-
106	99	* Run all tests
107	100
108		- bundle exec rake gitlab:test RAILS_ENV=test
	101	+ bundle exec rake test
109	102
110	103	* [RSpec](http://rspec.info/) unit and functional tests
111	104
...	...	@@ -142,7 +135,7 @@ or start each component separately
142	135
143	136	* [Mailing list](https://groups.google.com/forum/#!forum/gitlabhq) and [Stack Overflow](http://stackoverflow.com/questions/tagged/gitlab) are the best places to ask questions. For example you can use it if you have questions about: permission denied errors, invisible repos, can't clone/pull/push or with web hooks that don't fire. Please search for similar issues before posting your own, there's a good chance somebody else had the same issue you have now and has resolved it. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there to a fix.
144	137
145		-* [Feedback and suggestions forum](http://feedback.gitlab.com) is the place to propose and discuss new features for GitLab.
	138	+* [Feature request forum](http://feedback.gitlab.com) is the place to propose and discuss new features for GitLab.
146	139
147	140	* [Contributing guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) describes how to submit merge requests and issues. Pull requests and issues not in line with the guidelines in this document will be closed.
148	141
...	...	@@ -155,12 +148,3 @@ or start each component separately
155	148	* [Book](http://www.packtpub.com/gitlab-repository-management/book) written by GitLab enthusiast Jonathan M. Hethey is unofficial but it offers a good overview.
156	149
157	150	* [Gitter chat room](https://gitter.im/gitlabhq/gitlabhq#) here you can ask questions when you need help.
158		-
159		-
160		-### Getting in touch
161		-
162		-* [Core team](http://gitlab.org/team/)
163		-
164		-* [Contributors](http://contributors.gitlab.org/)
165		-
166		-* [Community](http://gitlab.org/community/)
...	...
...	...	@@ -1,31 +0,0 @@
1		-// This is a manifest file that'll be compiled into including all the files listed below.
2		-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
3		-// be included in the compiled file accessible from http://example.com/assets/application.js
4		-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
5		-// the compiled file.
6		-//
7		-//= require jquery
8		-//= require jquery.ui.all
9		-//= require jquery_ujs
10		-//= require jquery.cookie
11		-//= require jquery.endless-scroll
12		-//= require jquery.highlight
13		-//= require jquery.history
14		-//= require jquery.waitforimages
15		-//= require jquery.atwho
16		-//= require jquery.scrollto
17		-//= require jquery.blockUI
18		-//= require turbolinks
19		-//= require jquery.turbolinks
20		-//= require bootstrap
21		-//= require modernizr
22		-//= require select2
23		-//= require raphael
24		-//= require g.raphael-min
25		-//= require g.bar-min
26		-//= require branch-graph
27		-//= require highlightjs.min
28		-//= require ace/ace
29		-//= require_tree .
30		-//= require d3
31		-//= require underscore
...	...	@@ -0,0 +1,154 @@
	1	+# This is a manifest file that'll be compiled into including all the files listed below.
	2	+# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
	3	+# be included in the compiled file accessible from http://example.com/assets/application.js
	4	+# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
	5	+# the compiled file.
	6	+#
	7	+#= require jquery
	8	+#= require jquery.ui.all
	9	+#= require jquery_ujs
	10	+#= require jquery.cookie
	11	+#= require jquery.endless-scroll
	12	+#= require jquery.highlight
	13	+#= require jquery.history
	14	+#= require jquery.waitforimages
	15	+#= require jquery.atwho
	16	+#= require jquery.scrollto
	17	+#= require jquery.blockUI
	18	+#= require turbolinks
	19	+#= require jquery.turbolinks
	20	+#= require bootstrap
	21	+#= require modernizr
	22	+#= require select2
	23	+#= require raphael
	24	+#= require g.raphael-min
	25	+#= require g.bar-min
	26	+#= require branch-graph
	27	+#= require highlightjs.min
	28	+#= require ace/ace
	29	+#= require d3
	30	+#= require underscore
	31	+#= require nprogress
	32	+#= require nprogress-turbolinks
	33	+#= require_tree .
	34	+
	35	+window.slugify = (text) ->
	36	+ text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase()
	37	+
	38	+window.ajaxGet = (url) ->
	39	+ $.ajax({type: "GET", url: url, dataType: "script"})
	40	+
	41	+window.showAndHide = (selector) ->
	42	+
	43	+window.errorMessage = (message) ->
	44	+ ehtml = $("<p>")
	45	+ ehtml.addClass("error_message")
	46	+ ehtml.html(message)
	47	+ ehtml
	48	+
	49	+window.split = (val) ->
	50	+ return val.split( /,\s*/ )
	51	+
	52	+window.extractLast = (term) ->
	53	+ return split( term ).pop()
	54	+
	55	+# Disable button if text field is empty
	56	+window.disableButtonIfEmptyField = (field_selector, button_selector) ->
	57	+ field = $(field_selector)
	58	+ closest_submit = field.closest("form").find(button_selector)
	59	+
	60	+ closest_submit.disable() if field.val() is ""
	61	+
	62	+ field.on "input", ->
	63	+ if $(@).val() is ""
	64	+ closest_submit.disable()
	65	+ else
	66	+ closest_submit.enable()
	67	+
	68	+window.sanitize = (str) ->
	69	+ return str.replace(/<(?:.\|\n)*?>/gm, '')
	70	+
	71	+window.linkify = (str) ->
	72	+ exp = /(\b(https?\|ftp\|file):\/\/[-A-Z0-9+&@#\/%?=~_\|!:,.;]*[-A-Z0-9+&@#\/%=~_\|])/ig
	73	+ return str.replace(exp,"<a href='$1'>$1</a>")
	74	+
	75	+window.simpleFormat = (str) ->
	76	+ linkify(sanitize(str).replace(/\n/g, '<br />'))
	77	+
	78	+window.unbindEvents = ->
	79	+ $(document).unbind('scroll')
	80	+ $(document).off('scroll')
	81	+
	82	+document.addEventListener("page:fetch", unbindEvents)
	83	+
	84	+$ ->
	85	+ # Click a .one_click_select field, select the contents
	86	+ $(".one_click_select").on 'click', -> $(@).select()
	87	+
	88	+ $('.remove-row').bind 'ajax:success', ->
	89	+ $(this).closest('li').fadeOut()
	90	+
	91	+ # Initialize select2 selects
	92	+ $('select.select2').select2(width: 'resolve', dropdownAutoWidth: true)
	93	+
	94	+ # Initialize tooltips
	95	+ $('.has_tooltip').tooltip()
	96	+
	97	+ # Bottom tooltip
	98	+ $('.has_bottom_tooltip').tooltip(placement: 'bottom')
	99	+
	100	+ # Form submitter
	101	+ $('.trigger-submit').on 'change', ->
	102	+ $(@).parents('form').submit()
	103	+
	104	+ $("abbr.timeago").timeago()
	105	+ $('.js-timeago').timeago()
	106	+
	107	+ # Flash
	108	+ if (flash = $(".flash-container")).length > 0
	109	+ flash.click -> $(@).fadeOut()
	110	+ flash.show()
	111	+ setTimeout (-> flash.fadeOut()), 5000
	112	+
	113	+ # Disable form buttons while a form is submitting
	114	+ $('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->
	115	+ buttons = $('[type="submit"]', @)
	116	+
	117	+ switch e.type
	118	+ when 'ajax:beforeSend', 'submit'
	119	+ buttons.disable()
	120	+ else
	121	+ buttons.enable()
	122	+
	123	+ # Show/Hide the profile menu when hovering the account box
	124	+ $('.account-box').hover -> $(@).toggleClass('hover')
	125	+
	126	+ # Focus search field by pressing 's' key
	127	+ $(document).keypress (e) ->
	128	+ # Don't do anything if typing in an input
	129	+ return if $(e.target).is(":input")
	130	+
	131	+ switch e.which
	132	+ when 115
	133	+ $("#search").focus()
	134	+ e.preventDefault()
	135	+ when 63
	136	+ new Shortcuts()
	137	+ e.preventDefault()
	138	+
	139	+
	140	+ # Commit show suppressed diff
	141	+ $(".diff-content").on "click", ".supp_diff_link", ->
	142	+ $(@).next('table').show()
	143	+ $(@).remove()
	144	+
	145	+(($) ->
	146	+ # Disable an element and add the 'disabled' Bootstrap class
	147	+ $.fn.extend disable: ->
	148	+ $(@).attr('disabled', 'disabled').addClass('disabled')
	149	+
	150	+ # Enable an element and remove the 'disabled' Bootstrap class
	151	+ $.fn.extend enable: ->
	152	+ $(@).removeAttr('disabled').removeClass('disabled')
	153	+
	154	+)(jQuery)
...	...