Arthur Neves
fe51b4bcc2
Remove Gemfile_master.lock
2015-04-28 23:25:11 -04:00
Arthur Neves
d2b1cc55b9
Disable raise_in_transactional_callbacks for now
2015-04-28 23:20:08 -04:00
Arthur Neves
338fb6efdd
Test on rails 4.2 and master
2015-04-28 23:20:08 -04:00
Arthur Neves
25e28a1bdd
Add rails42 and remove bundler patch
2015-04-28 23:20:07 -04:00
Godfrey Chan
0887f33d77
Bump to sass-rails 4.0.5 for Rails 4.2 support
2015-04-28 23:19:45 -04:00
Godfrey Chan
233f56b6aa
AMS 0.8.3 was released with the patch we want
2015-04-28 23:15:26 -04:00
Godfrey Chan
fd5b0bb26b
Remove support for bundler < 1.5
2015-04-28 23:15:26 -04:00
Sam
5c0b6ef19a
Merge pull request #3408 from zzakcanncode/rails_v
...
Check Rails.version instead of ENV
2015-04-29 13:08:18 +10:00
Arthur Neves
439d0d2e37
Check Rails.version instead of ENV
...
Like that we can have code that works on multiple Rails versions, and we
dont need to mix a new method on Kernel.
Also, this makes easier to have multiple versions.
For instance, before master was 4.2, which is not the case anymore, so
on the code we should check versions and not Environment variables
2015-04-28 22:27:47 -04:00
Neil Lalonde
b2fd69a675
FIX: avatar_template when using relative_url_root
2015-04-28 20:58:46 -04:00
Robin Ward
3252bf1252
FIX: Desktop Notifications break Qunit tests
...
We should figure out why they can't run without the conditional in a
browser.
2015-04-28 19:24:32 -04:00
Robin Ward
e361916138
FIX: :fired: @eviltrout
2015-04-28 16:30:14 -04:00
Robin Ward
15ea0c4789
Merge pull request #3304 from riking/desktop-notifications
...
Desktop notifications!
2015-04-28 16:24:02 -04:00
Robin Ward
647dd76ba1
Extract the needs_approval?
logic
2015-04-28 16:14:36 -04:00
Robin Ward
c2f7676370
Support for custom reasons for things being queued for approval
2015-04-28 15:06:47 -04:00
Robin Ward
cf0c2d09d4
Handlers can be added with a priority
2015-04-28 15:06:47 -04:00
Régis Hanol
5783e908ea
FIX: Erratic behaviour when clicking an attachment link - Take 2
2015-04-28 20:05:41 +02:00
Robin Ward
2cbcd15789
FIX: Post Mannager wasn't being used for email replies
2015-04-28 13:04:34 -04:00
Robin Ward
1e36400021
FIX: Enter to change username was broken
2015-04-28 11:39:10 -04:00
Robin Ward
fe49141509
FIX: Topic creation validation should be skipped properly
2015-04-28 11:08:41 -04:00
Sam
4eaee8f611
Merge pull request #3377 from scossar/auto-rtl
...
Auto rtl
2015-04-28 07:58:35 +10:00
Sam
674cc1edb7
Merge pull request #3400 from zzakcanncode/travis_cleanup
...
Update travis config file
2015-04-28 07:53:45 +10:00
Sam
0f6d9f749c
Merge pull request #3397 from zzakcanncode/bumprails41
...
Bump rails to latest patch 4.1 release. (4.1.10)
2015-04-28 07:52:48 +10:00
Sam
531fd97957
Merge pull request #3398 from zzakcanncode/bump_observers
...
Bump rails-observers to master version.
2015-04-28 07:51:45 +10:00
Sam
6a338afbdd
Merge pull request #3403 from zzakcanncode/rspec_up
...
Rspec 3
2015-04-28 07:50:30 +10:00
Sam
729aaa826b
Merge pull request #3404 from techAPJ/patch-1
...
FEATURE: magic login route for admin when SSO is enabled
2015-04-28 07:47:50 +10:00
Jeff Atwood
443ea5bc97
Merge pull request #3405 from gschlager/patch-1
...
increase required Postgres version to 9.2
2015-04-27 13:23:52 -07:00
Régis Hanol
ad3d2269b2
FIX: erratic behaviour when clicking an attachment link
2015-04-27 22:18:52 +02:00
Robin Ward
8c930c97e0
If there are pending posts in a topic, display a message at the bottom
2015-04-27 15:55:10 -04:00
Robin Ward
ecafbb0a63
Can delete users via the moderation queue
2015-04-27 15:06:20 -04:00
Robin Ward
3cb4554bbb
Can refresh queued posts via button
2015-04-27 13:52:54 -04:00
Neil Lalonde
cce8693354
FIX: canonical link tag when using relative_url_root
2015-04-27 13:34:22 -04:00
Arpit Jalan
2932284293
FEATURE: magic login route for admin when SSO is enabled
2015-04-27 22:54:48 +05:30
Robin Ward
de42c627c5
Allow plugins to specify a minimum requires version
2015-04-27 13:07:12 -04:00
Régis Hanol
6af71bd601
FIX: polls requires a refresh to work when inserted in the stream
2015-04-27 18:59:29 +02:00
Robin Ward
19a89bb501
Small hooks for Queued Post version of discourse-akismet
2015-04-27 11:56:07 -04:00
Gerhard Schlager
19dce439f2
increase required Postgres version to 9.2
2015-04-27 16:49:12 +02:00
Jeff Atwood
44e5179743
increase required Postgres version to 9.2
2015-04-26 23:06:41 -07:00
Arthur Neves
8f0fb511c3
Fix warnings for rspec 3
2015-04-25 21:02:06 -04:00
Régis Hanol
10270593a4
FIX: remove links in poll email notification
2015-04-26 00:37:27 +02:00
Arthur Neves
f84541b1ba
Update rspec to rspec 3.2.0
2015-04-25 18:29:43 -04:00
Régis Hanol
8dc8aaaeb0
fix build
2015-04-26 00:22:29 +02:00
Régis Hanol
151dea4088
FIX: editing a poll/post with a poll wasn't working properly
2015-04-26 00:12:19 +02:00
Arthur Neves
e0ea68b9ca
Fix tests on site_setting for new rspec
2015-04-25 11:33:26 -04:00
Arthur Neves
b8cbe51026
Convert specs to RSpec 2.99.2 syntax with Transpec
...
This conversion is done by Transpec 3.1.0 with the following command:
transpec
* 424 conversions
from: obj.should
to: expect(obj).to
* 325 conversions
from: == expected
to: eq(expected)
* 38 conversions
from: obj.should_not
to: expect(obj).not_to
* 15 conversions
from: =~ /pattern/
to: match(/pattern/)
* 9 conversions
from: it { should ... }
to: it { is_expected.to ... }
* 5 conversions
from: lambda { }.should_not
to: expect { }.not_to
* 4 conversions
from: lambda { }.should
to: expect { }.to
* 2 conversions
from: -> { }.should
to: expect { }.to
* 2 conversions
from: -> { }.should_not
to: expect { }.not_to
* 1 conversion
from: === expected
to: be === expected
* 1 conversion
from: =~ [1, 2]
to: match_array([1, 2])
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2015-04-25 11:18:35 -04:00
Régis Hanol
84c65aeb60
Merge pull request #3401 from duduribeiro/fix_typo_on_vagrant_doc
...
Fix a typo on Discourse Vagrant documentation
2015-04-25 15:48:25 +02:00
Jeff Atwood
04b064cbde
add mention of HTML to reply placeholder
2015-04-25 02:48:08 -07:00
Jeff Atwood
6233770e3a
period at bottom of topic msg was dangling
2015-04-25 01:40:55 -07:00
Jeff Atwood
7c98b16bfd
increase required Postgres version to 9.2
2015-04-25 01:16:18 -07:00
Jeff Atwood
7d5b5533c4
smaller popular post top margins in digest
2015-04-25 00:54:22 -07:00