Commit graph

1273 commits

Author SHA1 Message Date
Jonne Haß
bb24b8bedb bump BUNDLED WITH [ci skip]
See https://github.com/bundler/bundler/issues/3697
2015-06-04 11:27:37 +02:00
Jonne Haß
f9ce41bae4 bump fixture_builder 2015-06-04 10:58:01 +02:00
Dennis Schubert
ee890310d3 Merge branch 'stable' into develop 2015-06-01 04:44:49 +02:00
Jonne Haß
ea63343b69 bump oauth related dependencies
closes #5924
2015-06-01 04:44:45 +02:00
Jonne Haß
b2faf20d18 Merge branch 'stable' into develop 2015-05-31 15:49:54 +02:00
Jonne Haß
59bbbeba14 update bundled with to 1.10.2 for now [ci skip]
See https://github.com/bundler/bundler/issues/3697
2015-05-31 15:48:42 +02:00
Dennis Schubert
807b4f72bd Merge pull request #6003 from jhass/remove_db_hack
Replace DB environment variable with optional bundler groups
2015-05-30 03:04:33 +02:00
Jonne Haß
146f7eea52 Merge branch 'stable' into develop 2015-05-29 11:42:03 +02:00
Sandip Trivedi
b026a2afe8 Replaces facebox vendored asset with rails gem #5194
closes #6005
2015-05-29 11:41:57 +02:00
Jonne Haß
c85fe3872e Replace DB environment variable with optional bundler groups
See the changes to the changelog for more details
2015-05-29 01:33:12 +02:00
Jonne Haß
351f54d74f Merge branch 'stable' into develop 2015-05-28 11:24:34 +02:00
Sandip Trivedi
36d6c5d2ba Remove unnecessary initializer and comments in Gemfile and add explicit rubyzip gem version in Gemfile with description
closes #6001
2015-05-28 11:24:30 +02:00
Sandip Trivedi
2ba2ef1b9c Replaces the zipzip gem with the rubyzip gem 2015-05-28 11:23:57 +02:00
Dennis Schubert
04df6c115d Merge branch 'stable' into develop 2015-05-28 01:28:19 +02:00
Steffen van Bergerem
6206bb9920 Update markdown-it-hashtag
closes #5998
2015-05-28 01:28:15 +02:00
Dennis Schubert
70dc4fcab1 Merge branch 'stable' into develop 2015-05-22 02:53:55 +02:00
Benjamin Neff
ac96232d85 use logging gem for better logging with class name and log-level 2015-05-22 02:53:19 +02:00
Benjamin Neff
49f0fb6dcd replace silence_assets.rb with quiet_assets gem 2015-05-22 02:53:19 +02:00
Dennis Schubert
00cb87ce11 Merge branch 'stable' into develop 2015-05-19 02:55:36 +02:00
Jonne Haß
4bde00177c replace foreman with eye
closes #5966
2015-05-19 02:55:31 +02:00
Jonne Haß
b5e277384b Merge branch 'stable' into develop 2015-05-17 20:44:53 +02:00
Jonne Haß
d2467319ed Bump open_graph_reader 2015-05-17 20:44:37 +02:00
Jonne Haß
15d7b019f1 Merge branch 'stable' into develop 2015-05-17 13:58:00 +02:00
Steffen van Bergerem
6bec3d67ed Update markdown-it-sanitizer and markdown-it-for-inline
closes #5965
2015-05-17 13:57:54 +02:00
Dennis Schubert
5477c7df96 Merge branch 'stable' into develop 2015-05-10 01:59:21 +02:00
Steffen van Bergerem
59e57c013b Update jasmine-ajax
closes #5937
2015-05-10 01:59:17 +02:00
Dennis Schubert
bd9bce2a5f Merge branch 'stable' into develop 2015-05-07 22:56:05 +02:00
Jonne Haß
60fb680572 bump hashie
closes #5925
2015-05-07 22:55:56 +02:00
Jonne Haß
729fc1a6bf bump sprockets-rails 2015-05-07 22:55:37 +02:00
Jonne Haß
2240599f59 bump rack 2015-05-07 22:55:37 +02:00
Jonne Haß
5d9822056b bump websocket 2015-05-07 22:55:36 +02:00
Jonne Haß
b702c80fb8 bump listen 2015-05-07 22:55:36 +02:00
Jonne Haß
e0116e268f bump domain_name 2015-05-07 22:55:36 +02:00
Jonne Haß
11f4561ae5 bump childprocess 2015-05-07 22:55:36 +02:00
Jonne Haß
4cf681a538 bump rspec 2015-05-07 22:55:36 +02:00
Jonne Haß
1024b3b1f1 bump byebug 2015-05-07 22:55:36 +02:00
Jonne Haß
2634ea07a9 bump js-routes 2015-05-07 22:55:36 +02:00
Jonne Haß
487afed53e bump webmock 2015-05-07 22:55:36 +02:00
Jonne Haß
70189f05f4 bump unicorn 2015-05-07 22:55:36 +02:00
Jonne Haß
a9519ede3d bump twitter-text 2015-05-07 22:55:36 +02:00
Jonne Haß
147ea4e399 bump spring 2015-05-07 22:55:36 +02:00
Jonne Haß
fa24333ca1 bump rubocop 2015-05-07 22:55:35 +02:00
Jonne Haß
5a6f6c68cc bump rack-cors 2015-05-07 22:55:35 +02:00
Jonne Haß
ac405dddeb bump mini_magick 2015-05-07 22:55:35 +02:00
Jonne Haß
4f75205d9f bump fog 2015-05-07 22:55:35 +02:00
Jonne Haß
5c6e20048a bump entypo-rails 2015-05-07 22:55:35 +02:00
Jonne Haß
319edd70ad bump backbone-on-rails 2015-05-07 22:55:35 +02:00
Jonne Haß
16562d6d36 bump autoprefixer-rails 2015-05-07 22:55:35 +02:00
Jonne Haß
55fdf51058 bump addressable 2015-05-07 22:55:35 +02:00
Dennis Schubert
642c4597e1 Merge branch 'stable' into develop 2015-05-07 04:03:57 +02:00
Jonne Haß
a7699c2a2c Update configurate and enable missing key exceptions
closes #5934
2015-05-07 04:03:43 +02:00
Dennis Schubert
17fbbeea69 Merge branch 'stable' into develop 2015-05-04 23:43:58 +02:00
Jonne Haß
f1c75e6a54 Bump open_graph_reader
It now returns the origin for a missing og:url
2015-05-04 23:43:53 +02:00
Jonne Haß
3fadcfa568 Merge branch 'stable' into develop 2015-05-04 15:14:41 +02:00
Jonne Haß
28ee47d6c9 bump sidekiq 2015-05-04 14:22:57 +02:00
Jonne Haß
bb14128052 bump ruby-oembed 2015-05-04 14:22:57 +02:00
Jonne Haß
971a3dd021 Merge branch 'stable' into develop 2015-05-04 04:04:48 +02:00
Steffen van Bergerem
0cffa00004 Add syntax highlighting for markdown content 2015-05-04 04:04:34 +02:00
Jonne Haß
381e4978d9 Merge pull request #5909 from svbergerem/update-jasmine
Update jasmine
2015-05-04 03:53:54 +02:00
Steffen van Bergerem
dd2e1ea29e Use rails-assets for jquery.elastic.js 2015-05-04 03:51:20 +02:00
Steffen van Bergerem
c64c4114ac Update jquery-rails 2015-05-04 03:42:36 +02:00
Steffen van Bergerem
19a19919bb Update jasmine 2015-05-02 16:46:30 +02:00
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +02:00
Simon Wörner
cee4f1c3cd fixed aspect sorting, added minimal jquery ui, added test 2015-04-26 01:57:00 +02:00
Steffen van Bergerem
a14713b985 Update markdown-it, disable fuzzy links 2015-04-21 20:50:16 +02:00
Steffen van Bergerem
fc8e92b67a Bump markdown-it 2015-04-20 22:06:00 +02:00
Dennis Schubert
cfc98d9a2a Merge branch 'hotfix/0.4.1.3' into release/0.5.0.0-RC 2015-04-11 20:15:10 +02:00
Dennis Schubert
9fc00d0814 Bump Redcarpet to fix OSVDB-120415 2015-04-11 19:51:18 +02:00
Jonne Haß
51c54caa34 Remove double entries from Gemfile.lock 2015-04-01 04:02:25 +02:00
Steffen van Bergerem
ba67196f5b Bump markdown-it 2015-04-01 00:59:13 +02:00
Steffen van Bergerem
241ac83f17 bump ruby-progressbar 2015-03-26 18:14:52 +01:00
Steffen van Bergerem
adf9bcf8e8 Update markdown-it 2015-03-26 00:07:25 +01:00
Jonne Haß
ea58c95fa0 Switch back to database cleaner
database_rewinder seems to cause deadlocks in postgres and other
subtle bugs for us.
2015-03-25 13:37:56 +01:00
Jonne Haß
15cdb552ba bump systemu 2015-03-25 02:33:58 +01:00
Jonne Haß
30fcf4229e bump fog 2015-03-25 02:33:58 +01:00
Jonne Haß
a6b61c473c bump ruby-progressbar 2015-03-25 02:33:58 +01:00
Jonne Haß
4f887ba5d5 bump jwt 2015-03-25 02:33:57 +01:00
Jonne Haß
699bd6e597 bump excon 2015-03-25 02:33:57 +01:00
Jonne Haß
3b1e93cb30 bump test_after_commit 2015-03-25 02:33:57 +01:00
Jonne Haß
d1c42c77ba bump sinatra 2015-03-25 02:33:57 +01:00
Jonne Haß
80957a769f bump sidekiq 2015-03-25 02:33:57 +01:00
Jonne Haß
65a738e604 bump rspec-rails 2015-03-25 02:33:56 +01:00
Jonne Haß
03680ef718 bump rails_admin 2015-03-25 02:08:44 +01:00
Jonne Haß
ae93a1eef2 bump rails-assets-jasmine-ajax 2015-03-24 22:15:40 +01:00
Jonne Haß
a92ad87e94 bump pry-byebug 2015-03-24 22:15:02 +01:00
Jonne Haß
38b1f792a4 bump mini_magick 2015-03-24 22:13:33 +01:00
Jonne Haß
9f6ca586a1 bump guard 2015-03-24 22:12:51 +01:00
Jonne Haß
f0b7d68399 bump autoprefixer-rails 2015-03-24 22:11:08 +01:00
Jonne Haß
a30295dcc6 bump acts-as-taggable-on 2015-03-24 22:06:02 +01:00
Jonne Haß
451c4c2f57 use explicit source for rails-assets.org gems 2015-03-24 18:55:04 +01:00
Jonne Haß
644fc46dee Merge pull request #5792 from MothOnMars/4020-role-specs
added specs and validations for Role model
2015-03-20 01:54:04 +01:00
Jonne Haß
0226cb9542 Merge pull request #5802 from jhass/rails42
bump to rails 4.2.1
2015-03-20 01:52:19 +01:00
Jonne Haß
9d85c488e3 bump to rails 4.2.1 2015-03-19 18:39:17 +01:00
Martha
d4f1a5dbe8 added specs and validations for Role model
- added shoulda-matchers gem for one-line specs
- added FactoryGirl syntax methods
2015-03-18 09:16:15 -07:00
Steffen van Bergerem
6d070c818c Use jshintrb and guard-jshintrb instead of jshint 2015-03-18 10:49:17 +01:00
Jonne Haß
69285b955c Enable Ruby linting
* Add Rubocop
* Add guard-rubocop
* Enable Ruby linting on Hound
2015-03-16 12:46:13 +01:00
Jonne Haß
2c7b7bb0dc bump open_graph_reader 2015-03-11 21:59:02 +01:00
Jonne Haß
679eca6f03 Bump jsxc 2015-03-08 23:04:52 +01:00
Steffen van Bergerem
2a52f65160 Bump markdown-it 2015-03-06 20:40:06 +01:00
Jonne Haß
0f2d2bd44d Replace DatabaseCleaner with DatabaseRewinder 2015-03-02 15:02:57 +01:00
Steffen van Bergerem
687cbf4954 Update markdown-it-diaspora-mention and markdown-it-sanitizer 2015-02-28 05:21:58 +01:00
Jonne Haß
74eb3daba0 bump domain_name 2015-02-28 02:36:15 +01:00
Jonne Haß
10c040c04e bump rails-assets-jquery-colorbox 2015-02-28 02:36:15 +01:00
Jonne Haß
a0be0fa1da bump kgio 2015-02-28 02:36:15 +01:00
Jonne Haß
90d91ae63b bump hashie 2015-02-28 02:36:15 +01:00
Jonne Haß
1a9f1ed462 bump ruby-progressbar 2015-02-28 02:36:14 +01:00
Jonne Haß
22464ba9fd bump jwt 2015-02-28 02:36:14 +01:00
Jonne Haß
e2b321502d bump cucumber 2015-02-28 02:36:14 +01:00
Jonne Haß
46176df481 bump bcrypt 2015-02-28 02:36:14 +01:00
Jonne Haß
95ba640e1b bump handlebars_assets 2015-02-28 02:36:14 +01:00
Jonne Haß
1b0cf2d11f bump compass & sass 2015-02-28 02:36:14 +01:00
Jonne Haß
fb6d3db7c7 bump autoprefixer-rails 2015-02-28 02:36:14 +01:00
Jonne Haß
9867f637ef bump autoprefixer-rails 2015-02-28 02:36:14 +01:00
Jonne Haß
84c61b4879 bump uglifier 2015-02-28 02:36:13 +01:00
Jonne Haß
fe6f1dbf54 bump typhoeus 2015-02-28 02:36:13 +01:00
Jonne Haß
eaa5c7f361 bump twitter-text 2015-02-28 02:36:13 +01:00
Jonne Haß
fb2f6e908a bump timecop 2015-02-28 02:36:13 +01:00
Jonne Haß
011235ea82 bump spring 2015-02-28 02:36:13 +01:00
Jonne Haß
ae97c140f5 bump simple_captcha2 2015-02-28 02:36:13 +01:00
Jonne Haß
2b9a2976f0 bump sidekiq 2015-02-28 02:36:13 +01:00
Jonne Haß
0d4c2d95c1 bump selenium-webdriver 2015-02-28 02:36:13 +01:00
Jonne Haß
987281270a bump ruby-oembed 2015-02-28 02:36:13 +01:00
Jonne Haß
77f4be4401 bump rspec-instafail 2015-02-28 01:40:05 +01:00
Jonne Haß
a4e8b1aca2 bump responders 2015-02-28 01:40:04 +01:00
Jonne Haß
5f3b6533d9 bump redcarpet 2015-02-28 01:40:04 +01:00
Jonne Haß
f5a0d77e2a bump rails_admin 2015-02-28 01:40:04 +01:00
Jonne Haß
fb4f3c3066 bump rails-i18n 2015-02-28 01:40:04 +01:00
Jonne Haß
33aeef2654 bump rails-assets-perfect-scrollbar 2015-02-28 01:40:03 +01:00
Jonne Haß
460779a234 bump rails-assets-jquery-placeholder 2015-02-28 01:40:03 +01:00
Jonne Haß
34044c4c75 bump rack-rewrite 2015-02-28 01:40:03 +01:00
Jonne Haß
3b3702cf4f bump rack-protection 2015-02-28 01:40:02 +01:00
Jonne Haß
07a17a8aa5 bump rack-cors 2015-02-28 01:40:02 +01:00
Jonne Haß
492200a5fb bump pry-byebug 2015-02-28 01:40:01 +01:00
Jonne Haß
77aa074c5d bump nokogiri 2015-02-28 01:40:01 +01:00
Jonne Haß
dc47eca6ee bump mysql2 2015-02-28 01:40:00 +01:00
Jonne Haß
b7235178f5 bump mini_magick 2015-02-28 01:40:00 +01:00
Jonne Haß
7311f3cbc1 bump json 2015-02-28 01:40:00 +01:00
Jonne Haß
44b9bb956f bump js_image_paths 2015-02-28 01:39:59 +01:00
Jonne Haß
e6fb73dc90 bump js-routes 2015-02-28 01:39:59 +01:00
Jonne Haß
d047337a7e bump http_accept_language 2015-02-28 01:39:59 +01:00
Jonne Haß
c1ef5e5d3b bump haml 2015-02-28 01:39:58 +01:00
Jonne Haß
fe3bc2c1b2 bump guard 2015-02-28 01:39:55 +01:00
Jonne Haß
25dd8ffc67 bump fog 2015-02-28 01:06:36 +01:00
Jonne Haß
273363ba6e bump faraday 2015-02-28 01:05:48 +01:00
Jonne Haß
e83cd159b0 bump database_cleaner 2015-02-28 01:05:03 +01:00
Jonne Haß
343d98f2f2 bump addressable 2015-02-28 01:02:14 +01:00
Jonne Haß
c0cb7536d5 bump acts-as-taggable-on 2015-02-28 01:01:48 +01:00
Jonne Haß
01a102e2f3 bump active_model_serializers 2015-02-28 01:01:03 +01:00
Jonne Haß
657d0baea7 Drop foreigner, Rails 4.2 ships the provided functionality 2015-02-27 17:00:41 +01:00
Jonne Haß
2d7399de28 Bump activerecord-import 2015-02-27 16:58:39 +01:00