github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 16:18:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
34,976 Commits 214 Branches 500 Tags 960 MiB
deec2cf578
Commit Graph

34976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Krzysztof Kotlarek
f530378df3 FIX: Restore for non-multisite is not raising an error on reconnect step (#8237) 
That commit introduced a bug to the system: f69dacf979

Restore works fine for multisite, however, stopped working for non-multisite.

Reason for that was that `establish_connection` method got a check if the multisite instance is available:
```
    def self.instance
      @instance
    end

    def self.establish_connection(opts)
      @instance.establish_connection(opts) if @instance
    end
```
However, the reload method don't have that check
```
    def self.reload
      @instance = new(instance.config_filename)
    end
```

To solve it, let's ensure we are in a multisite environment before call reload
 2019-10-24 11:46:22 +11:00
Neil Lalonde
cfe26eb301 FIX: backwards compatibility for uncompiled email style css 2019-10-23 19:22:33 -04:00
Vinoth Kannan
40254bae1b FIX: Do not load group members when user can't see it. 2019-10-24 01:57:29 +05:30
Neil Lalonde
f061aee818 FEATURE: support SCSS in custom email style 
In the CSS tab of Admin > Customize > Email Style, SCSS can now be used.
 2019-10-23 15:42:37 -04:00
Vinoth Kannan
0dcb4bef20 FIX: should not disable topic inputs while creating new topic. 
31577b2131
 2019-10-24 01:04:37 +05:30
Vinoth Kannan
726bf37a12 FEATURE: wiki editors are allowed edit tags for wiki topics. 
If a wiki editor's TL is greater than 'min trust level to tag topics' site setting then they can edit the tags for any wiki topic.
 2019-10-23 23:50:10 +05:30
Vinoth Kannan
31577b2131 FEATURE: wiki editors are allowed edit tags for wiki topics. 
If a wiki editor's TL is greater than 'min trust level to tag topics' site setting then they can edit the tags for any wiki topic.
 2019-10-23 23:35:38 +05:30
Robin Ward
9347108f02 Support for importing jQuery 
Also remove Ember.Qunit error about Ember.$ for now
 2019-10-23 13:25:25 -04:00
Robin Ward
39159ad5e4 FIX: Wizard tests were broken with new loader 2019-10-23 13:15:28 -04:00
Robin Ward
391db25665 FIX: Sortable controller var conflict 2019-10-23 13:08:41 -04:00
Robin Ward
6287eccb35 REFACTOR: Remove Ember.Controller in favor of import 2019-10-23 13:06:54 -04:00
Robin Ward
e18af18fec Support and examples for Ember.Object and Ember.Controller imports 
We should stop using global variables and instead import these as
needed.
 2019-10-23 12:55:11 -04:00
Robin Ward
0b37a3c235 Additioning Linting fixes 2019-10-23 12:41:58 -04:00
Robin Ward
dd3ace5c77 REFACTOR: Replace Ember.Route with proper import 2019-10-23 12:39:32 -04:00
Robin Ward
a8a76198b1 REFACTOR: Remove Ember.Component global variable 
Use imports instead.
 2019-10-23 12:30:52 -04:00
Joffrey JAFFEUX
3db61aa18a
UX: applies correct background to <select> on dark themes (#8234) 2019-10-23 17:10:10 +02:00
Penar Musaraj
4fa1ef0945 UX: Improve quoting on iOS 
Fixes quote usability on iOS when the button is near the right edge of the screen.
 2019-10-23 10:44:47 -04:00
Dan Ungureanu
a7301c8671 PERF: Add index on group to category_groups (#8231) 2019-10-23 10:30:43 +01:00
Dan Ungureanu
09a569aaba PERF: Add unique index oauth2_user_infos(user_id, provider) (#8230) 2019-10-23 10:27:56 +01:00
Daniel Waterworth
1a72a61822 FIX: Fixed testsuite 
The backup restorer tests weren't cleaning up after themselves and
playing poorly with prefabrication.
 2019-10-23 09:43:05 +01:00
Krzysztof Kotlarek
f34a0141c7 FIX: Correct path to ImportExport module (#8227) 
During the move from Classic autoloader to Zeitwerk import_export module was moved to correct file name convention.
427d54b2b0 (diff-d896ec33b95afb7fae9f8bfe73d0580b)

Problem is that export/import is still using old path to require that module

Meta: https://meta.discourse.org/t/topic-and-category-export-import/38930/40
 2019-10-23 17:27:14 +11:00
Krzysztof Kotlarek
f69dacf979 FIX: Reconnect in restore process connects to correct DB (#8218) 
Simplified flow of restore is like that
```
migrate_database
reconnect
extract_uploads
```

Problem with incorrect current database started with this fix https://github.com/discourse/discourse/commit/025d4ee91f4

Dump task is reconnecting to default database https://github.com/rails/rails/blob/master/activerecord/lib/active_record/railties/databases.rake#L429

And then, we are trying to reconnect to the original database with that code:
```
def reconnect_database
  log "Reconnecting to the database..."
  RailsMultisite::ConnectionManagement::establish_connection(db: @current_db)
end
```

This reconnect is not switching us back to correct database because of that check
https://github.com/discourse/rails_multisite/blob/master/lib/rails_multisite/connection_management.rb#L181
Basically, it finds existing handler and it thinks that we are connected to correct DB and this step can be skipped.

To solve it, we can reload RailsMultisite::ConnectionManagement which creates a new instance of that class
https://github.com/discourse/rails_multisite/blob/master/lib/rails_multisite/connection_management.rb#L38
 2019-10-23 17:23:50 +11:00
Sam Saffron
950da34826 DEV: waiting for 10ms is hardly enough 
tests that test thread behavior and rely on scheduling need to allow for
a wider amount of error margin
 2019-10-23 16:18:41 +11:00
Sam Saffron
676c432b0f FIX: notifications are missing under certain conditions 
This simplifies the code for refreshing notification counts. It now
unconditionally looks up the user object which protects against stale objects
in memory.

This also removes a pile of conditional logic we no longer need.
 2019-10-23 16:09:55 +11:00
Penar Musaraj
ab6a540fc4 UX: fixes regression with iOS composer 
Fixes a bug introduced in e83c2488a2 where dismissing the keyboard in iOS would not minimize the composer.
 2019-10-22 23:10:18 -04:00
Kris
67ad8fbd1b minor button styling for admin login 2019-10-22 16:45:23 -04:00
Kris
d4f1e6d11b UX: update disabled dropdowns style w/ color variables 2019-10-22 16:32:24 -04:00
Penar Musaraj
2ab6a68629 UX: Standardize tag display in search menu results 
This allows theme components (like discourse-tag-icons) to apply to tag results in search menu.
 2019-10-22 14:19:24 -04:00
Arpit Jalan
1e9d9d9346
FIX: respect tl3 links no follow setting (#8232) 2019-10-22 22:41:04 +05:30
Gerhard Schlager
51ecbeef4d DEV: Upgrade lefthook 
`yarn install` didn't work on a fresh system
 2019-10-22 18:00:20 +02:00
romanrizzi
a411806551 FIX: Return blank avatar when downloading an avatar is not possible due to file size 2019-10-22 12:05:36 -03:00
romanrizzi
e112369bb6 FIX: Exclude image_url from web_hook_topic_view_serializer 2019-10-22 11:53:24 -03:00
Blake Erickson
7d09af7eda
FIX: Prevent null-byte searches causing 500 error (#8226) 
This fix ensures that searches that contain a null byte return a 400
error instead of causing a 500 error.

For some reason from rspec we will reach the raise statement inside
of the `rescue_from ArgumentError` block, but outside of rspec it will
not execute the raise statement and so a 500 is thrown instead of
reaching the `rescue_from Discourse::InvalidParameters` block inside of
the application controller.

This fix raises Discourse::InvalidParameters directly from the search
controller instead of relying on `PG::Connection.escape_string` to
raise the `ArgumentError`.
 2019-10-22 08:44:52 -06:00
Robin Ward
283a0add80
Support for importing @ember/component and @ember/routing/route (#8214) 
This will allow us to take the first step in updating our modules
to be consistent with example Ember code and to align with Ember CLI.
 2019-10-22 09:47:27 -04:00
Mark VanLandingham
e5311ab645 DEV: Import DiscourseRoute rather than Discourse.Route (#8225) 
* DEV: Discourse.Route -> DiscourseRoute with import

* ran prettier on all routes

* prettiered one more file
 2019-10-22 09:46:10 -04:00
Arpit Jalan
12409f63a0 Bump onebox version. 
- FIX: Follow redirect returns url if response code is 200
- FIX: do not resize xkcd image
 2019-10-22 12:26:01 +05:30
Blake Erickson
3201613f13 FEATURE: Include image url in topic serializer 
The `image_url` is already included when fetching a list of topics, and
this commit adds it to the individual topic serializer so that it is
available via the api.

See

https://meta.discourse.org/t/single-topic-api-endpoint-should-contain-image-url/131020

for more details.
 2019-10-21 22:02:49 -06:00
Blake Erickson
ef0fe51e05
FIX: Include user id in notification webhook (#8195) 
The payload when receiving a notification webhook is pointless without
knowing which user the notification is for. This fix adds the user_id to
the notification serializer so that when you receive a notification
webhook you can properly identify which user the notification is for.

See

https://meta.discourse.org/t/getting-the-target-user-for-notification-webhook-events/129052?u=blake

for more details.
 2019-10-21 16:24:41 -06:00
Dan Ungureanu
ceb74bef8f
DEV: Add test. 
Follow-up to 2f54dd5e3d.
 2019-10-21 21:33:58 +03:00
Dan Ungureanu
2f54dd5e3d
FIX: Load user model when some attributes are missing. 
Follow-up to 3ad07aacfa.
 2019-10-21 21:05:25 +03:00
Robin Ward
ab53b485b4 Add setter for excerpt_size so plugins can set it more easily 2019-10-21 13:44:32 -04:00
Michael Brown
40b0b549ff DEV: update the comments re the encoded slug changes 
* followup to 2e73985d
 2019-10-21 13:39:45 -04:00
Rafael dos Santos Silva
2e73985d1b FIX: Make category updates slug validation idempotent 
Co-authored-by: Michael Brown <supermathie@gmail.com>
 2019-10-21 14:33:19 -03:00
Dan Ungureanu
3ad07aacfa
FIX: Reload only notifications when refreshing notification count (#8221) 
Previously, we used to reload the whole User instance which discarded
any changes made (for example setting 'unstage' to false).
 2019-10-21 20:25:46 +03:00
Dan Ungureanu
1358312584
FIX: Zeitwerk-related fixes for jobs. (#8219) 2019-10-21 20:25:35 +03:00
Kris
b41b12ad71
Add unique class to custom field wrappers (#8193) 2019-10-21 12:22:55 -04:00
Kris
56862f61c0
Add group name classes to tag page so groups can be hidden with CSS (#8118) 2019-10-21 12:22:19 -04:00
Roman Rizzi
835d2be4da
FIX: Rate limit and hijack certificate generation. (#8215) 
To eliminate a DDOS attack vector, we're taking the following measures:

The endpoint will be rate-limited to 3 requests every 60 seconds (per user).
A 24 hours max-age cache header is sent with the response.
The route will be hijacked to generate the certificate in the background.
 2019-10-21 13:14:15 -03:00
Nacho Caballero
d5121e5ddb FIX: Add common HTML5 media extensions to onebox audio and video tags (#8216) 2019-10-21 12:10:40 -04:00
Robin Ward
3085b923f6 Removed MOVED_MODULES which is 3 years old 2019-10-21 11:59:13 -04:00