Download as
Browse Code »

Commit 0bec49ebc103234007c7246e48a3b4ab9fab12cd

Authored by Dmitriy Zaporozhets
2 parents 7acd0604 001729bb
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #2100 from hiroponz/fix_non_utf8_file_encoding 

Fix #2058 diff problem of non ascii paths and non utf-8 file encoding
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
Gemfile
  Diff comments   View file @0bec49e
... ... @@ -26,7 +26,7 @@ gem "grit", git: "https://github.com/gitlabhq/grit.git", ref:
26 26 gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e'
27 27 gem 'yaml_db', git: "https://github.com/gitlabhq/yaml_db.git", ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd'
28 28 gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
29   -gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '212fd40bea61f3c6a167223768e7295dc32bbc10'
  29 +gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '8e6afc2da821354774aa4d1ee8a1aa2082f84a3e'
30 30  
31 31 # Gitolite client (for work with gitolite-admin repo)
32 32 gem "gitolite", '1.1.0'
... ...
Gemfile.lock
  Diff comments   View file @0bec49e
... ... @@ -26,10 +26,10 @@ GIT
26 26  
27 27 GIT
28 28 remote: https://github.com/gitlabhq/grit_ext.git
29   - revision: 212fd40bea61f3c6a167223768e7295dc32bbc10
30   - ref: 212fd40bea61f3c6a167223768e7295dc32bbc10
  29 + revision: 8e6afc2da821354774aa4d1ee8a1aa2082f84a3e
  30 + ref: 8e6afc2da821354774aa4d1ee8a1aa2082f84a3e
31 31 specs:
32   - grit_ext (0.6.0)
  32 + grit_ext (0.6.1)
33 33 charlock_holmes (~> 0.6.9)
34 34  
35 35 GIT
... ...