Merge branch 'master' of github.com:gitlabhq/gitlabhq

.travis.yml

@@ -21,6 +21,7 @@ env:
 before_install:
   - sudo apt-get install libicu-dev -y
 install:
+  - "travis_retry bundle config build.nokogiri --use-system-libraries"
   - "travis_retry bundle install --deployment --without production --retry 5"
 branches:
   only:
@@ -37,3 +38,5 @@ before_script:
 script: "bundle exec rake $TASK --trace"
 notifications:
   email: false
+git:
+  depth: 10

README.md

@@ -21,7 +21,7 @@
 
 - [![build status](https://ci.gitlab.org/projects/1/status.png?ref=master)](https://ci.gitlab.org/projects/1?ref=master) on ci.gitlab.org (master branch)
 
-- [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.png)](https://codeclimate.com/github/gitlabhq/gitlabhq)
+- [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
 
 - [![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq)
 

app/services/compare_service.rb

@@ -4,8 +4,8 @@ class CompareService
   def execute(current_user, source_project, source_branch, target_project, target_branch)
     # Try to compare branches to get commits list and diffs
     #
-    # Note: Use satellite only when need to compare between to repos
-    # because satellites are slower then operations on bare repo
+    # Note: Use satellite only when need to compare between two repos
+    # because satellites are slower than operations on bare repo
     if target_project == source_project
       Gitlab::CompareResult.new(
         Gitlab::Git::Compare.new(