gitlab-org--gitlab-foss/spec
Robert Speicher 7b42ff6306 Merge branch 'rs-merge_commit_message' into 'master'
Improve how MergeCommit#merge_commit_message builds the message

Now a merge request with a blank description will no longer produce a
merge commit message like this:

```
Merge branch 'foo' into 'master'

Bring the wonders of foo into the world



See merge request !7283
```

What an improvement! 🎉

See merge request !6450
2016-09-27 12:55:04 +00:00
..
config
controllers Merge branch 'rc-new-members-approve-request-access-service' into 'master' 2016-09-27 12:10:12 +00:00
factories Improve project_with_board factory to create the default lists 2016-09-26 14:42:38 -03:00
features Merge branch 'fix-unsubscribe-header' 2016-09-27 13:27:59 +02:00
finders fix issues mr counter 2016-09-20 14:39:15 +01:00
fixtures Returns the total number of issues in the JSON response 2016-08-31 09:30:37 +01:00
helpers Merge branch 'gitlab-ce-milestone-tab-badges' into 'master' 2016-09-24 10:49:45 +00:00
initializers
javascripts Merge branch 'add-remember-option-u2f' into 'master' 2016-09-09 18:42:11 +00:00
lib added more specs 2016-09-26 09:49:05 +02:00
mailers Wrap List-Unsubscribe link in angle brackets 2016-09-26 16:01:17 +01:00
models Improve how MergeCommit#merge_commit_message builds the message 2016-09-27 14:04:41 +02:00
policies Test if issue authors can access private projects 2016-09-20 14:57:23 -03:00
requests Add extra check for api users spec 2016-09-27 14:46:39 +03:00
routing Fix markdown help references 2016-08-26 09:38:21 -05:00
services Merge branch 'rc-new-members-approve-request-access-service' into 'master' 2016-09-27 12:10:12 +00:00
support Merge branch '22578-cycle-analytics-incorrect-commit-count' 2016-09-27 13:29:56 +02:00
tasks/gitlab
uploaders
views Scope environments to project 2016-09-21 13:19:34 +02:00
workers Added cron to prune events older than 12 months. 2016-09-07 19:41:25 +02:00
factories_spec.rb
rails_helper.rb
simplecov_env.rb Bump SimpleCov merge timeout to 365 days 2016-08-22 13:44:14 +02:00
spec_helper.rb Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-build-name 2016-08-24 20:56:30 +08:00
teaspoon_env.rb