From f72598b659871a3d4e8ef1905918067522ba2a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Fri, 6 Oct 2017 19:42:56 -0300 Subject: Move Gitlab::Diff::LineCode to module Gitlab::Git --- lib/github/representation/comment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/github') diff --git a/lib/github/representation/comment.rb b/lib/github/representation/comment.rb index 1b5be91461b..b87a11672ed 100644 --- a/lib/github/representation/comment.rb +++ b/lib/github/representation/comment.rb @@ -23,7 +23,7 @@ module Github private def generate_line_code(line) - Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos) + Gitlab::Git::DiffLineCode.generate(file_path, line.new_pos, line.old_pos) end def on_diff? -- cgit v1.2.1 From faa9bd402d3521b3f7b4cc2583f8ef1b3cceb821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Mon, 9 Oct 2017 16:40:37 -0300 Subject: Create a Gitlab::Git submodule for conlict-related files Rename classes to (hopefully) clearer names while we're doing that. --- lib/github/representation/comment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/github') diff --git a/lib/github/representation/comment.rb b/lib/github/representation/comment.rb index b87a11672ed..0cb871630fd 100644 --- a/lib/github/representation/comment.rb +++ b/lib/github/representation/comment.rb @@ -23,7 +23,7 @@ module Github private def generate_line_code(line) - Gitlab::Git::DiffLineCode.generate(file_path, line.new_pos, line.old_pos) + Gitlab::Git::Conflict::LineCode.generate(file_path, line.new_pos, line.old_pos) end def on_diff? -- cgit v1.2.1 From 9fdde3693b3b49e929b7c80ccbec4abe412edb7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Tue, 10 Oct 2017 14:44:14 -0300 Subject: Move line code generation into Gitlab::Git Having a distinct class just for that was a bit overkill --- lib/github/representation/comment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/github') diff --git a/lib/github/representation/comment.rb b/lib/github/representation/comment.rb index 0cb871630fd..83bf0b5310d 100644 --- a/lib/github/representation/comment.rb +++ b/lib/github/representation/comment.rb @@ -23,7 +23,7 @@ module Github private def generate_line_code(line) - Gitlab::Git::Conflict::LineCode.generate(file_path, line.new_pos, line.old_pos) + Gitlab::Git.diff_line_code(file_path, line.new_pos, line.old_pos) end def on_diff? -- cgit v1.2.1 From 314e5b5f20889971fef092c26bcb675ac2af4b07 Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Wed, 18 Oct 2017 12:53:06 +0100 Subject: Use wiki.disk_path --- lib/github/import.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/github') diff --git a/lib/github/import.rb b/lib/github/import.rb index 55f8387f27a..76612799412 100644 --- a/lib/github/import.rb +++ b/lib/github/import.rb @@ -74,7 +74,7 @@ module Github def fetch_wiki_repository return if project.wiki.repository_exists? - wiki_path = "#{project.disk_path}.wiki" + wiki_path = project.wiki.disk_path gitlab_shell.import_repository(project.repository_storage_path, wiki_path, wiki_url) rescue Gitlab::Shell::Error => e # GitHub error message when the wiki repo has not been created, -- cgit v1.2.1