gitlabhq

mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 20:56:08 +10:00

Files

T

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

Merge branch 'master' into ci/api-triggers

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

assets

move assets from lib directory to vendor

2012-05-29 17:56:48 +05:00

backup

Backup LFS objects same as any upload.

2015-11-19 10:43:45 +01:00

banzai

Merge branch 'backport-ee' into 'master'