From 09f83de297dc11b6572e26ec4e063c05fd668b22 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 30 Aug 2014 00:44:56 +0800 Subject: [PATCH 1/4] make CI build faster --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) 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 From 02ee3a53a0df043093b97ab06d5ae35c291d89d2 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 30 Aug 2014 00:50:44 +0800 Subject: [PATCH 2/4] Use svg instead of png to get better image quality --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f5f7a8aad49..6d87f314720 100644 --- a/README.md +++ b/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) From 5317c26cf75ef07ce21979ea4d3eb63f478fe242 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Fri, 29 Aug 2014 19:35:04 +0200 Subject: [PATCH 3/4] Comment typo. --- app/services/compare_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/compare_service.rb b/app/services/compare_service.rb index c5e04702914..ea4eb0d4cf1 100644 --- a/app/services/compare_service.rb +++ b/app/services/compare_service.rb @@ -4,7 +4,7 @@ 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 + # Note: Use satellite only when need to compare between two repos # because satellites are slower then operations on bare repo if target_project == source_project Gitlab::CompareResult.new( From af7b19003cc6183c0a43c2c7c6ee52691fef1069 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Fri, 29 Aug 2014 20:11:57 +0200 Subject: [PATCH 4/4] Comment typo. --- app/services/compare_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/compare_service.rb b/app/services/compare_service.rb index ea4eb0d4cf1..6aa9df4b194 100644 --- a/app/services/compare_service.rb +++ b/app/services/compare_service.rb @@ -5,7 +5,7 @@ class CompareService # Try to compare branches to get commits list and diffs # # Note: Use satellite only when need to compare between two repos - # because satellites are slower then operations on bare repo + # because satellites are slower than operations on bare repo if target_project == source_project Gitlab::CompareResult.new( Gitlab::Git::Compare.new(