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
..
ci	Merge branch 'master' into ci/api-triggers	2016-01-14 21:58:17 +01:00
abuse_reports.rb
broadcast_messages.rb	Update BroadcastMessage model	2016-01-13 11:34:58 -05:00
commit_statuses.rb
forked_project_links.rb
group_members.rb
label_links.rb
labels.rb
lfs_objects.rb	Update annotations	2015-12-08 21:00:01 -08:00
lfs_objects_projects.rb	Update annotations	2015-12-08 21:00:01 -08:00
merge_requests.rb	Annotate models	2016-01-06 13:09:55 +00:00
notes.rb	Update annotations	2015-12-08 21:00:01 -08:00
projects.rb	Annotate models	2016-01-06 13:09:55 +00:00
releases.rb