Permalink
Browse files

Merged opf/openproject/refs/tags/v6.1.4 into opf/openproject-ce/relea…

…se/6.1
  • Loading branch information...
2 parents cc5b735 + fd7fc2b commit c38fa514acc3f534ada1bd827608f50000761751 CI committed with oliverguenther Jan 20, 2017
Showing 2,841 changed files with 11,241 additions and 8,936 deletions.
View
@@ -1,12 +1,12 @@
#-- copyright
# OpenProject is a project management system.
-# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2006-2017 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
@@ -0,0 +1,24 @@
+-----BEGIN PUBLIC KEY-----
+MIIEFjANBgkqhkiG9w0BAQEFAAOCBAMAMIID/gKCA/UAquIZchoog2ffcr9J2KSl
+mlum6sN3smTVNsp9JGd1q4fr/kUFGch6q1cFEX3x5BGDXx7wPPI4ppKzeQHaxWmx
+wxqs3eevcTFUEF9A2MPX7p5Ia0TbH4d7e7D9YMWvDXoQLggrxMFdUHY3ppUnBPgB
++EJG1Pv0FlBAdxYX0em7kLwhcp9PBP/zXso/qkkKK/pncyKizOLC3zv3E0ixcQ7o
+Nq0aolTJFMHcqEquKaQN1jicDdzU6ks+YKh7kByZvVChe/InlroVXKrUa34hAZDM
+acEkURJma3meN0IyPFA7fHRe1AhiNYF2MatNKysPrbOffYLOjamlaqmHTeJAec6e
+vMHd+LlIz4xXivR0lY2wDawqp0waSLJaW8lZetOf0iwbqQkzZhz4sWDZopyGiqAU
+v9/zS4OjUBr7JQbVcV3LIkzGWwNysSvTMrlvzCesYVsCwpLjP6gFxdclYJuTwEeL
+o+T+AgoNyuj6ixhwHTJxIVhuBpebX44/YTYyUGMgItekDCH2Dxvtv2DaCL7YIqNG
+ibvCyzCyLak7Tz97CMvCUf1EIRVfolbGpphi2Zzpoeqhfheh+0LQ3gmMBJpuLnJU
+VXEtrOPunTkOrdUqL5rD/+mfd8yufsJ16Uk5j7gNUcIJsCcGWZ3Nhfidi3tvmJPF
+H8HgNZ6W6smj9k7+TdZbRsH1LZp1LL/stLch3ffFHHcJye7d2t75uKiOoz1/1JMY
+fl/wfaEaKvTGBKr/NFKcVDSBXHgx6VMA3oWV2AyLnTaY98XVPY1zzbyNKlNQkSaD
+p/VCl334+YMwR9/5aJYJg58lljw6aBu+cozNkydKjCmqEpZNdR1tFusAY7jd/M2G
+yXPBTdUJD6GrLx0Hot/wImJ30gOMgpeoetNUfM9/FimySLy65DRzCtLm1hthAlWM
+Is5vFwMmFFSb3ozTsnkj9W16jHk9HdodKJfezzcPqu3TW2EMMNbbtXa3OPaHkht2
+huYJGnGu0hNhAj+x+KCxkpLveS0Ajw322qmtAqnwJLvfwShnz//cptNX5kXtrNGy
++o6I4jHibIATfaMKMt8gHmCZ381zAwrAOU7c0FQna+IkU8dgZDx7T+Xo1Q/GXuaO
+1b2aT6geT60A3VgF+OBnoHe5Ext7vfNL9v0wcN5NLR5KgjexwEhcBcA2FauCTrVt
+FUNgir+5XALd/wBlvxkvPKTJnQld/aK7xF0ui3c3/ryPX5cKzpfm9APK/hOFzkJ7
+ieARHqrQGqOYdClIUJIH0b/92dFq49Eqn1cKpztVzsU9xzdI/4w5JUSw/kbguVf7
+Yd0Rdc9KF/9WMwjzrWSti4meNBUO6/18cAognx0Pf5qsrSzOewIDAQAB
+-----END PUBLIC KEY-----
View
@@ -39,6 +39,7 @@ targets:
before_precompile: "packaging/setup"
crons:
- packaging/cron/openproject-clear-old-sessions
+ - packaging/cron/openproject-clear-uploaded-files
services:
- postgres
installer: https://github.com/pkgr/installer.git
@@ -50,4 +51,4 @@ wizards:
- https://github.com/pkgr/addon-smtp.git
- https://github.com/pkgr/addon-memcached.git
- https://github.com/pkgr/addon-openproject.git
-buildpack: https://github.com/ddollar/heroku-buildpack-multi.git
+buildpack: https://github.com/opf/heroku-buildpack-multi.git
View
@@ -1,12 +1,12 @@
#-- copyright
# OpenProject is a project management system.
-# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2006-2017 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
View
@@ -1,12 +1,12 @@
#-- copyright
# OpenProject is a project management system.
-# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2006-2017 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@ source 'https://rubygems.org'
ruby '>= 2.2.5'
-gem 'rails', '~> 5.0.0'
+gem 'rails', '~> 5.0.1'
gem 'actionpack-xml_parser', '~> 2.0.0'
gem 'activemodel-serializers-xml', '~> 1.0.1'
gem 'activerecord-session_store', '~> 1.0.0'
@@ -153,6 +153,8 @@ gem 'nokogiri', '~> 1.6.8'
gem 'fog-aws'
gem 'carrierwave', git: 'https://github.com/carrierwaveuploader/carrierwave', branch: 'master'
+gem 'openproject-token', '~> 1.0.0'
+
group :test do
gem 'rack-test', '~> 0.6.3'
gem 'shoulda-context', '~> 1.2'
View
@@ -94,10 +94,10 @@ GIT
GIT
remote: https://github.com/opf/openproject-translations.git
- revision: 5ff2a6f1e733353bf558d72133f53187fccfc13c
+ revision: da52ff92cdcd62197b400bec93a1715cd685f092
branch: stable/6
specs:
- openproject-translations (6.1.3)
+ openproject-translations (6.1.4)
crowdin-api (~> 0.4.1)
mixlib-shellout (~> 2.1.0)
rails (~> 5.0.0)
@@ -244,54 +244,54 @@ GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.0.2)
- actioncable (5.0.0.1)
- actionpack (= 5.0.0.1)
+ actioncable (5.0.1)
+ actionpack (= 5.0.1)
nio4r (~> 1.2)
websocket-driver (~> 0.6.1)
- actionmailer (5.0.0.1)
- actionpack (= 5.0.0.1)
- actionview (= 5.0.0.1)
- activejob (= 5.0.0.1)
+ actionmailer (5.0.1)
+ actionpack (= 5.0.1)
+ actionview (= 5.0.1)
+ activejob (= 5.0.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.0.0.1)
- actionview (= 5.0.0.1)
- activesupport (= 5.0.0.1)
+ actionpack (5.0.1)
+ actionview (= 5.0.1)
+ activesupport (= 5.0.1)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-xml_parser (2.0.0)
actionpack (~> 5.x)
railties (~> 5.x)
- actionview (5.0.0.1)
- activesupport (= 5.0.0.1)
+ actionview (5.0.1)
+ activesupport (= 5.0.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
active_record_query_trace (1.5.4)
- activejob (5.0.0.1)
- activesupport (= 5.0.0.1)
+ activejob (5.0.1)
+ activesupport (= 5.0.1)
globalid (>= 0.3.6)
- activemodel (5.0.0.1)
- activesupport (= 5.0.0.1)
+ activemodel (5.0.1)
+ activesupport (= 5.0.1)
activemodel-serializers-xml (1.0.1)
activemodel (> 5.x)
activerecord (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
- activerecord (5.0.0.1)
- activemodel (= 5.0.0.1)
- activesupport (= 5.0.0.1)
+ activerecord (5.0.1)
+ activemodel (= 5.0.1)
+ activesupport (= 5.0.1)
arel (~> 7.0)
activerecord-session_store (1.0.0)
actionpack (>= 4.0, < 5.1)
activerecord (>= 4.0, < 5.1)
multi_json (~> 1.11, >= 1.11.2)
rack (>= 1.5.2, < 3)
railties (>= 4.0, < 5.1)
- activesupport (5.0.0.1)
+ activesupport (5.0.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
@@ -306,7 +306,7 @@ GEM
airbrake (5.1.0)
airbrake-ruby (~> 1.1)
airbrake-ruby (1.5.0)
- arel (7.1.2)
+ arel (7.1.4)
ast (2.3.0)
attr_required (1.0.1)
autoprefixer-rails (6.4.1.1)
@@ -324,7 +324,7 @@ GEM
bourbon (4.2.7)
sass (~> 3.4)
thor (~> 0.19)
- builder (3.2.2)
+ builder (3.2.3)
byebug (9.0.5)
capybara (2.8.1)
addressable
@@ -360,7 +360,7 @@ GEM
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
color-tools (1.3.0)
- concurrent-ruby (1.0.2)
+ concurrent-ruby (1.0.4)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crowdin-api (0.4.1)
@@ -467,7 +467,7 @@ GEM
htmldiff (0.0.1)
http-cookie (1.0.3)
domain_name (~> 0.5)
- httpclient (2.8.2.4)
+ httpclient (2.8.3)
i18n (0.7.0)
i18n-js (3.0.0.rc14)
i18n (~> 0.6, >= 0.6.6)
@@ -479,7 +479,7 @@ GEM
jquery-tablesorter (1.22.7)
railties (>= 3.2, < 6)
json (1.8.3)
- json-jwt (1.6.5)
+ json-jwt (1.7.1)
activesupport
bindata
multi_json (>= 1.3)
@@ -511,7 +511,7 @@ GEM
mime-types (2.99.3)
mini_portile2 (2.1.0)
minisyntax (0.2.5)
- minitest (5.9.0)
+ minitest (5.10.1)
mixlib-shellout (2.1.0)
multi_json (1.12.1)
multi_test (0.1.2)
@@ -523,9 +523,8 @@ GEM
netrc (0.11.0)
newrelic_rpm (3.16.2.321)
nio4r (1.2.1)
- nokogiri (1.6.8)
+ nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
- pkg-config (~> 1.1.7)
oj (2.17.4)
openid_connect (0.8.3)
activemodel
@@ -538,6 +537,8 @@ GEM
validate_email
validate_url
webfinger (>= 0.0.2)
+ openproject-token (1.0.0)
+ activemodel (~> 5.0)
parallel (1.9.0)
parallel_tests (2.4.1)
parallel
@@ -556,7 +557,6 @@ GEM
ruby-rc4
ttfunk
pg (0.19.0)
- pkg-config (1.1.7)
powerpack (0.1.1)
prawn (2.1.0)
pdf-core (~> 0.6.1)
@@ -588,7 +588,7 @@ GEM
rack (>= 0.4)
rack-attack (5.0.1)
rack
- rack-oauth2 (1.4.0)
+ rack-oauth2 (1.5.1)
activesupport (>= 2.3)
attr_required (>= 0.0.5)
httpclient (>= 2.4)
@@ -601,21 +601,21 @@ GEM
rack_session_access (0.1.1)
builder (>= 2.0.0)
rack (>= 1.0.0)
- rails (5.0.0.1)
- actioncable (= 5.0.0.1)
- actionmailer (= 5.0.0.1)
- actionpack (= 5.0.0.1)
- actionview (= 5.0.0.1)
- activejob (= 5.0.0.1)
- activemodel (= 5.0.0.1)
- activerecord (= 5.0.0.1)
- activesupport (= 5.0.0.1)
+ rails (5.0.1)
+ actioncable (= 5.0.1)
+ actionmailer (= 5.0.1)
+ actionpack (= 5.0.1)
+ actionview (= 5.0.1)
+ activejob (= 5.0.1)
+ activemodel (= 5.0.1)
+ activerecord (= 5.0.1)
+ activesupport (= 5.0.1)
bundler (>= 1.3.0, < 2.0)
- railties (= 5.0.0.1)
+ railties (= 5.0.1)
sprockets-rails (>= 2.0.0)
- rails-dom-testing (2.0.1)
+ rails-dom-testing (2.0.2)
activesupport (>= 4.2.0, < 6.0)
- nokogiri (~> 1.6.0)
+ nokogiri (~> 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
@@ -625,15 +625,15 @@ GEM
rails (> 3.1)
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
- railties (5.0.0.1)
- actionpack (= 5.0.0.1)
- activesupport (= 5.0.0.1)
+ railties (5.0.1)
+ actionpack (= 5.0.1)
+ activesupport (= 5.0.1)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
raindrops (0.17.0)
- rake (11.3.0)
+ rake (12.0.0)
rdoc (4.2.2)
json (~> 1.4)
redcarpet (3.3.4)
@@ -725,7 +725,7 @@ GEM
slop (3.6.0)
spreadsheet (0.8.9)
ruby-ole (>= 1.0)
- sprockets (3.7.0)
+ sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
@@ -749,7 +749,7 @@ GEM
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
- thor (0.19.1)
+ thor (0.19.4)
thread_safe (0.3.5)
tilt (2.0.5)
timecop (0.8.1)
@@ -882,6 +882,7 @@ DEPENDENCIES
openproject-pdf_export!
openproject-reporting!
openproject-themes-dark!
+ openproject-token (~> 1.0.0)
openproject-translations!
openproject-webhooks!
openproject-xls_export!
@@ -901,7 +902,7 @@ DEPENDENCIES
rack-protection (~> 2.0.0.beta2)
rack-test (~> 0.6.3)
rack_session_access
- rails (~> 5.0.0)
+ rails (~> 5.0.1)
rails-angular-xss!
rails-controller-testing!
rails_12factor
View
@@ -1,13 +1,13 @@
#!/usr/bin/env rake
#-- copyright
# OpenProject is a project management system.
-# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2006-2017 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,12 +1,12 @@
//-- copyright
// OpenProject is a project management system.
-// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+// Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.
//
// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2006-2017 Jean-Philippe Lang
// Copyright (C) 2010-2013 the ChiliProject Team
//
// This program is free software; you can redistribute it and/or
Oops, something went wrong.

0 comments on commit c38fa51

Please sign in to comment.