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

Merge branch 'hook-docs-behavior' into 'master'

2016-05-11 16:34:00 +00:00

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

init commit

2011-10-09 00:36:38 +03:00

ability.rb

Merge branch 'separate-banzai-references' into 'master'

2016-06-01 15:51:59 +00:00

abuse_report.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

appearance.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

application_setting.rb

Merge branch 'current-settings-use-request-store-during-request'

2016-06-01 12:55:00 +02:00

audit_event.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

blob.rb

Properly handle bigger files

2016-04-28 21:28:39 +02:00

broadcast_message.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +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

commit.rb

Refactor Participable

2016-06-01 16:22:35 +02:00

deploy_key.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

deploy_keys_project.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

email.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

event.rb

Reduce duplication and branching logic in EventsHelper

2016-05-16 14:52:04 -05:00

external_issue.rb

Merge branch 'master' into number_sign_for_external_issue_ref

2016-04-17 18:17:27 +02:00

forked_project_link.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

generic_commit_status.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

global_label.rb

Updates from last code review.

2016-03-06 23:07:19 -05:00

global_milestone.rb

Ruby fixes

2016-03-29 12:19:09 +01:00

group.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

identity.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

issue.rb

Refactor Participable

2016-06-01 16:22:35 +02:00

jira_issue.rb

Backport JIRA service

2015-12-18 14:19:48 -06:00

key.rb

Add leading comment space cop

2016-05-31 19:33:46 -03:00

label_link.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

label.rb

Merge branch 'remove-annotate-gem' into 'master'

2016-05-10 09:08:30 +00:00

legacy_diff_note.rb

Clean up LegacyDiffNote somewhat

2016-05-13 17:31:58 -05:00

lfs_object.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

lfs_objects_project.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

member.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

merge_request_diff.rb

Maintain commit order in MRs

2016-05-18 17:14:55 +01:00

merge_request.rb

Allows MR authors to have the source branch removed when merging the MR

2016-05-20 11:30:03 +02:00

milestone.rb

Address Yorick's feedback

2016-05-18 23:45:25 -05:00

namespace.rb

Merge branch 'docker-registry' into docker-registry-view

2016-05-13 17:15:01 -05:00

note.rb

Merge branch 'separate-banzai-references' into 'master'

2016-06-01 15:51:59 +00:00

notification_setting.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

oauth_access_token.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

personal_snippet.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

project_group_link.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

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

Allow users to access project shared with their group

2016-03-11 18:46:01 +01:00

project_wiki.rb

Codestyle changes

2016-05-31 11:24:58 -03:00

project.rb

Introduce container_registry_path_with_namespace

2016-06-01 22:57:50 +02:00

protected_branch.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

release.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

repository.rb

Remove main_language and tests

2016-05-25 17:16:42 -04:00

security_event.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

sent_notification.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

service.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

snippet.rb

Refactor Participable

2016-06-01 16:22:35 +02:00

spam_log.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

spam_report.rb

Support Akismet spam checking for creation of issues via API

2016-02-02 11:25:44 -02:00

subscription.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

todo.rb

Create a todo on failing MR build

2016-05-17 10:17:45 +01:00

tree.rb

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs

2016-02-01 13:51:05 +01:00

user.rb

Upgrade attr_encrypted and encryptor

2016-05-30 13:51:21 -06:00

users_star_project.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

wiki_page.rb

add slack notifications for wiki pages

2016-04-20 08:25:40 +08:00