Merge pull request #727 from AlphaNodes/4.0-stable

Redmine 4 changes

Author: Nicolas Rodriguez

Diff for: .rubocop.yml

@@ -0,0 +1,60 @@
+require:
+  - rubocop-rspec
+  - rubocop-performance
+
+Rails:
+  Enabled: true
+
+AllCops:
+  TargetRubyVersion: 2.3
+  TargetRailsVersion: 5.2
+  Include:
+    - '**/*.ruby'
+    - '**/*.rake'
+    - '**/*.rb'
+    - '**/*.rsb'
+    - '**/Rakefile'
+    - '**/Gemfile'
+
+Metrics/AbcSize:
+  Max: 65
+
+Metrics/BlockLength:
+  Max: 60
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Max: 20
+
+Metrics/LineLength:
+  Max: 140
+
+Metrics/MethodLength:
+  Max: 60
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Max: 25
+
+Rails/SkipsModelValidations:
+  Enabled: false
+
+Rails/CreateTableWithTimestamps:
+  Enabled: false
+
+# app/model/application_record.rb is missing in redmine, we can't use ApplicationRecord
+Rails/ApplicationRecord:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/AutoResourceCleanup:
+  Enabled: true
+
+Style/Documentation:
+  Enabled: false

Diff for: .travis.yml

@@ -2,8 +2,8 @@ language: ruby
 sudo: required
 cache: bundler
 rvm:
-  - 2.5.3
-  - 2.4.5
+  - 2.6.3
+  - 2.4.6
   - 2.3.8
 gemfile:
   - Gemfile
@@ -23,19 +23,8 @@ env:
     - POSTGRES_DATABASE=redmine
     - POSTGRES_USER=postgres
   matrix:
-    - REDMINE_VERSION=3.4-stable USE_SVN=true DATABASE_ADAPTER=mysql
-    - REDMINE_VERSION=3.4-stable USE_SVN=true DATABASE_ADAPTER=postgresql
-    - REDMINE_VERSION=3.3-stable USE_SVN=true DATABASE_ADAPTER=mysql
-    - REDMINE_VERSION=3.3-stable USE_SVN=true DATABASE_ADAPTER=postgresql
-
-    - REDMINE_VERSION=3.4.6 DATABASE_ADAPTER=mysql
-    - REDMINE_VERSION=3.4.6 DATABASE_ADAPTER=postgresql
-    - REDMINE_VERSION=3.3.8 DATABASE_ADAPTER=mysql
-    - REDMINE_VERSION=3.3.8 DATABASE_ADAPTER=postgresql
-matrix:
-  allow_failures:
-  - rvm: 2.5.3
-  - rvm: 2.4.5
+    - REDMINE_VERSION=4.0-stable DATABASE_ADAPTER=mysql USE_SVN=true
+    - REDMINE_VERSION=4.0-stable DATABASE_ADAPTER=postgresql USE_SVN=true
 before_install:
   - cd ../..
   - sudo apt-get update -qq

Diff for: CHANGELOG.md

@@ -1,5 +1,13 @@
 ## CHANGELOG
 
+### 4.0.0
+
+* compatible with Redmine 4 (drop Redmine 3.x support)
+* drop redmine_bootstrap_kit required plugin
+* requires additionals plugin for latest fontawesome, slim and deface support -> and better maintenance
+* switch from haml to slim templates (because this is already used in additionals plugin)
+* libraries high_charts and bootstrap are moved to this plugin (TODO: high_charts should be migrationed to charts.js, which comes with Redmine 4. Bootstrap should be drop to vanila redmine, to get better theme support)
+
 ### 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)
@@ -46,7 +54,7 @@
 ### 1.2.0 - 2015-11-18
 
 * Enhance protected branches permissions support : [#389](https://github.com/jbox-web/redmine_git_hosting/issues/389), [#414](https://github.com/jbox-web/redmine_git_hosting/issues/414)
-* Add support for [Gitolite options](http://gitolite.com/gitolite/options.html) : [#415](https://github.com/jbox-web/redmine_git_hosting/issues/415)
+* Add support for [Gitolite options](https://gitolite.com/gitolite/options.html) : [#415](https://github.com/jbox-web/redmine_git_hosting/issues/415)
 * Enhance global repository access : [#465](https://github.com/jbox-web/redmine_git_hosting/issues/465). You can now choose if Redmine has RW access on all repositories.
 * Improve validation of plugin settings. Validation errors are now displayed in the view.
 * Use our own Rack implementation to render Gitolite hooks
@@ -333,7 +341,7 @@ gitolite-admin.git/
 
   **Important !**
 
-As explained in [Gitolite documentation](http://gitolite.com/gitolite/non-core.html#localcode) hooks should be installed in a separate directory.
+As explained in [Gitolite documentation](https://gitolite.com/gitolite/non-core.html#localcode) hooks should be installed in a separate directory.
 This new version fixes Gitolite hooks install path for Gitolite v3.
 
 Hooks are now stored by default in ```<gitolite user home dir>/local```. You can override this in the plugin settings.

Diff for: Gemfile

@@ -4,9 +4,6 @@ gem 'gitolite-rugged', git: 'https://github.com/jbox-web/gitolite-rugged.git', t
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 2.0.0', git: 'https://github.com/jbox-web/grack.git', require: 'grack', branch: 'fix_gemfile'
 
-# HAML views
-gem 'haml-rails'
-
 # Memcached client for GitCache
 gem 'dalli'
 
@@ -15,45 +12,46 @@ gem 'redis'
 gem 'hiredis'
 
 # Markdown rendering
+gem 'escape_utils'
 gem 'html-pipeline'
-gem 'rouge'
-gem 'task_list'
 gem 'rinku'
+gem 'task_list'
 
 # Syntaxic coloration
 gem 'github-markup'
 gem 'RedCloth'
 gem 'org-ruby'
 gem 'creole'
 gem 'asciidoctor'
-gem 'rdoc', '>= 2.4.2'
 
 # Rack parser for Hrack
 gem 'rack-parser', require: 'rack/parser'
 
+# temp autoloading fix
+gem 'sidekiq'
+gem 'sshkey'
+
 group :development, :test do
   gem 'rspec'
-  gem 'rspec-rails'
+  gem 'rspec-rails', '~> 3.5', '>= 3.5.2'
 
   gem 'shoulda', '~> 3.5.0'
-  gem 'shoulda-matchers', '~> 2.7.0'
   gem 'shoulda-context'
+  gem 'shoulda-matchers', '~> 2.7.0'
 
-  gem 'factory_girl'
-  gem 'factory_girl_rails'
-  gem 'faker', '1.7.3'
-  gem 'sshkey'
   gem 'database_cleaner'
+  gem 'factory_bot_rails', '< 5.0'
+
+  gem 'rubocop', require: false
+  gem 'rubocop-rspec'
 
   # Publish to CodeClimate
   gem 'codeclimate-test-reporter', require: false
 end
 
 group :development do
-  gem 'spring'
-  gem 'spring-commands-rspec'
-  gem 'quiet_assets'
-
   gem 'brakeman'
   gem 'bullet'
+  gem 'spring'
+  gem 'spring-commands-rspec'
 end

Diff for: app/controllers/archived_repositories_controller.rb

@@ -1,21 +1,16 @@
 class ArchivedRepositoriesController < RepositoriesController
+  skip_before_action :authorize
+  skip_before_action :find_project_repository, only: :index
 
-  skip_before_filter :authorize
-  skip_before_filter :find_project_repository, only: :index
-
-  before_filter :can_view_archived_projects
-
+  before_action :can_view_archived_projects
 
   def index
     @archived_projects = Project.where("status = #{Project::STATUS_ARCHIVED}").includes(:repositories)
   end
 
-
   private
 
-
-    def can_view_archived_projects
-      render_403 unless User.current.admin?
-    end
-
+  def can_view_archived_projects
+    render_403 unless User.current.admin?
+  end
 end

Diff for: app/controllers/download_git_revision_controller.rb

@@ -2,13 +2,12 @@ class DownloadGitRevisionController < ApplicationController
 
   include XitoliteRepositoryFinder
 
-  before_filter :find_xitolite_repository
-  before_filter :can_download_git_revision
-  before_filter :set_download
-  before_filter :validate_download
-
-  helper :redmine_bootstrap_kit
+  before_action :find_xitolite_repository
+  before_action :can_download_git_revision
+  before_action :set_download
+  before_action :validate_download
 
+  helper :bootstrap_kit
 
   def index
     begin

Diff for: app/controllers/gitolite_public_keys_controller.rb

@@ -1,100 +1,88 @@
 class GitolitePublicKeysController < ApplicationController
-
   include RedmineGitHosting::GitoliteAccessor::Methods
 
-  before_filter :require_login
-  before_filter :find_user
-  before_filter :find_gitolite_public_key, only: [:destroy]
+  before_action :require_login
+  before_action :find_user
+  before_action :find_gitolite_public_key, only: [:destroy]
 
   helper :gitolite_public_keys
-  helper :redmine_bootstrap_kit
-
+  helper :bootstrap_kit
 
   def index
     @gitolite_user_keys   = @user.gitolite_public_keys.user_key.order('title ASC, created_at ASC')
     @gitolite_deploy_keys = @user.gitolite_public_keys.deploy_key.order('title ASC, created_at ASC')
   end
 
-
   def create
     if params[:create_button]
-      @gitolite_public_key = @user.gitolite_public_keys.new(params[:gitolite_public_key])
+      @gitolite_public_key = @user.gitolite_public_keys.new
+      @gitolite_public_key.safe_attributes = params[:gitolite_public_key]
       if @gitolite_public_key.save
         create_ssh_key(@gitolite_public_key)
         flash[:notice] = l(:notice_public_key_created, title: view_context.keylabel(@gitolite_public_key))
-        redirect_to @redirect_url
       else
         flash[:error] = @gitolite_public_key.errors.full_messages.to_sentence
-        redirect_to @redirect_url
       end
+      redirect_to @redirect_url
     else
       redirect_to @cancel_url
     end
   end
 
-
   def destroy
-    if request.delete?
-      if @gitolite_public_key.user == @user || @user.admin?
-        if @gitolite_public_key.destroy
-          destroy_ssh_key(@gitolite_public_key)
-          flash[:notice] = l(:notice_public_key_deleted, title: view_context.keylabel(@gitolite_public_key))
-        end
-        redirect_to @redirect_url
-      else
-        render_403
+    return unless request.delete?
+
+    if @gitolite_public_key.user == @user || @user.admin?
+      if @gitolite_public_key.destroy
+        destroy_ssh_key(@gitolite_public_key)
+        flash[:notice] = l(:notice_public_key_deleted, title: view_context.keylabel(@gitolite_public_key))
       end
+      redirect_to @redirect_url
+    else
+      render_403
     end
   end
 
-
   private
 
-
-    def find_user
-      if params[:user_id]
-        set_user_from_params
-      else
-        set_user_from_current_user
-      end
-    end
-
-
-    def set_user_from_params
-      @user = (params[:user_id] == 'current') ? User.current : User.find_by_id(params[:user_id])
-      if @user
-        @cancel_url = @redirect_url = url_for(controller: 'users', action: 'edit', id: params[:user_id], tab: 'keys')
-      else
-        render_404
-      end
-    end
-
-
-    def set_user_from_current_user
-      if User.current.allowed_to_create_ssh_keys?
-        @user = User.current
-        @redirect_url = url_for(controller: 'gitolite_public_keys', action: 'index')
-        @cancel_url = url_for(controller: 'my', action: 'account')
-      else
-        render_403
-      end
+  def find_user
+    if params[:user_id]
+      set_user_from_params
+    else
+      set_user_from_current_user
     end
+  end
 
-
-    def find_gitolite_public_key
-      @gitolite_public_key = @user.gitolite_public_keys.find(params[:id])
-    rescue ActiveRecord::RecordNotFound => e
+  def set_user_from_params
+    @user = params[:user_id] == 'current' ? User.current : User.find_by(id: params[:user_id])
+    if @user
+      @cancel_url = @redirect_url = url_for(controller: 'users', action: 'edit', id: params[:user_id], tab: 'keys')
+    else
       render_404
     end
+  end
 
-
-    def create_ssh_key(ssh_key)
-      gitolite_accessor.create_ssh_key(ssh_key)
+  def set_user_from_current_user
+    if User.current.allowed_to_create_ssh_keys?
+      @user = User.current
+      @redirect_url = url_for(controller: 'gitolite_public_keys', action: 'index')
+      @cancel_url = url_for(controller: 'my', action: 'account')
+    else
+      render_403
     end
+  end
 
+  def find_gitolite_public_key
+    @gitolite_public_key = @user.gitolite_public_keys.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
 
-    def destroy_ssh_key(ssh_key)
-      gitolite_accessor.destroy_ssh_key(ssh_key)
-    end
+  def create_ssh_key(ssh_key)
+    gitolite_accessor.create_ssh_key(ssh_key)
+  end
 
+  def destroy_ssh_key(ssh_key)
+    gitolite_accessor.destroy_ssh_key(ssh_key)
+  end
 end