Commit graph

17575 commits

Author SHA1 Message Date
Jonne Haß
1891b9c61e
Merge branch 'stable' into develop 2016-06-07 14:05:41 +02:00
Jonne Haß
4c750c8784
Merge branch 'master' into stable 2016-06-07 14:04:22 +02:00
Jonne Haß
0bc8e54afd
Update Nokogiri to 1.6.8
Which in turn updates libxml2 to 2.9.4 and libxslt to 1.1.29,  addressing
a range of security issues.
See https://groups.google.com/forum/#!topic/ruby-security-ann/RCHyF5K9Lbc
for more details.
2016-06-07 13:51:33 +02:00
Jonne Haß
9346fadefc
Merge branch 'stable' into develop 2016-06-07 13:11:52 +02:00
Jonne Haß
c8aa323d13
Set ca_file explicitly for the mail gem too 2016-06-07 13:11:32 +02:00
Jonne Haß
a5c9579c77
Merge branch 'stable' into develop 2016-06-07 12:30:40 +02:00
Jonne Haß
27569d4baa
OpenSSL verification modes other than none and peer make no sense for
TLS client connection, remove them from the examples.
2016-06-07 12:29:21 +02:00
Dennis Schubert
ac70d72190
Merge branch 'stable' into develop 2016-05-21 19:00:45 +02:00
Dennis Schubert
db5714d75f
updated 73 locale files [ci skip] 2016-05-21 19:00:35 +02:00
Dennis Schubert
aaf1f4741c
updated 73 locale files [ci skip] 2016-05-21 18:57:20 +02:00
Dennis Schubert
f6982aeca6
Merge branch 'stable' into develop 2016-05-17 03:09:20 +02:00
Dennis Schubert
95da98d0bf
Merge branch 'master' into stable 2016-05-17 03:08:54 +02:00
Dennis Schubert
a2864b9f40
Merge branch 'release/0.5.9.0' 2016-05-17 03:05:43 +02:00
Dennis Schubert
f285b1c459 Merge pull request #6831 from svbergerem/fix-conversations-message-content-overflow
Fix message content overflow in conversations
2016-05-13 04:54:44 +02:00
Steffen van Bergerem
1de7f8ea9e Fix message content overflow in conversations 2016-05-13 01:18:16 +02:00
Dennis Schubert
43601ce636
Bump rufus-scheduler 2016-05-12 13:40:24 +02:00
Dennis Schubert
85d509e9c8
Bump listen 2016-05-12 13:39:03 +02:00
Dennis Schubert
347f783052
Bump versionist 2016-05-12 13:38:15 +02:00
Dennis Schubert
cd7fad1f6d
Bump sidekiq 2016-05-12 13:37:57 +02:00
Dennis Schubert
b53fc46658
Bump rails-assets-blueimp-gallery 2016-05-12 13:37:34 +02:00
Dennis Schubert
19d6a94a9c
Bump openid_connect 2016-05-12 13:36:37 +02:00
Dennis Schubert
5284cd2fff
Bump leaflet-rails 2016-05-12 13:36:20 +02:00
Dennis Schubert
c96f34807c
Bump hamlit 2016-05-12 13:35:54 +02:00
Jonne Haß
b4a63e7369
Merge branch 'stable' into develop 2016-05-12 13:34:10 +02:00
Jonne Haß
5378e8c8e7
bump rails-assets-markdown-it 2016-05-12 13:16:38 +02:00
Dennis Schubert
c6a9f38442
Freeze all versions for consistency 2016-05-12 13:16:38 +02:00
Dennis Schubert
7b039da24a
Update Rubocop config 2016-05-12 13:16:37 +02:00
Jonne Haß
0bb6c017f1
bump rubocop 2016-05-12 13:16:37 +02:00
Dennis Schubert
66c6300414
Bump guard-rspec 2016-05-12 13:05:52 +02:00
Dennis Schubert
0fd8102191
Bump guard-cucumber 2016-05-12 13:05:52 +02:00
Dennis Schubert
40d8400669
Bump capybara 2016-05-12 13:05:52 +02:00
Dennis Schubert
fabd592a5d
Bump websocket 2016-05-12 13:00:38 +02:00
Dennis Schubert
1409e6457c
Bump sass 2016-05-12 13:00:38 +02:00
Dennis Schubert
7b6d89b796
Bump ruby-progressbar 2016-05-12 12:59:45 +02:00
Dennis Schubert
f3e5f202cc
Bump request_store 2016-05-12 12:58:16 +02:00
Dennis Schubert
af018e1005
Bump rails-assets-jquery-colorbox 2016-05-12 12:58:16 +02:00
Dennis Schubert
79b8f127f6
Bump parser 2016-05-12 12:58:16 +02:00
Dennis Schubert
d674c42998
Bump oauth 2016-05-12 12:58:16 +02:00
Dennis Schubert
d7e50293b3
Bump logging 2016-05-12 12:58:16 +02:00
Dennis Schubert
2d72ff82de
Bump http 2016-05-12 12:56:26 +02:00
Dennis Schubert
036dd843eb
Bump hitimes 2016-05-12 12:56:26 +02:00
Dennis Schubert
2f8ae82ca4
Bump hashie 2016-05-12 12:54:27 +02:00
Dennis Schubert
d46f386450
Bump hashdiff 2016-05-12 12:54:27 +02:00
Dennis Schubert
529ebe95e1
Bump font-awesome-rails 2016-05-12 12:54:27 +02:00
Dennis Schubert
0483dde36a
Bump domain_name 2016-05-12 12:54:27 +02:00
Dennis Schubert
6d59284968
Bump cucumber 2016-05-12 12:54:27 +02:00
Dennis Schubert
d505b669f1
Bump coderay 2016-05-12 12:54:27 +02:00
Dennis Schubert
91ce3bea24
Bump byebug 2016-05-12 12:54:27 +02:00
Dennis Schubert
d772848338
Bump unicorn 2016-05-12 12:53:39 +02:00
Dennis Schubert
a5533387be
Bump uglifier 2016-05-12 12:40:39 +02:00