diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-30 10:17:07 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-30 10:17:07 +0300 |
| commit | 1d04a6fda7e5768dfc71cdffd74ede8f924ec647 (patch) | |
| tree | a2d6e3b7b983aeb765721d4f465f243d05e01ff7 | |
| parent | 14f5199cdcd9a84bdd273b24ba8d8f2eb9f60c23 (diff) | |
| parent | 0ef9ee18b12e35d677d621206897dd1b86b607b4 (diff) | |
| download | gitlab-ce-1d04a6fda7e5768dfc71cdffd74ede8f924ec647.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | app/services/compare_service.rb | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index dc30c490995..51076237fba 100644 --- a/.travis.yml +++ b/.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 diff --git a/README.md b/README.md index f5f7a8aad49..6d87f314720 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ - [](https://ci.gitlab.org/projects/1?ref=master) on ci.gitlab.org (master branch) -- [](https://codeclimate.com/github/gitlabhq/gitlabhq) +- [](https://codeclimate.com/github/gitlabhq/gitlabhq) - [](https://coveralls.io/r/gitlabhq/gitlabhq) diff --git a/app/services/compare_service.rb b/app/services/compare_service.rb index c5e04702914..6aa9df4b194 100644 --- a/app/services/compare_service.rb +++ b/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( |