Skip to content

Commit

Permalink
DEV: Drop our mail gem fork (discourse#20805)
Browse files Browse the repository at this point in the history
Didn't happen in discourse#16622 but now that the official release is fixed - let's do this :P
  • Loading branch information
CvX authored and enduvar committed Sep 8, 2023
1 parent 57ae0ca commit fa3af7c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ gem "actionview_precompiler", require: false

gem "discourse-seed-fu"

gem "mail", git: "https://github.com/discourse/mail.git"
gem "mail"
gem "mini_mime"
gem "mini_suffix"

Expand Down
14 changes: 6 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
GIT
remote: https://github.com/discourse/mail.git
revision: 5b700fc95ee66378e0cf2559abc73c8bc3062a4b
specs:
mail (2.8.0.edge)
mini_mime (>= 0.1.1)

GIT
remote: https://github.com/rails/sprockets
revision: f4d3dae71ef29c44b75a49cfbf8032cce07b423a
Expand Down Expand Up @@ -225,6 +218,11 @@ GEM
nokogiri (>= 1.5.9)
lru_redux (1.1.0)
lz4-ruby (0.3.3)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
matrix (0.4.2)
maxminddb (0.1.22)
memory_profiler (1.0.1)
Expand Down Expand Up @@ -592,7 +590,7 @@ DEPENDENCIES
loofah
lru_redux
lz4-ruby
mail!
mail
maxminddb
memory_profiler
message_bus
Expand Down

0 comments on commit fa3af7c

Please sign in to comment.