gitlab-org--gitlab-foss/lib/api
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
..
api.rb Merge branch 'master' into ci/api-builds 2016-01-14 13:30:18 +01:00
api_guard.rb
branches.rb
builds.rb Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus 2016-01-14 14:59:04 +01:00
commit_statuses.rb
commits.rb
deploy_keys.rb
entities.rb Merge branch 'master' into ci/api-triggers 2016-01-14 21:58:17 +01:00
files.rb
group_members.rb
groups.rb
helpers.rb Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into add-pagination-headers-to-api 2016-01-14 14:23:42 +01:00
internal.rb
issues.rb
keys.rb
labels.rb
merge_requests.rb
milestones.rb
namespaces.rb
notes.rb Revert changes to how the notes are paginated in the API 2016-01-14 14:20:21 +01:00
project_hooks.rb
project_members.rb
project_snippets.rb
projects.rb
repositories.rb
services.rb
session.rb
settings.rb
system_hooks.rb
tags.rb
triggers.rb
users.rb
variables.rb Fix some typos 2016-01-13 18:47:39 +01:00