jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,386 Commits 1 Branch 0 Tags
bfca6986327d56c00d7bf78524ac435e051f8e63
Commit Graph

5386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Albert Yi
bfca698632 Merge pull request #2909 from evazion/fix-dmail-ip-addr 
dmails: don't default IP addr to 127.0.0.1 in database (fixes #2908).
 2017-03-03 11:59:29 -08:00
Type-kun
47f0d98a0f Update dtext gem to current revision 2017-03-02 12:35:14 +05:00
evazion
02122343c3 dmails: don't default IP addr to 127.0.0.1 in database (fixes #2908). 
Bug introduced in 1400f64; that commit changed dmails so that
creator_ip_addr defaulted to CurrentUser.ip_addr like this:

    after_initialize :initialize_attributes, if: :new_record?

    def initialize_attributes
      self.from_id ||= CurrentUser.id
      self.creator_ip_addr ||= CurrentUser.ip_addr
    end

...but creator_ip_addr already defaulted to 127.0.0.1 from the database,
so the ||= assignment didn't work. Remove the database default so we
always default to CurrentUser.ip_addr.
 2017-03-01 19:51:48 -06:00
r888888888
5676978096 require membership to see post history 2017-03-01 16:29:00 -08:00
Albert Yi
704d7bd560 Merge pull request #2906 from evazion/feat-modqueue-hilite-bad-tags 
Modqueue: highlight uploads containing "bad" tags.
 2017-03-01 13:36:39 -08:00
evazion
2bb134f08d modqueue: highlight uploads containing "bad" tags. 2017-03-01 15:31:16 -06:00
Albert Yi
6de3e8ae4c Merge pull request #2905 from evazion/fix-scss 
Fix "DEPRECATION WARNING: Extra .css in SCSS file is unnecessary."
 2017-03-01 13:18:12 -08:00
r888888888
e94edc9a75 switch approver and post pruners to use system user 2017-02-28 17:10:36 -08:00
evazion
21e76d55e6 Remove extraneous byte-ordering marks. 2017-02-28 19:01:10 -06:00
evazion
5fffbb4be5 stylesheets: fix @import "*.css.scss" to "*.scss". 2017-02-28 19:01:10 -06:00
evazion
df3925ecb4 stylesheets: rename *.css.scss -> *.scss. 
Fixes "DEPRECATION WARNING: Extra .css in SCSS file is unnecessary."
 2017-02-28 19:01:09 -06:00
r888888888
27f7f4f12e remove postarchive export method 2017-02-28 16:50:51 -08:00
r888888888
12e4a82db3 fix upload tags report 2017-02-28 16:28:58 -08:00
r888888888
7f22baa1bc refactor upload tags report 2017-02-28 15:34:40 -08:00
Albert Yi
458a9692d6 Merge pull request #2864 from r888888888/upload_tags_report 
Implement #2863: basic upload tags change report
 2017-02-28 15:28:40 -08:00
r888888888
33db2b868f include daemons gem 2017-02-28 14:07:47 -08:00
Albert Yi
a425e72e23 Merge pull request #2903 from evazion/fix-update-gems 
Update rails to 4.2.8.
 2017-02-28 13:23:06 -08:00
evazion
c7e276abff Gemfile.lock: update rails to 4.2.8. 2017-02-28 00:11:27 -06:00
evazion
204fbd811c Gemfile.lock: update dalli to 2.7.6. 2017-02-28 00:11:27 -06:00
evazion
ed894af675 Gemfile.lock: update responders to 2.3.0. 2017-02-28 00:11:27 -06:00
evazion
076c409b0d Gemfile.lock: update rmagick to 2.16.0. 2017-02-28 00:11:27 -06:00
evazion
722a672aef Gemfile.lock: update whenever to 0.9.7. 2017-02-28 00:11:27 -06:00
evazion
bfb0c08e8c Gemfile.lock: update mechanize to 2.7.5. 2017-02-28 00:11:27 -06:00
evazion
2a05b81f43 Gemfile.lock: update simple_form to 3.4.0. 2017-02-28 00:11:26 -06:00
evazion
af1c1004f7 Gemfile.lock: update delayed_job to 4.1.2. 2017-02-28 00:11:26 -06:00
evazion
176f5775b4 Gemfile.lock: update sass-rails to 5.0.6. 2017-02-28 00:11:26 -06:00
evazion
9d3a4101c4 Gemfile.lock: update uglifier to 3.0.4. 2017-02-28 00:11:26 -06:00
evazion
742afd1b72 Gemfile.lock: update pg to 0.19.0. 2017-02-28 00:11:26 -06:00
evazion
4ede0c4166 Gemfile.lock: update ffaker to 2.5.0. 2017-02-28 00:11:25 -06:00
evazion
59bb705307 Gemfile.lock: update awesome_print to 1.7.0. 2017-02-28 00:11:25 -06:00
evazion
822d881096 Gemfile.lock: update pry-byebug to 3.4.2. 2017-02-28 00:11:25 -06:00
evazion
bdbf54aef7 Gemfile: remove unused gems. 
coffee-rails and daemons are unused.

kgio, net-ssh, and nokogiri are pulled in by other gems, but they aren't
used by us directly, so they shouldn't need to be listed in the Gemfile.
 2017-02-28 00:11:25 -06:00
evazion
615e4bbebd Gemfile: move test group to bottom. 2017-02-28 00:11:25 -06:00
r888888888
02fc06764d update dtext gem 2017-02-27 17:03:13 -08:00
Albert Yi
d406a9e472 Merge pull request #2899 from evazion/fix-mention-dmails 
Send @mention dmails from DanbooruBot
 2017-02-27 17:01:09 -08:00
Albert Yi
fd7cddc909 Merge branch 'master' into fix-mention-dmails 2017-02-27 17:00:24 -08:00
r888888888
80f439f075 fixes #2898: Wiki Page Versions still not recording "is_deleted" 2017-02-27 16:57:24 -08:00
Albert Yi
3780645cb2 Merge pull request #2897 from evazion/fix-rescue_from 
Remove redundant rescue_from calls.
 2017-02-27 16:48:44 -08:00
Albert Yi
1fa0aabbe0 Merge pull request #2896 from evazion/fix-username-whitespace 
Disallow unicode whitespace in usernames (#2894).
 2017-02-27 16:47:44 -08:00
Albert Yi
27a85cd066 Merge pull request #2895 from evazion/fix-modqueue-dtext 
modqueue: link tags, optimize sql, use dtext in disapproval reasons.
 2017-02-27 16:47:19 -08:00
r888888888
b332273378 fixes #2892: after_destroy callbacks should be fired upon comment deletion 2017-02-27 16:45:51 -08:00
r888888888
a90a1bd895 fix boolean checks in postarchive 2017-02-27 15:41:45 -08:00
r888888888
16cd879e08 potential fix for #2900: Post Versions JSON API failure - undefined method join 2017-02-27 15:22:15 -08:00
r888888888
398f58684f Merge branch 'post-archive' 2017-02-27 10:45:13 -08:00
evazion
46280f2227 mentions: include mentioner in subject line. 
The template looks like this:

Subject:

    #{creator_name} mentioned you in a comment on post ##{post_id}

Body:

    @#{creator_name} mentioned you in a \"comment\":/posts/#{post_id}#comment-#{id} on post ##{post_id}:

    [quote]
    #{DText.excerpt(body, "@"+user_name)}
    [/quote]
 2017-02-25 23:05:44 -06:00
evazion
6994231801 mentions: send dmails from DanbooruBot. 2017-02-25 23:05:44 -06:00
evazion
6e3ddb6ed6 dmails: don't save copies of outgoing dmails sent by DanbooruBot. 
There's not much sense in saving copies of everything DanbooruBot sends
in DanbooruBot's inbox. They probably won't be checked so it just bloats
the dmails table.
 2017-02-25 23:05:44 -06:00
evazion
40092f21ba Remove redundant rescue_from calls. 
These are redundant because ApplicationController rescues these exceptions already.
 2017-02-25 02:18:16 -06:00
evazion
6966b74e18 Disallow unicode whitespace in usernames (#2894). 2017-02-25 01:51:33 -06:00
evazion
b80976bce7 modqueue: link tags, like they are in /comments. 2017-02-24 21:03:14 -06:00