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.lock | |
| 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.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0640c14d343..e64a32b6230 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -266,7 +266,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.0) gemojione (~> 2.0) - gitlab_git (7.2.3) + gitlab_git (7.2.5) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -765,7 +765,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) - gitlab_git (~> 7.2.3) + gitlab_git (~> 7.2.5) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) |