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
backup	Backup LFS objects same as any upload.	2015-11-19 10:43:45 +01:00
banzai	Merge branch 'backport-ee' into 'master'	2016-01-14 18:39:49 +00:00
ci	Refactor build artifacts upload API endpoint	2016-01-14 12:48:17 +01:00
gitlab	Merge branch 'diff-parse-first-commit' into 'master'	2016-01-14 14:29:08 -05:00
omni_auth	Fix signin with OmniAuth providers	2015-12-08 14:58:15 +01:00
rouge/formatters	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
support	Fix spelling of "it's" to "its" where appropriate.	2015-12-24 15:28:12 +11:00
tasks	Disable colorization if STDOUT is not a tty	2016-01-12 21:34:23 -05:00
award_emoji.rb	Emoji picker: better alias handling	2015-12-24 11:28:55 +02:00
banzai.rb	Move Markdown/reference logic from Gitlab::Markdown to Banzai	2015-12-15 15:51:16 +01:00
disable_email_interceptor.rb
event_filter.rb
extracts_path.rb
file_size_validator.rb
file_streamer.rb	Implement Build Artifacts	2015-11-10 12:51:50 +01:00
gitlab.rb
gt_one_coercion.rb
repository_cache.rb
static_model.rb
unfold_form.rb
uploaded_file.rb	Implement Build Artifacts	2015-11-10 12:51:50 +01:00
version_check.rb	Update version check images to use SVG	2016-01-05 14:35:29 -05:00