Tomasz Maczukin 768721dc58 Merge branch 'master' into ci/api-triggers ... * master: (150 commits) fixes margin and padding Update mailroom/postfix documentation [ci skip] Fix css mess around git clone panel. Align it properly Fix missing padding for user/group pages Fix parse_gollum_tags matcher Update documentation on Banzai::Filter::GollumTagsFilter Add tests for the wiki pipeline Refactoring Banzai::Filter::GollumTagsFilter Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter Remove GollumTagsPipeline Refactoring Gitlab::GithubImport::Importer Remove unnecessary brackets on WIKI_SLUG_ID route constraints Move js function to removing accents to vendor/assets/javascripts Update CHANGELOG Use the WikiPipeline when rendering the wiki markdown content Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML Relax constraints for wiki slug Import GitHub wiki into GitLab Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus Revert changes to how the notes are paginated in the API ... Conflicts: doc/api/README.md lib/api/entities.rb		2016-01-14 21:58:17 +01:00
..
benchmarks	Move Markdown/reference logic from Gitlab::Markdown to Banzai	2015-12-15 15:51:16 +01:00
controllers	Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master'	2016-01-14 14:38:55 +00:00
factories	Merge branch 'master' into ci/api-triggers	2016-01-14 21:58:17 +01:00
features	Add tests for the wiki pipeline	2016-01-14 12:09:31 -02:00
finders	remove public field from namespace and refactoring	2016-01-04 16:00:29 +02:00
fixtures	Add tests for the wiki pipeline	2016-01-14 12:09:31 -02:00
helpers	Use the WikiPipeline when rendering the wiki markdown content	2016-01-14 12:09:31 -02:00
javascripts	reverting more MR ajax files, will appear in different commit	2016-01-12 14:55:54 -05:00
lib	Refactoring Banzai::Filter::GollumTagsFilter	2016-01-14 12:09:31 -02:00
mailers	Minor improvements, unsubscribe from email footer	2016-01-09 19:32:03 +01:00
models	Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML	2016-01-14 12:09:31 -02:00
requests	Merge branch 'master' into ci/api-triggers	2016-01-14 21:58:17 +01:00
routing	Merge branch 'issue_3076' into 'master'	2016-01-08 15:52:05 +00:00
services	Merge branch 'feature/ldap-sync-edgecases' into 'master'	2016-01-14 11:00:08 +00:00
support	Merge branch 'add-pagination-headers-to-api' into 'master'	2016-01-14 15:20:16 +00:00
tasks/gitlab
views/help
workers	Write to InfluxDB directly via UDP	2015-12-29 14:53:45 +01:00
factories.rb	Unsubscribe from thread through link in email footer	2016-01-09 12:41:22 +01:00
factories_spec.rb
rails_helper.rb
spec_helper.rb
teaspoon_env.rb