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

407 commits

Author SHA1 Message Date
Jonne Haß
cba76060bf ensure our locales are at the bottom of the load path, fixes #2614 2013-01-31 16:41:09 +01:00
Ruxton
40fdf3819b Added DailyMotion & Twitter oEmbeds 2013-01-25 22:31:44 +08:00
Ruxton
89042078ca Oembed Update - Added instagram, better display for rich/photo 2013-01-22 22:37:36 +08:00
Jonne Haß
bf27cca03a Do not generate paths like /a/b/c/config/boot.rb/../../Gemfile to require and open things, create a proper path instead. 2012-11-30 18:16:56 +01:00
Dennis Schubert
ba5b779cd0 Make Devise remember the session for 2 weeks. Fix #3472 2012-11-06 22:24:57 +01:00
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +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ß
234b76a936 properly integrate asset_sync 2012-09-26 20:23:45 +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ß
6c1a1ec6d2 it's enviroNment 2012-09-15 18:52:12 +02:00
Jonne Haß
48dcccf7b3 Unify redis initialization 
REDISTOGO_URL is now deprecated in favor of REDIS_URL which is supported by the redis gem too.
 2012-09-15 18:23:22 +02:00
Jonne Haß
3e935e1104 use present to check if redis_url is empty 2012-09-12 22:30:08 +02:00
Jonne Haß
70a9218ea5 add thread_safe true to redis initialization because resque does it too now 2012-09-12 22:17:14 +02:00
Jonne Haß
142e38e78b update devise 2012-09-12 13:29:57 +02:00
Jonne Haß
d27408d8a9 set perform_deliveries, this should fix #3524 2012-09-07 21:46:13 +02:00
Lawrence Leonard "Larry" Gilbert
37b6045c04 Clarify warning shown when single_process_mode used in production 2012-07-04 18:02:40 -07:00
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup 
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
 2012-06-11 03:13:20 -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
75277b4d0e gzip outgoing stuffs for great success 2012-05-24 13:02:20 -07:00
Maxwell Salzberg
980ec78b7b fix piwki loading [ci skip] 2012-05-23 11:03:02 -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
455dc34eae remove hotlink controller, just rewrite those landing assets 2012-05-16 15:02:59 -07:00
danielgrippi
d7a099dadb add publish_actions to facebook connection [ci skip] 2012-05-15 14:07:34 -07:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Dennis Collinson
927b78b79d kill references to ServiceUser 2012-05-14 18:47:14 -07:00
Maxwell Salzberg
379df76118 Update to faraday-middleware, as faraday stack has been deprecated. 
Hopefully this will make REE happy in Travis
 2012-05-14 15:59:07 -07:00
Maxwell Salzberg
ad6151c808 Revert "@joshsusser hates our ci setup, /cc @suss" 
This reverts commit cbca19b3f5.
 2012-05-14 15:59:06 -07:00
Steven Hancock
b16f309aca Upgrade Rails Admin to latest gem 
This gives us a clean fix for the Kaminari vs. Will Paginate
issues and fixes a few other little bugs in Rails Admin.

fixes #3210
 2012-05-11 03:32:05 -07:00
Steven Hancock
4c644c336b Actually only load rails admin in production mode 
This is what I think 28f8db51e7 was supposed to do.

With the initializer in an "unless Rails.env.production?" block
the entire initializer was being ignored in production mode and
loaded in all other environments, but Rails Admin was still
loading regardless of that. 😁

This only loads rails admin in production and excludes it from
all other environments. Also keeps non-admins out of /admin_panel
(without the initializer it was free-for-all) and temp fixes #3210
until a new gem is released.
 2012-05-09 11:46:18 -07:00
danielgrippi
0ec364e44c DG MS; popup on services, inlined in the composer 2012-05-08 18:09:33 -07:00
Jonas Lundqvist
819bb95dbd reorder so integration2 connects to correct redis port 2012-05-08 11:20:56 +02:00
danielgrippi
5821a84024 validations and all that jazz [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
fe49579ff5 remove google-analytics middleware due to the fact that it doesn't support injection of custom variables before _trackPageView is called (this results in custom vars not getting tracked) 
i've submitted an issue to the gem.  hopefully we can put it back in later… for now i've copy and pasted its output into a helper method.
 2012-05-01 18:02:25 -07:00
Maxwell Salzberg
d22a98cd96 monkey patch to_xs for ruby 1.8, and fix a test as a result 2012-04-25 11:38:42 -07:00
Dennis Collinson
e55073fdd4 temp reverting to prove max wrong. 
Revert "killing rails admin to investigate if its what's causing boot and deploy to be so slow"

This reverts commit 78bcb1c321.
 2012-04-24 16:45:25 -07:00
Dennis Collinson
78bcb1c321 killing rails admin to investigate if its what's causing boot and deploy to be so slow 2012-04-24 16:30:31 -07:00
Maxwell Salzberg
28f8db51e7 only load rails admin in production mode 2012-04-24 13:48:14 -07:00
Maxwell Salzberg
63616c5ced trying this on for size again; Revert "I can't test this at this momement. I will put it back in once i have a" 
This reverts commit 53304df740.

Conflicts:

	config/initializers/airbrake.rb
 2012-04-19 21:02:29 -07:00
Dennis Collinson
8cc5f86298 reverting some test env munging 
max isn't a princess
learn2git
learn2bash
lulz
 2012-04-19 14:59:33 -07:00
Dennis Collinson
cbca19b3f5 @joshsusser hates our ci setup, /cc @suss 
Revert "silence asset noise in development.  Thanks to @joshsusser. @denniscollective said I should put something pithy here, but that sounds like a bad idea."

This reverts commit 1307907330.
 2012-04-19 14:43:19 -07:00
Dennis Collinson
8386179f16 max, you're a princess, WIP 2012-04-19 11:15:59 -07:00
Maxwell Salzberg
1307907330 silence asset noise in development. Thanks to @joshsusser. @denniscollective said I should put something pithy here, but that sounds like a bad idea. 2012-04-18 17:26:27 -07:00
Maxwell Salzberg
24b69236a0 exclude share vis in rails admin, dont exclude users [ci skip] 2012-04-15 17:58:49 -07:00
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -07:00
Maxwell Salzberg
bb5aa2821d use the built in asset_sync initializer. add a rake task to bootstrap 
heroku and asset sync, which puts the S3 config vars in from your app
config.
 2012-04-03 14:47:33 -07:00
Maxwell Salzberg
4ba3ec0b42 update initializer 2012-04-02 18:43:18 -07:00
Maxwell Salzberg
b33ee8c688 add asset sync gem 2012-04-02 18:32:35 -07:00
Maxwell Salzberg
2da0c0f585 never use s3 in the test env ::sigh:: 2012-03-29 16:11:32 -07:00
danielgrippi
e19c84b5a3 remove the monkey patch that didn't work. 2012-03-21 13:58:20 -07:00
danielgrippi
03409495f9 better patch for ActiveSupport 2012-03-21 13:50:24 -07:00
danielgrippi
9c0ed946a7 no more rspec failures; and suppress a warning with a backported 
monkeypatch
 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
835f808e5a more progress 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
35a6f4f265 basic 3.1 upgrade... a few things are still broken. help me out and run the tests and fix them <3 2012-03-21 13:50:24 -07:00
Jonne Haß
3c23364fbc refactor locale initialization and selection a bit 2012-03-21 19:25:47 +01:00
Diaspora Europe
d626148a83 fix will paginate renderer 2012-03-16 18:58:01 +01:00
Daniel Grippi
39ee27acf0 Merge pull request #3003 from diasp/will-paginate-bootstrap 
mobile: added will paginate for bootstrap
 2012-03-15 12:09:29 -07:00
Florian Staudacher
7b4c377df1 make tests happy 2012-03-15 19:44:18 +01:00
Florian Staudacher
e6b403434f some restructuring around oembed providers 2012-03-15 18:34:47 +01:00
Diaspora Europe
fe65058624 use will paginate, added renderer for bootstrap 2012-03-15 16:44:25 +01:00
Diaspora Europe
3f26c0e3d7 mobile: added will paginate for bootstrap 2012-03-15 16:44:25 +01:00
Steven Hancock
f2922c943c Cross-Origin Resource Sharing 
Remove partial support for CORS on webfinger routes and replace
it with the Rack::Cors middleware. This provides more complete
CORS support and works around a caching issue with nginx on
Heroku and potentially other reverse proxies.

CORS headers are only added if the incoming request includes
an "Origin" header, which seems to be correct according to
the CORS spec.

closes #2216
 2012-03-10 23:49:56 -08:00
Maxwell Salzberg
54e8040bfd basic federation profile testing stuff 2012-02-14 10:58:57 -08:00
Jonne Haß
e5fe6a2280 fix typo, sorry [ci skip] 2012-02-01 20:06:44 +01:00
Jonne Haß
de4c9a1289 add warning about common setup error manifesting in uninitialized constant Oink 2012-01-31 21:56:01 +01:00
danielgrippi
60ff88c1e7 Use Resque.inline instead of custom code [ci skip] 2012-01-28 19:23:03 -08:00
Maxwell Salzberg
3be247f8ca remove unicorn intializer as we now do it in config.ru 2012-01-27 13:16:34 -08:00
Maxwell Salzberg
48941fbae1 DG MS; add rack-rewrite to handle forwarding old urls [ci skip] 2012-01-26 16:32:46 -08:00
danielgrippi
da9e57b2c9 added oink in dev mode 2012-01-26 13:18:58 -08:00
Maxwell Salzberg
939383ef32 You can now use rake assets:precompile to upload all of your static assets to s3. This uses your prexisiting settings in AppConfig for s3. then, start your server with ASSET_HOST={cdn_hostname} remember to include https and no trailing slash 2012-01-25 11:22:45 -08:00
Maxwell Salzberg
53304df740 I can't test this at this momement. I will put it back in once i have a 
chance to test it first Revert "finally found a way to disable airbrake [ci skip]"

This reverts commit 8aafd56482.
 2012-01-24 15:42:39 -08:00
Maxwell Salzberg
335172c411 move unicorn killer to initializer so thin still works, also a fix for newrelic not sending data 2012-01-24 15:42:25 -08:00
Jonne Haß
8aafd56482 finally found a way to disable airbrake [ci skip] 2012-01-25 00:28:28 +01:00
Maxwell Salzberg
a1aae2c3dc add airbrake back to resque 2012-01-24 14:58:36 -08:00
Maxwell Salzberg
ba010833c7 move newrelic and airbrake out of any group, as it is not loading at all 
if it is in any bundler group #confused
 2012-01-24 14:58:36 -08:00
Maxwell Salzberg
5b947db0d7 remove a couple of stray things I mistakenly -am -ed in. also, I am a jerk 2012-01-22 23:07:26 -08:00
Maxwell Salzberg
25a15259bc explicitly require airbrake middleware if it is configured.... i should not have to do this however 2012-01-22 11:06:18 -08:00
Jonne Haß
1d8dbdd8d8 the middleware stack is just an array and insert_before just an alias to insert, basically, guess what inset(0, something) does. AKA finally fix Rack:SSL 2012-01-22 19:20:35 +01:00
Jonne Haß
98bdf68003 do not rely on hoptoad to insert rack ssl 2012-01-22 18:42:06 +01:00
Jonne Haß
ebfc3de878 do not require newrelic or airbrake unless they are configured 2012-01-22 15:38:55 +01:00
Jonne Haß
7fd606ba19 Merge branch '2688-airbreak' of https://github.com/fred/diaspora 
Conflicts:
	config/application.yml.example
 2012-01-22 15:05:37 +01:00
Maxwell Salzberg
912211dc0b make omniauth look at where our ca_file is 2012-01-20 17:21:18 -08:00
Maxwell Salzberg
1fe7793ec5 Place Rack:SSL before hoptoad 2012-01-19 00:56:06 -08:00
Frederico Araujo
5ce4f60736 Added Fallback to use old hoptoad_api_key if not application.yml is not update 2012-01-19 13:20:59 +07:00
Maxwell Salzberg
69e81a0dc3 move loading rack ssl to an initializer, so we have EnviromentConfiguration and AppConfig. also, circumvent ssl requirement option is now back" 2012-01-18 17:57:26 -08:00
Frederico Araujo
f4801651eb Issue #2688 Remove hoptoad_notifier and use airbreak 2012-01-18 23:07:00 +07:00
Jonne Haß
bec3e2c92b set faradays timeout 25 2012-01-15 02:49:14 +01:00
Maxwell Salzberg
cedc49bf09 MS DC; oauth keys are now pulled out of application.yml to be simplier. incldue newrelic as heroku expects it, without affecting people who do not use newrelic. If you do use new relic in production, you have to put your newrelic api key in application.yml 2012-01-05 17:31:38 -08:00
Maxwell Salzberg
0199949f3c move analytics to initializer, thx MrZYX 2012-01-05 10:55:29 -08:00
Jonne Haß
4a260056c0 lets see if this fixes #1337 2012-01-04 15:33:41 +01:00
Maxwell Salzberg
a7d59ce115 add EnviromentConfiguration to keep track of heroku specfic enviroment hacks 2012-01-03 16:01:21 -08:00
Jonne Haß
a8136ed86b d'oh aka --amend 2012-01-02 21:11:47 +01:00
Jonne Haß
cc961d66e2 symbolize smtp_authentication setting to conform to rails docs 2012-01-02 21:08:57 +01:00
Jonne Haß
2268a992f7 make serve_static_assets setting configurable 2011-12-29 16:39:17 +01:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
Jonne Hass
0866ebb962 remove unused GIT_INFO [ci skip] 2011-12-21 23:19:22 +01:00
Maxwell Salzberg
ebf9004f91 update messagebus to latest version of their api 2011-12-19 12:24:25 -08:00
Jonne Hass
94aaa46a12 slight speed improvement by tweaking devise in the test env 2011-12-11 13:12:40 +01:00
Jonne Hass
57661fe9dd fixed a couple of specs 2011-12-11 02:08:38 +01:00