Douwe Maan 6b0801d4f3 Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master' ... Expose MergeRequest#merge_status _Originally opened at !2478 by @develop7._ - - - This enables API users to see whether a merge request can be merged without conflicts. See merge request !2756		2016-02-09 16:01:20 +00:00
..
api	Expose MergeRequest::merge_status to API	2016-02-08 17:04:58 +01:00
assets	…
backup	Make sure there is a connection before using ActiveRecord	2016-02-08 17:31:24 +01:00
banzai	Allow limited Markdown in Broadcast Messages	2016-02-06 14:30:07 -05:00
ci	Merge branch 'fix-ci-runners-version-update' into 'master'	2016-01-27 20:50:24 +00:00
gitlab	Merge branch 'increase_import_timeout' into 'master'	2016-02-09 10:41:11 +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	Merge branch 'fix-init' into 'master'	2016-02-08 17:30:10 +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	Fix rubocop warnings in lib	2015-10-03 01:29:58 -05:00
extracts_path.rb	Only render 404 page from /public	2015-10-13 20:12:34 +03:00
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