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_guard.rb

Rubocop: Style/CaseIndentation enabled

2015-02-02 21:26:40 -08:00

api.rb

Merge branch 'master' into ci/api-builds

2016-01-14 13:30:18 +01:00

branches.rb

Added the missing comma

2015-03-31 17:08:33 +01:00

builds.rb

Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus

2016-01-14 14:59:04 +01:00

commit_statuses.rb

Migrate CI::Project to Project

2015-12-11 18:02:09 +01:00

commits.rb

Order commit comments in API chronologically

2015-05-08 14:34:10 +02:00

deploy_keys.rb

Fix failing tests due to updates on the return messages.

2015-01-07 11:39:20 +01:00

entities.rb

Merge branch 'master' into ci/api-triggers

2016-01-14 21:58:17 +01:00

files.rb

Automatically fork a project when not allowed to edit a file.

2015-12-18 10:03:34 +01:00

group_members.rb

Track who created a group or project member.

2015-04-14 12:06:42 +02:00

groups.rb

Add API group projects endpoint.

2015-12-07 17:10:40 +01:00

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

Improve Git access error messages.

2015-05-13 09:41:55 +02:00

issues.rb

Merge branch 'rename-abilities' into 'master'

2015-06-26 16:39:17 +00:00

keys.rb

Add API method for get user by ID of an SSH key

2015-09-03 15:47:22 +03:00

labels.rb

Fix failing tests due to updates on the return messages.

2015-01-07 11:39:20 +01:00

merge_requests.rb

Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running

2016-01-05 16:30:03 +01:00

milestones.rb

Fix the test and add documentation for the "per-milestone issues API call"

2015-01-22 12:14:53 +01:00

namespaces.rb

Make namespace API available to all users

2015-05-28 11:39:12 -07:00

notes.rb

Revert changes to how the notes are paginated in the API

2016-01-14 14:20:21 +01:00

project_hooks.rb

Migrate CI::Services and CI::WebHooks to Services and WebHooks

2015-12-10 16:04:08 +01:00

project_members.rb

Use project_member instead of team_member.

2015-03-15 13:50:38 +01:00

project_snippets.rb

Rename abilities to correspond contoller/model action names

2015-06-26 15:55:56 +02:00

projects.rb

Merge branch 'ci/api-projects' into 'master'

2016-01-13 13:32:35 +00:00

repositories.rb

Move git tags API to separate file

2015-11-12 15:41:13 +01:00

services.rb

Hide passwords to non-admin users in the services API

2015-10-12 15:24:00 +02:00

session.rb

Add LDAP support to /api/session

2013-07-16 11:28:19 +03:00

settings.rb

Add tests and improve logic

2015-07-06 16:47:19 +02:00

system_hooks.rb

Added X-GitLab-Event header for web hooks

2015-05-08 16:49:03 +03:00

tags.rb

Delete tag via API

2016-01-08 10:10:04 +01:00

triggers.rb

Add some fixes after review

2016-01-13 12:20:59 +01:00

users.rb

Codestyle changes

2016-01-12 12:29:10 -02:00

variables.rb

Fix some typos

2016-01-13 18:47:39 +01:00