Commit graph

1472 commits

Author SHA1 Message Date
Benjamin Neff
3497183645 bump diaspora_federation to 0.1.1
This fetches reshare roots if they are not available locally already.
2016-06-26 21:43:15 +02:00
Benjamin Neff
21fd9f23da remove roxml 2016-06-26 06:21:01 +02:00
Benjamin Neff
88d91233d3 bump diaspora_federation to v0.1.0 2016-06-26 06:20:58 +02:00
Steffen van Bergerem
21476e4ea7
Bump eslintrb 2016-06-20 22:57:02 +02:00
Jonne Haß
2cab7f02eb
Merge branch 'stable' into develop 2016-06-19 11:56:58 +02:00
Dennis Schubert
3ae3bfe520
Don't require guard-* gems 2016-06-19 11:53:02 +02:00
Dennis Schubert
eb1e1e1263 Merge pull request #6768 from svbergerem/poltergeist
Use Poltergeist instead of Selenium
2016-06-19 11:43:50 +02:00
Dennis Schubert
76369f33c5
Remove pry-debundle 2016-06-19 11:38:12 +02:00
Dennis Schubert
d41711a383
Merge branch 'stable' into develop 2016-06-19 05:38:59 +02:00
Dennis Schubert
7fb6ffbb4d
Don't require guard-rspec
since it causes an ugly warning in the console!
2016-06-19 05:37:41 +02:00
Steffen van Bergerem
629e6382ec
Use Poltergeist instead of Selenium 2016-06-19 01:53:18 +02:00
Dennis Schubert
f9e0469183
Use a forked version of eslintrb for now
fixes #6866
upstream https://github.com/zendesk/eslintrb/pull/7
2016-06-17 07:32:31 +02:00
Dennis Schubert
673740b93c
Merge pull request #6860 from svbergerem/eslint
Use eslint instead of jshint
2016-06-16 02:50:27 +02:00
Steffen van Bergerem
cec7fcd964
Bump hamlit 2016-06-16 02:39:45 +02:00
Steffen van Bergerem
02bd6c3c3e
Bump eye 2016-06-16 02:39:37 +02:00
Dennis Schubert
45063bf08d
Merge branch 'stable' into develop 2016-06-16 02:39:20 +02:00
Steffen van Bergerem
d6341c21c7
Bump webmock 2016-06-16 02:34:03 +02:00
Steffen van Bergerem
966166f057
Bump ruby-oembed 2016-06-16 02:34:03 +02:00
Steffen van Bergerem
8182dfb818
Drop rspec-instafail dependency 2016-06-16 02:34:03 +02:00
Steffen van Bergerem
1158b0a41c
Bump rails-assets-markdown-it 2016-06-16 02:34:03 +02:00
Steffen van Bergerem
47d427cf44
Bump rails-assets-higlightjs 2016-06-16 02:34:03 +02:00
Steffen van Bergerem
df0c26da5c
Bump json-schema 2016-06-16 02:34:02 +02:00
Steffen van Bergerem
86aab68c8e
Bump js-routes 2016-06-16 02:34:02 +02:00
Steffen van Bergerem
f5d8ae68c1
Bump guard-rspec 2016-06-16 02:34:02 +02:00
Steffen van Bergerem
8af192d6bd
Bump guard 2016-06-16 02:34:02 +02:00
Steffen van Bergerem
86d8c5f239
Bump autoprefixer-rails 2016-06-16 02:01:06 +02:00
Steffen van Bergerem
e7227891e7 Use eslint instead of jshint 2016-06-12 10:03:59 +02:00
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
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
d772848338
Bump unicorn 2016-05-12 12:53:39 +02:00
Dennis Schubert
a5533387be
Bump uglifier 2016-05-12 12:40:39 +02:00
Dennis Schubert
ca548ed034
Bump typhoeus 2016-05-12 12:40:39 +02:00
Dennis Schubert
d16f9ef4b4
Bump twitter-text 2016-05-12 12:40:39 +02:00
Dennis Schubert
ac5caadd3d
Bump timecop 2016-05-12 12:40:39 +02:00
Dennis Schubert
241f0d977a
Bump test_after_commit 2016-05-12 12:34:52 +02:00
Dennis Schubert
43d0946769
Bump spring 2016-05-12 12:32:39 +02:00
Dennis Schubert
81779a86e5
Bump rubyzip 2016-05-12 12:30:42 +02:00
Dennis Schubert
ee98a96594
Bump ruby-oembed 2016-05-12 12:28:33 +02:00
Dennis Schubert
04f2f0741a
Bump rspec-instafail 2016-05-12 12:26:57 +02:00
Dennis Schubert
87644862de
Bump responders 2016-05-12 12:26:57 +02:00
Dennis Schubert
bd705bd01f
Bump rails-assets-perfect-scrollbar 2016-05-12 12:26:57 +02:00
Dennis Schubert
a73a9fefa6
Bump rails-assets-highlightjs 2016-05-12 12:24:02 +02:00
Dennis Schubert
8d214e8952
Bump mysql2 2016-05-12 12:21:20 +02:00
Dennis Schubert
b8e3c6cfb1
Bump mini_magick 2016-05-12 12:19:10 +02:00
Dennis Schubert
bb88156592
Bump json-schema 2016-05-12 12:18:29 +02:00
Dennis Schubert
93afbb924c
Bump js-routes 2016-05-12 12:15:42 +02:00
Dennis Schubert
dbe598e194
Bump jquery-rails 2016-05-12 12:15:42 +02:00
Dennis Schubert
6411449567
Bump fog and adapters 2016-05-12 12:15:01 +02:00
Dennis Schubert
7c256018a7
Bump factory_girl_rails 2016-05-12 12:13:32 +02:00
Dennis Schubert
2b45ba67c6
Bump database_cleaner 2016-05-12 12:09:24 +02:00
Dennis Schubert
4c06540f22
Bump carrierwave 2016-05-12 12:09:24 +02:00
Dennis Schubert
b72fd03a31
Bump autoprefixer-rails 2016-05-12 12:06:36 +02:00
Dennis Schubert
02ea344636
Bump activerecord-import 2016-05-12 12:04:43 +02:00
Dennis Schubert
f725349f18
Bump active_model_serializers 2016-05-12 12:04:43 +02:00
Dennis Schubert
f95ccdf979
Bump rails 2016-05-12 12:04:43 +02:00
Lukas Matt
1c5c4f10af
bump diaspora-prosody-config to v0.0.5
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2016-05-12 00:59:07 +02:00
Dennis Schubert
2131e3425a Merge pull request #6792 from Zauberstuhl/unicorn_killer
Move unicorn_killer to Gemfile
2016-05-06 02:13:07 +02:00
Lukas Matt
f0d5ff12a2 Diaspora configuration wrapper for Prosody
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2016-04-25 15:30:28 +02:00
Lukas Matt
56c7af940d
Move unicorn_killer to Gemfile 2016-04-13 14:41:02 +02:00
Dennis Schubert
e95c742aa1 Merge branch 'stable' into develop 2016-03-30 10:18:09 +02:00
Benjamin Neff
c4ad63d106 bump diaspora_federation
and bump typhoeus
2016-03-30 09:45:46 +02:00
Steffen van Bergerem
f06ff01c9e Remove jquery.hotkeys 2016-03-04 18:02:22 +01:00
Steffen van Bergerem
bee08daca6 Remove jquery-elastic 2016-03-04 18:02:22 +01:00
Jonne Haß
e596b1d277 Merge branch 'stable' into develop 2016-03-04 15:05:36 +01:00
Dennis Schubert
92fcbfbede Bump mysql2 2016-03-04 15:00:33 +01:00
Dennis Schubert
e00cbf62ae Bump js_image_paths 2016-03-04 14:53:02 +01:00
Dennis Schubert
558094409b Bump js-routes 2016-03-04 14:53:02 +01:00
Dennis Schubert
5eba267db2 Bump autoprefixer-rails 2016-03-04 14:53:02 +01:00
Dennis Schubert
9af3e957f6 Bump rails 2016-03-04 14:50:07 +01:00
Dennis Schubert
091c426004 Merge pull request #6672 from k0kubun/hamlit
Use Hamlit to render Haml
2016-03-01 07:16:25 +01:00
Jonne Haß
086b6e4529 Merge branch 'stable' into develop 2016-02-16 11:19:10 +01:00
Steffen van Bergerem
9eb0dddb1a Speed up asset serving in development
closes #6702
2016-02-16 11:19:04 +01:00
Jonne Haß
2a47b889d1 Merge branch 'stable' into develop 2016-02-12 22:18:43 +01:00
Steffen van Bergerem
e66ff6973f Bump markdown-it
closes #6695
2016-02-12 22:18:38 +01:00
Dennis Schubert
0ee0b31e5c Bump openid_connect 2016-02-09 22:22:18 +01:00
Steffen van Bergerem
e10f606d7b Merge branch 'stable' into develop 2016-02-09 22:19:14 +01:00
Dennis Schubert
9cf2a9be49 Bump mysql2 ActiveRecord issues seem to be gone. 2016-02-09 21:18:09 +01:00
Dennis Schubert
3bfab029d5 Bump twitter-text 2016-02-09 21:14:35 +01:00
Dennis Schubert
86ed0026f3 Bump twitter 2016-02-09 21:14:35 +01:00
Dennis Schubert
c05ca939b6 Bump spring 2016-02-09 21:13:23 +01:00
Dennis Schubert
ed2564d76d Bump simplecov 2016-02-09 21:13:23 +01:00
Dennis Schubert
98949e3afd Bump rb-inotify 2016-02-09 21:12:29 +01:00
Dennis Schubert
9855385bde Bump rb-fsevent 2016-02-09 21:10:45 +01:00
Dennis Schubert
d3b5215951 Bump mini_magick 2016-02-09 21:10:45 +01:00
Dennis Schubert
66b81e4dd3 Bump json-schema 2016-02-09 21:09:58 +01:00