Merge branch 'devel' into v1.0.x

redmine-git-hosting · Apr 10, 2015 · ed2fbfc · ed2fbfc
2 parents d0f6fde + 18e77ec
commit ed2fbfc
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -11,15 +11,15 @@
 
 This plugin allows straightforward management of Gitolite within Redmine.
 
-You can follow announcements [here](https://jbox-web.github.io/redmine_git_hosting/news/) or take a look at the [roadmap](https://jbox-web.github.io/redmine_git_hosting/about/roadmap/).
+You can follow announcements [here](http://redmine-git-hosting.io/news/) or take a look at the [roadmap](http://redmine-git-hosting.io/about/roadmap/).
 
-**[Latest stable version : 1.0.3](https://jbox-web.github.io/redmine_git_hosting/about/releases-notes/#toc-release-1-0-3)**
+**[Latest stable version : 1.0.3](http://redmine-git-hosting.io/releases-notes/release-1.0.3.html)**
 
 ## Installation
 
-The installation tutorial is [here](https://jbox-web.github.io/redmine_git_hosting/howtos/install/#step-by-step-installation). The migration tutorial is [here](https://jbox-web.github.io/redmine_git_hosting/howtos/migrate/).
+The installation tutorial is [here](http://redmine-git-hosting.io/get_started/). The migration tutorial is [here](http://redmine-git-hosting.io/how-to/migrate/).
 
-Read the documentation and more on the [project's website](https://jbox-web.github.io/redmine_git_hosting/).
+Read the documentation and more on the [project's website](http://redmine-git-hosting.io/).
 
 
 ## Copyrights & License

diff --git a/app/views/common/_git_urls.html.haml b/app/views/common/_git_urls.html.haml
@@ -19,4 +19,4 @@
   #git_url_box= l(:label_repository_access_not_configured)
 
 :javascript
-  $(document).ready(function() { setGitUrls('.git_url'); });
+  $(document).ready(function() { setFirstGitUrl('.git_url_list'); setGitUrls('.git_url'); });
diff --git a/assets/javascripts/application.js b/assets/javascripts/application.js
@@ -50,15 +50,19 @@ function updateUrl(element) {
 
 function setGitUrls(elements) {
   $(elements).each(function(index, element){
-    if (index == 0){
-      updateUrl(element);
-    };
     $(element).on('click', function(){
       updateUrl($(this));
     });
   });
 }
 
+function setFirstGitUrl(elements) {
+  $(elements).each(function(index, element){
+    var first_url = $(element).children().first();
+    updateUrl(first_url);
+  });
+}
+
 // GIT INSTRUCTIONS
 function updateInstructionUrl(element) {
   var url = $(element).data('url');

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1,6 +1,6 @@
 en:
 
-  module_name: Redmine Git Hosting
+  redmine_git_hosting: Redmine Git Hosting
 
   ########### MISCELANOUS ###########
   label_enabled: Enabled

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -1,6 +1,6 @@
 fr:
 
-  module_name: Redmine Git Hosting
+  redmine_git_hosting: Redmine Git Hosting
 
   ########### MISCELANOUS ###########
   label_enabled: Activé

diff --git a/init.rb b/init.rb
@@ -121,7 +121,7 @@
   end
 
   Redmine::MenuManager.map :admin_menu do |menu|
-    menu.push :redmine_git_hosting, { controller: 'settings', action: 'plugin', id: 'redmine_git_hosting' }, caption: :module_name
+    menu.push :redmine_git_hosting, { controller: 'settings', action: 'plugin', id: 'redmine_git_hosting' }, caption: :redmine_git_hosting
   end
 
   Redmine::MenuManager.map :top_menu do |menu|

diff --git a/lib/redmine_git_hosting/cache/redis.rb b/lib/redmine_git_hosting/cache/redis.rb
@@ -10,8 +10,12 @@ def set_cache(repo_id, command, output)
       # Create a SHA256 of the Git command as key id
       hashed_command = hash_key(repo_id, command)
 
+      # If *max_cache_time* is set to -1 (until next commit) then
+      # set the cache time to 1 day (we don't know when will be the next commit)
+      cache_time = (max_cache_time < 0) ? 86400 : max_cache_time
+
       begin
-        client.set(hashed_command, output, ex: max_cache_time)
+        client.set(hashed_command, output, ex: cache_time)
         true
       rescue => e
         logger.error("Redis Adapter : could not insert in cache, this is the error : '#{e.message}'")
@@ -72,7 +76,7 @@ def key_prefix(repo_id)
       end
 
 
-      # Make SHAR256 of the Git command as identifier
+      # Make SHA256 of the Git command as identifier
       #
       def hash_key(repo_id, command)
         "#{key_prefix(repo_id)}:#{Digest::SHA256.hexdigest(command)[0..16]}"