gitlab-org--gitlab-foss/app
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
..
assets fixes margin and padding 2016-01-14 15:10:33 -05:00
controllers Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' 2016-01-14 14:38:55 +00:00
finders Drop projects order in IssuableFinder 2016-01-07 14:53:02 +01:00
helpers Merge branch 'import-gh-wiki' into 'master' 2016-01-14 15:08:42 +00:00
mailers Minor improvements, unsubscribe from email footer 2016-01-09 19:32:03 +01:00
models Merge branch 'master' into ci/api-triggers 2016-01-14 21:58:17 +01:00
services Merge branch 'backport-ee' into 'master' 2016-01-14 18:39:49 +00:00
uploaders DRY up upload and download services 2016-01-08 17:38:53 +01:00
validators Blacklist 'new' 2016-01-08 10:19:22 +01:00
views Merge branch 'rs-fix-cross-reference' into 'master' 2016-01-14 18:07:57 +00:00
workers Write to InfluxDB directly via UDP 2015-12-29 14:53:45 +01:00