delta/gitlab/gitlab-ce.git/config/initializers, branch adding_crime_security gitlab.com: gitlab-org/gitlab-ce.git Fixed Rubocop offenses 2015-12-15T02:53:52+00:00 Gabriel Mazetto gabriel@gitlab.com 2015-12-15T02:53:52+00:00 b5291f95996743067bbec5a32f9c6cf0d34b36c7 






Use new runners registration token to register CI runners
2015-12-11T09:39:39+00:00

Grzegorz Bizon
grzegorz.bizon@ntsn.pl

2015-12-10T12:50:00+00:00

e2e43a114b5af63aad6d9badcb727c8829abb167












Upgraded Sidekiq to 4.x
2015-12-10T19:18:03+00:00

Gabriel Mazetto
gabriel@gitlab.com

2015-12-10T17:45:36+00:00

3e5b24d46a7fe904a5f934a54dafbb05a01f837b












Merge branch 'master' into tmp-reference-pipeline-and-caching
2015-12-10T13:04:34+00:00

Douwe Maan
douwe@gitlab.com

2015-12-10T13:04:34+00:00

10387f6b8a9071688d7db9a12c910ca02660ca87

# 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





# 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







Use devise paranoid mode and ensure the same message is returned every time
2015-12-10T00:40:37+00:00

Drew Blessing
drew@gitlab.com

2015-12-09T17:45:26+00:00

f4ec906e90b2f8dbf18b359b773e3b31f5da89ff

Skipped CI because it has already passed. Had to rebase due to CHANGELOG.





Skipped CI because it has already passed. Had to rebase due to CHANGELOG.







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

2015-12-08T20:22:23+00:00

Robert Speicher
robert@gitlab.com

2015-12-08T20:22:23+00:00

bcd89a58e736685bcce662fe0acf793ee925b536


Implement different Markdown rendering pipelines and cache Markdown

Builds on !1090. 

Related to !1014.

Fixes #2054.

See merge request !1602





Implement different Markdown rendering pipelines and cache Markdown

Builds on !1090. 

Related to !1014.

Fixes #2054.

See merge request !1602






Fix signin with OmniAuth providers
2015-12-08T13:58:15+00:00

Douwe Maan
douwe@gitlab.com

2015-12-08T13:41:19+00:00

41a4785b855a082197b3c22004cb8af96e5453ee












Merge branch 'master' into reference-pipeline-and-caching
2015-12-08T12:40:32+00:00

Douwe Maan
douwe@gitlab.com

2015-12-08T12:40:32+00:00

926c3bef9fbda49d5cab268bcd83355142e945c1












Merge branch 'feature/sidekiq-cron' into 'master'

2015-12-07T18:53:59+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2015-12-07T18:53:59+00:00

1da71fa9ed4513d966a5824382fc87be4f0fb307


Migrate from Sidetiq to Sidekiq-cron

Migrate from Sidetiq to Sidekiq-cron
Updated Sidekiq to 3.5.x

This will solve #2355

See merge request !1982





Migrate from Sidetiq to Sidekiq-cron

Migrate from Sidetiq to Sidekiq-cron
Updated Sidekiq to 3.5.x

This will solve #2355

See merge request !1982






Merge branch 'master' into reference-pipeline-and-caching
2015-12-07T13:48:53+00:00

Douwe Maan
douwe@gitlab.com

2015-12-07T13:48:53+00:00

d611a3879816d07f5842e2bdcea69b0813777107