gitlab-org--gitlab-foss/spec/factories
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 Re-annotate models 2015-09-06 07:48:48 -07:00
broadcast_messages.rb Update BroadcastMessage model 2016-01-13 11:34:58 -05:00
commit_statuses.rb Specs for 'Merge When Build Succeeds' 2015-12-02 13:27:16 +01:00
forked_project_links.rb Re-annotate models 2014-04-09 15:05:03 +03:00
group_members.rb Replace project_access attribute with access_level in specs and API 2014-09-15 11:36:50 +03:00
label_links.rb Annotate models 2014-08-25 12:25:02 +03:00
labels.rb Annotate models 2015-11-13 19:22:46 +01:00
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 Annotate models 2015-11-13 19:22:46 +01:00