diff --git a/README.mkd b/README.mkd index 69528e6c141..4cdb4bdd128 100755 --- a/README.mkd +++ b/README.mkd @@ -110,8 +110,8 @@ The *httpServer* variable should be set to the hostname which will be used to ac may optionally include a port using the ':portnum' syntax, i.e. www.my-own-person-git-host-server.com:8000. Unlike earlier versions of this plugin, this variable should *not* include the path to your Redmine root. -The *gitServer* variable should be set to the hostname which will be used to access the gitolite repositories via ssh. In most configurations, this -variable will be identical to the *httpServer*, except for the fact that *gitServer* will never include an optional port number. +The *gitServer* variable should be set to the hostname which will be used to access the gitolite repositories via ssh. Like *httpServer*, this variable may optionally include a port using the ':portnum' syntax, i.e. www.my-own-person-git-host-server.com:444. In most configurations, the *gitServer* +variable will be identical to the *httpServer*, except when ports are involved. The *gitUser* is the user under which gitolite is installed. diff --git a/app/models/git_hosting_settings_observer.rb b/app/models/git_hosting_settings_observer.rb index e80e3615690..0d586cf9d2c 100644 --- a/app/models/git_hosting_settings_observer.rb +++ b/app/models/git_hosting_settings_observer.rb @@ -26,20 +26,20 @@ def before_save(object) valuehash['gitoliteIdentityPublicKeyFile'] = @@old_valuehash['gitoliteIdentityPublicKeyFile'] end - # Server should not include any path components + # Server should not include any path components. Also, ports should be numeric. if valuehash['gitServer'] normalizedServer = valuehash['gitServer'].lstrip.rstrip.split('/').first - if (normalizedServer == '') + if (!normalizedServer.match(/^[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*(:\d+)?$/)) valuehash['gitServer'] = @@old_valuehash['gitServer'] else valuehash['gitServer'] = normalizedServer end end - # Server should not include any path components + # Server should not include any path components. Also, ports should be numeric. if valuehash['httpServer'] normalizedServer = valuehash['httpServer'].lstrip.rstrip.split('/').first - if (normalizedServer == '') + if (!normalizedServer.match(/^[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*(:\d+)?$/)) valuehash['httpServer'] = @@old_valuehash['httpServer'] else valuehash['httpServer'] = normalizedServer diff --git a/app/views/repositories/git_instructions.html.erb b/app/views/repositories/git_instructions.html.erb index 7ec4075eb0e..2664af7851e 100644 --- a/app/views/repositories/git_instructions.html.erb +++ b/app/views/repositories/git_instructions.html.erb @@ -1,7 +1,10 @@ + <%# This is used to display basic git setup instructions, like on github... %> <% flash.now[:warning] = "Repository is empty. Get started by following the instructions below." %> -<% git_ssh_url = Setting.plugin_redmine_git_hosting['gitUser'] + "@" + Setting.plugin_redmine_git_hosting['gitServer'] + ":" + GitHosting.repository_name(@project) + '.git' %> - +<% gitSHP = Setting.plugin_redmine_git_hosting['gitServer'].match(/:\d+$/) %> +<% git_ssh_url = + "#{gitSHP ? 'ssh://' : ''}#{Setting.plugin_redmine_git_hosting['gitUser']}@#{Setting.plugin_redmine_git_hosting['gitServer']}#{gitSHP ? '/' : ':'}#{GitHosting.repository_name(@project)}.git" %> +

Git Setup:

diff --git a/app/views/settings/_display_access.html.erb b/app/views/settings/_display_access.html.erb index 5e7d63063d3..e0acbac9c62 100644 --- a/app/views/settings/_display_access.html.erb +++ b/app/views/settings/_display_access.html.erb @@ -7,7 +7,8 @@ %>
- <%= "ssh://#{@settings['gitUser']}@#{@settings['gitServer']}:#{@settings['gitRedmineSubdir']}#{(GitHosting.repository_hierarchy)?'project1/project2/':''}project3.git" + <% gitSHP = Setting.plugin_redmine_git_hosting['gitServer'].match(/:\d+$/) %> + <%= "#{gitSHP ? 'ssh://' : ''}#{@settings['gitUser']}@#{@settings['gitServer']}#{gitSHP ? '/' : ':'}#{@settings['gitRedmineSubdir']}#{(GitHosting.repository_hierarchy)?'project1/project2/':''}project3.git" %>
diff --git a/assets/javascripts/git_url_display.js b/assets/javascripts/git_url_display.js index b601e77a78b..b276bc9ab23 100644 --- a/assets/javascripts/git_url_display.js +++ b/assets/javascripts/git_url_display.js @@ -4,7 +4,8 @@ function updateGitUrl(el) guHttpBase = guHttpBase.replace(/\/$/, "") var urls=[] - urls["git_url_ssh"] = [guGitUser + "@" + guGitServer + ":" + guSshURL, guUserIsCommitter] + var gitSHP = /:\d+$/.test(guGitServer) + urls["git_url_ssh"] = [(gitSHP ? "ssh://" : "") + guGitUser + "@" + guGitServer + (gitSHP ? "/" : ":") + guSshURL, guUserIsCommitter] urls["git_url_http"] = [guHttpProto + "://" + ( (!guProjectIsPublic) || guUserIsCommitter ? guUser + "@" : "") + guHttpBase + "/" + guHttpURL, guUserIsCommitter] urls["git_url_git"] = ["git://" + guGitServer + "/" + guSshURL, false] var allGitUrlIds = ["git_url_ssh", "git_url_http", "git_url_git"] diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/da.yml b/config/locales/da.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/de.yml b/config/locales/de.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/el.yml b/config/locales/el.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/en.yml b/config/locales/en.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/es.yml b/config/locales/es.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/he.yml b/config/locales/he.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/id.yml b/config/locales/id.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/it.yml b/config/locales/it.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/no.yml b/config/locales/no.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index bb511450454..7ba32bcb0c2 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -98,7 +98,7 @@ pt: mirror_push_sucess: Sucesso. mirror_push_fail: Falhou! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/pt.yml b/config/locales/pt.yml index bb511450454..7ba32bcb0c2 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -98,7 +98,7 @@ pt: mirror_push_sucess: Sucesso. mirror_push_fail: Falhou! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/th.yml b/config/locales/th.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 883f70017e9..93609f2ddeb 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -100,7 +100,7 @@ mirror_push_sucess: Success. mirror_push_fail: Failed! - display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties + display_access_setup: Assume that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties display_access_emphasis: In the above patterns, emphasized components represent context-dependent elements. display_access_hierarchical: Parent projects are included in the URLs, since the repository is in Hierarchical mode. display_access_flat: Parent projects are not included in the URLs, since the repository is in Flat mode. diff --git a/lib/git_hosting.rb b/lib/git_hosting.rb index dbd36bd9ae0..ef7dc5be393 100755 --- a/lib/git_hosting.rb +++ b/lib/git_hosting.rb @@ -396,7 +396,7 @@ def self.clone_or_pull_gitolite_admin else logger.info "Cloning gitolite-admin repository to #{repo_dir}" shell %[rm -rf "#{repo_dir}"] - shell %[env GIT_SSH=#{gitolite_ssh()} git clone #{git_user}@#{Setting.plugin_redmine_git_hosting['gitServer']}:gitolite-admin.git #{repo_dir}] + shell %[env GIT_SSH=#{gitolite_ssh()} git clone ssh://#{git_user}@#{Setting.plugin_redmine_git_hosting['gitServer']}/gitolite-admin.git #{repo_dir}] return_val = true # on master, since fresh clone end shell %[chmod 700 "#{repo_dir}" ] @@ -415,7 +415,7 @@ def self.clone_or_pull_gitolite_admin logger.info " Deleting and recloning gitolite-admin to #{repo_dir}" shell %[rm -r #{repo_dir}] unless !File.exists?(repo_dir) - shell %[env GIT_SSH=#{gitolite_ssh()} git clone #{git_user}@#{Setting.plugin_redmine_git_hosting['gitServer']}:gitolite-admin.git #{repo_dir}] + shell %[env GIT_SSH=#{gitolite_ssh()} git clone ssh://#{git_user}@#{Setting.plugin_redmine_git_hosting['gitServer']}/gitolite-admin.git #{repo_dir}] shell %[chmod 700 "#{repo_dir}" ] # Make sure we have our hooks setup GitAdapterHooks.check_hooks_installed