gitlab-org--gitlab-foss/spec
Douwe Maan 291fd85880 Merge branch 'github-importer' into 'master'
Does not halt the GitHub import process when an error occurs

## What are the relevant issue numbers?

Fixes #20385 

https://gitlab.com/gitlab-org/gitlab-ce/issues/20149

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5763
2016-08-24 20:39:29 +00:00
..
config
controllers Fix incorrect "stopped impersonation" log message 2016-08-23 01:09:16 -07:00
factories api: expose wiki_page_events project hook field in the API 2016-08-24 10:33:51 -04:00
features Merge branch 'disable-commenting-on-unrelatable-diff-line' into 'master' 2016-08-23 21:28:07 +00:00
finders Merge branch 'issue_18135' into 'master' 2016-08-19 23:06:30 +00:00
fixtures Fix JSON schema to issues in issue board lists 2016-08-19 11:47:33 -03:00
helpers Show "Create Merge Request" widget for push events to fork projects on the source project 2016-08-24 18:54:26 +02:00
initializers
javascripts expose 'only_allow_merge_if_build_succeeds' project setting in the API 2016-08-24 17:11:48 +09:00
lib Merge branch 'github-importer' into 'master' 2016-08-24 20:39:29 +00:00
mailers Merge branch 'master' into 'expiration-date-on-memberships' 2016-08-19 10:58:01 +00:00
models Show "Create Merge Request" widget for push events to fork projects on the source project 2016-08-24 18:54:26 +02:00
requests Merge branch 'api_only_allow_merge_if_build_succeeds' into 'master' 2016-08-24 19:27:58 +00:00
routing Support integration with Koding (online IDE) 2016-08-19 12:10:58 -07:00
services Merge branch 'mark-as-processable' into 'master' 2016-08-19 18:35:07 +00:00
support Merge branch '4273-slash-commands' into 'master' 2016-08-18 16:41:16 -05:00
tasks/gitlab
uploaders
views Update Hamlit to 2.6.1 2016-08-18 13:26:32 -05:00
workers Merge branch '21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-after-a-push' into 'master' 2016-08-19 18:16:55 +00: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 Use travel_to instead of dependency injection, feedback: 2016-08-19 16:57:25 +08:00
teaspoon_env.rb