kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/models
History
Robert Speicher 0a250cf9eb Merge branch 'rails-5-backports' into 'master' 
Fix two problematic bits of code that will be deprecated or broken in Rails 5.

Found in the Rails 5 MR: !5555

These are safe to use in Rails 4.2.7 as well as Rails 5.0.0, so I figured I'd backport them for the sake of making that merge request smaller.

The explanation for the mime_types.rb code is here: https://github.com/rails-api/active_model_serializers/issues/1027#issuecomment-126543577

See merge request !6214
2016-09-12 21:02:57 +00:00
..
ci Merge branch 'issue_21825' into 'master' 2016-09-12 16:15:22 +00:00
concerns Merge branch 'issue_19734' into 'master' 2016-09-01 15:28:14 +00:00
hooks Scope hooks thal will run for confidential issues 2016-08-31 18:34:45 -03: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 'upstream/master' into pipeline-hooks 2016-09-06 16:23:17 +08:00
protected_branch Backport changes from gitlab-org/gitlab-ee!581 to CE. 2016-08-16 11:05:14 +05:30
.gitkeep
ability.rb factor out a RuleSet so that delegate! retains @cannot 2016-08-30 11:39:22 -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 Pull import sources from Gitlab::ImportSources 2016-09-09 21:24:20 +05:30
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 Use JavaScript tooltips for mentions (!5301) 2016-09-01 01:21:34 +02:00
commit_range.rb Use JavaScript tooltips for mentions (!5301) 2016-09-01 01:21:34 +02:00
commit_status.rb Merge branch 'statuseable-hasstatus' into 'master' 2016-08-25 18:49:03 +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 Optimize discussion notes resolving and unresolving 2016-09-06 12:14:09 -03:00
discussion.rb Optimize discussion notes resolving and unresolving 2016-09-06 12:14:09 -03: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 remove Ability.abilities 2016-08-30 11:35:06 -07: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 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 Move #to_discussion to NoteOnDiff 2016-08-30 16:30:42 +01: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 Merge branch 'refactor/add-policies' into 'master' 2016-08-31 20:53:40 +00:00
merge_request_diff.rb Refactor merge request version compare feature 2016-09-07 10:24:48 +03: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 prevent authored awardable thumbs votes 2016-08-28 18:15:55 +01: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 Address @DouweM's feedback on !3749. 2016-04-28 22:28:36 +05:30
personal_snippet.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
project.rb Fix two problematic bits of code that will be deprecated or broken in Rails 5. 2016-09-05 20:58:27 -06:00
project_feature.rb Project tools visibility level 2016-09-01 11:47:59 -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 Simplify a condition in Repository#update_file 2016-09-12 18:10:08 +02: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 Enable pipeline events by default 2016-09-09 20:41:06 +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 Project tools visibility level 2016-09-01 11:47:59 -03: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