Commit Graph

17159 Commits

Author SHA1 Message Date
Sam
6577f3c1ed Merge pull request #3909 from humzashah/reduced-time-operation
reused value of `Time.now` in a method
2015-12-02 09:01:22 +11:00
Sam
f66feb0ad0 Merge pull request #3847 from andyw8/prepare-for-separate-spec-helpers
Prepare for separate RSpec helper files
2015-12-02 08:59:52 +11:00
Syed Humza Shah
d0955e02d6 reused value of Time.now in a method
`Time.now` was being used to fetch the current time, twice in the
same line. This commit stores the time value in a variable and
reuses it instead of generating/fetching it for the second time.

Additionally, a guard clause in the same method is substituted by
an `if/else/end` block for clarity.
2015-12-01 21:06:37 +00:00
Andy Waite
3e50313fdc Prepare for separation of RSpec helper files
Since rspec-rails 3, the default installation creates two helper files:
* `spec_helper.rb`
* `rails_helper.rb`

`spec_helper.rb` is intended as a way of running specs that do not
require Rails, whereas `rails_helper.rb` loads Rails (as Discourse's
current `spec_helper.rb` does).

For more information:

https://www.relishapp.com/rspec/rspec-rails/docs/upgrade#default-helper-files

In this commit, I've simply replaced all instances of `spec_helper` with
`rails_helper`, and renamed the original `spec_helper.rb`.

This brings the Discourse project closer to the standard usage of RSpec
in a Rails app.

At present, every spec relies on loading Rails, but there are likely
many that don't need to. In a future pull request, I hope to introduce a
separate, minimal `spec_helper.rb` which can be used in tests which
don't rely on Rails.
2015-12-01 20:39:42 +00:00
Robin Ward
c8de38c553 Ignore assertions.js for now. 2015-12-01 15:37:16 -05:00
Robin Ward
2006be41cf Split up pretender a bit. It was getting unwieldly. 2015-12-01 15:31:15 -05:00
Régis Hanol
868079f2a8 remove tnation importer (we only want to keep generic importers) 2015-12-01 15:40:16 +01:00
Régis Hanol
26006f12a2 Increased 'error resistance' in base importer class 2015-12-01 15:38:21 +01:00
Régis Hanol
a8e69c2fd6 Merge pull request #3908 from gdpelican/topic-compat-for-action-summary
Allow compat with ActionSummary for topic model
2015-12-01 15:09:26 +01:00
James Kiesel
71d7a96fd1 Allow compat with ActionSummary for topic model 2015-12-01 22:07:52 +08:00
Régis Hanol
5b9594277a skip most post validations for staged accounts 2015-12-01 10:40:23 +01:00
Sam
46d2e17194 Remove mock that was breaking tests 2015-12-01 17:04:16 +11:00
Sam
d1a5d8ea62 FEATURE: show group mentions and topics in groups page 2015-12-01 16:52:43 +11:00
Sam
0cffbf87c3 update import sample to not have passwords and stuff like that 2015-12-01 12:30:41 +11:00
Sam
1f7c03df5c FIX: missing email notifications for group mentions 2015-12-01 12:12:55 +11:00
Sam
aa2f802247 PERF: DISCOURSE_NO_CONSTANTS removed
we minimize the amount of constants we decalre see: https://meta.discourse.org/t/deprecating-es6-compatibility-layer/35821
2015-12-01 10:58:01 +11:00
Robin Ward
b0b85725ad If a search for a translation is exactly the value, prioritize it 2015-11-30 15:31:30 -05:00
Robin Ward
de88be2fbc Support for "Only show overridden" in site text customization 2015-11-30 15:25:08 -05:00
Arpit Jalan
04593b8fef Update Translations 2015-12-01 01:09:45 +05:30
Régis Hanol
7c694139ec trust staged accounts when validating posts 2015-11-30 19:08:35 +01:00
Régis Hanol
dd28a3c63a add support for inline images in emails in 2015-11-30 18:33:24 +01:00
Régis Hanol
478062ba71 remove README 2015-11-30 11:32:48 +01:00
Régis Hanol
f36ba0b5bf add discourse-details plugin 2015-11-30 11:32:01 +01:00
Régis Hanol
08ae5f89bd FIX: rounding issue might appear when summing up all the decimals 2015-11-30 11:24:25 +01:00
Régis Hanol
96cd36e86d FIX: properly compute the number of voters using only valid options 2015-11-30 11:23:38 +01:00
Arpit Jalan
fc57fa70f9 UX: load onebox CSS at the end for embed stylesheet 2015-11-30 14:17:49 +05:30
Sam
f6390c8ad6 correct bad merge 2015-11-30 17:12:51 +11:00
Sam
ad3dd161e7 FEATURE: first class group mentions built in
If you allow a group to be mentioned it can be mentioned with the @ symbol.

Keep in mind as a safety mechanism max_users_notified_per_group_mention is set to 100
2015-11-30 17:08:43 +11:00
Arpit Jalan
5a7831265a add search example for category name with space 2015-11-29 02:07:24 +05:30
Arpit Jalan
86374c90de FIX: if the email template has multiple subjects, link to customize text page 2015-11-28 11:50:02 +05:30
Robin Ward
222fd00724 FIX: Another missing translation replacement 2015-11-27 17:41:03 -05:00
Robin Ward
c4eee825de FIX: Missing site name key 2015-11-27 17:23:43 -05:00
Robin Ward
7181e3cb75 FIX: Missing new education keys 2015-11-27 17:00:43 -05:00
Neil Lalonde
84342ecdef FIX: anonymized user's preferences should have system assigned avatar chosen 2015-11-27 14:37:30 -05:00
Arpit Jalan
4bc6cfd718 FIX: admin email customization editor should not have bold text 2015-11-28 00:46:14 +05:30
Régis Hanol
16b3d26d7b allow staff members to view staged accounts user card/profile 2015-11-27 20:02:24 +01:00
Robin Ward
8c48c12498 FIX: Inserting link wouldn't clear the text field sometimes 2015-11-27 13:32:11 -05:00
Régis Hanol
540933dce3 don't notify users about sequential replies in messages 2015-11-27 19:29:44 +01:00
Régis Hanol
914b854d92 send invite & message notification emails immediately 2015-11-27 19:09:35 +01:00
Régis Hanol
08cd17b4cf remove deprecation warning in admin/user-index template 2015-11-27 18:58:40 +01:00
Robin Ward
c2241ed368 FIX: "Saved!" wasn't resetting when viewing a different email template 2015-11-27 12:51:50 -05:00
Robin Ward
82ef27bb79 FIX: Category not updating below suggested topics 2015-11-27 12:42:32 -05:00
Robin Ward
5a15c4997c Let's be honest: we skip focus for iOS, not touch in general. 2015-11-27 12:23:51 -05:00
Régis Hanol
76692235ae FIX: don't ever fetch staged accounts in unseen mentions 2015-11-27 18:16:50 +01:00
Robin Ward
5e93140f85 FEATURE: Can override any translation via an admin interface 2015-11-27 11:35:19 -05:00
Arpit Jalan
6354324f2f FIX: validate automatic membership email domains 2015-11-27 12:35:33 +05:30
Sam
f74a6457ee FEATURE: allow CJK to be tokenized in non CJK sites.
Meaning a mixed English/Chinese site can still have a functioning search.
2015-11-27 16:35:27 +11:00
Sam
b0905bee15 update logster 2015-11-27 14:14:19 +11:00
Sam
55b6f1aaa0 more fields needed flagging as HTML fields 2015-11-27 12:22:54 +11:00
Sam
43d63367fd PERF: stop loading handlebars and ember compilers in prod
(this removes a nice 50K from our initial payload and saves memory)

Also fixes invalid HTML automatically if added to HEAD or /BODY
2015-11-27 11:59:01 +11:00