.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,10 @@
+
+____________________________________________________________________
+
+**Do not send a pull request to this GitHub repository**.
+
+For more detail, please see [official website] wiki [Contribute].
+
+[official website]: http://www.redmine.org
+[Contribute]: http://www.redmine.org/projects/redmine/wiki/Contribute
+

.gitignore

@@ -1,11 +1,13 @@
 /.project
+/.idea
 /.loadpath
 /.powrc
 /.rvmrc
 /config/additional_environment.rb
 /config/configuration.yml
 /config/database.yml
 /config/email.yml
+/config/secrets.yml
 /config/initializers/session_store.rb
 /config/initializers/secret_token.rb
 /coverage
@@ -18,11 +20,14 @@
 /log/*.log*
 /log/mongrel_debug
 /plugins/*
+!/plugins/redmine_webhook
+!/plugins/redmine_issue_templates
 !/plugins/README
 /public/dispatch.*
 /public/plugin_assets/*
 /public/themes/*
 !/public/themes/alternate
+!/public/themes/circle
 !/public/themes/classic
 !/public/themes/README
 /tmp/*

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "public/themes/circle"]
+	path = public/themes/circle
+	url = https://github.com/RCRM/circle
+[submodule "plugins/redmine_webhook"]
+	path = plugins/redmine_webhook
+	url = https://github.com/suer/redmine_webhook
+[submodule "plugins/redmine_issue_templates"]
+	path = plugins/redmine_issue_templates
+	url = https://github.com/dolphin-emu/redmine_issue_templates.git
+[submodule "public/themes/flat"]
+	path = public/themes/flat
+	url = https://github.com/dolphin-emu/redmine-theme-flat.git

.hgignore

@@ -1,13 +1,15 @@
 syntax: glob
 
 .project
+.idea
 .loadpath
 .powrc
 .rvmrc
 config/additional_environment.rb
 config/configuration.yml
 config/database.yml
 config/email.yml
+config/secrets.yml
 config/initializers/session_store.rb
 config/initializers/secret_token.rb
 coverage

Gemfile

@@ -4,24 +4,32 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
   abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
 end
 
-gem "rails", "4.2.3"
-gem "jquery-rails", "~> 3.1.3"
-gem "coderay", "~> 1.1.0"
-gem "builder", ">= 3.0.4"
+gem "rails", "4.2.8"
+gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
+gem "jquery-rails", "~> 3.1.4"
+gem "coderay", "~> 1.1.1"
 gem "request_store", "1.0.5"
-gem "mime-types"
+gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
 gem "protected_attributes"
-gem "actionpack-action_caching"
 gem "actionpack-xml_parser"
-gem "loofah", "~> 2.0"
+gem "roadie-rails", "~> 1.1.1"
+gem "roadie", "~> 3.2.1"
+gem "mimemagic"
+
+gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
+gem "i18n", "~> 0.7.0"
+gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
+
+# Request at least rails-html-sanitizer 1.0.3 because of security advisories
+gem "rails-html-sanitizer", ">= 1.0.3"
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby]
-gem "rbpdf", "~> 1.18.6"
+gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
+gem "rbpdf", "~> 1.19.2"
 
 # Optional gem for LDAP authentication
 group :ldap do
-  gem "net-ldap", "~> 0.3.1"
+  gem "net-ldap", "~> 0.12.0"
 end
 
 # Optional gem for OpenID authentication
@@ -38,16 +46,10 @@ platforms :mri, :mingw, :x64_mingw do
 
   # Optional Markdown support, not for JRuby
   group :markdown do
-    gem "redcarpet", "~> 3.1.2"
+    gem "redcarpet", "~> 3.4.0"
   end
 end
 
-platforms :jruby do
-  # jruby-openssl is bundled with JRuby 1.7.0
-  gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
-  gem "activerecord-jdbc-adapter", "~> 1.3.2"
-end
-
 # Include database gems for the adapters found in the database
 # configuration file
 require 'erb'
@@ -60,19 +62,14 @@ if File.exist?(database_file)
     adapters.each do |adapter|
       case adapter
       when 'mysql2'
-        gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw]
-        gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
-      when 'mysql'
-        gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+        gem "mysql2", "~> 0.4.6", :platforms => [:mri, :mingw, :x64_mingw]
       when /postgresql/
         gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw]
-        gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
       when /sqlite3/
-        gem "sqlite3", :platforms => [:mri, :mingw, :x64_mingw]
-        gem "jdbc-sqlite3", ">= 3.8.10.1", :platforms => :jruby
-        gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+        gem "sqlite3", (RUBY_VERSION < "2.0" && RUBY_PLATFORM =~ /mingw/ ? "1.3.12" : "~>1.3.12"),
+                       :platforms => [:mri, :mingw, :x64_mingw]
       when /sqlserver/
-        gem "tiny_tds", "~> 0.6.2", :platforms => [:mri, :mingw, :x64_mingw]
+        gem "tiny_tds", (RUBY_VERSION >= "2.0" ? "~> 1.0.5" : "~> 0.7.0"), :platforms => [:mri, :mingw, :x64_mingw]
         gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw]
       else
         warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems")
@@ -86,7 +83,7 @@ else
 end
 
 group :development do
-  gem "rdoc", ">= 2.4.2"
+  gem "rdoc", "~> 4.3"
   gem "yard"
 end
 
@@ -95,9 +92,11 @@ group :test do
   gem "rails-dom-testing"
   gem "mocha"
   gem "simplecov", "~> 0.9.1", :require => false
+  # TODO: remove this after upgrading to Rails 5
+  gem "test_after_commit", "~> 0.4.2"
   # For running UI tests
   gem "capybara"
-  gem "selenium-webdriver"
+  gem "selenium-webdriver", "~> 2.53.4"
 end
 
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")