github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-04 04:53:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
28,256 Commits 214 Branches 500 Tags 960 MiB
63b2207065
Commit Graph

28256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gerhard Schlager
b970b072f6 FIX: User merge should not fail when primary email address is missing 
The merge process might move all email addresses of the source user to the target user. Destroying the source user failed in that case.
 2018-06-01 16:23:21 +02:00
Arpit Jalan
313ff264f2 use generic example domain 2018-06-01 14:20:41 +05:30
OsamaSayegh
474ff94df3 REFACTOR: convert invites controller specs to requests (#5898) 
REFACTOR: convert invites controller specs to requests
 2018-06-01 13:06:08 +08:00
Guo Xiang Tan
d57a5d3e8c Fix brittle spec. 2018-06-01 11:56:56 +08:00
Guo Xiang Tan
12a0f12530 Fix the build. 2018-06-01 11:24:32 +08:00
Joe
560a950da9
FIX: alignment for instructions on change email and 2FA fields 2018-06-01 09:51:46 +08:00
Guo Xiang Tan
9ef61e0af5 PERF: Prefer exists? instead of loading AR object. 2018-06-01 09:44:14 +08:00
Guo Xiang Tan
50be06af47 Remove stale code. 2018-06-01 08:18:59 +08:00
Blake Erickson
7750b30016 FIX: Allow a user to remove their title 
Somewhere there was a regression and a user couldn't remove their own
title. If they selected '(none)' in the UI it would say it was saved,
but it would not actually be updated in the db.
 2018-05-31 17:16:52 -06:00
Neil Lalonde
1a55948525 Version bump to v2.1.0.beta1 2018-05-31 18:29:10 -04:00
Kris
ba7aff62db safety so pre blocks can't break modal width 2018-05-31 18:19:27 -04:00
Kris
6c15effca2 envelope missing on invite page, long pre lines making modals wide 2018-05-31 18:11:24 -04:00
Neil Lalonde
dee9af2877 Update translations 2018-05-31 17:03:38 -04:00
OsamaSayegh
d4848f2d58 REFACTOR: topics controller specs to requests (#5886) 
* REFACTOR: topics controller specs to requests
 2018-05-31 22:45:32 +08:00
Guo Xiang Tan
7fc8a36529 DEV: Take 2 Queue jobs in tests by default. 
On my machine this cuts the time taken to run our test suite
from ~11mins to ~9mins.
 2018-05-31 16:23:23 +08:00
Guo Xiang Tan
56e9ff6853 Revert "DEV: Queue jobs in tests by default." 
Too risky for now

This reverts commit be28154d3b.
 2018-05-31 15:34:46 +08:00
Guo Xiang Tan
2b783997fa Refactor tests to complete assertions within a single it block. 2018-05-31 15:05:47 +08:00
Sam
5086fdc76d FIX: add protection for scss removal during upgrade 
In some cases plugins would remove scss files or change them, but CSS
was still calculated based off stale data in old instance cache
 2018-05-31 17:02:48 +10:00
Guo Xiang Tan
be28154d3b DEV: Queue jobs in tests by default. 2018-05-31 14:45:47 +08:00
Guo Xiang Tan
95f9b72351 FIX: Update activation email route was returning a generic json error. 2018-05-31 14:19:43 +08:00
Sam
5a8d2b5e45 FIX: rake assets:precompile should be re-runnable 2018-05-31 16:18:01 +10:00
Kris
3e9f1d5cf6 Few small modal fixes 2018-05-30 23:24:43 -04:00
OsamaSayegh
4e21a031df Remove trailing whitespace 2018-05-31 12:31:46 +10:00
OsamaSayegh
23e3a68592 REFACTOR: session controller specs to requests 2018-05-31 12:31:46 +10:00
Dax74
5bd38e3a29
Add Github Linkback plugin 2018-05-31 01:02:35 +02:00
Kris
57cef06192 incoming email modal width too narrow 2018-05-30 15:28:29 -04:00
Joffrey JAFFEUX
e32ccde72d
FIX: uses mixin instead of mobile file for local-dates modal 2018-05-30 19:14:31 +02:00
Joffrey JAFFEUX
0c3a0b59cd
unused code 2018-05-30 19:07:08 +02:00
Joffrey JAFFEUX
c3ec758107
UX: improves local-dates modal form UI 2018-05-30 19:05:41 +02:00
Joffrey JAFFEUX
8128cbd7db
UX: adds subtitle support for modals 2018-05-30 17:14:00 +02:00
Joffrey JAFFEUX
43b1768987
UX: ceil dahsboard values 2018-05-30 16:32:43 +02:00
Régis Hanol
6862194255 extract configuration variables from SMF1 importer 2018-05-30 15:53:57 +02:00
Régis Hanol
f10af7e449 FIX: don't generate an exception when trying to cleanup unexisting tmp letter avatars 2018-05-30 15:33:58 +02:00
Joe
733ffc4bbf
FIX: add classes to input groups and move tips 2018-05-30 21:02:06 +08:00
Joe
ec7f597274
FIX: update poll-builder to new modal design 2018-05-30 21:00:54 +08:00
Arpit Jalan
704cca3de2 FIX: add proper search context for personal messages 2018-05-30 14:47:46 +05:30
Sam Saffron
01da2a21bf xenial is not stable on travis 2018-05-30 18:45:09 +10:00
Guo Xiang Tan
db4af262dc DEV: Create smoke test screenshot directory in rake task. 2018-05-30 16:20:18 +08:00
Guo Xiang Tan
fe5a48997c DEV: Store smoke tests failure image in a dedicated tmp folder. 2018-05-30 15:59:07 +08:00
Guo Xiang Tan
30279a4843 DEV: Allow smoke test failure screenshot path to be configured. 2018-05-30 15:42:46 +08:00
Guo Xiang Tan
f623740ffc DEV: Stablize DiscourseRedis tests. 2018-05-30 14:45:19 +08:00
Joe
47a9b3427b
FIX: input tip causes modal to change width when present 2018-05-30 14:26:06 +08:00
Guo Xiang Tan
77c99b6434 Fix condition in travis. 2018-05-30 14:05:16 +08:00
Sam
f0eeb59f9f update apt 2018-05-30 15:01:12 +10:00
Sam
a9eb6e7884 correct syntax 2018-05-30 14:45:33 +10:00
Sam
9444302067 try xenial for travis 2018-05-30 14:35:16 +10:00
Sam
b94ae29874 DEV: travis: don't output db migrate 2018-05-30 14:34:12 +10:00
Guo Xiang Tan
1fe6fd759f Move db migrate on Travis into install step. 
This will allow us to collapse the migration logs.
 2018-05-30 12:30:26 +08:00
Sam
77dc316e1b try to cache apt 2018-05-30 14:20:48 +10:00
Guo Xiang Tan
21e9315416 FIX: Use user account email instead of auth email when totp is enabled. 
https://meta.discourse.org/t/github-2fa-flow-broken/88674
 2018-05-30 12:15:12 +08:00