gitlab-org--gitlab-foss/config
Douwe Maan 10387f6b8a Merge branch 'master' into tmp-reference-pipeline-and-caching
# Conflicts:
#	spec/lib/gitlab/markdown/autolink_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/cross_project_reference_spec.rb
#	spec/lib/gitlab/markdown/emoji_filter_spec.rb
#	spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/external_link_filter_spec.rb
#	spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/label_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/redactor_filter_spec.rb
#	spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
#	spec/lib/gitlab/markdown/relative_link_filter_spec.rb
#	spec/lib/gitlab/markdown/sanitization_filter_spec.rb
#	spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
#	spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
#	spec/lib/gitlab/markdown/task_list_filter_spec.rb
#	spec/lib/gitlab/markdown/upload_link_filter_spec.rb
#	spec/lib/gitlab/markdown/user_reference_filter_spec.rb
2015-12-10 14:04:34 +01:00
..
environments Merge branch 'master' into reference-pipeline-and-caching 2015-12-03 13:34:25 +01:00
initializers Merge branch 'master' into tmp-reference-pipeline-and-caching 2015-12-10 14:04:34 +01:00
locales Use devise paranoid mode and ensure the same message is returned every time 2015-12-09 18:40:37 -06:00
application.rb Migrate mailers to ActiveJob 2015-11-26 17:03:43 +02:00
aws.yml.example Add a note that changing example configuration files requires changing omnibus-gitlab. 2015-06-11 15:11:37 +02:00
boot.rb
database.yml.mysql
database.yml.postgresql
environment.rb Rails update to 4.2.4 2015-11-25 18:18:44 +02:00
gitlab.teatro.yml Revert "Allow to configure smtp and sendmail in gitlab.yml" 2015-05-06 17:39:18 +03:00
gitlab.yml.example Update documentation about automatic issue closing 2015-12-07 14:11:13 +01:00
mail_room.yml Make Reply by email easier to configure 2015-10-13 13:10:49 +02:00
newrelic.yml
resque.yml.example Add a note that changing example configuration files requires changing omnibus-gitlab. 2015-06-11 15:11:37 +02:00
routes.rb Merge branch 'master' into merge-if-green 2015-12-09 09:00:25 +01:00
schedule.rb Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
schedule.yml Migrate from Sidetiq to Sidekiq-cron 2015-12-04 11:29:45 -02:00
secrets.yml.example Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
sidekiq.yml.example Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
unicorn.rb.example Add a note that changing example configuration files requires changing omnibus-gitlab. 2015-06-11 15:11:37 +02:00
unicorn.rb.example.development