Files

 master

/

config

/

Copy path

Directory actions

More options

Directory actions

More options

Latest commit

Nighoo

Merge branch 'master' of git://github.com/diaspora/diaspora

Feb 15, 2016

0c22a45 · Feb 15, 2016

History

History

This branch is 93 commits ahead of, 3745 commits behind diaspora/diaspora:master.

/

config

/

Top

Folders and files

Name		Name	Last commit message	Last commit date
parent directory ..
environments		environments	add logfile-appender in test environment	Jul 9, 2015
initializers		initializers	add subscribe url to webfinger	Dec 30, 2015
locales		locales	Merge branch 'master' of git://github.com/diaspora/diaspora	Feb 15, 2016
vines		vines	Add vines README file for cert instructions	Nov 13, 2014
.jshint.json		.jshint.json	Update javascript styleguide	Mar 31, 2015
.jshint_ignore		.jshint_ignore	Use jshintrb and guard-jshintrb instead of jshint	Mar 18, 2015
application.rb		application.rb	precompile images from facebox gem	Jun 15, 2015
asset_sync.rb		asset_sync.rb	move asset_sync require to the earliest point possible	Jun 13, 2013
boot.rb		boot.rb	make everything boot again	Aug 23, 2014
cucumber.yml		cucumber.yml	add cucumber feature for taking screenshots of important pages	Dec 17, 2012
database.yml.example		database.yml.example	Add collation and config check	Feb 5, 2015
defaults.yml		defaults.yml	Prepeare 0.5.6.3 hotfix-hotfix	Jan 26, 2016
diaspora.yml.example		diaspora.yml.example	Add option to set a pid file for unicorn in diaspora.yml	Sep 19, 2015
environment.rb		environment.rb	Refactor config/ directory	May 19, 2013
eye.rb		eye.rb	add monitoring checks	Dec 20, 2015
load_config.rb		load_config.rb	Load diaspora.yml overrides for test env	Jul 24, 2015
locale_settings.yml		locale_settings.yml	Update for sq translation	Dec 27, 2015
logging.rb		logging.rb	make sql and federation debug-logging configurable	Jun 9, 2015
oembed_providers.yml		oembed_providers.yml	Add media.ccc.de as trusted oEmbed endpoint	Dec 28, 2015
routes.rb		routes.rb	Merge branch 'master' of git://github.com/diaspora/diaspora	Feb 15, 2016
schedule.rb.example		schedule.rb.example	Adds maintenance rake tasks for logrotate and temp file deletion; Add…	Dec 15, 2011
selenium.yml		selenium.yml	MS DG update copyright	Sep 14, 2011
sidekiq.yml		sidekiq.yml	Don't set key for logfile on Heroku	Oct 14, 2015
unicorn.rb		unicorn.rb	Add option to set a pid file for unicorn in diaspora.yml	Sep 19, 2015
View all files