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

669 commits

Author SHA1 Message Date
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