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
..
build.rb	Improve readability of artifacts browser `Entry` related code	2016-01-14 12:48:17 +01:00
commit.rb	Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled	2015-12-17 16:33:47 +01:00
runner.rb	Remove ci_ prefix from all ci related things	2015-12-11 18:02:09 +01:00
runner_project.rb	Annotate models	2016-01-06 13:09:55 +00:00
trigger.rb	Merge branch '8-4-stable' into ci/api-triggers	2016-01-14 10:58:40 +01:00
trigger_request.rb	…
variable.rb	Merge branch '8-4-stable' into ci/api-variables	2016-01-13 23:59:00 +01:00