Commit graph

1183 commits

Author SHA1 Message Date
Jonne Haß
c83650f023 Merge branch 'stable' into develop 2015-06-10 13:33:37 +02:00
Steffen van Bergerem
034fc5b183 Update markdown-it
closes #6091
2015-06-10 13:33:33 +02:00
Jonne Haß
72bb85eeba Merge branch 'stable' into develop 2015-06-08 16:59:31 +02:00
Steffen van Bergerem
5516926b74 Update perfect-scrollbar
closes #6085
2015-06-08 16:59:27 +02:00
Dennis Schubert
ad52eaf6d7 Merge branch 'stable' into develop 2015-06-08 04:09:57 +02:00
Jan Berdajs
ec4e7b4a69 upgrade Twitter gem - fixes Faraday deprecation warning 2015-06-08 04:08:02 +02:00
Dennis Schubert
3a07be1243 Merge branch 'stable' into develop 2015-06-06 17:55:01 +02:00
Benjamin Neff
0b5bf2e340 add simplecov for test-coverage
works with rubymine

closes #6065
2015-06-06 17:54:57 +02:00
Augier
207b6c6153 Port to Bootstrap 3
correcting images display on stream sidebar

Corrections on profile page
2015-06-04 18:05:43 +02:00
Jonne Haß
e39d024ba1 Merge branch 'stable' into develop 2015-06-04 11:31:43 +02:00
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