summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-12-15 17:31:14 +0100
committerRémy Coutable <remy@rymai.me>2016-12-19 17:35:51 +0100
commit103114e3d73819f76bed9d8ad1bbdb8964875579 (patch)
tree3457c48ed93ee0266acf6f459e5a9c312e3d42b4 /config
parent5d4531db2555d3051fc47e9268728a670ece95f9 (diff)
downloadgitlab-ce-103114e3d73819f76bed9d8ad1bbdb8964875579.tar.gz
Rename Gogs to Gitea, DRY the controller and improve views
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb2
-rw-r--r--config/routes/import.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index c0dbf62bfa2..ee97b4e42b9 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -213,7 +213,7 @@ Settings.gitlab.default_projects_features['builds'] = true if Settin
Settings.gitlab.default_projects_features['container_registry'] = true if Settings.gitlab.default_projects_features['container_registry'].nil?
Settings.gitlab.default_projects_features['visibility_level'] = Settings.send(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE)
Settings.gitlab['domain_whitelist'] ||= []
-Settings.gitlab['import_sources'] ||= %w[gogs github bitbucket gitlab google_code fogbugz git gitlab_project]
+Settings.gitlab['import_sources'] ||= %w[github bitbucket gitlab google_code fogbugz git gitlab_project gitea]
Settings.gitlab['trusted_proxies'] ||= []
Settings.gitlab['no_todos_messages'] ||= YAML.load_file(Rails.root.join('config', 'no_todos_messages.yml'))
diff --git a/config/routes/import.rb b/config/routes/import.rb
index a0427dade99..c378253bf15 100644
--- a/config/routes/import.rb
+++ b/config/routes/import.rb
@@ -6,7 +6,7 @@ namespace :import do
get :jobs
end
- resource :gogs, only: [:create, :new], controller: :gogs do
+ resource :gitea, only: [:create, :new], controller: :gitea do
post :personal_access_token
get :status
get :jobs