Skip to content

Commit 4125550

Browse files
author
root
committed
Merge branch 'v1.2.x' of github.com:jbox-web/redmine_git_hosting into v1.2.x
2 parents 44b8b5b + 5c2badf commit 4125550

File tree

1 file changed

+1
-38
lines changed

1 file changed

+1
-38
lines changed

Gemfile

+1-38
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gem 'redcarpet', '~> 3.3.2'
1111
## Redmine 2.x
1212
## Ruby/Rack Git Smart-HTTP Server Handler (use our own repository because Redmine still uses Rails 3 and Rack 1.4)
1313
# gem 'gitlab-grack', git: 'https://github.com/jbox-web/grack.git', require: 'grack', branch: 'fix_rails3'
14-
# gem 'redcarpet', '~> 2.3.0'
14+
# gem 'redcarpet', '~> 3.3.2'
1515

1616
# HAML views
1717
gem 'haml-rails'
@@ -33,40 +33,3 @@ gem 'asciidoctor'
3333

3434
# Rack parser for Hrack
3535
gem 'rack-parser', require: 'rack/parser'
36-
37-
group :development, :test do
38-
gem 'rspec', '~> 3.0.0'
39-
gem 'rspec-rails', '~> 3.0.1'
40-
41-
gem 'shoulda', '~> 3.5.0'
42-
gem 'shoulda-matchers', '~> 2.7.0'
43-
gem 'shoulda-context'
44-
45-
gem 'factory_girl'
46-
gem 'factory_girl_rails'
47-
gem 'faker'
48-
gem 'sshkey'
49-
gem 'database_cleaner'
50-
51-
# Code coverage
52-
gem 'simplecov', '~> 0.9.1'
53-
gem 'simplecov-rcov'
54-
55-
# Junit results
56-
gem 'ci_reporter_rspec', '~> 1.0.0'
57-
58-
# Publish to Coveralls
59-
gem 'coveralls', require: false
60-
61-
# Publish to CodeClimate
62-
gem 'codeclimate-test-reporter', require: false
63-
end
64-
65-
group :development do
66-
gem 'spring', '~> 1.3.1'
67-
gem 'spring-commands-rspec', '~> 1.0.4'
68-
gem 'quiet_assets', '~> 1.1.0'
69-
70-
# gem 'brakeman', '~> 2.6.3'
71-
# gem 'bullet', '~> 4.14.7'
72-
end

0 commit comments

Comments
 (0)