nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
18213 commits 4 branches 0 tags 121 MiB
Commit graph

1472 commits

Author SHA1 Message Date
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ß
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ß
6790232960 bump pg 2015-02-27 17:00:41 +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
Jonne Haß
b53ce9a51d Bump Rails to 4.2 2015-02-27 16:58:38 +01:00
Lukas Matt
94f73be7d9 bump Vines to v0.1.27 and Jsxc to v0.0.12 2015-02-25 00:11:01 +01:00
Steffen van Bergerem
eb7e2eac9d Update jasmine-ajax 2015-02-17 04:03:42 +01:00
Steffen van Bergerem
d09e8a3758 Bump markdown-it-sanitizer 2015-02-13 02:58:31 +01:00
Jonne Haß
e9179e33ea bump spring 2015-02-13 00:32:50 +01:00
Steffen van Bergerem
7112cb112b Add hovercards for mentions 2015-02-11 00:46:00 +01:00
Steffen van Bergerem
5f4f32f2cf Update jasmine 2015-02-10 19:28:52 +01:00
Steffen van Bergerem
6b0a5823e3 Add JSHint javascript linter 2015-02-08 23:41:31 +01:00
Steffen van Bergerem
61c17c7896 Add more markdown-it plugins 
activate sanitizer, sub and sup
 2015-01-13 03:41:06 +01:00
Steffen van Bergerem
0d9fd0aaac Bump markdown-it-hashtag to v0.2.3 2015-01-11 18:17:17 +01:00
Steffen van Bergerem
d692e6df7d Bump markdown-it to 3.0.3, markdown-it-hashtag to 0.2.2 and markdown-it-diaspora-mention to 0.1.2 2015-01-11 02:54:30 +01:00
Steffen van Bergerem
026773194a Replace pagedown by markdown-it 2015-01-10 18:56:20 +01:00
Dumitru Ursu
3e1b944121 Remove prefixed CSS properties 2015-01-09 13:50:29 +02:00
Dumitru Ursu
4ba1032f42 Add autoprefixer 2015-01-07 13:02:53 +02:00
James Kiesel
e174514d69 Add JSON exporter for user profile download 2014-12-16 08:55:35 +13:00
Jonne Haß
e25a48cc1c Bump open_graph_reader 2014-12-14 16:55:30 +01:00
Jonne Haß
74a6f42501 Bye opengraph_parser, hi open_graph_reader 
opengraph_parser is basically unmainted, issues are ignored
or deliberately closed without fixing. It pollutes the global
namespace and has no verification of correctness.

The opengraph gem has basically the same issues, not really maintained,
unreleased patches on master since over a year, not really smart either.

So I created my own version and while at it, why not strive try to be
complete and robust, although it's still a work in progress.

This also improves general URL detection by parsing them
from the message after stripping markdown.

An additional dependency was added to support
fetching sites that require cookies to work at all.
For the same reason Faraday's default redirect limit was
bumped.
 2014-12-08 02:01:31 +01:00
Jonne Haß
a580171e32 Replace spork with spring, update & use binstubs 
Spring is the recommended application preloader for rails
 2014-12-01 08:06:07 +01:00
Jonne Haß
850c98cbf7 bump sinatra 2014-11-29 16:24:50 +01:00
Jonne Haß
c0aa5565cc Merge pull request #5403 from pravi/bump_rack-protection 
bump sinatra to 1.4.5 and rack-protection to 1.4
 2014-11-29 16:17:56 +01:00
Jonne Haß
04b000232f Merge pull request #5427 from axilleas/minitest_to_gemfile 
Add minitest to Gemfile
 2014-11-29 15:33:18 +01:00
Praveen Arimbrathodiyil
9165b94522 bump rack-protection to 1.5.2 2014-11-28 23:05:16 +05:30
Lukas Matt
2e89b70967 bump jsxc to v0.0.9 2014-11-26 19:30:49 +01:00
Achilleas Pipinellis
e88b154ff3 Add minitest to Gemfile. 
In order to use the system Fedora/EPEL ruby we need to install
minitest in production. See comments in Gemfile.
 2014-11-26 17:25:56 +02:00
Jonne Haß
10f3a071c5 Merge pull request #5420 from diaspora/update_gems 
Update gems

Conflicts:
	Gemfile.lock
 2014-11-24 23:02:50 +01:00
Lukas Matt
77ce94db40 bump jsxc to version 0.0.8 2014-11-24 19:12:05 +01:00
Jonne Haß
c305293314 bump mini_magick 2014-11-24 16:51:45 +01:00
Jonne Haß
5622f72420 bump jasmine 2014-11-24 16:44:39 +01:00
Jonne Haß
c2e355fce9 bump guard 2014-11-24 16:43:00 +01:00
Jonne Haß
64b9a4769b bump fog 2014-11-24 16:38:38 +01:00
Jonne Haß
3d757abf6d bump mysql2 2014-11-24 16:34:37 +01:00
Jonne Haß
dca06ae075 bump sidekiq 2014-11-24 16:31:22 +01:00
Jonne Haß
e4f68acf0a bump rails 2014-11-24 16:29:41 +01:00
Praveen Arimbrathodiyil
91c7020003 bump sidekiq to 3.2.6 
From upstream changelog,

    Deprecate delay extension for ActionMailer 4.2+ . [seuros, #1933]
    Poll interval tuning now accounts for dead processes [epchris, #1984]
    Add non-production environment to Web UI page titles [JacobEvelyn, #2004]

Debian already have 3.2.6 and I'd like to keep both versions in sync.
 2014-11-17 15:40:02 +05:30
Lukas Matt
78100c6fb2 Add vines, jsxc and devise token dependencies 2014-11-13 11:15:30 +01:00
Jonne Haß
e0a2c6438a lock down guard until all plugins updated 2014-11-09 20:18:14 +01:00
Jonne Haß
e965db534f bump webmock 2014-11-09 19:35:18 +01:00
Jonne Haß
62a7b130a2 bump twitter-text 2014-11-09 19:34:19 +01:00
Jonne Haß
791feab474 bump test_after_commit 2014-11-09 19:33:49 +01:00
Jonne Haß
7fc022a9b9 bump selenium-webdriver 2014-11-09 19:33:26 +01:00
Jonne Haß
fceba693f6 bump ruby-oembed 2014-11-09 19:33:04 +01:00
Jonne Haß
0a33a5f95a bump rails-assets-punycode 2014-11-09 19:32:39 +01:00
Jonne Haß
abe0629c02 bump rails-assets-perfect-scrollbar 2014-11-09 19:31:26 +01:00
Jonne Haß
9d967e9585 bump nokogiri 2014-11-09 19:30:52 +01:00
Jonne Haß
96c7624d82 bump guard-cucumber 2014-11-09 19:26:47 +01:00
Jonne Haß
a050d1bbba bump gon 2014-11-09 19:26:03 +01:00
Jonne Haß
0bd6ecd666 bump factory_girl_rails 2014-11-09 19:25:14 +01:00
Jonne Haß
f42d519e51 bump devise 2014-11-09 19:24:23 +01:00
Jonne Haß
f890121b8f bump sass-rails 2014-11-09 19:23:21 +01:00
Jonne Haß
aab1e4b5b1 Merge branch 'hotfix/0.4.1.2' into develop 
Conflicts:
	Changelog.md
	Gemfile
	Gemfile.lock
	config/defaults.yml
 2014-10-30 21:36:46 +01:00
Jonne Haß
7000f39881 bump Rails to fix CVE-2014-7818 2014-10-30 21:29:16 +01:00
Sandip Trivedi
722112314b Replaced jquery.hotkeys.js vendored asset with a bower package #5194 2014-10-23 01:12:26 -04:00
Jonne Haß
f361a0f885 Merge pull request #5288 from jaywink/remove-old-users 
Maintenance feature to remove old users, scheduled in settings
 2014-10-17 01:00:51 +02:00
Augier
2ce98b49d7 Fix issue #4416 
Conflicts:
	spec/helpers/notifier_helper_spec.rb
 2014-10-16 23:27:48 +02:00
Jason Robinson
69c3566958 Maintenance feature to remove old users 
Add Sidetiq webview to the Sidekiq monitoring panel

Add rake task maintenance:queue_users_for_removal
This basically just triggers an immediate run of the normal maintenance remove old users functionality that is normally (if enabled) scheduled to run once a day via sidetiq

Add extra safety when checking for user removal due to inactivity.
Now also user.last_seen will also be checked to make sure a user will not be removed in the event that the Devise rememember me login functionality has stopped the users remove_after timestamp from being removed.

Add initializer for maintenance job.
Add warning about mail being disabled if remove_old_users maintenance is enabled.
 2014-10-16 22:53:08 +03:00
Jonne Haß
673f14e050 Revert "bump rails-timeago" 
This reverts commit bea94bd7b5.
 2014-10-14 16:12:27 +02:00
Jonne Haß
67bf4de895 bump webmock 2014-10-14 14:07:28 +02:00
Jonne Haß
2dbc20522f bump test_after_commit 2014-10-14 14:07:06 +02:00
Jonne Haß
bea94bd7b5 bump rails-timeago 2014-10-14 14:05:38 +02:00
Jonne Haß
94f5f59872 bump rails-assets-perfect-scrollbar 2014-10-14 14:05:12 +02:00
Jonne Haß
b6caef127f bump jasmine 2014-10-14 14:04:04 +02:00
Jonne Haß
1c35921e3c bump fog 2014-10-14 14:03:48 +02:00
Jonne Haß
0c5c737a38 bump cucumber-rails 2014-10-14 14:03:26 +02:00
Jonne Haß
e5189cf457 bump devise 2014-10-14 14:01:10 +02:00
Jonne Haß
995d3f900a bump capybara 2014-10-14 14:00:32 +02:00
Jonne Haß
2bc0fa5a6e bump backbone-on-rails 2014-10-14 14:00:05 +02:00
Jonne Haß
18b7a75b36 bump activerecord-import 2014-10-14 13:58:29 +02:00
Jonne Haß
9a8b1359e9 bump rails_admin 2014-10-14 13:57:27 +02:00
Jonne Haß
e86f76ea8c bump redcarpet, closes #4549 2014-10-14 13:46:27 +02:00
Sandip Trivedi
fce957443e Update jquery.idle-timer.js from 0.9.3 to 1.0.1 #5194 2014-10-08 00:10:42 -04:00
Sandip Trivedi
215fc1c96b Replaced jquery.idle-timer.js vendored asset with a bower package #5194 2014-10-08 00:00:14 -04:00
Sandip Trivedi
eb916f2690 Update jquery.placeholder.js from 1.8.7 to 2.0.8 #5194 2014-10-07 00:56:37 -04:00
Sandip Trivedi
2af32220a5 Replaced jquery.placeholder.js vendored asset with a bower package #5194 2014-10-07 00:46:24 -04:00
Sandip Trivedi
d7e8e2ce2c Replaced jquery.textchange.js vendored asset with a bower package #5194 2014-10-06 18:54:50 -04:00
Jonne Haß
eac3f042a4 Reset dynamic configuration after each example in the testsuite 2014-10-04 00:59:03 +02:00
Sandip Trivedi
10feffada4 Replaced punycode.js vendored asset with a bower package #5194 2014-09-30 16:16:52 -04:00
Jonne Haß
4a87e7d72e bump acts-as-taggable-on, closes #5228, #5234 2014-09-29 16:10:51 +02:00
Florian Staudacher
c7b4b77ce8 Merge pull request #5209 from jhass/federation_improvements 
Federation improvements
 2014-09-27 16:18:37 +02:00
Jonne Haß
430d5bd2e9 bump configurate 2014-09-26 22:14:09 +02:00
Florian Staudacher
9a16560d8d * rename profile header view to make name more accurate 
* include 'js-routes' for rails routes in javascript
  (TODO: config options?)
* add handlebars helper for rails routes
 2014-09-15 01:37:23 +02:00
Jonne Haß
52f3e8d01d bump test_after_commit 2014-09-12 23:55:21 +02:00
Jonne Haß
f3d980ba5d bump sidekiq 2014-09-12 23:55:21 +02:00
Jonne Haß
743fc70999 bump selenium-webdriver 2014-09-12 23:55:21 +02:00
Jonne Haß
ba70f2293e bump mini_magick 2014-09-12 21:57:00 +02:00
Jonne Haß
a6ad721b8e bump handlebars_assets 2014-09-12 21:52:43 +02:00
Jonne Haß
9f125058f7 bump rails 2014-09-12 21:49:09 +02:00
Jonne Haß
c225bb17ce add pry and pry-debundle to the Gemfile 
If you now install pry-byebug and pry-stackexplorer,
you'll get a nice debugger
 2014-09-06 23:13:53 +02:00
Jonne Haß
fb058609e3 bump test_after_commit 2014-09-06 00:17:36 +02:00
Jonne Haß
3a7b0db67b bump rails-i18n 2014-09-05 23:52:17 +02:00
Jonne Haß
ef501f755c bump jquery-rails 2014-09-05 23:51:33 +02:00
Jonne Haß
9870069c56 bump rspec 2014-09-05 23:46:56 +02:00
Jonne Haß
f3ad3c93a3 Merge pull request #5190 from jhass/bump_handlebars 
bump handlebars_assets

Conflicts:
	Gemfile
 2014-09-01 13:53:16 +02:00
Jonne Haß
7c6776c280 bump jquery-rails 2014-09-01 12:15:01 +02:00
Jonne Haß
5da86def06 bump handlebars_assets 2014-09-01 11:44:34 +02:00
Jonne Haß
1a5bcec394 bump omniauth 2014-09-01 11:11:06 +02:00
Jonne Haß
7508300193 bump sidekiq 2014-09-01 11:03:53 +02:00
Jonne Haß
ef1cbda8c9 bump acts-as-taggable-on 2014-09-01 11:02:48 +02:00
Jonne Haß
2b2f4e44e5 bump sidekiq 2014-08-31 00:11:23 +02:00
Jonne Haß
462198799b Dynamic asset paths everywhere 
* Use asset pipeline aware helpers in CSS files
* Add js_image_paths to push image asset names to the client side JS
 2014-08-28 21:04:29 +02:00
Jonne Haß
6fef1cf990 bump gon 2014-08-27 18:32:50 +02:00
khall
087dbd4acf Bumping rspec to 3.0.2 2014-08-26 17:12:21 -07:00
khall
c42916df27 Two tests failing after rspec 2.99 => 3.0.0 2014-08-26 17:10:26 -07:00
khall
027bb9fcb0 Rspec version bump to 2.99 2014-08-26 17:00:21 -07:00
Jonne Haß
00de34ba38 Merge pull request #5129 from jaideng123/5106-scrolling_in_notifications 
Increased the number of notifications shown in drop down bar to 15

Conflicts:
	Gemfile.lock
 2014-08-26 02:06:55 +02:00
jaideng123
b70f306ff5 Integrated Perfect Scrollbar into notifications dropdown 2014-08-25 15:33:25 -05:00
Jonne Haß
ef214d7681 bump http_accept_language 2014-08-25 22:06:28 +02:00
Jonne Haß
5ffbafa56a bump rack-google-analytics 2014-08-25 21:49:46 +02:00
Jonne Haß
eb3fbc35b2 bump rails-timeago 2014-08-25 21:40:15 +02:00
Jonne Haß
37f062c07f bump sinon-rails 2014-08-25 21:39:52 +02:00
Jonne Haß
b34fe4199b bump simple_captcha2 2014-08-25 19:20:50 +02:00
Jonne Haß
8de29bc28d bump faraday and faraday_middleware. closes #4950 2014-08-25 19:16:55 +02:00
Jonne Haß
67331a7371 bump rails_autolink 2014-08-25 19:16:54 +02:00
Jonne Haß
4da21d02db bump will_paginate 2014-08-25 19:16:54 +02:00
Jonne Haß
4415d91aa6 bump uglifier 2014-08-25 19:16:51 +02:00
Jonne Haß
b3f18e1961 bump typhoeus 2014-08-25 19:16:22 +02:00
Jonne Haß
5fa8d7c44c bump test_after_commit 2014-08-25 19:15:30 +02:00
Jonne Haß
a974f281e8 bump ruby-oembed 2014-08-25 19:15:30 +02:00
Jonne Haß
02bb317df0 bump rspec-instafail 2014-08-25 19:15:29 +02:00
Jonne Haß
3fc8be03af bump rb-inotify 2014-08-25 19:15:29 +02:00
Jonne Haß
6c0ee4c78d bump rails_admin 2014-08-25 19:15:29 +02:00
Jonne Haß
9cd0100090 bump rack-piwik 2014-08-25 19:15:29 +02:00
Jonne Haß
047a05f74c bump mini_magick 2014-08-25 19:15:29 +02:00
Jonne Haß
59d1076e31 bump guard-rspec 2014-08-25 19:15:29 +02:00
Jonne Haß
ebf43c1956 bump gon 2014-08-25 19:15:29 +02:00
Jonne Haß
b0bf570cd9 bump fog 2014-08-25 19:15:29 +02:00
Jonne Haß
25f117f8d8 bump devise 2014-08-25 19:15:29 +02:00
Jonne Haß
168aa26306 bump asset_sync 2014-08-25 19:15:27 +02:00
Jonne Haß
d745d621f8 bump acts-as-taggable-on 2014-08-25 19:14:50 +02:00
Jonne Haß
42b08e8ab8 Update to Rails 4.1 2014-08-25 17:37:02 +02:00
Jonne Haß
e0c836c03d bump rails 2014-08-24 16:03:50 +02:00
Jonne Haß
2361b8e00f bump capybara and phantomjs 2014-08-24 01:57:49 +02:00
Jonne Haß
01c4fa18d3 fix and stablize some cukes 2014-08-24 01:02:35 +02:00
Jonne Haß
68affd5dd1 bump entypo-rails 2014-08-24 01:02:35 +02:00
Jonne Haß
3fadba0430 update rails and compass-rails after rebase 2014-08-23 16:47:57 +02:00
Jonne Haß
5068be90e8 reduce cuke failures 
* Bump sass-rails (without effect)
* Bump mobile-fu (without effect)
* Cosmetically fix two cukes
* Refactor Taggable#tag_strings
* Rename default.css to default.css.scss (without effect)
* Fix receiving a conversation
* Pass aspect_ids instead of a relation to User#aspects_from_ids
 2014-08-23 16:47:57 +02:00
Jonne Haß
38e5ae2b73 bump rails_admin 2014-08-23 16:47:57 +02:00
Jonne Haß
8d1b611f88 bump jasmine-jquery-rails 2014-08-23 16:47:57 +02:00
Jonne Haß
b671509184 bump jasmine 2014-08-23 16:47:57 +02:00
Jonne Haß
e9ab6dc1e6 bump rack-ssl 2014-08-23 16:47:57 +02:00
Jonne Haß
c856fb459a bump rails-i18n 2014-08-23 16:47:57 +02:00
Jonne Haß
c506276c73 bump activerecord-import 2014-08-23 16:47:57 +02:00
Jonne Haß
61c72b44e9 update rails to 4.0.5 2014-08-23 16:47:56 +02:00
Florian Staudacher
d4aca571ac add jasmine-jquery gem and use it, port some more specs 2014-08-23 16:46:08 +02:00
Jonne Haß
7fd2294111 switch to simple_captcha2 2014-08-23 16:38:50 +02:00
Jonne Haß
55f40a2b65 update to rails 4 2014-08-23 16:33:53 +02:00
Jonne Haß
58927d1a9d bump sidekiq to 2.17.7 2014-08-23 16:03:17 +02:00
Jonne Haß
ec877e3784 Merge pull request #4978 from jhass/bump_acts_as_taggable_on 
Bump acts-as-taggable-on
 2014-08-18 12:20:19 +02:00
Jonne Haß
e4246b6fdd Bump Rails to 3.2.19 
Rails 3.2.19 fixes a possible SQL-Injection when using the PostgreSQL
adapter. However this is only exploitable when using the "bit" type,
which we don't.
 2014-07-02 22:17:21 +02:00
Jonne Haß
ccae3a1c64 lock nokogiri to 1.6.1, closes #4996 2014-06-18 11:44:46 +02:00
Jonne Haß
72d1ed8f7d bump acts-as-taggable-on 2014-06-01 18:42:51 +02:00
Jonne Haß
e5f8b5fc57 bump sinon-rails 2014-06-01 13:55:59 +02:00
Jonne Haß
34fc681bc4 lock rails-timeago to 2.4.0 2014-06-01 13:55:59 +02:00
Jonne Haß
e3fd3520f2 bump webmock 2014-06-01 13:55:59 +02:00
Jonne Haß
55f496cb66 bump unicorn 2014-06-01 13:55:59 +02:00
Jonne Haß
38ee2f5faf bump uglifier 2014-06-01 13:55:58 +02:00
Jonne Haß
dda4e52aac bump typhoeus 2014-06-01 13:55:58 +02:00
Jonne Haß
50778e5b8b bump test_after_commit 2014-06-01 13:55:58 +02:00
Jonne Haß
91eb92180b bump strong_parameters 2014-06-01 13:55:58 +02:00
Jonne Haß
48a38231af bump selenium-webdriver 2014-06-01 13:55:58 +02:00
Jonne Haß
bc9eaed382 bump rspec-rails 2014-06-01 13:55:58 +02:00
Jonne Haß
4aaeb5f40f bump redcarpet 2014-06-01 13:55:57 +02:00
Jonne Haß
bc6ac28841 bump rb-inotify 2014-06-01 13:55:57 +02:00
Jonne Haß
08610f1b52 bump rack-cors 2014-06-01 13:55:57 +02:00
Jonne Haß
b749603d1e bump omniauth-wordpress 2014-06-01 13:55:57 +02:00
Jonne Haß
ef62fb8c89 bump omniauth 2014-06-01 13:55:57 +02:00
Jonne Haß
75107080c4 bump nokogiri 2014-06-01 13:55:57 +02:00
Jonne Haß
c25705a7e3 bump mysql2 2014-06-01 13:55:56 +02:00
Jonne Haß
dca5a6d8f3 bump markerb 2014-06-01 13:55:56 +02:00
Jonne Haß
241c584a0d bump guard-rspec 2014-06-01 13:55:56 +02:00
Jonne Haß
bb3fc500b1 bump gon 2014-06-01 13:55:56 +02:00
Jonne Haß
7b3abb1f11 bump fuubar 2014-06-01 13:55:56 +02:00
Jonne Haß
1704d71b22 bump fog 2014-06-01 13:55:51 +02:00
Jonne Haß
e8999332bf bump factory_girl_rails 2014-06-01 13:22:08 +02:00
Jonne Haß
85dc46b0de bump entypo-rails 2014-06-01 13:21:25 +02:00
Jonne Haß
5654d5921f bump devise 2014-06-01 13:20:06 +02:00
Jonne Haß
9f54d40428 bump database_cleaner 2014-06-01 13:19:14 +02:00
Jonne Haß
0ba9df6989 bump cucumber-rails 2014-06-01 13:18:24 +02:00
Jonne Haß
061373d2d4 bump compass-rails 2014-06-01 13:17:59 +02:00
Jonne Haß
cad043bfd7 bump carrierwave 2014-06-01 13:16:43 +02:00
Jonne Haß
f0b6f9315d bump backbone-on-rails 2014-06-01 13:15:16 +02:00
Jonne Haß
418c8d653d bump addressable 2014-06-01 13:11:57 +02:00
Jonne Haß
dcf275442d Update Rails to 3.2.18 
This Rails release closes a security issue but we're not affected by it.
See CVE-2014-0130 for further details.
 2014-05-06 19:10:15 +02:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer 
Introduce message renderer
 2014-04-13 15:00:46 +03:00
Jason Robinson
6947a1945c Merge pull request #4883 from MrZYX/uuid 
Use uuids for guid generation
 2014-04-11 16:40:57 +03:00
Jonne Haß
02ed7144a0 drop rmagick, fixes #4594 
This breaks the screenshot tool.

RMagick no longer compiles on recent ImageMagicks that have HDRI
support enabled.
 2014-04-04 20:41:37 +02:00
Jonne Haß
98057885ac use uuids for guid generation 2014-03-30 15:38:18 +02:00
Jonne Haß
8280556a47 Introduce message renderer 
This new class replaces all existing server side message
rendering helpers and is the new global entry point for such
needs. All models with relevant fields now expose an instance
of MessageRenderer for those. MessageRenderer acts as
gateway between the existing processing solutions for markdown,
mentions and tags and provides a very flexible interface for
all output needs. This makes the API to obtain a message
in a certain format clear. As a result of centralizing the
processing a lot of duplication is eliminated. Centralizing
the message processing also makes it clear where to change
its behaviour, add new representations and what options
are already available.
 2014-03-15 17:16:17 +01:00
Fabian Rodriguez
4042e50289 Removes client_side_validations 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-02-23 16:48:47 +01:00
Fabian Rodriguez
1fd156fd46 bump jquery-rails to 3.0.4 2014-02-23 16:48:46 +01:00
Jason Robinson
5fe5507128 Add devise_lastseenable for user last seen tracking. 
Adds a timestamp to user model which is touched when user comes back. Statistics active users counts now use these more reliable timestamps. Fixes #4734
 2014-02-22 23:22:46 +02:00
Jonne Haß
57991187d1 Merge branch 'hotfix/0.3.0.3' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-02-19 11:31:02 +01:00
Jonne Haß
1df3f546c9 update rails to 3.2.17 2014-02-19 11:09:06 +01:00
Ruxton
49800ece87 Moves rails-timeago into the root of Gemfile, it's used in views + assets 2014-01-20 21:25:15 +08:00
Ruxton
a3113cce7c Switched to using rails-timeago to make keeping on top of new versions of plugin easier 2014-01-20 09:33:35 +08:00
Florian Staudacher
1924c40d38 replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem 
- updates underscore to 1.5.2 and backbone to 1.1.0

backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
  models

other changes:
- fix some events triggering multiple times in connection with deleting
  a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
  * no longer test the backbone router as part of our code
  * jasmine factory already returns model instances, no need to wrap
    that again
 2014-01-16 23:23:30 +01:00
Jonne Haß
15b1dae362 update devise to 3.2 2014-01-15 12:59:59 +01:00
Jonne Haß
cb048a2785 bump pg 2014-01-13 12:26:57 +01:00
Jonne Haß
25988ff04c bump webmock 2014-01-13 12:26:23 +01:00
Jonne Haß
f107a3145d bump will_paginate 2014-01-13 12:26:22 +01:00
Jonne Haß
84c4e68a73 bump rack-rewrite 2014-01-13 12:26:22 +01:00
Jonne Haß
e712bec498 bump json 2014-01-13 12:26:21 +01:00
Jonne Haß
196bb5e4c1 bump i18n-inflector-rails 2014-01-13 12:25:39 +01:00
Jonne Haß
f7759f2177 bump haml 2014-01-13 12:25:39 +01:00
Jonne Haß
92a153edaf bump guard-rspec 2014-01-13 12:25:39 +01:00
Jonne Haß
d0aa4cee61 bump faraday 2014-01-13 12:25:39 +01:00
Jonne Haß
88cb24fd32 bump acts_as_api 2014-01-13 12:25:39 +01:00
Jonne Haß
cabc6a5c92 bump rails_autolink 2014-01-13 12:25:36 +01:00
Jonne Haß
97d744d6da bump test_after_commit 2014-01-13 12:25:36 +01:00
Jonne Haß
d6878631bf bump capybara 2014-01-13 12:25:36 +01:00
Jonne Haß
b1375fd3f0 bump rack-google-analytics 2014-01-13 12:25:36 +01:00
Jonne Haß
801d4d4617 bump mini_magick 2014-01-13 12:25:35 +01:00
Jonne Haß
b771287893 bump omniauth-twitter 2014-01-13 12:25:35 +01:00
Jonne Haß
b7424b52e2 bump omniauth-facebook 2014-01-13 12:25:32 +01:00
Jonne Haß
56b62b0fa4 bump rb-inotify 2014-01-13 12:23:08 +01:00
Jonne Haß
8591488ad9 bump rb-fsevent 2014-01-13 12:23:08 +01:00
Jonne Haß
ccadcee444 bump spork 2014-01-13 12:23:07 +01:00
Jonne Haß
630a1e5980 bump guard-cucumber 2014-01-13 12:23:07 +01:00
Jonne Haß
52e3da9866 bump fuubar 2014-01-13 12:23:07 +01:00
Jonne Haß
8001a2da66 bump rspec 2014-01-13 12:23:07 +01:00
Jonne Haß
c45a381c36 bump foreigner 2014-01-13 12:23:06 +01:00
Jonne Haß
fbf8cdef2d bump fog 2014-01-13 12:23:06 +01:00
Jonne Haß
716b1af381 bump factory_girl_rails 2014-01-13 12:23:06 +01:00
Jonne Haß
7461cfad8a bump database_cleaner 2014-01-13 12:23:05 +01:00
Jonne Haß
7eb60dfd42 bump cucumber-rails 2014-01-13 12:23:05 +01:00
Jonne Haß
77e989dc8a bump client_side_validations 2014-01-13 12:23:05 +01:00
Jonne Haß
b1c9cec265 bump unicorn 2014-01-13 12:23:05 +01:00
Jonne Haß
9be498bce8 bump nokogiri 2014-01-12 23:27:16 +01:00
Jonne Haß
358076c14f bump mobile-fu 2014-01-12 23:27:16 +01:00
Jonne Haß
d706932db0 bump mysql2 2014-01-12 23:27:16 +01:00
Jonne Haß
4648654e03 bump typhoeus 2014-01-12 23:27:16 +01:00
Jonne Haß
ab7cbcc4cc bump timecop 2014-01-12 23:27:16 +01:00
Jonne Haß
4339d69f1e bump sidekiq 2014-01-12 23:27:16 +01:00
Jonne Haß
0db8086916 Add compatibility layer for old rubyzip 
https://github.com/rubyzip/rubyzip#important-note
 2014-01-12 23:27:15 +01:00
Fabian Rodriguez
08acd6e5bf bump Timecop 
Time.now remains the same inside the block, outside of the block it
returns
 2014-01-12 23:27:15 +01:00
Jason Robinson
db71c9c50b Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$ 2014-01-06 22:00:53 +02:00
maruf
c17a474142 Simple captcha for signup page 2014-01-06 22:00:37 +02:00
flaburgan
3174310ba0 Bump selenium, close #4621 2014-01-03 23:12:26 +01:00
Jonne Haß
a9e52528c1 bump sidekiq 2013-12-08 14:03:08 +01:00
Fabian Rodriguez
c339090f6e Merge branch 'release/0.2.0.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-12-05 09:11:41 -02:00
Fabian Rodriguez
740c0bc082 bump Rails to version 3.2.16 2013-12-04 21:36:54 -02:00
Jonne Haß
ad20a8487b bump ruby-oembed 2013-09-19 23:39:13 +02:00
Roger Braun
44ee6b4892 User entypo font for large icons.. 2013-08-22 09:56:35 +02:00
Jonne Haß
9b92d6a10a bump devise to 3.0.2 2013-08-10 15:42:06 +02:00
Jonne Haß
769bc5ce90 update devise to 2.2.4 2013-08-08 15:40:46 +02:00
Jonne Haß
884cead57e bump selenium-webdriver, closes #4367 2013-08-08 09:53:09 +02:00
Andrew Smith
ffca9776d5 Bumped oauth-wordpress gem to 0.2.0 for compatability 2013-08-05 08:21:27 -07:00
Jonne Haß
6689f20710 Merge pull request #4321 from andrewcsmith/feature/4100-add-support-for-posting-to-wordpress-as-a-service 
Feature/4100 add support for posting to wordpress as a service

Conflicts:
	Gemfile.lock
 2013-08-04 17:15:39 +02:00
Andrew Smith
2bb6bc8eef Added Wordpress service functionality, 
for cross-posting to OAuth-enabled Wordpress.com or Jetpack-enabled Wordpress.org blogs.

Added model for Wordpress service

Added very very basic Wordpress cross-posting functionality.

Added markdown support to post body

Fixed Wordpress::MAX_CHARACTERS problem

cleanup

Added default settings for Wordpress OAuth

Added default settings for Wordpress OAuth

Added Wordpress to configured services spec.

changelog changes
 2013-08-04 07:46:56 -07:00
Fábián Tamás László
0a4b58ac12 rspec test for GatherOpenGraphData worker 
Added rspec test for og in status_message model

Added rspec test for og_html helper

Improved tests for opengraph embedding
 2013-08-04 15:47:09 +02:00
Tamas Laszlo Fabian
22c644c2ae Replaced opengraph with opengraph_parser 
Code style fixes
 2013-08-04 15:44:58 +02:00
Fábián Tamás László
176c6826e0 opengraph POC 
Fixed small-frame opengraph view

Fixed incompletely saved OpenGraphCache bug
 2013-08-04 15:42:29 +02:00
James Fleming
9ca9a6f310 Remove duplicates and bad code habits. 
Remove some blank line.

Do not chain bang methods.
 2013-08-02 11:39:24 +02:00
carolina
143a970e61 Added strong_parameters gem to Gemfile and created an initializer in config 2013-08-02 11:39:05 +02:00
James Fleming
2a57f4851a Install strong_parameters 2013-08-02 10:09:04 +02:00
Jonne Haß
dd9e563322 bump sinon-rails 2013-08-01 23:20:07 +02:00
Jonne Haß
5119759bcf bump uglifier 2013-08-01 23:20:07 +02:00
Jonne Haß
f8cb203c87 bump database_cleaner 2013-08-01 23:20:07 +02:00
Jonne Haß
af749b2a72 bump redcarpet 2013-08-01 22:21:50 +02:00
Jonne Haß
f85f7e0840 bump mysql2 2013-08-01 22:21:50 +02:00
Jonne Haß
b5c2578af5 bump pg 2013-08-01 22:21:50 +02:00
Jonne Haß
f5015f27a7 bump nokogiri 2013-08-01 22:21:50 +02:00
Jonne Haß
6d53f989f3 bump fog 2013-08-01 22:21:50 +02:00
Jonne Haß
bbe8f6373c bump faraday 2013-08-01 22:21:49 +02:00
Jonne Haß
b22cb395b7 bump asset_sync 2013-08-01 22:21:49 +02:00
Jonne Haß
1bb2485c33 bump webmock 2013-08-01 21:59:36 +02:00
Jonne Haß
a3dba71809 bump foreigner 2013-08-01 21:59:36 +02:00
Jonne Haß
2fcc6bfc5a bump fixture_builder 2013-08-01 21:59:36 +02:00
Jonne Haß
3c9e3853e8 bump addressable 2013-08-01 21:59:36 +02:00
Jonne Haß
d113538171 bump remotipart 2013-08-01 21:59:36 +02:00
Jonne Haß
e3de9ad52d bump guard 2013-08-01 21:59:36 +02:00
Jonne Haß
70d1384cb1 bump omniauth-twitter 2013-08-01 21:59:36 +02:00
Jonne Haß
b2e7eb4e2b bump twitter 2013-08-01 21:59:36 +02:00
Jonne Haß
f76cd9c596 bump rails-i18n 2013-08-01 17:54:55 +02:00
Jonne Haß
beda9b2a1a bump carrierwave 2013-08-01 17:54:55 +02:00
Jonne Haß
6672b1c941 bump unicorn 2013-08-01 17:53:50 +02:00
Jonne Haß
300752fc87 bump capybara 
* removed wait_until where possible
* replaced wait_until with DOM obersavtions
* added match: :first to all finders that assumed getting the first element
* replaced evaluate_script with execute_script where possible
* replaced a few execute_script with DOM observations through Capybara
* removed sleep where possible
* replaced sleep with DOM obersvations
* replaced "wait for ajax" with DOM obersavations
* replaced alert confirmation with new selenium API
* bump selenium webdriver
* made any other fixes to get green again
 2013-07-31 01:47:23 +02:00
Jonne Haß
6720f6b3f7 bump fuubar 2013-06-12 00:23:47 +02:00
Jonne Haß
178b92d8ad bump rack-cors 2013-06-12 00:23:47 +02:00
Jonne Haß
7323c9c0fc bump twitter 2013-06-11 23:17:08 +02:00
Jonne Haß
0786a3d6b7 bump mobile-fu 2013-06-11 23:17:08 +02:00
Jonne Haß
b2b16ee3ab bump gon 2013-06-11 23:17:08 +02:00
Jonne Haß
d3fe58407c bump json 2013-06-11 23:17:08 +02:00
Jonne Haß
277f07d41b bump rails_autolink 2013-06-11 23:17:08 +02:00
Jonne Haß
06ca713d38 bump uglifier 2013-06-11 23:17:08 +02:00
Jonne Haß
c1635b34d6 bump slim 2013-06-11 23:17:08 +02:00
Jonne Haß
5859ceb5ea bump rspec-rails 2013-06-11 23:17:08 +02:00
Jonne Haß
d3953720a8 bump rails_admin 2013-06-11 23:17:08 +02:00
Jonne Haß
d9b63b26ea bump mini_magick 2013-06-11 23:17:07 +02:00
Jonne Haß
061bca7ca5 bump haml 2013-06-11 22:49:35 +02:00
Jonne Haß
858f447512 bump guard 2013-06-11 22:49:35 +02:00
Jonne Haß
fc3da627fb bump fog 2013-06-11 22:49:32 +02:00
Jonne Haß
0a127a9076 bump database_cleaner 2013-06-11 22:15:45 +02:00
Jonne Haß
6467ee1962 bump acts-as-taggable-on 2013-06-11 22:15:45 +02:00
Jonne Haß
9cbfee9408 bump configurate 2013-06-04 22:58:20 +02:00
Florian Staudacher
bcb1214f99 Merge pull request #4162 from MrZYX/typhoeus 
bump Typhoeus and refactor HydraWrapper
 2013-06-04 03:36:39 -07:00
Jonne Haß
234ebdb2e9 bump redcarpet, should fix #4104 2013-05-25 15:21:17 +02:00
Jonne Haß
009209d939 bump Typhoeus and refactor HydraWrapper 2013-05-25 13:45:37 +02:00
Jonne Haß
e3265aa650 Revert "bump sidekiq" 
This reverts commit 9307a1aaeb.
 2013-05-17 17:35:34 +02:00
Jonne Haß
e8f57d8fac Revert "downgrade multi_json" 
This reverts commit 4c4a98f42e.
 2013-05-17 13:19:00 +02:00
Jonne Haß
4c4a98f42e downgrade multi_json 2013-05-17 13:12:41 +02:00
Jonne Haß
9307a1aaeb bump sidekiq 2013-05-17 12:30:33 +02:00
Jonne Haß
6b1fdaafc0 Merge branch 'locator' of git://github.com/tangosource/diaspora into tangosource-locator 2013-05-06 17:33:10 +02:00
Jonne Haß
e70c2593ff bump configurate 2013-05-03 12:07:50 +02:00
Marco Gallardo
4aab8762fa Locator feature 
added marker image for publisher, showing div for address, and added
functionality to close it when clicking 'X' image

showing marker image in publisher

renamed map-marker to locator

fixed style for map marker image in publisher

added locator.js to get user's location

loading google maps api

removed unecessary append and showing location next to publisher

moved location address inside div and  added image to close location

styled div location address an image to close location

removing location when clicking close image

cleaned code

cleaned code

showing loader while location is being obtained, translated normal js to
backbone structure, created locations db stuff, and removing location
div when clicking 'share'

refactored code; started to move code to backbone

refactored js code; moving functionality to backbone structure

created address function to make accessible address variable value

refactored locator.js

showing and removing location div from dom

created location; it belongs_to status_message

added location model and created association with status_message

added hidden field for location address and added respective code on js files to retrieve it on ajax call

saving location for status_message (post)

removing location when sharing

renamed locator backbone view to location, added template, showing
location, and saving lat and lng

prepared and added template to show location

added location to post model in order to have it accessible in backbone

retrieving location to show it in template

removed console.log XD

fixes when removing location

cleanind location_address hidden field when location is removed

more fixes; showing location when sharing

saving location just when it exists

created method to retrieve location address just when location was created

fixed issue about showing 'Near from' message when there was not any location

added style for location

cleaned code

renamed locator view

retrieving lat and lng from locator.js

saving lat and lng in location_coords

saving lat and lng

added style for input location_address

removed location_address  hidden field; the value will be taken directly from input with the location

replaced div with location for input; the user will be able to edit the place

avoiding submitting the form when pressing Enter key on new input for location

added missed spec file for location model

refactored location_view code

refactored location_view code

cleaned code

added sinon library for testing

added describes for new publisher's view functions

created test for destroyLocation function

added test for showLocation publisher view function

created test for avoidEnter publisher view function

removed unnecessary div

Created first test for locations view, added more specs, added Sinon.js,
and fixed issue with assets

loading locator.js for tests

moved location stuff to app/assets

moved locator.js and sinon.js to app/assets

fixed route for images

included locator.js to assets

fixed issue when post object is different than StatusMessage; also fixed issue with lat and lng

loading Sinon for specs

refactoring locator errorGettingposition and start replacing google maps stuff with OSM

added OpenLayers JS, osmlocator, and added them into the main js

changing the locator from Google to OSM instance

changing lat and lng value in the backbone view

removing google javascript tag in application layout

adding jasmine to locator test and removed locator.js

adding jasmine to locator test using OSM

adding Jasmine test to OSM locator

removed locator.js

removed require locator and updated schema

fixed js response; added location

since we are using OSM Locator we don't need locator-spec test

fixed spec for location view; we are not using google maps anymore

changed description of osmlocator-spec

fixed issue with status-message-location template

fixed style for location_address textbox

fixed tests for locator

moved split function to model

created test for location model

removed puts

added effect for location marker

added translations for locator

removed conflicting-unnecessary lines that were loading files for specs

removed sinon library; using sinon-rails gem

removed useless code

removed puts; added Rails.logger.error

added sinon.js file

added specific version of sinon-rails gem

improving validations sintax

using openlayers-rails gem

removed 'google API' text

using sinon gem

isolating LocationStream view

refactored validation

getting location when post is a Reshare

refactored code

fixed aligment for elements under location message

improved styling for location message

refactored begin-rescue block

getting absolute root instead of just the root

added address method to retrive address of location

removed code from Post model; also added descriptinon why it was removed

removed validation when retrieving address; with latest refactorizations we dont need them any more

interpolated location; using file in locales

fixed width for div of location

moved Sinon gem into development and test group

fixed method's description

added missed indexes

updated schema with locations table

removed openlayers-rails gem

preventing location to be saved if there are not coordinates

fixed spec; wrong closing tag
 2013-05-02 17:31:53 -05:00
Jonne Haß
ea792246d0 bump sidekiq 2013-04-25 21:30:35 +02:00
Jonne Haß
6302de458d bump sidekiq 2013-04-20 14:37:42 +02:00
Jonne Haß
9c582a775a bump addressable 2013-04-20 14:37:41 +02:00
Jonne Haß
4bbbe93b2d bump acts-as-taggable-on 2013-04-20 14:37:41 +02:00
Jonne Haß
b3e1d860e9 bump rails_admin 2013-04-20 14:37:41 +02:00
Jonne Haß
c8eec463e5 bump configurate 2013-04-20 14:37:41 +02:00
Jonne Haß
849b0befd6 bump gon 2013-04-19 19:25:44 +02:00
Jonne Haß
347ea03042 bump pg 2013-04-19 19:25:43 +02:00
Jonne Haß
83ab708d44 bump uglifier 2013-04-19 19:25:43 +02:00
Jonne Haß
734f6cadbd bump fog 2013-04-19 19:25:42 +02:00
Jonne Haß
0694b3e9d0 bump foreigner 2013-04-19 19:25:42 +02:00
Jonne Haß
eeba00cde4 bump omniauth 2013-04-19 19:25:42 +02:00
Jonne Haß
f98b8e30d6 bump haml 2013-04-19 19:25:42 +02:00
Jonne Haß
07b2ceaf69 bump selenium-webdriver 2013-04-19 19:25:42 +02:00
Jonne Haß
ec32e33a37 bump faraday 2013-04-19 19:25:41 +02:00
Jonne Haß
20c5857612 bump client_side_validations 2013-04-19 19:25:41 +02:00
Jonne Haß
90c294c4d5 bump omniauth-twitter 2013-04-19 19:25:41 +02:00
Jonne Haß
d136fd56e7 bump guard 2013-04-15 01:36:48 +02:00
Florian Staudacher
f3aa802a0d remove capistrano from the main source code repo 
capistrano deployment scripts will be maintained in a separate deployment repo
 2013-04-15 00:50:23 +02:00
Jonne Haß
ac7bccfe4c bump sidekiq 2013-04-13 11:27:26 +02:00
Jonne Haß
92a2a9189d bump sidekiq and cleanup unicorn.rb 2013-04-04 20:42:41 +02:00
Dennis Schubert
f3b7d57b3a Merge pull request #3993 from MrZYX/sidekiq 
Sidekiq (+ some cleanup)
 2013-04-03 15:19:15 -07:00
Jonne Haß
1b71436c63 revert to old behaviour of only having mysql in the Gemfile.lock, fixes #4080 2013-03-28 00:56:54 +01:00
Jonne Haß
f956fca494 make all database adapters available in test env, reensure test related rake tasks are available in development env 2013-03-24 13:48:12 +01:00
Jonne Haß
79a79d65d6 Bye Resque. Ohai Sidekiq. 
* Dropped all references to Resque
* Moved all jobs under app/workers since that's the Sidekiq convention
* Renamed Jobs module to Worker to match new location
* Adapted all jobs to Sidekiq
* Replaced all enqueue calls with perform_async
* Dropped Resque hacks from specs and features, replaced with
  sidekig/testing in RSpec and sidekig/testing/inline in Cucumber
* Updated scripts to start a Sidekiq server
* Inline Sidekiq sinatra app
* Let Sidekiq create the actual Redis instance
* Workaround already initialized constant warnings in service models
* Resolved ToDo in one job definition by creating proper exception clases
  for some errors in receiving posts
* Added sidekiq section to configuration to make it completly
  configurable to the user
* Add Sidekiq middleware for clean backtraces
* Delay HttpMulti retry to give offline pods a chance to come back up
* Do not retry on GUID already taken and alike errors
* Be graceful about deleted posts in GatherOEmbedData
 2013-03-21 23:39:07 +01:00
Jonne Haß
ba57fb52f2 bump rails-i18n 2013-03-21 22:07:32 +01:00
Jonne Haß
5869fc27c1 bump rack-piwik 2013-03-21 22:07:32 +01:00
Jonne Haß
e932b506b3 bump omniauth-twitter 2013-03-21 22:07:32 +01:00
Jonne Haß
97393faab3 bump rails_admin 2013-03-21 22:07:32 +01:00
Jonne Haß
c8829a703b bump nokogiri 2013-03-21 22:07:32 +01:00
Jonne Haß
18c66ac6bf bump lumberjack 2013-03-21 22:07:32 +01:00
Jonne Haß
90e1a654ad bump jasmine 2013-03-21 22:07:31 +01:00
Jonne Haß
e7ff0448ed bump foreman 2013-03-21 22:07:31 +01:00
Jonne Haß
cb1f31ae8e bump timecop 2013-03-21 22:07:31 +01:00
Jonne Haß
802ef60cad bump twitter 2013-03-21 22:07:31 +01:00
Jonne Haß
05ba4d04e7 bump fog 2013-03-21 22:07:30 +01:00
Jonne Haß
8aa4d8e0e8 bump cucumber-rails 2013-03-21 22:07:30 +01:00
Jonne Haß
1e00d8b683 bump selenium-webdriver 2013-03-21 22:07:30 +01:00
Jonne Haß
e5311653a8 bump foreigner 2013-03-21 22:07:30 +01:00
Jonne Haß
c6818617e4 bump faraday 2013-03-21 22:07:30 +01:00
Jonne Haß
283b26cc30 bump rspec-rails 2013-03-21 22:07:30 +01:00
Jonne Haß
871abf8d4b bump unicorn 2013-03-21 21:25:19 +01:00
Jonne Haß
3855eaf223 bump handlebars_assets 2013-03-21 21:25:18 +01:00
Jonne Haß
10e5bb7b0d bump guard 2013-03-21 21:25:18 +01:00
Jonne Haß
c1ffc59ddb bump client_side_validations 2013-03-21 21:25:18 +01:00
Jonne Haß
669faa042d bump addressable 2013-03-21 20:50:25 +01:00
Jonne Haß
a55f6fd98c Merge branch 'hotfix/0.0.3.4' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-03-18 21:10:29 +01:00
Jonne Haß
1a995aa47c bump rails to 3.2.13, release 0.0.3.4 2013-03-18 21:07:55 +01:00
Jonne Haß
2afa2899c5 rework Gemfile 2013-03-15 21:00:27 +01:00
Juan Manuel Azambuja
1115e10536 Merge branch 'develop' into diaspora_with_sprites 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.sass
	app/assets/templates/comment_tpl.jst.hbs
	app/assets/templates/stream-element_tpl.jst.hbs
	app/helpers/aspects_helper.rb
	app/helpers/contacts_helper.rb
	app/views/aspects/_aspect_listings.haml
	app/views/aspects/toggle_contact_visibility.js.erb
	app/views/contacts/_aspect_listings.haml
	app/views/layouts/_header.html.haml
	app/views/shared/_footer.html.haml
	app/views/tags/_followed_tags_listings.haml
 2013-03-11 20:10:55 -03:00
Juan Manuel Azambuja
f429cacd7a [Sprites] add sprites for icon images 2013-03-11 19:26:11 -03:00
Alexander Wenzowski
57669017bd bundler should communicate with rubygems using ssl 2013-03-11 21:21:31 +01:00
Alexander Wenzowski
98207ed9ea roxml should be loaded from rubygems 2013-03-01 17:36:38 -05:00
Alexander Wenzowski
63f9a6f1ba bundler should communicate with rubygems using ssl 2013-02-28 19:05:39 -05:00
Jonne Haß
abaf7f9a27 bump selenium-webdriver 2013-02-21 16:54:26 +01:00
Jonne Haß
131fdd4b2f bump handlebars_assets 2013-02-17 12:48:31 +01:00
Jonne Haß
2ae4d10431 bump remotipart 2013-02-17 12:48:31 +01:00
Jonne Haß
34a89a2794 bump omniauth 2013-02-17 12:48:31 +01:00
Jonne Haß
3ae073a2dc bump mini_magick 2013-02-17 12:48:31 +01:00
Jonne Haß
f5df8a9c90 bump unicorn 2013-02-17 12:48:30 +01:00
Jonne Haß
a858ad83f6 bump faraday 2013-02-17 12:48:30 +01:00
Jonne Haß
90b3fdda8e bump activerecord-import 2013-02-17 12:48:30 +01:00
Fabián Rodríguez
8d7dd965d8 update handlebars_assets to 0.10.0 2013-02-17 12:48:30 +01:00
Fabián Rodríguez
ac866a321d remove fastercsv form Gemfile & Gemfile.lock 2013-02-17 12:48:29 +01:00
Jonne Haß
e723d9f3d1 bump foreigner 2013-02-17 12:48:29 +01:00
Jonne Haß
9a90a799e6 bump twitter 2013-02-17 12:48:28 +01:00
Jonne Haß
de7acb1579 bump guard 2013-02-17 12:48:28 +01:00
Jonne Haß
70804a2f77 bump timecop 2013-02-17 12:48:28 +01:00
Jonne Haß
cc3f470502 bump rails_admin and haml 2013-02-17 12:48:28 +01:00
Jonne Haß
8d7073a475 bump factory_girl_rails 2013-02-17 12:48:27 +01:00
Jonne Haß
7337dd7972 bump carrierwave 2013-02-17 12:48:27 +01:00
Jonne Haß
2bad517ceb bump selenium-webdriver 2013-02-17 12:48:27 +01:00
Jonne Haß
6366cf5a1d bump fog 2013-02-17 12:48:27 +01:00
Jonne Haß
c4b0709851 bump rack-ssl 2013-02-17 12:48:27 +01:00
Jonne Haß
ad4ba363a9 Merge branch 'hotfix/0.0.2.5' into develop 
Conflicts:
	Changelog.md
	Gemfile.lock
	config/defaults.yml
 2013-02-11 20:54:35 +01:00
Jonne Haß
f2ce9fa17f * Fix CVE-2013-0269 by updating the gems json to 1.7.7 and multi\_json to 1.5.1. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58) 
* Additionally ensure can't affect us by bumping Rails to 3.2.12. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8)
* And exclude CVE-2013-0262 and CVE-2013-0263 by updating rack to 1.4.5.
 2013-02-11 20:51:02 +01:00
Jonne Haß
1b73817a5e bump and lock down rmagick 2013-02-04 00:39:41 +01:00
Jonne Haß
6ded1238c7 bump configurate 2013-01-29 12:54:35 +01:00
Jonne Haß
74613b0b15 Merge branch 'hotfix/0.0.2.3' into develop 
Conflicts:
	Changelog.md
	Gemfile.lock
 2013-01-28 20:41:25 +01:00
Jonne Haß
8a8ee42ebc Update Devise to 2.1.3 
http://blog.plataformatec.com.br/2013/01/security-announcement-devise-v2-2-3-v2-1-3-v2-0-5-and-v1-5-3-released/
 2013-01-28 20:38:30 +01:00
Jonne Haß
aadbd95215 Markerb got a release so we can get rid of another gem pulled from git \o/ 2013-01-25 13:26:19 +01:00
Jonne Haß
cf01b33b5f bump will_paginate 2013-01-17 02:00:20 +01:00
Jonne Haß
ac2fa74ac8 bump foreman 2013-01-17 02:00:20 +01:00
Jonne Haß
fe7a49226c bump asset_sync 2013-01-17 02:00:20 +01:00
Jonne Haß
2c9f619638 bump gon 2013-01-17 02:00:20 +01:00
Jonne Haß
9de76c10cd bump sass and sass-rails 2013-01-17 02:00:20 +01:00
Jonne Haß
e07bc6a548 bump nokogiri 2013-01-17 02:00:20 +01:00
Jonne Haß
7c76d42a4d bump rack-rewrite 2013-01-17 02:00:19 +01:00
Jonne Haß
d91e9517b8 bump selenium-webdriver 2013-01-17 02:00:19 +01:00
Jonne Haß
e0682daba8 bump unicorn 2013-01-17 02:00:19 +01:00
Jonne Haß
44da915489 bump mobile-fu 2013-01-17 02:00:19 +01:00
Jonne Haß
9535e894f3 bump ruby-oembed 2013-01-17 02:00:19 +01:00
Jonne Haß
fb8923232c bump jquery-rails 2013-01-17 02:00:19 +01:00
Jonne Haß
e1794d89de bump bootstrap-sass 2013-01-17 02:00:19 +01:00
Jonne Haß
6acbb169d8 bump handlebars_assets 2013-01-17 02:00:19 +01:00
Jonne Haß
df066c9b7a bump guard 2013-01-17 02:00:19 +01:00
Jonne Haß
d863510543 bump fixture_builder 2013-01-17 02:00:19 +01:00
Jonne Haß
64b86b27c1 bump rspec-rails and rspec 
fix two specs by not checking for object identity
 2013-01-17 02:00:03 +01:00
Jonne Haß
e45ed19c33 bump rails_admin 2013-01-17 01:03:51 +01:00
Jonne Haß
6757845398 bump rails-i18n 2013-01-17 01:02:36 +01:00
Jonne Haß
f57afa7d88 bump omniauth-twitter 2013-01-17 01:02:36 +01:00
Jonne Haß
0282782293 bump twitter 2013-01-17 01:02:36 +01:00
Jonne Haß
0c39e2521b bump timecop 2013-01-17 01:02:04 +01:00
Jonne Haß
1d9ecfd22e bump fog 2013-01-17 00:28:57 +01:00
Jonne Haß
a09a8cbffc Merge branch 'hotfix/0.0.2.2' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-01-09 00:11:29 +01:00
Florian Staudacher
b320e50236 bump Rails to 3.2.11 
see:
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
 2013-01-09 00:09:07 +01:00
Jonne Haß
26139fc2dc Merge branch 'hotfix/0.0.2.1' into develop 
Conflicts:
	Changelog.md
	Gemfile
	Gemfile.lock
	config/defaults.yml
 2013-01-02 23:45:53 +01:00
Jonne Haß
11f82c794e Bump to Rails 3.2.10 as per CVE-2012-5664 
https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53
 2013-01-02 23:40:46 +01:00
Florian Staudacher
ff173e233c add cucumber feature for taking screenshots of important pages 
- for before/after comparisons,
including rake tasks for easily generating the images from command line
 2012-12-17 20:25:34 +01:00
Jonne Haß
15b6b7c56e bump selenium-webdriver 2012-12-08 12:36:05 +01:00
Florian Staudacher
94760f4c04 update jasmine gem, removed useless spec, + changelog) 2012-12-07 21:21:27 +01:00
Tom Scott
e717eaac70 Remove debugger from the Gemfile. 
Developers are free to choose their own debugging agent, but unless
it causes problems, personal development gems are not to be
included in the project's Gemfile. This is so each developer can
maintain their own comfortable environment without having workflows
enforced upon them.

Conflicts:
	Gemfile.lock
 2012-12-07 14:21:09 -05:00
Jonne Haß
366768eac7 the day I decide to switch to seleniums prerelease 2.27 comes out. great. anyway, still two timeouts, any ideas? anyone? 2012-12-06 18:38:06 +01:00
Jonne Haß
613fbb6ffd lets see what travis has to say about the selenium prerelease 2012-12-06 10:37:11 +01:00
Jonne Haß
669dd87b11 extract configruation system to a gem 2012-11-30 13:35:59 +01:00
Jonne Haß
c5be6be377 bump rails to 3.2.9 2012-11-21 19:27:03 +01:00
Jonne Haß
71b5695b6e drop capistrano-ext, closes #3735 2012-11-21 19:18:43 +01:00
David McMullin
9678a1d4b2 add x-frame headers 2012-11-18 09:55:10 +00:00
Jonne Haß
70b0c9e2b7 add rb-fsevent to the Gemfile for our OS X devs 2012-11-14 19:57:52 +01:00
Jonne Haß
0b206534bd bump selenium-webdriver 2012-11-11 13:29:41 +01:00
Jonne Haß
f6d352bc7e bump gon 2012-11-11 13:29:40 +01:00
Jonne Haß
c4d5597fa4 bump faraday_middleware 2012-11-11 13:29:40 +01:00
Jonne Haß
4fc2cb1cba bump carrierwave 2012-11-11 13:29:40 +01:00
Jonne Haß
f2f741a518 bump capybara 2012-11-11 13:29:40 +01:00
Jonne Haß
f4d63c6d90 bump twitter 2012-11-11 13:26:19 +01:00
Jonne Haß
03f5cfcce5 bump rails-i18n 2012-11-11 13:26:18 +01:00
Jonne Haß
497b822d03 bump debugger 2012-11-11 13:25:20 +01:00
Jonne Haß
c447eba4d1 bump rails_admin 2012-11-11 13:25:15 +01:00
Jonne Haß
ec0483ccdb bump rack-rewrite 2012-11-11 13:23:25 +01:00
Jonne Haß
468781008a bump bootstrap-sass 2012-11-11 13:23:25 +01:00
Jonne Haß
91e6644bc2 bump rspec-rails 2012-11-11 13:23:24 +01:00
Jonne Haß
4a4f98c3ef bump unicorn 2012-11-11 13:23:24 +01:00
Jonne Haß
882f5affcf bump database_cleaner 2012-11-11 13:23:24 +01:00
Jonne Haß
9d18724191 bump redcarpet 2012-11-11 13:23:23 +01:00
Jonne Haß
18e8b076c7 bump guard 2012-11-11 13:23:23 +01:00
Jonne Haß
598875f2e3 bump resque 2012-11-11 13:23:22 +01:00
Jonne Haß
7f60cd62bf bump webmock 2012-11-11 13:23:22 +01:00
Jonne Haß
5aed18a53f bump client_side_validations 2012-11-11 13:23:22 +01:00
Jonne Haß
653dd80d43 remove bundler from Gemfile 2012-11-11 13:23:22 +01:00
Jonne Haß
5df3295954 bump handlebars_assets 2012-11-11 13:23:21 +01:00
Jonne Haß
002c3c27fc bump foreman 2012-11-11 13:23:21 +01:00
Jonne Haß
02635a7f64 bump fuubar 2012-11-11 13:23:21 +01:00
Jonne Haß
945aa12b5c bump timecop 2012-11-11 13:23:21 +01:00
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +02:00
Jonne Haß
f0ef4a764e refactor script/server and associated stuff 2012-10-19 12:25:15 +02:00
Jonne Haß
fdc5811e1e made hy available, temporarily switched to git release of rails-i18n to fix #3023 [ci skip] 2012-10-07 14:30:29 +02:00
Jonne Haß
5c7a9c1ce6 Release cleanup, closes #3620 
* remove un-/underused gems
* remove their associated files
* remove some parallel_tests leftovers
 2012-09-30 22:26:23 +02:00
Jonne Haß
4c8e08e608 bump omniauth-tumblr as tumblr made breaking api changes 2012-09-30 22:09:58 +02:00
Jonne Haß
e05c6e8897 drop heroku, heroku_san and associated rake tasks and files 2012-09-26 20:21:20 +02:00
Jonne Haß
2a4db54db9 New configuration system 
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
 2012-09-26 20:19:37 +02:00
Jonne Haß
ac59a3fa7a rails_admin version that is no longer conflicting with client_side_validations was released 2012-09-26 18:55:06 +02:00
Jonne Haß
7ba092ae0b bump jquery-rails 2012-09-26 18:55:06 +02:00
Jonne Haß
d5be4d6e2b bump asset_sync 2012-09-26 18:55:06 +02:00
Jonne Haß
254d4fd335 bump heroku and fog 2012-09-26 18:55:06 +02:00
Jonne Haß
0560cedab0 bump activerecord-import 2012-09-26 18:55:06 +02:00
Jonne Haß
db11b9d214 Merge branch 'update_gems' into develop 2012-09-20 14:37:34 +02:00
Jonne Haß
70eda77395 bump timecop 2012-09-17 21:25:39 +02:00
Jonne Haß
6d74926b9f bump foreman 2012-09-15 14:09:32 +02:00
Jonne Haß
5fdbbe03ee bump faraday and faraday_middleware 2012-09-15 14:06:04 +02:00
Steven Hancock
ca719893dc Update bootstrap-sass to 2.1.0.0 2012-09-15 01:42:27 -07:00
Jonne Haß
bedb7d1e22 bump activerecord-import 2012-09-13 18:08:13 +02:00
Jonne Haß
3dbbbbe979 bump jasmine and handlebars_assets, postfix all handlebars templates with _tpl to avoid name clashes 2012-09-12 21:22:34 +02:00
Jonne Haß
d9851b2368 bump yard 2012-09-12 17:19:28 +02:00
Jonne Haß
98ba8840c7 bump webmock 2012-09-12 17:14:06 +02:00
Jonne Haß
008651cb7e bump factory_girl_rails 2012-09-12 17:11:25 +02:00
Jonne Haß
76edd7bf7b bump acts_as_api 2012-09-12 17:10:27 +02:00
Jonne Haß
57c77fcd0a bump nokogiri 2012-09-12 16:11:30 +02:00
Jonne Haß
97e05b62ea lock gems for more safety 2012-09-12 15:24:09 +02:00
Jonne Haß
090d6022bd Merge pull request #3566 from MrZYX/cleanup_gemfile 
remove ruby-debug and all other MRI 1.8 related stuff from Gemfile
 2012-09-12 06:14:38 -07:00
Jonne Haß
358ed79f99 Merge branch 'update_devise' 
Conflicts:
	Gemfile.lock
 2012-09-12 15:11:34 +02:00
Jonne Haß
142e38e78b update devise 2012-09-12 13:29:57 +02:00
Jonne Haß
20a7e5570f remove ruby-debug and all other MRI 1.8 related stuff from Gemfile 2012-09-12 13:26:21 +02:00
Jonne Haß
58d1448085 update factory girl 2012-09-12 13:24:23 +02:00
Jonne Haß
8dab297d26 bump and convert back to gem release: acts-as-taggable-on 2012-09-11 00:46:37 +02:00
Jonne Haß
f22346a4ae bump pg 2012-09-11 00:46:37 +02:00
Jonne Haß
ab0143d18e bump gon 2012-09-11 00:46:36 +02:00
Jonne Haß
0d925c0fed bump haml 2012-09-11 00:46:36 +02:00
Jonne Haß
e7b1edbef7 bump database_cleaner 2012-09-11 00:46:36 +02:00
Jonne Haß
80153bf287 bump thin 2012-09-11 00:46:36 +02:00
Jonne Haß
39a5baa8c8 bump resque 2012-09-11 00:46:35 +02:00
Jonne Haß
29967d14e1 bump omniauth 2012-09-11 00:46:35 +02:00
Jonne Haß
d1987d62c4 bump heroku_san 2012-09-11 00:46:35 +02:00
Jonne Haß
72cfff77b9 bump fixture_builder 2012-09-11 00:46:32 +02:00
Jonne Haß
d5b4a76488 bump foreman 2012-09-10 23:55:52 +02:00
Jonne Haß
d9a9c5352a bump foreigner 2012-09-10 23:55:52 +02:00
Jonne Haß
d33bf10c56 bump selenium-webdriver 2012-09-07 02:35:17 +02:00
Jonne Haß
6780d83770 update to rails 3.2.6 2012-09-06 20:35:18 +02:00
Maxwell Salzberg
4cf27d4248 use a fork of rails admin due to default proc problem override use in rails admin 2012-08-28 00:23:11 -07:00
Maxwell Salzberg
67ee4b6a95 updating typhoeus as it seemed to break inter pod communication 2012-08-27 12:10:55 -07:00
Movilla
6782babafd update gem typhoeus 0.4.2 2012-08-14 17:24:36 +02:00
Steven Hancock
6344d43432 Update Cucumber and Selenium 
Attempting to appease the Travis Bot
 2012-06-18 16:30:13 -07:00
Steven Hancock
a2ccf685ca Update Rails to 3.2.6 2012-06-13 06:19:32 -07:00
Steven Hancock
dc2184724b Use https for git dependencies in the Gemfile 
This is useful if your development and/or production setup is behind
a firewall and you can't use `git://`. Followup to #3358
 2012-06-11 20:24:54 -07:00
wubwubwubcr3w
8e4e5545eb update heroku_san gem 2012-06-05 16:07:27 +02:00
Maxwell Salzberg
0975488964 possible rspec bug? 
updating from 2.9 ~> 2.10 causes
spec/controllers/publics_controller_spec.rb  to break.  Namely, it now
seems that the host_meta, and web finger actions now return successful
http codes, but have blank bodies. Running this code by hand shows that
the response bodies are indeed not  blank, as reported by rspec-rails
2.9.x
 2012-06-04 12:49:24 -07:00
Maxwell Salzberg
d62a2ffc78 according to rspec-rails docs, rspec-rails should be in both test and development groups. Also, remove some implied gems which are sucked in by rspec-rails 2012-06-03 23:45:49 -07:00
Maxwell Salzberg
89406b568e update a bunch of gems that DONT break the build 2012-06-03 23:34:10 -07:00
Maxwell Salzberg
80daa05817 update haml to get rid if weird escape_javascript bug 2012-05-31 23:10:34 -07:00
Maxwell Salzberg
4db207b3dd update to 3.2.5 2012-05-31 22:14:32 -07:00
Maxwell Salzberg
324e460cfb updating rails to 3.2.4 2012-05-31 15:34:26 -07:00
danielgrippi
72d2f619fc added GA back into rack; added mixpanel configuration options 2012-05-30 13:30:28 -07:00
Steven Hancock
c2bc7272fb Escape hashtags in emails 
Custom Redcarpet renderer to escape hashtags (but not legitimate headers)
in emails before Markdown processing. Prevents hashtags from being rendered
as H1 headers. This also leaves open the possibility of parsing hashtags
into clickable links in the future.

fixes #3325
 2012-05-28 21:31:27 -07:00
Maxwell Salzberg
9e80639ee8 remove some unused gems 2012-05-22 11:03:58 -07:00
Florian Staudacher
d815cf5d82 take acts-as-taggable-on gem from git, solve tag case-sensitivity 2012-05-21 17:20:04 +02:00
Maxwell Salzberg
d069865c42 upgrade carrierwave to 0.6.2 2012-05-17 18:51:12 -07:00
Maxwell Salzberg
af1109dcf7 remove a couple more stray files we dont use anymore, and remove rest-client 2012-05-17 18:23:39 -07:00
Florian Staudacher
fd5aedeb01 updated webmock, hopefully fix cucumber 2012-05-18 00:21:04 +02:00
Maxwell Salzberg
471ce309ea kill your darlings; remove diaspora_client with fire 2012-05-17 14:55:53 -07:00
Maxwell Salzberg
69d81951a5 wip 2012-05-17 14:55:22 -07:00
Maxwell Salzberg
b55c2ab956 update heroku san to be an official version 2012-05-17 14:27:51 -07:00
Maxwell Salzberg
b124d3e5a1 Revert "update factory girl" new version does not support 1.8.7 :( 
This reverts commit c52342b7cb.
 2012-05-16 17:43:56 -07:00
Maxwell Salzberg
c52342b7cb update factory girl 2012-05-16 17:17:14 -07:00
danielgrippi
ebbbf74489 add 1.9.3 back into the gemfile. LETS DO THIS [ci skip] 2012-05-15 17:19:28 -07:00
danielgrippi
fb0fa46613 whoops (gemfile) [ci skip] 2012-05-15 17:10:44 -07:00
danielgrippi
15eab43408 explicitly set ruby version in gemfile [ci skip] 2012-05-15 14:40:00 -07:00
danielgrippi
f9bc493581 remove 1.9.3 from heroku env [ci skip] 2012-05-15 14:26:42 -07:00
Maxwell Salzberg
e3ccbb3471 use a forked version of heroku_san until upstream updates; rake now freezes args which was causing probs 
'
 2012-05-15 13:13:23 -07:00
Maxwell Salzberg
89d72f7f1e most recent version of rails has a bug which causes conversations to break: see https://github.com/rails/rails/issues/6312 2012-05-14 21:53:36 -07:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00