gitlab-org--gitlab-foss/app/models
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
..
ci Merge branch 'mark-as-processable' into 'master' 2016-08-19 18:35:07 +00:00
concerns Also check if Akismet is enabled, before showing the `Submit as spam` button. 2016-08-22 21:36:04 -05:00
hooks Implement pipeline hooks, extracted from !5525 2016-08-02 18:22:24 +08:00
members Merge branch 'master' into expiration-date-on-memberships 2016-08-18 15:54:07 +01:00
network Enable Style/SpaceAfterComma Rubocop cop 2016-06-29 15:23:44 +02:00
project_services Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack 2016-08-15 20:36:06 +02:00
protected_branch Backport changes from gitlab-org/gitlab-ee!581 to CE. 2016-08-16 11:05:14 +05:30
.gitkeep
ability.rb Make Ability#project_abilities return unique values and fix counts 2016-08-20 06:53:14 -07:00
abuse_report.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
appearance.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
application_setting.rb Support integration with Koding (online IDE) 2016-08-19 12:10:58 -07:00
audit_event.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
award_emoji.rb Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem. 2016-06-29 14:53:09 -06:00
blob.rb Limit the size of SVGs when viewing them as blobs 2016-08-15 13:42:52 +02:00
board.rb The lists: Backlog, and Done cannot be destroyed 2016-08-17 12:58:57 -03:00
broadcast_message.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
commit.rb Fix line commenting for the initial commit 2016-08-19 16:35:44 +01:00
commit_range.rb Fix comment for project argument in commit_range.rb 2016-06-20 11:12:04 -07:00
commit_status.rb Merge branch 'mark-as-processable' into 'master' 2016-08-19 18:35:07 +00:00
compare.rb Make Compare#diffs diff_options a regular argument 2016-08-03 09:32:01 -07:00
deploy_key.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
deploy_keys_project.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
deployment.rb Method names changed to #includes_commit? 2016-08-12 10:43:04 +02:00
diff_note.rb Call `set_discussion_id` again in DiffNote `before_validation` because the order is important 2016-08-19 18:24:12 -05:00
discussion.rb Fix bug where notes weren’t shown in discussion when the code had changed after creation 2016-08-19 12:38:40 -05:00
email.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
environment.rb Method names changed to #includes_commit? 2016-08-12 10:43:04 +02:00
event.rb Use a more future-proof check for Note/LegacyDiffNote 2016-07-06 10:08:42 +02:00
external_issue.rb
forked_project_link.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
generic_commit_status.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
global_label.rb
global_milestone.rb
group.rb Add expiration date to group memberships 2016-08-18 21:09:17 +01:00
identity.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
issue.rb Further refactor and syntax fixes. 2016-08-15 17:20:57 -05:00
key.rb Add simple identifier to public SSH keys 2016-08-02 06:56:23 +01:00
label.rb Destroy related lists when a label is removed 2016-08-17 12:58:58 -03:00
label_link.rb squashed - fixed label and milestone association problems, updated specs and refactored reader class a bit 2016-08-01 09:57:40 +02:00
legacy_diff_note.rb Fix bug where notes weren’t shown in discussion when the code had changed after creation 2016-08-19 12:38:40 -05:00
lfs_object.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
lfs_objects_project.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
list.rb Add a movable scope and a movable? method to List model 2016-08-17 12:58:59 -03:00
member.rb Allow project group links to be expired 2016-08-18 22:45:41 +01:00
merge_request.rb Improve performance of MR show page 2016-08-18 19:08:59 -05:00
merge_request_diff.rb Enable Style/SpaceAroundEqualsInParameterDefault cop 2016-08-06 04:03:01 +02:00
milestone.rb use has_many relationship with events 2016-07-01 15:34:10 +02:00
namespace.rb Fix bug where destroying a namespace would not always destroy projects 2016-08-11 15:36:35 -07:00
note.rb Fix Error 500 resulting when loading network graph 2016-08-20 09:57:20 -07:00
notification_setting.rb Exclude projects pending delete from notifications 2016-07-07 20:49:17 +01:00
oauth_access_token.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
personal_access_token.rb
personal_snippet.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
project.rb Does not halt the GitHub import process when an error occurs 2016-08-24 12:16:42 -03:00
project_group_link.rb Allow project group links to be expired 2016-08-18 22:45:41 +01:00
project_import_data.rb add missing attribute to attr_encrypted so it is fully backwards-compatible 2016-06-28 09:55:19 +02:00
project_snippet.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
project_team.rb Add expiration date to group memberships 2016-08-18 21:09:17 +01:00
project_wiki.rb Add method missing from EE 2016-08-12 21:56:40 -04:00
protected_branch.rb Backport changes from gitlab-org/gitlab-ee!581 to CE. 2016-08-16 11:05:14 +05:30
release.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
repository.rb Support integration with Koding (online IDE) 2016-08-19 12:10:58 -07:00
security_event.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
sent_notification.rb Allow SentNotification#position to be set as string or hash 2016-07-11 12:21:05 -05:00
service.rb Simplify the name for data builder, feedback: 2016-08-12 16:09:29 +08:00
snippet.rb Merge branch 'feature/custom-highlighting' into 'master' 2016-06-28 08:42:42 +00:00
spam_log.rb Allow `SpamLog` to be submitted as ham 2016-08-15 13:18:15 -05:00
subscription.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
todo.rb Todos sorting dropdown 2016-08-19 16:14:20 -03:00
tree.rb
u2f_registration.rb Allow naming U2F devices. 2016-08-18 22:12:02 +05:30
user.rb Show "Create Merge Request" widget for push events to fork projects on the source project 2016-08-24 18:54:26 +02:00
user_agent_detail.rb Further refactor and syntax fixes. 2016-08-15 17:20:57 -05:00
users_star_project.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
wiki_page.rb `WikiPage` should have a slug even when not persisted. 2016-07-25 09:22:47 +05:30