Skip to content

Commit b11dc42

Browse files
author
root
committed
Support for Redmine 2.x has been dropped
1 parent 09c23e1 commit b11dc42

File tree

3 files changed

+6
-101
lines changed

3 files changed

+6
-101
lines changed

Diff for: contrib/travis/data/gem_files/rails3.gemfile

-63
This file was deleted.

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

+3-8
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ gem 'gitolite-rugged', git: 'https://github.com/jbox-web/gitolite-rugged.git', t
66
## Redmine 3.x
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'
9-
10-
if ['3.1.2', '3.0.6', '2.6.8'].include?(ENV['REDMINE_VERSION'])
11-
gem 'redcarpet', '~> 3.1.2'
12-
else
13-
gem 'redcarpet', '~> 3.3.2'
14-
end
9+
gem 'redcarpet', '~> 3.3.2'
1510

1611
# HAML views
1712
gem 'haml-rails'
@@ -35,8 +30,8 @@ gem 'asciidoctor'
3530
gem 'rack-parser', require: 'rack/parser'
3631

3732
group :development, :test do
38-
gem 'rspec', '~> 3.0.0'
39-
gem 'rspec-rails', '~> 3.0.1'
33+
gem 'rspec'
34+
gem 'rspec-rails'
4035

4136
gem 'shoulda', '~> 3.5.0'
4237
gem 'shoulda-matchers', '~> 2.7.0'

Diff for: contrib/travis/plugin.sh

+3-30
Original file line numberDiff line numberDiff line change
@@ -58,36 +58,9 @@ function install_database() {
5858

5959

6060
function install_gemfile() {
61-
log_title "INSTALL GEMFILE"
62-
63-
if [ "$major" == "3" ] ; then
64-
if [ -f "${CONTRIB_DATA_DIR}/gem_files/rails4.gemfile" ] ; then
65-
log_title "INSTALL RAILS 4 VERSION"
66-
cp "${CONTRIB_DATA_DIR}/gem_files/rails4.gemfile" "${PLUGIN_DIR}/Gemfile"
67-
log_ok
68-
fi
69-
else
70-
71-
if [ -f "${CONTRIB_DATA_DIR}/gem_files/rails3.gemfile" ] ; then
72-
log_title "INSTALL RAILS 3 VERSION"
73-
cp "${CONTRIB_DATA_DIR}/gem_files/rails3.gemfile" "${PLUGIN_DIR}/Gemfile"
74-
log_ok
75-
fi
76-
77-
log_title "RAILS 3 : UPDATE REDMINE GEMFILE"
78-
79-
echo "Update shoulda to 3.5.0"
80-
sed -i 's/gem "shoulda", "~> 3.3.2"/gem "shoulda", "~> 3.5.0"/' "redmine/Gemfile"
81-
log_ok
82-
83-
echo "Let update shoulda-matchers to 2.7.0"
84-
sed -i 's/gem "shoulda-matchers", "1.4.1"/#gem "shoulda-matchers", "1.4.1"/' "redmine/Gemfile"
85-
log_ok
86-
87-
echo "Update capybara to 2.2.0"
88-
sed -i 's/gem "capybara", "~> 2.1.0"/gem "capybara", "~> 2.2.0"/' "redmine/Gemfile"
89-
log_ok
90-
fi
61+
log_title "INSTALL RAILS 4 GEMFILE"
62+
cp "${CONTRIB_DATA_DIR}/gem_files/rails4.gemfile" "${PLUGIN_DIR}/Gemfile"
63+
log_ok
9164
}
9265

9366

0 commit comments

Comments
 (0)