redmine-git-hosting · Jul 24, 2016 · Aug 15, 2016 · Aug 15, 2016 · Oct 3, 2016 · Oct 5, 2016
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 .*.swp
 Gemfile.lock
+settings.yml
 /tmp
 /rdoc
 /coverage
 /junit
+custom_hooks.rb
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,38 @@
 ## CHANGELOG
 
+### 1.2.3 - 2017-07-17
+
+* Merge [#640](https://github.com/jbox-web/redmine_git_hosting/pull/640) ([Views] Fix typo while rendering partial repositories/download_revision)
+* Merge [#646](https://github.com/jbox-web/redmine_git_hosting/pull/646) (Fix compatibility with Redmine 3.3)
+* Merge [#663](https://github.com/jbox-web/redmine_git_hosting/pull/663) ([Core] Fix installation of Gitolite3 hooks)
+* Improve custom Gitolite hook loading (see `custom_hooks.rb.example` at the root of the project)
+* Fix plugin icon with Redmine 3.4.x
+* Fix author url in sub-uri mode
+* Check if hook's permissions has changed
+* Catch Errno::ENOENT exceptions when installing custom hooks
+* Add logs for well installed Gitolite hooks
+
+### 1.2.2 - 2016-12-31
+
+* Fix [#472](https://github.com/jbox-web/redmine_git_hosting/issues/472) ([Views] 404 on the "My public keys" link in the user panel)
+* Fix [#526](https://github.com/jbox-web/redmine_git_hosting/issues/526) ([Core] Plugin breaks if gitolite user == redmine user)
+* Fix [#551](https://github.com/jbox-web/redmine_git_hosting/issues/551) ([Core] Make Sidekiq truly optional)
+* Fix [#576](https://github.com/jbox-web/redmine_git_hosting/issues/576) ([Models] Can't add Git Config Key)
+* Fix [#630](https://github.com/jbox-web/redmine_git_hosting/issues/630) ([Core] Use "gitolite query-rc" to get Gitolite variables)
+* Fix [#632](https://github.com/jbox-web/redmine_git_hosting/issues/632) ([Core] Mirroring does not work on git push)
+* Merge [#581](https://github.com/jbox-web/redmine_git_hosting/pull/581) (Fix [#472](https://github.com/jbox-web/redmine_git_hosting/issues/472) by amelentjev)
+* Merge [#621](https://github.com/jbox-web/redmine_git_hosting/pull/621) ([Routes] Mount grack under http_server_subdir)
+* Merge [#624](https://github.com/jbox-web/redmine_git_hosting/pull/624) ([Translations] Add Spanish translation)
+* Merge [#634](https://github.com/jbox-web/redmine_git_hosting/pull/634) ([Views] Added missing mandatory param for partial repositories/download_revision)
+* Merge [#636](https://github.com/jbox-web/redmine_git_hosting/pull/636) ([Doc] "Remove user ID from Gitolite identifier" requires a restart)
+* Fix repo url in Gitolite hooks
+* Fix nil data case when loading custom settings from empty file
+* Allow to load plugin settings from a file in Redmine root (should ease deployment and upgrades)
+* Fix wrong Repository Git objects count
+* Add Russian translation
+* Rename `redmine_git_hosting:restore_defaults` task to `redmine_git_hosting:update_settings`
+* Add Rake task `redmine_git_hosting:dump_settings` to dump plugin settings in console
+
 ### 1.2.1 - 2016-07-25
 
 * Fix [#524](https://github.com/jbox-web/redmine_git_hosting/issues/524) ([DB] Index too long)

diff --git a/Gemfile b/Gemfile
@@ -1,12 +1,9 @@
-source 'https://rubygems.org'
-
 # Gitolite Admin repository management
 gem 'gitolite-rugged', git: 'https://github.com/jbox-web/gitolite-rugged.git', tag: '1.2.0'
 
 ## Redmine 3.x
 ## Ruby/Rack Git Smart-HTTP Server Handler (use our own repository because Redmine uses Rails 4.2 and Rack 1.6)
 gem 'gitlab-grack', git: 'https://github.com/jbox-web/grack.git', require: 'grack', branch: 'fix_rails4'
-gem 'redcarpet', '~> 3.3.2'
 
 ## Redmine 2.x
 ## Ruby/Rack Git Smart-HTTP Server Handler (use our own repository because Redmine still uses Rails 3 and Rack 1.4)
@@ -30,6 +27,7 @@ gem 'org-ruby'
 gem 'creole'
 # gem 'wikicloth'
 gem 'asciidoctor'
+gem 'rdoc', "~> 4.3"
 
 # Rack parser for Hrack
 gem 'rack-parser', require: 'rack/parser'
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ This plugin allows straightforward management of Gitolite within Redmine.
 
 You can follow announcements [here](http://redmine-git-hosting.io/blog/) or take a look at the [roadmap](http://redmine-git-hosting.io/about/roadmap/).
 
-**[Latest stable version : 1.2.1](http://redmine-git-hosting.io/releases-notes/release-1.2.1.html)**
+**[Latest stable version : 1.2.3](http://redmine-git-hosting.io/releases-notes/release-1.2.3.html)**
 
 ## Installation
 

diff --git a/app/controllers/repository_git_config_keys_controller.rb b/app/controllers/repository_git_config_keys_controller.rb
@@ -53,7 +53,7 @@ def destroy
 
     def key_type
       case params[:repository_git_config_key][:type]
-      when 'RepositoryGitConfigKey::Config'
+      when 'RepositoryGitConfigKey::GitConfig'
         :git_config_keys
       when 'RepositoryGitConfigKey::Option'
         :git_option_keys

diff --git a/app/forms/plugin_settings_validation/storage_config.rb b/app/forms/plugin_settings_validation/storage_config.rb
@@ -2,30 +2,23 @@ module PluginSettingsValidation
   module StorageConfig
     extend ActiveSupport::Concern
 
-    PATHS_TO_VALIDATE = [:gitolite_global_storage_dir, :gitolite_redmine_storage_dir, :gitolite_recycle_bin_dir, :gitolite_local_code_dir]
+    PATHS_TO_VALIDATE = [:gitolite_global_storage_dir, :gitolite_redmine_storage_dir, :gitolite_recycle_bin_dir]
 
     included do
       # Gitolite Storage Config
       add_accessor :gitolite_global_storage_dir,
                    :gitolite_redmine_storage_dir,
-                   :gitolite_recycle_bin_dir,
-                   :gitolite_local_code_dir,
-                   :gitolite_lib_dir
+                   :gitolite_recycle_bin_dir
 
       before_validation do
         self.gitolite_global_storage_dir  = strip_value(gitolite_global_storage_dir)
         self.gitolite_redmine_storage_dir = strip_value(gitolite_redmine_storage_dir)
         self.gitolite_recycle_bin_dir     = strip_value(gitolite_recycle_bin_dir)
-        self.gitolite_local_code_dir      = strip_value(gitolite_local_code_dir)
-        self.gitolite_lib_dir             = strip_value(gitolite_lib_dir)
       end
 
-      validates_presence_of :gitolite_global_storage_dir, :gitolite_recycle_bin_dir, :gitolite_lib_dir
-      validates_presence_of :gitolite_local_code_dir, if: Proc.new { RedmineGitHosting::Config.gitolite_version == 3 }
+      validates_presence_of :gitolite_global_storage_dir, :gitolite_recycle_bin_dir
 
       validates_each PATHS_TO_VALIDATE do |record, attr, value|
-        # *gitolite_local_code_dir* is only available with Gitolite 3
-        next if attr == :gitolite_local_code_dir && RedmineGitHosting::Config.gitolite_version != 3
         record.errors.add(attr, 'must be relative') if value.starts_with?('/')
       end
     end

diff --git a/app/helpers/repository_git_config_keys_helper.rb b/app/helpers/repository_git_config_keys_helper.rb
@@ -2,7 +2,7 @@ module RepositoryGitConfigKeysHelper
 
   def git_config_key_options
     [
-      [l(:label_git_key_type_config), 'RepositoryGitConfigKey::Config'],
+      [l(:label_git_key_type_config), 'RepositoryGitConfigKey::GitConfig'],
       [l(:label_git_key_type_option), 'RepositoryGitConfigKey::Option']
     ]
   end

diff --git a/app/models/concerns/gitolitable/validations.rb b/app/models/concerns/gitolitable/validations.rb
@@ -54,7 +54,7 @@ def empty_in_gitolite?
 
 
     def git_objects_count
-      RedmineGitHosting::Commands.sudo_git_objects_count(gitolite_repository_path)
+      RedmineGitHosting::Commands.sudo_git_objects_count(File.join(gitolite_repository_path, 'objects'))
     end
 
 

diff --git a/app/views/archived_repositories/show.html.erb b/app/views/archived_repositories/show.html.erb
@@ -60,7 +60,8 @@
     <% end %>
   </ul>
 
-  <%= render :partial => 'repositories/download_revision' %>
+  <%= render :partial => 'repositories/download_revision',
+            :locals => { :repository => @repository } %>
 <% end %>
 
 <% content_for :header_tags do %>

diff --git a/app/views/settings/redmine_git_hosting/_gitolite_config_file.html.haml b/app/views/settings/redmine_git_hosting/_gitolite_config_file.html.haml
@@ -25,7 +25,10 @@
   = bootstrap_switch_tag do
     = hidden_field_tag 'settings[gitolite_identifier_strip_user_id]', "#{disable_button}"
     = check_box_tag 'settings[gitolite_identifier_strip_user_id]', gitolite_identifier_strip_user_id, gitolite_identifier_strip_user_id, { disabled: disable_button }
-
+  %br
+  %em
+    = surround '(', ')' do
+      = l(:label_gitolite_identifier_strip_user_id_desc)
 %br
 
 .git_hosting_access_box

diff --git a/app/views/settings/redmine_git_hosting/_gitolite_config_storage.html.haml b/app/views/settings/redmine_git_hosting/_gitolite_config_storage.html.haml
@@ -2,8 +2,6 @@
 - gitolite_global_storage_dir  = RedmineGitHosting::Config.get_setting(:gitolite_global_storage_dir)
 - gitolite_redmine_storage_dir = RedmineGitHosting::Config.get_setting(:gitolite_redmine_storage_dir)
 - gitolite_recycle_bin_dir     = RedmineGitHosting::Config.get_setting(:gitolite_recycle_bin_dir)
-- gitolite_local_code_dir      = RedmineGitHosting::Config.get_setting(:gitolite_local_code_dir)
-- gitolite_lib_dir             = RedmineGitHosting::Config.get_setting(:gitolite_lib_dir)
 
 %h3= l(:label_gitolite_storage_config)
 
@@ -30,21 +28,3 @@
   %em
     = surround '(', ')' do
       = l(:label_gitolite_redmine_storage_dir_desc)
-
-- if RedmineGitHosting::Config.gitolite_version == 3
-  %p
-    %label= l(:label_gitolite_local_code_dir)
-    = text_field_tag 'settings[gitolite_local_code_dir]', gitolite_local_code_dir, size: 60
-    %br
-    %em
-      = surround '(', ')' do
-        = l(:label_gitolite_local_code_dir_desc) + ','
-        = link_to 'Gitolite non-core programs', 'http://gitolite.com/gitolite/non-core.html#localcode', target: 'blank'
-
-%p
-  %label= l(:label_gitolite_lib_dir)
-  = text_field_tag 'settings[gitolite_lib_dir]', gitolite_lib_dir, size: 60
-  %br
-  %em
-    = surround '(', ')' do
-      = l(:label_gitolite_lib_dir_desc)
diff --git a/app/views/settings/redmine_git_hosting/_gitolite_config_test.html.haml b/app/views/settings/redmine_git_hosting/_gitolite_config_test.html.haml
@@ -20,6 +20,30 @@
     %td= l(:label_sudo_redmine_to_gitolite_user)
     %td= image_tag (RedmineGitHosting::Config.can_redmine_sudo_to_gitolite_user? ? 'true.png' : 'exclamation.png')
 
+  %tr
+    %td= l(:label_gitolite_bin_dir)
+    %td
+      - if RedmineGitHosting::Config.gitolite_bin_dir
+        %span{ class: 'label label-success' }= RedmineGitHosting::Config.gitolite_bin_dir
+      - else
+        = image_tag('exclamation.png')
+
+  %tr
+    %td= l(:label_gitolite_lib_dir)
+    %td
+      - if RedmineGitHosting::Config.gitolite_lib_dir
+        %span{ class: 'label label-success' }= RedmineGitHosting::Config.gitolite_lib_dir
+      - else
+        = image_tag('exclamation.png')
+
+  %tr
+    %td= l(:label_gitolite_local_code_dir)
+    %td
+      - if RedmineGitHosting::Config.gitolite_local_code_dir
+        %span{ class: 'label label-success' }= RedmineGitHosting::Config.gitolite_local_code_dir
+      - else
+        = image_tag('exclamation.png')
+
   - gitolite_checks = RedmineGitHosting::Config.check_hooks_install!
 
   %tr

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -0,0 +1,24 @@
+es:
+
+  redmine_git_hosting: Redmine Git Hosting
+
+  ########### MISCELANOUS ###########
+  label_enabled: Activado
+  label_disabled: Desactivado
+  label_true: Cierto
+  label_false: Falso
+  label_backup_in_progress: Guardando...
+  label_delete_in_progress: Borrando...
+  label_url: URL
+  label_mode: Modo
+  label_hour: Hora
+  button_ok: Aceptar
+  button_clone: Clonar
+
+  label_monday: Lunes
+  label_tuesday: Martes
+  label_wednesday: Miércoles
+  label_thursday: Jueves
+  label_friday: Viernes
+  label_saturday: Sábado
+  label_sunday: Domingo
diff --git a/config/locales/forms/move_repository/es.yml b/config/locales/forms/move_repository/es.yml
@@ -0,0 +1,12 @@
+es:
+  label_move_repository: "Mover repositorio : '%{repo_name}'"
+
+  activemodel:
+    errors:
+      models:
+        move_repository_form:
+          attributes:
+            base:
+              identifier_empty: No es posible mover un repositorio con el identificador vacío
+              identifier_taken: El identificador del repositorio ya está siendo usado por el proyecto nuevo
+              wrong_target_project: El proyecto de destino es idéntico al proyecto de origen
diff --git a/config/locales/forms/move_repository/ja.yml b/config/locales/forms/move_repository/ja.yml
@@ -0,0 +1,12 @@
+ja:
+  label_move_repository: "リポジトリを移動する：'%{repo_name}'"
+
+  activemodel:
+    errors:
+      models:
+        move_repository_form:
+          attributes:
+            base:
+              identifier_empty: 空タイトルのリポジトリは移動できません
+              identifier_taken: 指定したリポジトリのタイトルは既に他のプロジェクトに使用されています
+              wrong_target_project: 移動先と移動元のプロジェクトは同じです
diff --git a/config/locales/forms/move_repository/ru.yml b/config/locales/forms/move_repository/ru.yml
@@ -0,0 +1,12 @@
+ru:
+  label_move_repository: "Перемещение репозитория: '%{repo_name}'"
+
+  activemodel:
+    errors:
+      models:
+        move_repository_form:
+          attributes:
+            base:
+              identifier_empty: Не возможно переместить репозиторий с пустым идентификатором
+              identifier_taken: Идентификатор репозитория уже используется новым проектом
+              wrong_target_project: Целевой проект совпадает с исходным
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
@@ -0,0 +1,24 @@
+ja:
+
+  redmine_git_hosting: Redmine Git Hosting
+
+  ########### MISCELANOUS ###########
+  label_enabled: 有効
+  label_disabled: 無効
+  label_true: True
+  label_false: False
+  label_backup_in_progress: 保存中...
+  label_delete_in_progress: 削除中...
+  label_url: URL
+  label_mode: モード
+  label_hour: 時
+  button_ok: OK
+  button_clone: クローン
+
+  label_monday: 月曜日
+  label_tuesday: 火曜日
+  label_wednesday: 水曜日
+  label_thursday: 木曜日
+  label_friday: 金曜日
+  label_saturday: 土曜日
+  label_sunday: 日曜日
diff --git a/config/locales/models/gitolite_public_key/es.yml b/config/locales/models/gitolite_public_key/es.yml
@@ -0,0 +1,51 @@
+es:
+
+  ########### SSH KEYS ###########
+
+  # User SSH keys (notices)
+  notice_public_key_created: La clave pública <strong>%{title}</strong> se ha creado correctamente.
+  notice_public_key_updated: La clave pública <strong>%{title}</strong> se ha actualizado correctamente.
+  notice_public_key_deleted: La clave pública <strong>%{title}</strong> se ha borrado correctamente.
+
+  # User SSH keys (fields)
+  field_key: esta clave
+
+  # User SSH keys (labels)
+  label_my_public_keys: Mis claves públicas
+  label_public_keys: Claves públicas
+  label_public_key: Clave pública
+  label_public_key_edit: Editar una clave pública existente
+  label_current_public_keys: Claves públicas actuales
+  label_current_user_keys: Claves de usuario actuales
+  label_current_deploy_keys: Claves de despliegue actuales
+  label_no_public_keys: No se ha definido ninguna clave pública
+  label_public_key_new: Introducir una nueva clave pública
+  label_identifier_can_be_arbitrary: Identificador
+  label_identifier_can_be_arbitrary_desc: (Puede ser cualquier cadena de texto con significado)
+  label_key_type: Tipo de clave pública
+  label_user_key: Clave de usuario
+  label_deploy_key: Clave de despliegue
+  label_cut_and_paste: Corte y pegue el fichero .pub entero.
+  label_identifier_cannot_be_changed: Identificador<br/><em>(no puede cambiarse)</em>
+  label_key_cannot_be_changed_please_create_new_key: 'No es posible modificar la clave. Sin embargo, puede borrarla y crear una nueva.'
+
+  # User SSH keys (confirmation)
+  text_gitolite_key_destroy_confirmation: "¿Seguro que quiere destruir esta clave: %{title}?"
+
+  # User SSH keys (errors)
+  error_public_key_create_failed: Ha fallado la creación de la clave pública.
+  error_public_key_update_failed: Ha fallado la actualización de la clave pública.
+
+
+  activerecord:
+    errors:
+      models:
+
+        gitolite_public_key:
+          attributes:
+            key:
+              corrupted: parece estar corrompida.
+              taken_by_you: 'ya se está utilizando por usted como "%{name}".'
+              taken_by_other: 'ya se está utilizando por el usuario "%{login}" como "%{name}".'
+              taken_by_someone: ya se está utilizando. Pertenece a otro usuario (pregunte al administrador acerca de los detalles).
+              taken_by_gitolite_admin: ya se está utilizando como la clave de administrador de Gitolite.