github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 23:53:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
dbb3ddc7a6
discourse/app/models
History
Blake Erickson dbb3ddc7a6 FIX: approve invited user 
This commit fixes the case where invited users who typed in a password
would not be approved by default. Because we moved the user create logic
for an invited user there was a clash with the `save` in the user model
and the `save` in the invite_redeemer class.

- added approve logic into invite_redeemer class.
- added tests to verify that the user is approved
- added a check to see if must_approve_users is on
- added a check to see if the inviter is staff
- go ahead and approve the user if must_approve_users is off
- keep existing User.approve workflow if user exists
- improve if/else logic to remove duplicate code
- use `Time.zone.now`
2017-03-05 06:58:23 -07:00
..
concerns remove rails-observers 2016-12-22 16:46:53 +11:00
about.rb Rename SiteSetting#use_https to force_https. 2016-06-29 15:02:43 +08:00
admin_dashboard_data.rb Use && and || consistently so that there's less chance of copy paste errors in the future 2017-02-15 00:25:49 -08:00
api_key.rb
application_request.rb cut out an exception 2015-08-19 16:57:26 +10:00
auto_track_duration_site_setting.rb fix the build 2015-09-14 10:48:24 +02:00
backup.rb FIX: log backups download/destroy staff action 2017-01-16 19:53:31 +01:00
badge_grouping.rb annotate models 2016-02-23 10:33:53 +11:00
badge_type.rb annotate models 2016-02-23 10:33:53 +11:00
badge.rb FIX: should not be able to rename a system badge 2017-02-20 14:35:05 +01:00
category_and_topic_lists.rb FEATURE: new 'categories_and_latest' endpoint 2016-08-29 22:47:44 +02:00
category_custom_field.rb
category_featured_topic.rb FEATURE: each category can control how many topics to show on categories page 2017-03-01 15:12:57 -05:00
category_featured_user.rb
category_group.rb FEATURE: Log staff actions for Category changes. 2015-09-18 10:53:08 +08:00
category_list.rb FEATURE: each category can control how many topics to show on categories page 2017-03-01 15:12:57 -05:00
category_page_style.rb UX: new 'category_page_style' site setting 2016-08-22 23:01:43 +02:00
category_search_data.rb
category_tag_group.rb annotate models 2016-06-17 11:28:49 +10:00
category_tag.rb annotate models 2016-06-17 11:28:49 +10:00
category_user.rb FIX: Couldn't update category notification level 2016-08-02 11:22:02 -04:00
category.rb FEATURE: each category can control how many topics to show on categories page 2017-03-01 15:12:57 -05:00
color_scheme_color.rb annotate models 2016-02-23 10:33:53 +11:00
color_scheme.rb FEATURE: Let plugins register themes easily 2017-01-13 11:50:52 -05:00
developer.rb missing annotation 2016-08-15 17:59:36 +10:00
digest_email_site_setting.rb FEATURE: More digest email frequency options. Digests can be sent as often as every 30 minutes. 2016-03-02 15:43:47 -05:00
directory_item.rb annotate models 2016-10-31 15:02:11 +05:30
discourse_single_sign_on.rb Add user title to SSO payload 2017-01-31 16:42:27 -08:00
discourse_version_check.rb FEATURE: Installed Version link shows GitHub Compare to branch being followed 2016-08-02 06:18:44 -04:00
draft_sequence.rb annotate models 2016-02-23 10:33:53 +11:00
draft.rb annotate models 2016-02-23 10:33:53 +11:00
email_change_request.rb FIX: Don't allow invalid email to be saved. 2016-12-21 17:47:11 +08:00
email_log.rb annotate models 2016-06-17 11:28:49 +10:00
email_token.rb FEATURE: remove email_token_grace_period_hours 2016-12-19 17:15:20 +11:00
embeddable_host.rb FIX: Embedding was broken with non-english URLs and ports 2017-02-27 12:17:52 -05:00
embedding.rb FEATURE: Ability to scrub titles when importing embeddable content 2016-08-22 12:43:02 -04:00
emoji_set_site_setting.rb FIX: Emoji update job was not being queued 2016-07-25 12:11:36 -04:00
emoji.rb FIX: Use full path for emoji resize job 2017-01-02 13:34:32 -02:00
facebook_user_info.rb annotate models 2016-10-31 15:02:11 +05:30
github_user_info.rb annotate models 2016-02-23 10:33:53 +11:00
given_daily_like.rb annotate models 2016-03-28 15:21:45 +11:00
global_setting.rb FEATURE: per client user tokens 2017-02-07 09:22:16 -05:00
google_user_info.rb annotate models 2016-02-23 10:33:53 +11:00
group_archived_message.rb FEATURE: move_to_inbox and archive_message events 2017-02-28 09:56:41 -05:00
group_custom_field.rb
group_history.rb FEATURE: Group logs. 2016-12-12 17:29:54 +08:00
group_manager.rb update annotations 2015-09-18 10:41:10 +10:00
group_mention.rb Update annotate and annotate models 2016-01-11 17:30:56 +11:00
group_user.rb Server side code for Watching First Post Only 2016-07-07 11:21:50 -04:00
group.rb FIX: Show groups that user is owner of on groups page. 2017-02-03 16:51:32 +08:00
incoming_domain.rb
incoming_email.rb annotate models 2016-05-30 10:45:32 +10:00
incoming_link.rb handle invalid param gracefully 2015-05-07 11:06:42 +10:00
incoming_links_report.rb FIX: broken links on admin dashboard in Top Referrers section 2016-02-22 14:31:13 -05:00
incoming_referer.rb
instagram_user_info.rb annotate models 2016-03-28 15:21:45 +11:00
invite_redeemer.rb FIX: approve invited user 2017-03-05 06:58:23 -07:00
invite.rb FEATURE: new invite acceptance page, where username can be chosen and password can be set 2017-02-15 16:51:57 -05:00
invited_group.rb
like_notification_frequency_site_setting.rb FEATURE: like notification frequency of never 2016-03-06 09:12:59 +11:00
locale_site_setting.rb Add locale step 2016-09-22 09:52:19 -04:00
mailing_list_mode_site_setting.rb FEATURE:'No Echo' option for mailing list mode. 2016-10-19 13:14:36 -04:00
muted_user.rb update annotations 2015-09-18 10:41:10 +10:00
new_topic_duration_site_setting.rb fix the build 2015-09-14 10:48:24 +02:00
notification_level_when_replying_site_setting.rb Add notification level user preference when replying to a topic 2016-09-30 14:58:07 -04:00
notification.rb UserEmailObserver is now removed 2016-12-22 16:46:53 +11:00
oauth2_user_info.rb annotate models 2016-02-23 10:33:53 +11:00
onceoff_log.rb annotate models 2016-05-30 10:45:32 +10:00
optimized_image.rb slightly shorter regexp for OptimizedImage.safe_path? 2017-01-02 16:28:14 +01:00
permalink.rb FIX: permalinks redirect on subfolder installs could add the subfolder to the url twice 2015-10-12 16:54:53 -04:00
plugin_store_row.rb annotate models 2016-02-23 10:33:53 +11:00
plugin_store.rb
post_action_type.rb remove rails-observers 2016-12-22 16:46:53 +11:00
post_action.rb remove rails-observers 2016-12-22 16:46:53 +11:00
post_analyzer.rb FIX: don't extract links from .elided parts 2016-12-05 15:19:15 +01:00
post_custom_field.rb update annotations 2015-09-18 10:41:10 +10:00
post_detail.rb annotate models 2016-02-23 10:33:53 +11:00
post_mover.rb FIX: Couldn't move posts with deleted replies 2016-08-04 11:56:01 -04:00
post_reply.rb FIX: Update post replies when we move posts. (#4324) 2016-07-13 17:34:21 +02:00
post_revision.rb remove rails-observers 2016-12-22 16:46:53 +11:00
post_search_data.rb annotate models 2016-02-23 10:33:53 +11:00
post_stat.rb update annotations 2015-09-18 10:41:10 +10:00
post_timing.rb FEATURE: track user visits on mobile and display on admin dashboard in a new Mobile section 2015-07-07 14:06:42 -04:00
post_upload.rb Update annotations. 2016-11-24 10:13:03 +08:00
post.rb Revert "FIX: Don't skip callbacks when rebaking posts." 2017-02-01 10:52:15 +08:00
previous_replies_site_setting.rb FEATURE: allow users to control how many previous replies they get 2016-02-19 13:57:07 +11:00
queued_post.rb FIX: Polls permanently broken if post requires approval. 2017-01-26 13:29:43 +08:00
quoted_post.rb FIX: don't raise exception when a quote was already extracted 2016-11-30 17:18:34 +01:00
report.rb FIX: admin dashboard posts count should not include system posts and whispers 2017-02-21 14:45:41 -05:00
rtl.rb Add initial Urdu support with RTL direction 2016-12-03 23:17:51 -05:00
s3_region_site_setting.rb New AWS S3 Storage Mumbai region added (#4335) 2016-07-18 09:03:26 +02:00
scheduler_stat.rb FEATURE: store history for scheduled job execution 2016-05-30 11:38:08 +10:00
screened_email.rb annotate models 2016-02-23 10:33:53 +11:00
screened_ip_address.rb SECURITY: Possible SQL injection. 2016-07-18 15:35:41 +08:00
screened_url.rb annotate models 2016-02-23 10:33:53 +11:00
single_sign_on_record.rb annotate models 2016-10-31 15:02:11 +05:30
site_customization.rb FIX: Customization templates were not working with Glimmer2 2016-12-27 12:17:30 -05:00
site_setting.rb PERF: Don't calculate the same query twice. 2016-11-24 14:05:26 +08:00
site.rb FIX: Associate category logo and background to uploads record. 2016-12-12 17:37:28 +08:00
slug_setting.rb FEATURE: add slug geneartion options 2015-05-05 18:08:30 +08:00
stylesheet_cache.rb annotate models 2016-02-23 10:33:53 +11:00
tag_group_membership.rb annotate models 2016-06-17 11:28:49 +10:00
tag_group.rb annotate models 2016-06-17 11:28:49 +10:00
tag_user.rb FEATURE: improved tag and category watching and tracking 2016-07-08 12:58:30 +10:00
tag.rb FIX: Tags used only on deleted topics could not be used again 2016-10-28 15:11:50 -04:00
top_lists.rb
top_menu_item.rb
top_topic.rb PERF: Don't calculate the same query twice. 2016-11-24 14:05:26 +08:00
topic_allowed_group.rb
topic_allowed_user.rb
topic_converter.rb FEATURE: move a topic from PM to regular topic or vice versa 2016-05-02 21:34:05 +05:30
topic_custom_field.rb annotate models 2016-05-30 10:45:32 +10:00
topic_embed.rb FIX: Allow Safe Redirections in Topic Embedding 2016-09-15 13:56:59 -04:00
topic_featured_users.rb FIX: If posts are deleted they should be updated in consistency jobs 2016-06-21 13:05:56 -04:00
topic_invite.rb
topic_link_click.rb FIX: Support links with google analytics tracking and hashes 2016-08-23 12:13:31 -04:00
topic_link.rb just checking for existence is enough here 2016-11-30 23:41:07 +01:00
topic_list.rb FIX: N+1 in topic_list 2017-02-22 12:20:50 -05:00
topic_notifier.rb FEATURE: notification_level on a per-group basis 2015-12-14 23:17:09 +01:00
topic_participants_summary.rb FEATURE: primary group class on avatars in topic list 2017-02-20 15:55:10 -05:00
topic_poster.rb FEATURE: primary group class on avatars in topic list 2017-02-20 15:55:10 -05:00
topic_posters_summary.rb FEATURE: primary group class on avatars in topic list 2017-02-20 15:55:10 -05:00
topic_status_update.rb Replace certain uses of 'gsub' with 'tr' or 'chomp' for a speed 2016-06-10 22:08:37 -05:00
topic_tag.rb annotate models 2016-05-30 10:45:32 +10:00
topic_tracking_state.rb FIX: whisper no longer experimental 2016-12-02 17:03:31 +11:00
topic_user.rb remove UserActionObserver, replace with after_save and service 2016-12-22 16:46:53 +11:00
topic_view_item.rb FIX: Use custom date for redis key in TopicViewItem.add. 2015-09-14 11:17:28 +08:00
topic.rb remove unecessary '.limit(1)' 2017-02-24 12:56:13 +01:00
translation_override.rb annotate models 2016-05-30 10:45:32 +10:00
trust_level_setting.rb fix the build 2015-09-14 10:48:24 +02:00
trust_level3_requirements.rb FEATURE: add caps to trust level 3 requirements for posts read and topics viewed, configurable in settings 2016-05-25 14:55:49 -04:00
twitter_user_info.rb annotate models 2016-02-23 10:33:53 +11:00
unsubscribe_key.rb FEATURE: configure session time via site setting for all the users (#4343) 2016-07-23 02:57:30 +05:30
upload.rb FEATURE: new 'max_image_megapixels' site setting 2017-01-11 23:37:12 +01:00
user_action.rb action to be reserved for assigned plugin 2017-02-08 12:10:16 -05:00
user_api_key.rb annotate models 2016-10-31 15:02:11 +05:30
user_archived_message.rb FEATURE: move_to_inbox and archive_message events 2017-02-28 09:56:41 -05:00
user_auth_token_log.rb FEATURE: add hidden setting for verbose auth token logging 2017-02-13 14:01:09 -05:00
user_auth_token.rb FIX: on initial token issue stop unmarking token as unseen 2017-02-28 10:38:22 -05:00
user_avatar.rb Update annotations. 2016-11-24 10:13:03 +08:00
user_badge.rb annotate models 2016-02-23 10:33:53 +11:00
user_badges.rb FEATURE: you can not drill down and see why you have badges 2016-01-18 17:59:20 +11:00
user_custom_field.rb
user_export.rb PERF: stream CSV exports so they don't fail when they are too big 2016-05-25 22:20:35 +02:00
user_field_option.rb annotate models 2016-02-23 10:33:53 +11:00
user_field.rb remove rails-observers 2016-12-22 16:46:53 +11:00
user_history.rb FEATURE: log all username and name changes 2017-02-28 00:23:27 +05:30
user_open_id.rb annotate models 2016-02-23 10:33:53 +11:00
user_option.rb PERF: avoid query on every logged on page load 2016-12-05 17:38:02 +11:00
user_profile_view.rb FIX: Don't track user profile view when viewed by system user. 2016-08-23 16:25:31 +08:00
user_profile.rb FEATURE: new setting to validate user website 2016-12-26 21:29:27 +05:30
user_search_data.rb
user_search.rb FEATURE: allow user search API to restrict to group 2017-02-09 18:45:39 -05:00
user_stat.rb reset bounce score when email is successfully changed 2017-02-20 10:37:01 +01:00
user_summary.rb FIX: most liked queries were leaking info in user summaries 2016-05-30 19:48:46 +02:00
user_visit.rb FEATURE: filter admin reports via user group 2016-02-04 11:23:49 +05:30
user.rb Use Time.zone.now instead. 2017-03-05 11:10:40 +08:00
username_validator.rb FIX: Don't allow invalid email to be saved. 2016-12-21 17:47:11 +08:00
warning.rb
web_hook_event_type.rb FEATURE: Webhook for user creation and approval 2016-09-19 10:12:55 +08:00
web_hook_event.rb annotate models 2016-10-31 15:02:11 +05:30
web_hook.rb Add user_updated event to webhooks. 2016-12-13 11:26:26 +08:00