gitlab-org--gitlab-foss/spec
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
..
benchmarks Move Markdown/reference logic from Gitlab::Markdown to Banzai 2015-12-15 15:51:16 +01:00
controllers Add spec for assigning view param from cookie 2016-02-05 16:03:20 -05:00
factories Remove unmaintainable db schema comment from build factory 2016-02-04 10:16:21 +01:00
features Remove project-issuable-filter from admin builds page :) 2016-02-05 11:53:06 +01:00
finders remove public field from namespace and refactoring 2016-01-04 16:00:29 +02:00
fixtures Render sanitized SVG images 2016-02-01 18:25:32 +01:00
helpers Allow link_to_label to take an optional type arg 2016-02-04 19:14:48 +01:00
initializers Ensure Gravatar host looks like an actual host 2016-01-18 14:58:16 +01:00
javascripts Project dropdown test span -> i 2016-02-05 20:08:28 +00:00
lib Merge remote-tracking branch 'origin/rs-database-info' 2016-02-04 16:42:22 +01:00
mailers Add option to include the sender name in body of Notify email. fix #7824 2016-02-09 12:58:13 +01:00
models Merge branch 'fix/max-attachment-size-setting-validation' 2016-02-09 16:52:20 +01:00
requests Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master' 2016-02-09 16:01:20 +00:00
routing Increase the minimum length for commit SHA matching to 7 2016-01-29 19:52:29 -05:00
services Cache various Repository Git operations 2016-02-08 15:40:19 +01:00
support Increase the minimum length for commit SHA matching to 7 2016-01-29 19:52:29 -05:00
tasks/gitlab Add lfs to backup specs. 2015-11-19 10:43:45 +01:00
views/help Allow non-admin users to see version information 2015-09-23 17:18:15 -04:00
workers Write to InfluxDB directly via UDP 2015-12-29 14:53:45 +01:00
factories.rb Unsubscribe from thread through link in email footer 2016-01-09 12:41:22 +01:00
factories_spec.rb
rails_helper.rb
spec_helper.rb Add temporary monkey patch to get specs passing on 4.2.5.1 2016-01-25 14:53:28 -08:00
teaspoon_env.rb