Nick Thomas 5a827e0c00 Merge branch 'mr-widget-conflicts-protected-branch' into 'master' ... Disable resolve conflicts for protected branches Closes #53463 See merge request gitlab-org/gitlab-ce!23842		2019-01-08 15:05:43 +00:00
..
api/schemas	Disable resolve conflicts for protected branches	2019-01-07 09:17:04 +00:00
authentication	saml/auth_hash: Allow 2FA bypass for SAML 2.0 responses	2018-10-25 12:08:07 +01:00
clusters
codequality	CE Resolve "Refactor code quality similar to JUnit tests"	2018-10-02 17:01:26 +00:00
config
container_registry
emails	Use new issue email address format	2019-01-03 14:37:35 -06:00
encoding
gitlab/ci/external_files	Remove gem install bundler from Docker-based Ruby environments	2019-01-01 19:27:19 +09:00
importers/bitbucket_server	Add spec for pull request activity	2018-07-25 15:39:39 -07:00
junit	Fix fixtures and factory	2018-08-02 17:15:25 +09:00
patchfiles	Apply patches when creating MR via email	2018-11-07 16:27:55 +01:00
project_services/campfire
security-reports	Use Container Scaning report fixture from EE	2019-01-07 17:37:09 +01:00
trace	Fix typos in lib	2018-11-15 12:15:43 +02:00
aosp_manifest.xml	Add manifest import feature	2018-07-11 12:22:57 +03:00
banana_sample.gif
bfg_object_map.txt	Use BFG object maps to clean projects	2018-12-06 18:58:00 +00:00
big-image.png
blockquote_fence_after.md
blockquote_fence_before.md
ci_build_artifacts.zip
ci_build_artifacts_metadata.gz
csv_comma.csv	Import CSV Backend	2019-01-07 11:16:58 +08:00
csv_semicolon.csv	Import CSV Backend	2019-01-07 11:16:58 +08:00
csv_tab.csv	Import CSV Backend	2019-01-07 11:16:58 +08:00
dk.png
doc_sample.txt
domain_blacklist.txt
fuzzy.po
git-cheat-sheet.pdf	Fixed bug with the content disposition with wiki attachments	2018-10-17 15:47:05 +00:00
GoogleCodeProjectHosting.json
invalid.po
logo_sample.svg
markdown.md.erb	enable CommonMark as the default	2018-06-14 08:30:16 +00:00
metrics.json
missing_metadata.po
missing_plurals.po
multiple_plurals.po
newlines.po
pages.tar.gz
pages.zip
pages.zip.meta
pages_empty.tar.gz
pages_empty.zip
pages_empty.zip.meta
project_export.tar.gz	Update Import/Export to use object storage (based on aa feature flag)	2018-07-06 15:46:18 +02:00
rails_sample.jpg
sanitized.svg
ssh_host_example_key.pub	Instance Configuration page now displays correct SSH fingerprints	2018-10-03 15:25:42 +01:00
symlink_export.tar.gz	Fix persistent symlink in project import	2018-12-17 16:14:35 +01:00
unescaped_chars.po
unsanitized.svg
valid.po	Remove Koding integration and documentation	2018-10-12 22:18:51 -07:00
video_sample.mp4