diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-22 10:11:26 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-22 10:11:26 +0000 |
| commit | 75f7a9648ea7b0ad09ab54dc62a925b1733d9c01 (patch) | |
| tree | 9d3935c878acb36b9b580009aeaf568c709d8e3a /Gemfile | |
| parent | 29069abec30fbdcae43577874ddbddb6081c67b5 (diff) | |
| parent | cfc261d7078347d83e865e48efe948158aac0622 (diff) | |
| download | gitlab-ce-75f7a9648ea7b0ad09ab54dc62a925b1733d9c01.tar.gz | |
Merge branch 'web-editor-autocrlf' into 'master'
Convert CRLF newlines to LF when committing using the web editor.
Fixes #1823 and https://github.com/gitlabhq/gitlabhq/issues/7950.
Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/29 being merged and a new gitlab_git being released.
cc @jacobvosmaer
See merge request !858
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -34,7 +34,7 @@ gem "browser", '~> 0.8.0' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 7.2.3' +gem "gitlab_git", '~> 7.2.5' # Ruby/Rack Git Smart-HTTP Server Handler # GitLab fork with a lot of changes (improved thread-safety, better memory usage etc) |