Douwe Maan ac923b4fb4 Merge branch 'fix/atom-url-issue' into 'master' ... Fix atom url issue on projects This MR adds prevents a project to have a path ending in .atom that conflicts with the feed and Adds a migration to migrate old .atom projects to a different path Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699 See merge request !2651		2016-02-04 16:12:47 +00:00
..
api	Merge branch 'support-akismet' into 'master'	2016-02-03 01:26:30 +00:00
assets	…
backup	…
banzai	Make Pipelines responsible for defining their custom whitelist	2016-02-03 17:24:08 -05:00
ci	Merge branch 'fix-ci-runners-version-update' into 'master'	2016-01-27 20:50:24 +00:00
gitlab	Merge branch 'fix/atom-url-issue' into 'master'	2016-02-04 16:12:47 +00:00
omni_auth	Fix signin with OmniAuth providers	2015-12-08 14:58:15 +01:00
rouge/formatters	Remove custom Lexer. #3945 [ci skip]	2016-01-08 15:20:48 -05:00
support	Consistent rails_socket use.	2016-01-25 13:19:27 +00:00
tasks	Prevent StateMachine warnings from outputting during a cron task	2016-01-15 17:47:56 -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	…
gitlab.rb	…
gt_one_coercion.rb	…
repository_cache.rb	…
static_model.rb	…
unfold_form.rb	…
uploaded_file.rb	…
version_check.rb	Update version check images to use SVG	2016-01-05 14:35:29 -05:00