diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index d8e01fd6c68..d7fbbc7bbcb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ before_install: - gem install charlock_holmes -v="0.6.9" branches: only: - - 'code-search' + - 'master' rvm: - 1.9.3-p392 - 2.0.0 @@ -24,7 +24,7 @@ gem 'omniauth-github' # Extracting information from a git repository # We cannot use original git since some bugs gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git' -gem 'gitlab_git', '~> 1.0.6' +gem 'gitlab_git', '~> 1.1.0' # Ruby/Rack Git Smart-HTTP Server Handler gem 'gitlab-grack', '~> 1.0.0', require: 'grack' @@ -155,7 +155,7 @@ group :development, :test do # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest' - + # Generate Fake data gem "ffaker" diff --git a/Gemfile.lock b/Gemfile.lock index 0a247127c57..ad2f6764a9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM gitlab-pygments.rb (0.3.2) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) - gitlab_git (1.0.6) + gitlab_git (1.1.0) activesupport (~> 3.2.13) github-linguist (~> 2.3.4) grit (~> 2.5.0) @@ -518,7 +518,7 @@ DEPENDENCIES github-markup (~> 0.7.4) gitlab-grack (~> 1.0.0) gitlab-pygments.rb (~> 0.3.2) - gitlab_git (~> 1.0.6) + gitlab_git (~> 1.1.0) gitlab_meta (= 5.0) gitlab_omniauth-ldap (= 1.0.2) gollum-lib (~> 1.0.0) |