Skip to content

Commit 3a68fad

Browse files
authored
Merge pull request #86 from jigarius/bugfix/redmine-5-compatibility
Add Redmine 5 compatibility
2 parents 18dd0f7 + 16e40a8 commit 3a68fad

File tree

3 files changed

+22
-19
lines changed

3 files changed

+22
-19
lines changed

.docker/redmine/configuration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ default:
7878
# You can use `rake redmine:plugins:assets` to manually mirror assets
7979
# to public/plugin_assets when you install/upgrade a Redmine plugin.
8080
#
81-
mirror_plugins_assets_on_startup: true
81+
mirror_plugins_assets_on_startup: false
8282

8383
# Your secret key for verifying cookie session data integrity. If you
8484
# change this key, all old sessions will become invalid! Make sure the

docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3.1'
21
services:
32
redmine:
43
image: redmine:5.x-toggl2redmine

init.rb

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
# frozen_string_literal: true
22

3-
require_relative 'lib/toggl_2_redmine'
3+
Rails.configuration.to_prepare do
4+
require_relative 'lib/toggl_2_redmine'
45

5-
Redmine::Plugin.register :toggl2redmine do
6-
# Package info.
7-
name 'Toggl 2 Redmine'
8-
author 'Jigar Mehta'
9-
description 'Imports time entries from Toggl into Redmine.'
10-
version Toggl2Redmine::VERSION
11-
url 'https://github.com/jigarius/toggl2redmine'
12-
author_url 'https://jigarius.com/'
6+
Redmine::Plugin.register :toggl2redmine do
7+
# Package info.
8+
name 'Toggl 2 Redmine'
9+
author 'Jigarius'
10+
description 'Imports time entries from Toggl into Redmine.'
11+
version Toggl2Redmine::VERSION
12+
url 'https://github.com/jigarius/toggl2redmine'
13+
author_url 'https://jigarius.com/'
1314

14-
# Menu items.
15-
menu :application_menu,
16-
:toggl2redmine,
17-
{ controller: 't2r_import', action: 'index' },
18-
caption: 'Toggl'
19-
end
15+
# Menu items.
16+
menu :application_menu,
17+
:toggl2redmine,
18+
{ controller: 't2r_import', action: 'index' },
19+
caption: 'Toggl'
20+
end
2021

21-
# Patches.
22-
require 'patches/time_entry'
22+
Rails.configuration.to_prepare do
23+
# Patches.
24+
require 'patches/time_entry_patch'
25+
end
26+
end

0 commit comments

Comments
 (0)