Robert Speicher 7d33fba7af Merge branch 'upgrade-devise-two-factor' into 'master' ... Upgrade devise, devise-two-factor, and attr_encrypted Devise 4 includes support for Rails 5, working towards #14286. devise-async doesn't support Devise 4.0 and in 4.1 the bug that was blocking using Devise's built-in ActiveJob integration was fixed. So devise-async is removed. devise-two-factor 3.0.0 is required for Devise 4 support. attr_encrypted and encryptor are optional but recommended upgrades for devise-two-factor 3.0.0. The mode and algorithm will need to be changed in order to update to attr_encrypted 4.x in the future. See merge request !4216		2016-06-02 00:44:41 +00:00
..
ci	Merge branch 'upgrade-devise-two-factor' into 'master'	2016-06-02 00:44:41 +00:00
concerns	Merge branch 'separate-banzai-references' into 'master'	2016-06-01 15:51:59 +00:00
hooks
members	Add changelog and code refactor	2016-05-30 22:32:07 +07:00
network	Merge branch 'style/enable-semicolon-rubocop-cop' into 'master'	2016-06-01 17:41:19 +00:00
project_services	Enable Lint/LiteralInCondition rubocop cop	2016-05-30 12:34:25 +02:00
.gitkeep
ability.rb	Merge branch 'separate-banzai-references' into 'master'	2016-06-01 15:51:59 +00:00
abuse_report.rb
appearance.rb
application_setting.rb	Merge branch 'current-settings-use-request-store-during-request'	2016-06-01 12:55:00 +02:00
audit_event.rb
blob.rb
broadcast_message.rb
commit.rb	Refactor Participable	2016-06-01 16:22:35 +02:00
commit_range.rb	Don't modify arguments in CommitRange#initialize	2016-05-26 13:58:01 +02:00
commit_status.rb	Merge branch 'create-todo-on-failing-build' into 'master'	2016-05-19 21:18:22 +00:00
deploy_key.rb
deploy_keys_project.rb
email.rb
event.rb	Reduce duplication and branching logic in EventsHelper	2016-05-16 14:52:04 -05:00
external_issue.rb
forked_project_link.rb
generic_commit_status.rb
global_label.rb
global_milestone.rb
group.rb
identity.rb
issue.rb	Refactor Participable	2016-06-01 16:22:35 +02:00
jira_issue.rb
key.rb	Add leading comment space cop	2016-05-31 19:33:46 -03:00
label.rb
label_link.rb
legacy_diff_note.rb
lfs_object.rb
lfs_objects_project.rb
member.rb
merge_request.rb	Allows MR authors to have the source branch removed when merging the MR	2016-05-20 11:30:03 +02:00
merge_request_diff.rb	Maintain commit order in MRs	2016-05-18 17:14:55 +01:00
milestone.rb	Address Yorick's feedback	2016-05-18 23:45:25 -05:00
namespace.rb
note.rb	Merge branch 'separate-banzai-references' into 'master'	2016-06-01 15:51:59 +00:00
notification_setting.rb
oauth_access_token.rb
personal_snippet.rb
project.rb	Introduce container_registry_path_with_namespace	2016-06-01 22:57:50 +02:00
project_group_link.rb
project_import_data.rb	Upgrade attr_encrypted and encryptor	2016-05-30 13:51:21 -06:00
project_snippet.rb	Refactor Participable	2016-06-01 16:22:35 +02:00
project_team.rb
project_wiki.rb	Codestyle changes	2016-05-31 11:24:58 -03:00
protected_branch.rb
release.rb
repository.rb	Remove main_language and tests	2016-05-25 17:16:42 -04:00
security_event.rb
sent_notification.rb
service.rb
snippet.rb	Refactor Participable	2016-06-01 16:22:35 +02:00
spam_log.rb
spam_report.rb
subscription.rb
todo.rb	Create a todo on failing MR build	2016-05-17 10:17:45 +01:00
tree.rb
user.rb	Upgrade attr_encrypted and encryptor	2016-05-30 13:51:21 -06:00
users_star_project.rb
wiki_page.rb