Download as
Browse Code »

Commit 2255dc8f8d388b6df1919f9fc44ecb9ea55de511

Authored by Dmitriy Zaporozhets
2 parents 3ca6c960 13e7ef4b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #947 from netdata/Update_gemfile_for_latest_grit 

Update to the latest grit
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
Gemfile
  Diff comments   View file @2255dc8
... ... @@ -8,7 +8,7 @@ gem "devise", "~> 1.5"
8 8 gem "stamp"
9 9 gem "kaminari"
10 10 gem "haml-rails"
11   -gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "9536f306645f2d6b1f993ae02d3a29893ba8881f"
  11 +gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
12 12 gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
13 13 gem "carrierwave"
14 14 gem "six"
... ...
Gemfile.lock
  Diff comments   View file @2255dc8
... ... @@ -15,8 +15,8 @@ GIT
15 15  
16 16 GIT
17 17 remote: https://github.com/gitlabhq/grit.git
18   - revision: 9536f306645f2d6b1f993ae02d3a29893ba8881f
19   - ref: 9536f306645f2d6b1f993ae02d3a29893ba8881f
  18 + revision: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
  19 + ref: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
20 20 specs:
21 21 grit (2.5.0)
22 22 diff-lcs (~> 1.1)
... ...