gitlab_git 7.2.4 → 7.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d43d1859e1ba560a9b0bef8f3e7648428db5183
-  data.tar.gz: 45fe03e2f99ab9d0a238daa50c61253fff10128e
+  metadata.gz: 77a0966dee4ee400b3d059cf21d5c3011f6892bd
+  data.tar.gz: 7b336b8404c2cb023cfe5389fcaa81ca57fc1181
 SHA512:
-  metadata.gz: 8bdaa34ce7d4396dba478349431b0ef123249f60a63986413d2b5a4387be4859849693a898c6051c6b9e6b6b3a11b435db86b2b3667a0054e03ef821c8e7a9ef
-  data.tar.gz: 916c7d976cf401ee50c594b418a3c0562284df425f19b89464afdc9ce6eed929a1b3533194e72565c8f7c24b9b978b8fa10e3514afa0d52082cd6c72612898ee
+  metadata.gz: 75d79c89f80a7e030e93f582f2bd0c76d01bb31718619b450b201154260b8843badfcd0854baa4643d2fbb475e46b59e96da42e3d30e80e40eb0a6e7021d7705
+  data.tar.gz: 4426e90fffa2b670f0c4e4bf520a5e9057a582349463722249693596ae11a30dc32e8fa3b876dc038e3263a2bd777118eb284f64542100c9b67a3175dc39ea03

data/VERSION

@@ -1 +1 @@
-7.2.4
+7.2.5

data/lib/gitlab_git/blob.rb

@@ -126,7 +126,13 @@ module Gitlab
           if action == :remove
             index.remove(file[:path])
           else
-            oid = repo.write(file[:content], :blob)
+            content = file[:content]
+
+            # When writing to the repo directly as we are doing here, 
+            # the `core.autocrlf` config isn't taken into account.
+            content.gsub!("\r\n", "\n") if repository.autocrlf
+
+            oid = repo.write(content, :blob)
             index.add(path: file[:path], oid: oid, mode: 0100644)
           end
 

data/lib/gitlab_git/repository.rb

@@ -756,9 +756,18 @@ module Gitlab
         commits
       end
 
-      # Set the "core.autocrlf" config option to true for this repo.
-      def enable_autocrlf
-        rugged.config['core.autocrlf'] = true
+      AUTOCRLF_VALUES = {
+        "true" => true,
+        "false" => false,
+        "input" => :input
+      }.freeze
+
+      def autocrlf
+        AUTOCRLF_VALUES[rugged.config['core.autocrlf']]
+      end
+
+      def autocrlf=(value)
+        rugged.config['core.autocrlf'] = AUTOCRLF_VALUES.invert[value]
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.2.4
+  version: 7.2.5
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Gitlab::Git library