Commit Graph

14207 Commits

Author SHA1 Message Date
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
Carlos Ribeiro 9d20cea668 Fix a typo on Discourse Vagrant documentation 2015-04-24 19:11:51 -03:00
Arthur Neves a9b2483277
Bump rails-observers to master version.
876c522184
Has the patched applied on SamSaffron/rails-observers.
2015-04-24 16:38:48 -04:00
Arthur Neves 94678f977a
Update travis config file
A few things in here:
- Test on ruby 2.2
- Allow failures in all variants of RAILS_MASTER test
- Use db:create task
2015-04-24 16:28:27 -04:00
Godfrey Chan 5386b29b26
AMS 0.8.3 was released with the patch we want 2015-04-24 16:07:23 -04:00
Robin Ward 151b559e4c FIX: If you delete a user, delete their queued posts as well. 2015-04-24 16:04:44 -04:00
Robin Ward 15dbce5886 Show pending posts count in modal when your posts are enqueued 2015-04-24 15:44:59 -04:00
Arthur Neves e6655e7d7e
Bump rails to latest patch 4.1 release. (4.1.10)
We should be using the latest patch release of the current supported
version.
Also this adds a more explicit version of rails on the Gemfile. This is
will help to test on rails 4.2 and master.
2015-04-24 15:36:46 -04:00
Robin Ward 3660fe4f60 FIX: When approving/rejecting a post it should delete the user action 2015-04-24 15:25:47 -04:00
Robin Ward 3a6efa25f0 Allow ReadOnly to propogate up to the Ember app via Response Header 2015-04-24 14:37:16 -04:00
Robin Ward 5b3f99aa50 Don't blow up if Redis switches to READONLY 2015-04-24 14:37:16 -04:00
Régis Hanol 8129cce104 FIX: clicking "show results" wasn't working after casting a vote 2015-04-24 17:24:13 +02:00
Robin Ward eff921d1ec FIX: Turn that frown upside down! 2015-04-24 11:14:06 -04:00
Robin Ward 2562b61448 `normalize_name` is a better name for this. 2015-04-24 10:35:18 -04:00
Régis Hanol a5804d7040 FIX: reduce 'download_remote_images_threshold' default value to 10 2015-04-24 12:07:01 +02:00
Régis Hanol be5a76fbc8 Merge pull request #3394 from scossar/fix-height-on-onebox-image
Fix: size on onebox-avatar
2015-04-24 11:18:26 +02:00
Régis Hanol 80b2935e11 FIX: prevent DOS when fixing avatar in quotes 2015-04-24 11:14:10 +02:00
Jeff Atwood a6ea9bd05c Merge pull request #3395 from riking/patch-1
FIX: Whoops, DiscourseLocalOnebox became DiscourseGlobalOnebox
2015-04-24 01:11:13 -07:00
riking 1412687112 FIX: Whoops, DiscourseLocalOnebox became DiscourseGlobalOnebox 2015-04-24 01:09:38 -07:00
Simon Cossar def9740d5d Fix size on onebox-avatar 2015-04-23 20:42:27 -07:00
riking 21b915f209 Suggested changes 2015-04-23 18:39:48 -07:00
Sam Saffron 923c164d54 workaround: pg app installs a poorly encoded db, so skip CI will catch 2015-04-24 07:23:02 +10:00
Neil Lalonde ae028a5bb1 FIX: support for redirects to external url in permalinks table was broken 2015-04-23 16:45:28 -04:00
Robin Ward e17ea2e787 UX: Show a dash if a version string is missing 2015-04-23 14:50:37 -04:00