Redmine 6 #60

kontron · Nov 14, 2024 · 8295995 · 8295995
1 parent 3665911
commit 8295995
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Redmine OAuth plugin 2.2.9 devel
+## Redmine OAuth plugin 3.0.0 devel
 
 [![GitHub CI](https://github.com/kontron/redmine_oauth/actions/workflows/rubyonrails.yml/badge.svg?branch=devel)](https://github.com/kontron/redmine_oauth/actions/workflows/rubyonrails.yml)
 [![Support Ukraine Badge](https://bit.ly/support-ukraine-now)](https://github.com/support-ukraine/support-ukraine)
@@ -8,7 +8,7 @@ This plugin is used to authenticate in Redmine through an OAuth provider.
 The user is identified by the email registered with the OAuth provider. The email must match an email registered
 in Redmine. If such an email is not found, the user will be offered to register in Redmine, depending on Redmine's 
 setting **Self-registration**. OAuth logout is also supported, if it is set in the options.
-Access to Redmine can controlled by roles assigned in your OAuth provider.
+Access to Redmine can be controlled by roles assigned in your OAuth provider.
 See [#36](https://github.com/kontron/redmine_oauth/issues/36#issuecomment-2348842432) for details; as well as OAuth 
 autologin.
 
@@ -62,8 +62,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
 
 ### Registration
 
-Register your Redmine instance as an application with your OAuth provider. Follow the instructions given on their web 
-sites. Add `https://yourdomain/oauth2callback` as redirect URI.
+Register your Redmine instance as an application with your OAuth provider. Follow the instructions given on their 
+websites. Add `https://yourdomain/oauth2callback` as redirect URI.
 
 ### Configuration
 

diff --git a/app/controllers/redmine_oauth_controller.rb b/app/controllers/redmine_oauth_controller.rb
@@ -241,7 +241,7 @@ def try_to_login(email, info)
           onthefly_creation_failed user
         end
       end
-    else  # Invalid credentials
+    else # Invalid credentials
       params[:username] = email
       invalid_credentials
       raise StandardError, l(:notice_account_invalid_credentials)

diff --git a/init.rb b/init.rb
@@ -29,11 +29,11 @@
   name 'Redmine OAuth plugin'
   author 'Karel Pičman'
   description 'Redmine OAuth plugin'
-  version '2.2.9 devel'
+  version '3.0.0 devel'
   url 'https://github.com/kontron/redmine_oauth'
   author_url 'https://github.com/kontron/redmine_oauth/graphs/contributors'
 
-  requires_redmine version_or_higher: '5.1.0'
+  requires_redmine version_or_higher: '6.0.0'
 
   settings default: {
     oauth_name: 'none',

diff --git a/lib/redmine_oauth/hooks/views/base_view_hooks.rb b/lib/redmine_oauth/hooks/views/base_view_hooks.rb
@@ -28,9 +28,9 @@ def view_layouts_base_html_head(context = {})
             context[:controller].class.name
           )
 
-          "\n".html_safe + stylesheet_link_tag('redmine_oauth.css', plugin: :redmine_oauth) +
-            "\n".html_safe + stylesheet_link_tag('../vendor/fontawesome/all.min.css', plugin: :redmine_oauth) +
-            "\n".html_safe + javascript_include_tag('redmine_oauth.js', plugin: :redmine_oauth)
+          "\n".html_safe + stylesheet_link_tag('redmine_oauth', plugin: :redmine_oauth) +
+            "\n".html_safe + stylesheet_link_tag('fontawesome/all.min', plugin: :redmine_oauth) +
+            "\n".html_safe + javascript_include_tag('redmine_oauth', plugin: :redmine_oauth)
         end
       end
     end

diff --git a/test/functional/redmine_oauth_controller_test.rb b/test/functional/redmine_oauth_controller_test.rb
@@ -36,6 +36,6 @@ def test_oauth
 
   def test_oauth_callback_csrf
     get '/oauth2callback'
-    assert_response 422
+    assert_response :unprocessable_content
   end
 end