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

..

1_settings.rb

Have ClosingIssueExtractor recognize all referenced issues

2015-11-30 21:36:35 +01:00

2_app.rb

Replace all usages of git command with configurable binary path

2015-11-03 17:11:09 -05:00

4_ci_app.rb

remove gitlab_ci config

2015-09-10 13:42:41 +03:00

5_backend.rb

Warn when gitlab-shell version doesn't match requirement.

2015-04-06 14:02:49 +02:00

active_record_query_trace.rb

Added active_record_query_trace

2015-10-15 12:05:01 +02:00

attr_encrypted_no_db_connection.rb

Fix.

2015-05-15 15:32:49 +02:00

backtrace_silencers.rb

init commit

2011-10-09 00:36:38 +03:00

bullet.rb

Added Bullet to the Gemfile

2015-10-15 12:05:01 +02:00

carrierwave.rb

Rubocop: comment indentation

2015-02-02 21:34:16 -08:00

connection_fix.rb

Groundwork for merging CI into CE

2015-08-25 18:42:46 -07:00

cookies_serializer.rb

Rails update to 4.2.4

2015-11-25 18:18:44 +02:00

default_url_options.rb

Rails update to 4.2.4

2015-11-25 18:18:44 +02:00

devise_async.rb

Send devise emails async

2013-10-09 15:25:31 +03:00

devise_password_length.rb.example

Add instructions for custom password length limits

2014-01-13 10:41:10 +01:00

devise.rb

Use devise paranoid mode and ensure the same message is returned every time

2015-12-09 18:40:37 -06:00

disable_email_interceptor.rb

Revert "Allow to configure smtp and sendmail in gitlab.yml"

2015-05-06 17:39:18 +03:00

doorkeeper.rb

retrieving oauth token with LDAP credentials

2015-08-31 15:10:01 +03:00

gitlab_shell_secret_token.rb

Allow to configure gitlab_shell_secret location

2015-05-16 21:46:06 +02:00

haml.rb

Enable HAML ugly mode by default for all environments

2013-05-14 22:17:46 +03:00

inflections.rb

Remove inflector rule that makes commits uncountable

2015-11-03 11:36:20 +01:00

kaminari_config.rb

add kaminari config with default and max per_page values

2012-09-03 04:22:49 -07:00

mime_types.rb

Add Markdown to Mime types

2015-04-15 12:25:24 -04:00

omniauth.rb

Fix signin with OmniAuth providers

2015-12-08 14:58:15 +01:00

postgresql_limit_fix.rb

patch rails to ignore text limit

2012-10-10 13:17:48 +04:00

public_key.rb

Fix typo.

2015-03-20 16:13:03 -07:00

rack_attack_git_basic_auth.rb

Add more comments explaining how we block IPs

2014-12-18 11:08:11 +01:00

rack_attack.rb.example

Rails update to 4.2.4

2015-11-25 18:18:44 +02:00

rack_lineprof.rb

Rails update to 4.2.4

2015-11-25 18:18:44 +02:00

secret_token.rb

Rails update to 4.2.4

2015-11-25 18:18:44 +02:00

session_store.rb

Merge branch 'master' into reference-pipeline-and-caching

2015-12-02 11:20:51 +01:00

sherlock.rb

Rails update to 4.2.4

2015-11-25 18:18:44 +02:00

sidekiq.rb

Migrate from Sidetiq to Sidekiq-cron

2015-12-04 11:29:45 -02:00

smtp_settings.rb.sample

Rails update to 4.2.4

2015-11-25 18:18:44 +02:00

static_files.rb

Migrate mailers to ActiveJob

2015-11-26 17:03:43 +02:00

time_zone.rb

Add timezone configuration to gitlab.yml

2014-10-21 11:27:16 +02:00

wrap_parameters.rb

init commit

2011-10-09 00:36:38 +03:00