Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/environment.rb2
-rw-r--r--config/initializers/gitlabhq/20_grit_ext.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/config/environment.rb b/config/environment.rb
index 9b09be0557d..c880a7adc42 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -4,4 +4,4 @@ require File.expand_path('../application', __FILE__)
# Initialize the rails application
Gitlab::Application.initialize!
-require File.join(Rails.root, "lib", "gitlabhq", "git_host")
+require File.join(Rails.root, "lib", "gitlab", "git_host")
diff --git a/config/initializers/gitlabhq/20_grit_ext.rb b/config/initializers/gitlabhq/20_grit_ext.rb
index 13e692cf20d..33c33ccc77a 100644
--- a/config/initializers/gitlabhq/20_grit_ext.rb
+++ b/config/initializers/gitlabhq/20_grit_ext.rb
@@ -15,11 +15,11 @@ end
Grit::Diff.class_eval do
def old_path
- Gitlabhq::Encode.utf8 a_path
+ Gitlab::Encode.utf8 a_path
end
def new_path
- Gitlabhq::Encode.utf8 b_path
+ Gitlab::Encode.utf8 b_path
end
end