Skip to content

Commit 6c501ab

Browse files
committed
Redmine 4.0.1 and Ruby 5.1 compatibility
1 parent 3cd8e89 commit 6c501ab

15 files changed

+59
-48
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 2.0.0
2+
3+
* Redmine 4.0.1
4+
15
# 1.1.5
26

37
* Bump to 1.1.5, no code changes but version number correction

Gemfile.lock

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,52 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activemodel (4.2.6)
5-
activesupport (= 4.2.6)
6-
builder (~> 3.1)
7-
activesupport (4.2.6)
8-
i18n (~> 0.7)
9-
json (~> 1.7, >= 1.7.7)
4+
activemodel (5.2.2)
5+
activesupport (= 5.2.2)
6+
activesupport (5.2.2)
7+
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
i18n (>= 0.7, < 2)
109
minitest (~> 5.1)
11-
thread_safe (~> 0.3, >= 0.3.4)
1210
tzinfo (~> 1.1)
13-
addressable (2.4.0)
14-
builder (3.2.2)
15-
domain_name (0.5.20160310)
11+
addressable (2.6.0)
12+
public_suffix (>= 2.0.2, < 4.0)
13+
concurrent-ruby (1.1.4)
14+
domain_name (0.5.20180417)
1615
unf (>= 0.0.5, < 1.0.0)
17-
http-cookie (1.0.2)
16+
http-cookie (1.0.3)
1817
domain_name (~> 0.5)
19-
i18n (0.7.0)
20-
json (1.8.3)
21-
mime-types (2.99.2)
22-
minitest (5.9.0)
18+
i18n (1.5.3)
19+
concurrent-ruby (~> 1.0)
20+
json (2.1.0)
21+
mime-types (3.2.2)
22+
mime-types-data (~> 3.2015)
23+
mime-types-data (3.2018.0812)
24+
minitest (5.11.3)
2325
netrc (0.11.0)
24-
oauth (0.4.7)
25-
rest-client (1.8.0)
26+
oauth (0.5.4)
27+
public_suffix (3.0.3)
28+
rest-client (2.0.2)
2629
http-cookie (>= 1.0.2, < 2.0)
27-
mime-types (>= 1.16, < 3.0)
28-
netrc (~> 0.7)
29-
ruby-trello (1.4.2)
30+
mime-types (>= 1.16, < 4.0)
31+
netrc (~> 0.8)
32+
ruby-trello (2.1.0)
3033
activemodel (>= 3.2.0)
3134
addressable (~> 2.3)
3235
json
33-
oauth (~> 0.4.5)
34-
rest-client (~> 1.8.0)
35-
thread_safe (0.3.5)
36-
tzinfo (1.2.2)
36+
oauth (>= 0.4.5)
37+
rest-client (>= 1.8.0)
38+
thread_safe (0.3.6)
39+
tzinfo (1.2.5)
3740
thread_safe (~> 0.1)
3841
unf (0.1.4)
3942
unf_ext
40-
unf_ext (0.0.7.2)
43+
unf_ext (0.0.7.5)
4144

4245
PLATFORMS
4346
ruby
4447

4548
DEPENDENCIES
4649
ruby-trello
50+
51+
BUNDLED WITH
52+
1.13.6

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
## Setup
44

55
1. cd `${YOUR_REDMINE_HOME}/plugins`
6-
1. `git clone https://github.com/KKBOX/redmine-trello-card-sync.git redmine_trello_card_sync`
6+
1. `git clone https://github.com/LoovtO/redmine_trello_card_sync.git`
77
1. Change directory back to your Redmine installation. (`cd ${YOUR_REDMINE_HOME}`)
88
1. Run `bundle install --without development test` to install essential gems.
9-
1. Run `bundle exec rake db:migrate_plugins RAILS_ENV=production` to setup plugin-related database tables. (In older version of Redmine, you may need to run `RAILS_ENV=production bundle exec rake redmine:plugins:migrate` instead)
9+
1. Run `bundle exec rake redmine:plugins:migrate RAILS_ENV=production` to setup plugin-related database tables. (In older version of Redmine, you may need to run `RAILS_ENV=production bundle exec rake redmine:plugins:migrate` instead)
1010
1. Go to `http(s)://${YOUR_REDMINE_HOST}/settings/plugin/redmine_trello_card_sync`, enter the essential settings to enable this plugin.
1111
* Get your API key (32 characters long) & member token (64 characters long) from [here](https://trello.com/app-key), note they are *different*, one is the value of "Key", another is what you will get from the "Token" link.
1212
1. Restart your Redmine server to take effect.
@@ -17,4 +17,4 @@ Enable this plugin module in each project's settings -> modules page, such as `h
1717

1818
Once you enable the module, you can configure mappings at `http(s)://${YOUR_REDMINE_HOST}/projects/${YOUR_PROJECT}/trello_card_sync/mappings`.
1919

20-
You can enter your Trello username at `http(s)://${YOUR_REDMINE_HOST}/my/account`.
20+
You can enter your Trello username at `http(s)://${YOUR_REDMINE_HOST}/my/account`.

app/controllers/mappings_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
class MappingsController < ApplicationController
55
unloadable
66

7-
before_filter :find_project_by_project_id, :authorize
8-
before_filter :setup_trello_api
7+
before_action :find_project_by_project_id, :authorize
8+
before_action :setup_trello_api
99

1010
def index
1111
@board_lists = []

app/controllers/trello_webhooks_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
class TrelloWebhooksController < ApplicationController
66
unloadable
77
skip_before_action :check_if_login_required
8-
skip_before_action :authenticate
8+
skip_before_action :authenticate, raise: false
99
skip_before_action :verify_authenticity_token
1010

1111
def index

db/migrate/001_add_trello_board_id_to_project.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class AddTrelloBoardIdToProject < ActiveRecord::Migration
1+
class AddTrelloBoardIdToProject < ActiveRecord::Migration[5.1]
22
def change
33
add_column :projects, :trello_board_id, :string, :default => "", :null => false
44
add_column :projects, :trello_board_sync, :boolean, :default => false, :null => false

db/migrate/002_add_trello_username_to_user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class AddTrelloUsernameToUser < ActiveRecord::Migration
1+
class AddTrelloUsernameToUser < ActiveRecord::Migration[5.1]
22
def change
33
add_column :users, :trello_username, :string, :default => "", :null => false
44
end

db/migrate/003_add_trello_board_mapping_to_project.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class AddTrelloBoardMappingToProject < ActiveRecord::Migration
1+
class AddTrelloBoardMappingToProject < ActiveRecord::Migration[5.1]
22
def change
33
add_column :projects, :trello_mapping_redmine_statuses, :text, :default => nil
44
add_column :projects, :trello_mapping_trello_lists, :text, :default => nil
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
class AddTrelloExcludeTrackerFromSyncToProject < ActiveRecord::Migration
1+
class AddTrelloExcludeTrackerFromSyncToProject < ActiveRecord::Migration[5.1]
22
def change
33
add_column :projects, :trello_excluded_trackers, :text, :default => nil
44
end
5-
end
5+
end

db/migrate/005_change_trello_exclude_tracker_default_to_project.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class ChangeTrelloExcludeTrackerDefaultToProject < ActiveRecord::Migration
1+
class ChangeTrelloExcludeTrackerDefaultToProject < ActiveRecord::Migration[5.1]
22
def change
33
change_column :projects, :trello_excluded_trackers, :text
44
end

0 commit comments

Comments
 (0)