Skip to content

Commit b956c27

Browse files
Phiber2000Phiber2000
committed
Merge remote-tracking branch 'remotes/base/devel' into fix_sub-uri
2 parents 7219cce + b9a8541 commit b956c27

File tree

11 files changed

+46
-120
lines changed

11 files changed

+46
-120
lines changed

Diff for: ‎.travis.yml

+12-109
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,16 @@
11
language: ruby
2+
sudo: required
3+
cache: bundler
24
rvm:
3-
- 2.1.0
4-
- 2.0.0
5+
- 2.3.1
6+
- 2.2.5
57
gemfile:
68
- Gemfile
79
branches:
810
only:
911
- devel
1012
- /^fix_.*$/
1113
- /^feat_.*$/
12-
matrix:
13-
include:
14-
- rvm: 2.2.0
15-
env: REDMINE_VERSION=3.2-stable USE_SVN=true DATABASE_ADAPTER=mysql
16-
gemfile: Gemfile
17-
- rvm: 2.2.0
18-
env: REDMINE_VERSION=3.2-stable USE_SVN=true DATABASE_ADAPTER=postgresql
19-
gemfile: Gemfile
20-
- rvm: 2.2.0
21-
env: REDMINE_VERSION=3.1-stable USE_SVN=true DATABASE_ADAPTER=mysql
22-
gemfile: Gemfile
23-
- rvm: 2.2.0
24-
env: REDMINE_VERSION=3.1-stable USE_SVN=true DATABASE_ADAPTER=postgresql
25-
gemfile: Gemfile
26-
- rvm: 2.2.0
27-
env: REDMINE_VERSION=3.0-stable USE_SVN=true DATABASE_ADAPTER=mysql
28-
gemfile: Gemfile
29-
- rvm: 2.2.0
30-
env: REDMINE_VERSION=3.0-stable USE_SVN=true DATABASE_ADAPTER=postgresql
31-
gemfile: Gemfile
32-
- rvm: 2.2.0
33-
env: REDMINE_VERSION=3.0.7 DATABASE_ADAPTER=mysql
34-
gemfile: Gemfile
35-
- rvm: 2.2.0
36-
env: REDMINE_VERSION=3.0.7 DATABASE_ADAPTER=postgresql
37-
gemfile: Gemfile
38-
- rvm: 2.2.0
39-
env: REDMINE_VERSION=3.1.3 DATABASE_ADAPTER=mysql
40-
gemfile: Gemfile
41-
- rvm: 2.2.0
42-
env: REDMINE_VERSION=3.1.3 DATABASE_ADAPTER=postgresql
43-
gemfile: Gemfile
44-
- rvm: 2.2.0
45-
env: REDMINE_VERSION=3.2.0 DATABASE_ADAPTER=mysql
46-
gemfile: Gemfile
47-
- rvm: 2.2.0
48-
env: REDMINE_VERSION=3.2.0 DATABASE_ADAPTER=postgresql
49-
gemfile: Gemfile
5014
env:
5115
global:
5216
- REDMINE_LANG=en
@@ -58,80 +22,19 @@ env:
5822
- POSTGRES_DATABASE=redmine
5923
- POSTGRES_USER=postgres
6024
matrix:
25+
- REDMINE_VERSION=3.3-stable USE_SVN=true DATABASE_ADAPTER=mysql
26+
- REDMINE_VERSION=3.3-stable USE_SVN=true DATABASE_ADAPTER=postgresql
6127
- REDMINE_VERSION=3.2-stable USE_SVN=true DATABASE_ADAPTER=mysql
6228
- REDMINE_VERSION=3.2-stable USE_SVN=true DATABASE_ADAPTER=postgresql
6329
- REDMINE_VERSION=3.1-stable USE_SVN=true DATABASE_ADAPTER=mysql
6430
- REDMINE_VERSION=3.1-stable USE_SVN=true DATABASE_ADAPTER=postgresql
65-
- REDMINE_VERSION=3.0-stable USE_SVN=true DATABASE_ADAPTER=mysql
66-
- REDMINE_VERSION=3.0-stable USE_SVN=true DATABASE_ADAPTER=postgresql
67-
- REDMINE_VERSION=2.6-stable USE_SVN=true DATABASE_ADAPTER=mysql
68-
- REDMINE_VERSION=2.6-stable USE_SVN=true DATABASE_ADAPTER=postgresql
6931

70-
- REDMINE_VERSION=3.2.0 DATABASE_ADAPTER=mysql
71-
- REDMINE_VERSION=3.2.0 DATABASE_ADAPTER=postgresql
72-
- REDMINE_VERSION=3.1.3 DATABASE_ADAPTER=mysql
73-
- REDMINE_VERSION=3.1.3 DATABASE_ADAPTER=postgresql
74-
- REDMINE_VERSION=3.0.7 DATABASE_ADAPTER=mysql
75-
- REDMINE_VERSION=3.0.7 DATABASE_ADAPTER=postgresql
76-
- REDMINE_VERSION=2.6.9 DATABASE_ADAPTER=mysql
77-
- REDMINE_VERSION=2.6.9 DATABASE_ADAPTER=postgresql
78-
79-
# - REDMINE_VERSION=3.1.2 DATABASE_ADAPTER=mysql
80-
# - REDMINE_VERSION=3.1.2 DATABASE_ADAPTER=postgresql
81-
# - REDMINE_VERSION=3.0.6 DATABASE_ADAPTER=mysql
82-
# - REDMINE_VERSION=3.0.6 DATABASE_ADAPTER=postgresql
83-
# - REDMINE_VERSION=2.6.8 DATABASE_ADAPTER=mysql
84-
# - REDMINE_VERSION=2.6.8 DATABASE_ADAPTER=postgresql
85-
# - REDMINE_VERSION=3.1.1 DATABASE_ADAPTER=mysql
86-
# - REDMINE_VERSION=3.1.1 DATABASE_ADAPTER=postgresql
87-
# - REDMINE_VERSION=3.0.5 DATABASE_ADAPTER=mysql
88-
# - REDMINE_VERSION=3.0.5 DATABASE_ADAPTER=postgresql
89-
# - REDMINE_VERSION=2.6.7 DATABASE_ADAPTER=mysql
90-
# - REDMINE_VERSION=2.6.7 DATABASE_ADAPTER=postgresql
91-
# - REDMINE_VERSION=3.1.0 DATABASE_ADAPTER=mysql
92-
# - REDMINE_VERSION=3.1.0 DATABASE_ADAPTER=postgresql
93-
# - REDMINE_VERSION=3.0.4 DATABASE_ADAPTER=mysql
94-
# - REDMINE_VERSION=3.0.4 DATABASE_ADAPTER=postgresql
95-
# - REDMINE_VERSION=2.6.6 DATABASE_ADAPTER=mysql
96-
# - REDMINE_VERSION=2.6.6 DATABASE_ADAPTER=postgresql
97-
# - REDMINE_VERSION=3.0.3 DATABASE_ADAPTER=mysql
98-
# - REDMINE_VERSION=3.0.3 DATABASE_ADAPTER=postgresql
99-
# - REDMINE_VERSION=2.6.5 DATABASE_ADAPTER=mysql
100-
# - REDMINE_VERSION=2.6.5 DATABASE_ADAPTER=postgresql
101-
# - REDMINE_VERSION=3.0.2 DATABASE_ADAPTER=mysql
102-
# - REDMINE_VERSION=3.0.2 DATABASE_ADAPTER=postgresql
103-
# - REDMINE_VERSION=2.6.4 DATABASE_ADAPTER=mysql
104-
# - REDMINE_VERSION=2.6.4 DATABASE_ADAPTER=postgresql
105-
# - REDMINE_VERSION=3.0.1 DATABASE_ADAPTER=mysql
106-
# - REDMINE_VERSION=3.0.1 DATABASE_ADAPTER=postgresql
107-
# - REDMINE_VERSION=2.6.3 DATABASE_ADAPTER=mysql
108-
# - REDMINE_VERSION=2.6.3 DATABASE_ADAPTER=postgresql
109-
# - REDMINE_VERSION=3.0.0 DATABASE_ADAPTER=mysql
110-
# - REDMINE_VERSION=3.0.0 DATABASE_ADAPTER=postgresql
111-
# - REDMINE_VERSION=2.6.2 DATABASE_ADAPTER=mysql
112-
# - REDMINE_VERSION=2.6.2 DATABASE_ADAPTER=postgresql
113-
# - REDMINE_VERSION=2.6.1 DATABASE_ADAPTER=mysql
114-
# - REDMINE_VERSION=2.6.1 DATABASE_ADAPTER=postgresql
115-
# - REDMINE_VERSION=2.6.0 DATABASE_ADAPTER=mysql
116-
# - REDMINE_VERSION=2.6.0 DATABASE_ADAPTER=postgresql
117-
# - REDMINE_VERSION=2.5.3 DATABASE_ADAPTER=mysql
118-
# - REDMINE_VERSION=2.5.3 DATABASE_ADAPTER=postgresql
119-
# - REDMINE_VERSION=2.5.2 DATABASE_ADAPTER=mysql
120-
# - REDMINE_VERSION=2.5.2 DATABASE_ADAPTER=postgresql
121-
# - REDMINE_VERSION=2.5.1
122-
# - REDMINE_VERSION=2.5.0
123-
# - REDMINE_VERSION=2.4.7 DATABASE_ADAPTER=mysql
124-
# - REDMINE_VERSION=2.4.7 DATABASE_ADAPTER=postgresql
125-
# - REDMINE_VERSION=2.4.6 DATABASE_ADAPTER=mysql
126-
# - REDMINE_VERSION=2.4.6 DATABASE_ADAPTER=postgresql
127-
# - REDMINE_VERSION=2.4.5
128-
# - REDMINE_VERSION=2.4.4
129-
# - REDMINE_VERSION=2.4.3
130-
# - REDMINE_VERSION=2.4.2
131-
# - REDMINE_VERSION=2.4.1
132-
# - REDMINE_VERSION=2.4.0
133-
# - REDMINE_VERSION=2.3.4
134-
# - REDMINE_VERSION=2.2.4
32+
- REDMINE_VERSION=3.3.0 DATABASE_ADAPTER=mysql
33+
- REDMINE_VERSION=3.3.0 DATABASE_ADAPTER=postgresql
34+
- REDMINE_VERSION=3.2.3 DATABASE_ADAPTER=mysql
35+
- REDMINE_VERSION=3.2.3 DATABASE_ADAPTER=postgresql
36+
- REDMINE_VERSION=3.1.6 DATABASE_ADAPTER=mysql
37+
- REDMINE_VERSION=3.1.6 DATABASE_ADAPTER=postgresql
13538
before_install:
13639
- cd ../..
13740
- sudo apt-get update -qq

Diff for: ‎AUTHORS

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Jean-Sébastien Bour <[email protected]>
2727
John Axel Eriksson <[email protected]>
2828
John Kubiatowicz <[email protected]>
2929
Joshua Hogendorn <[email protected]>
30+
Kovalev Vladimir <[email protected]>
3031
Ludovic Schoepps <[email protected]>
3132
Lukas Mika <[email protected]>
3233
Marco Nenciarini <[email protected]>
@@ -49,6 +50,7 @@ root <root@hanzo.(none)>
4950
rposborne <[email protected]>
5051
Ryan Thompson <[email protected]>
5152
Sebastian Harl <[email protected]>
53+
Simon Peeters <[email protected]>
5254
Slotos <[email protected]>
5355
Soeren Helbig <[email protected]>
5456
Strnadj <[email protected]>

Diff for: ‎CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
## CHANGELOG
22

3+
### 1.2.1 - 2016-07-25
4+
5+
* Fix [#524](https://github.com/jbox-web/redmine_git_hosting/issues/524) ([DB] Index too long)
6+
* Fix [#533](https://github.com/jbox-web/redmine_git_hosting/issues/533) ([Views] About readme.md preview feature)
7+
* Fix [#541](https://github.com/jbox-web/redmine_git_hosting/issues/541) ([Core] SSH/Gitolite server host on 1.2)
8+
* Fix [#553](https://github.com/jbox-web/redmine_git_hosting/issues/553) ([Controllers] Protected branches user list never updated. Mass-assign warning.)
9+
* Fix [#569](https://github.com/jbox-web/redmine_git_hosting/issues/569) ([Core] Connection refused when sshd doesn't listen on default port)
10+
* Merge [#583](https://github.com/jbox-web/redmine_git_hosting/pull/583) ([Core] force UTF-8 encoding for tags and branches)
11+
* Merge [#600](https://github.com/jbox-web/redmine_git_hosting/pull/600) ([Core] Improve performance)
12+
313
### 1.2.0 - 2015-11-18
414

515
* 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)

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This plugin allows straightforward management of Gitolite within Redmine.
1515

1616
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/).
1717

18-
**[Latest stable version : 1.2.0](http://redmine-git-hosting.io/releases-notes/release-1.2.0.html)**
18+
**[Latest stable version : 1.2.1](http://redmine-git-hosting.io/releases-notes/release-1.2.1.html)**
1919

2020
## Installation
2121

Diff for: ‎app/forms/plugin_settings_validation/ssh_config.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module SshConfig
2020
end
2121

2222
validates :gitolite_user, presence: true
23-
validates :gitolite_server_host, presence: true, format: { with: Resolv::IPv4::Regex }
23+
validates :gitolite_server_host, presence: true
2424
validates :gitolite_server_port, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 65_536 }
2525
validates :gitolite_ssh_private_key, presence: true
2626
validates :gitolite_ssh_public_key, presence: true

Diff for: ‎app/workers/githosting_shell_worker.rb

+9
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ class GithostingShellWorker
33

44
sidekiq_options queue: :redmine_git_hosting, retry: false
55

6+
def self.maybe_do(command, object, options = {})
7+
args = [command.to_s, object, options]
8+
Sidekiq::Queue.new(:redmine_git_hosting).each do |job|
9+
return if job.args == args
10+
end
11+
12+
perform_async(command, object, options)
13+
end
14+
615
def perform(command, object, options = {})
716
logger.info("#{command} | #{object} | #{options}")
817
RedmineGitHosting::GitoliteWrapper.resync_gitolite(command, object, options)

Diff for: ‎contrib/hooks/post-receive/lib/git_hosting_config.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def project_name
5252

5353

5454
def repository_name
55-
if config.has_key?('repositoryid')
55+
if config.has_key?('repositoryid') && !config['repositoryid'].empty?
5656
"#{project_name}/#{config['repositoryid']}"
5757
else
5858
project_name

Diff for: ‎contrib/travis/data/gem_files/rails4.gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ gem 'gitolite-rugged', git: 'https://github.com/jbox-web/gitolite-rugged.git', t
77
## Ruby/Rack Git Smart-HTTP Server Handler (use our own repository because Redmine uses Rails 4.2 and Rack 1.6)
88
gem 'gitlab-grack', git: 'https://github.com/jbox-web/grack.git', require: 'grack', branch: 'fix_rails4'
99

10-
if ENV['USE_SVN'] || ['3.1.2', '3.0.6', '2.6.8'].include?(ENV['REDMINE_VERSION'])
11-
gem 'redcarpet', '~> 3.3.2'
12-
else
10+
if ['3.1.2', '3.0.6', '2.6.8'].include?(ENV['REDMINE_VERSION'])
1311
gem 'redcarpet', '~> 3.1.2'
12+
else
13+
gem 'redcarpet', '~> 3.3.2'
1414
end
1515

1616
# HAML views

Diff for: ‎lib/redmine/scm/adapters/xitolite_adapter.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def branches
8585
git_cmd(cmd_args) do |io|
8686
io.each_line do |line|
8787
branch_rev = line.match('\s*(\*?)\s*(.*?)\s*([0-9a-f]{40}).*$')
88-
bran = GitBranch.new(branch_rev[2])
88+
bran = GitBranch.new(branch_rev[2].to_s.force_encoding(Encoding::UTF_8))
8989
bran.revision = branch_rev[3]
9090
bran.scmid = branch_rev[3]
9191
bran.is_default = (branch_rev[1] == '*')
@@ -104,7 +104,7 @@ def tags
104104
@tags = []
105105
cmd_args = %w|tag|
106106
git_cmd(cmd_args) do |io|
107-
@tags = io.readlines.sort!.map { |t| t.strip }
107+
@tags = io.readlines.sort!.map { |t| t.strip.force_encoding(Encoding::UTF_8) }
108108
end
109109
@tags
110110
rescue ScmCommandAborted => e

Diff for: ‎lib/redmine_git_hosting/gitolite_accessor.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def resync_gitolite(command, object, options = {})
140140
end
141141

142142
if RedmineGitHosting::Config.gitolite_use_sidekiq? && !bypass
143-
GithostingShellWorker.perform_async(command, object, options)
143+
GithostingShellWorker.maybe_do(command, object, options)
144144
else
145145
GitoliteWrapper.resync_gitolite(command, object, options)
146146
end

Diff for: ‎lib/redmine_git_hosting/gitolite_wrappers/projects/update_projects.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ def call
77
return if git_projects.empty?
88
admin.transaction do
99
git_projects.each do |project|
10-
handle_project_update(project)
11-
gitolite_admin_repo_commit(project.identifier)
10+
if project.gitolite_repos.any?
11+
handle_project_update(project)
12+
gitolite_admin_repo_commit(project.identifier)
13+
end
1214
end
1315
end
1416
end

0 commit comments

Comments
 (0)