Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/postalserver/postal
Browse files Browse the repository at this point in the history 
� Conflicts:
�	Gemfile
�	Gemfile.lock
�	db/schema.rb
  • Loading branch information
@tobeyadr
tobeyadr committed Sep 13, 2021
2 parents 3ec4049 + a735219 commit 9bbef40
Show file tree
Hide file tree
Showing 28 changed files with 342 additions and 156 deletions.
57 changes: 26 additions & 31 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,40 @@
source 'https://rubygems.org'
gem 'acme-client'
gem 'rails', '= 5.2.5'
gem 'mysql2'
gem 'puma'
gem 'turbolinks', '~> 5'
gem 'haml'
gem 'nifty-utils'
gem 'nilify_blanks'
gem 'kaminari'
gem 'bcrypt'
gem 'foreman'
gem 'hashie'
gem 'authie', '~> 3.0'
gem 'dynamic_form'
gem 'changey'
gem 'mail', :git => 'https://github.com/mikel/mail.git', :branch => '2-7-stable'
gem 'autoprefixer-rails'
gem 'basic_ssl'
gem 'bcrypt'
gem 'bunny'
gem 'changey'
gem 'secure_headers'
gem 'chronic'
gem 'basic_ssl'
gem 'clockwork'
gem 'dynamic_form'
gem 'encrypto_signo'
gem 'foreman'
gem 'gelf'
gem 'haml'
gem 'hashie'
gem 'highline', :require => false
gem 'jwt'
gem 'kaminari'
gem 'mail', :git => 'https://github.com/mikel/mail.git', :branch => '2-7-stable'
gem 'mongo'
gem 'moonrope'
gem 'mysql2'
gem 'nifty-utils'
gem 'nilify_blanks'
gem 'nio4r'
gem 'puma'
gem 'rails', '= 5.2.4.1'
gem 'secure_headers'
gem 'mongo'
gem 'sentry-raven'
gem 'turbolinks', '~> 5'

# TO run rake task to fetch emails every 5 mins
gem 'whenever'
gem 'gelf'
gem 'moonrope'
gem 'jwt'
gem 'acme-client'
gem 'highline', :require => false

group :development, :assets do
gem 'coffee-rails', '~> 4.2'
gem 'jquery-rails'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.2'
gem 'jquery-rails'
end

group :development, :test do
Expand All @@ -46,10 +43,8 @@ end

group :development do
gem 'annotate'
gem 'capistrano', '~> 3.14', require: false
gem 'capistrano-rails', '~> 1.3', require: false
gem 'database_cleaner'
gem 'factory_bot_rails', '~> 4.0'
gem 'rspec'
gem 'rspec-rails'
gem "factory_bot_rails", "~> 4.0"
gem "database_cleaner"
end
161 changes: 69 additions & 92 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/mikel/mail.git
revision: 904fc3299163771ca47d5cc5c2f540f6f828c2d6
revision: 51c05e0aea01d9a265305a1ac8b853b00ef1299d
branch: 2-7-stable
specs:
mail (2.7.2.edge)
Expand All @@ -11,49 +11,47 @@ GEM
specs:
acme-client (2.0.0)
faraday (~> 0.9, >= 0.9.1)
actioncable (5.2.4.1)
actionpack (= 5.2.4.1)
actioncable (5.2.5)
actionpack (= 5.2.5)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.4.1)
actionpack (= 5.2.4.1)
actionview (= 5.2.4.1)
activejob (= 5.2.4.1)
actionmailer (5.2.5)
actionpack (= 5.2.5)
actionview (= 5.2.5)
activejob (= 5.2.5)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.4.1)
actionview (= 5.2.4.1)
activesupport (= 5.2.4.1)
actionpack (5.2.5)
actionview (= 5.2.5)
activesupport (= 5.2.5)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.4.1)
activesupport (= 5.2.4.1)
actionview (5.2.5)
activesupport (= 5.2.5)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.4.1)
activesupport (= 5.2.4.1)
activejob (5.2.5)
activesupport (= 5.2.5)
globalid (>= 0.3.6)
activemodel (5.2.4.1)
activesupport (= 5.2.4.1)
activerecord (5.2.4.1)
activemodel (= 5.2.4.1)
activesupport (= 5.2.4.1)
activemodel (5.2.5)
activesupport (= 5.2.5)
activerecord (5.2.5)
activemodel (= 5.2.5)
activesupport (= 5.2.5)
arel (>= 9.0)
activestorage (5.2.4.1)
actionpack (= 5.2.4.1)
activerecord (= 5.2.4.1)
marcel (~> 0.3.1)
activesupport (5.2.4.1)
activestorage (5.2.5)
actionpack (= 5.2.5)
activerecord (= 5.2.5)
marcel (~> 1.0.0)
activesupport (5.2.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
airbrussh (1.4.0)
sshkit (>= 1.6.1, != 1.7.0)
amq-protocol (2.3.0)
annotate (2.7.4)
activerecord (>= 3.2, < 6.0)
Expand All @@ -70,16 +68,6 @@ GEM
bunny (2.14.4)
amq-protocol (~> 2.3, >= 2.3.0)
byebug (10.0.2)
capistrano (3.14.1)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
sshkit (>= 1.9.0)
capistrano-bundler (1.6.0)
capistrano (~> 3.1)
capistrano-rails (1.5.0)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
changey (1.0.0)
activerecord (>= 4.2, < 6)
chronic (0.10.2)
Expand All @@ -92,14 +80,14 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.6)
concurrent-ruby (1.1.8)
crass (1.0.6)
database_cleaner (1.7.0)
deep_merge (1.2.1)
diff-lcs (1.3)
dynamic_form (1.1.4)
encrypto_signo (1.0.0)
erubi (1.9.0)
erubi (1.10.0)
execjs (2.7.0)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
Expand All @@ -120,36 +108,34 @@ GEM
tilt
hashie (3.6.0)
highline (2.0.0)
i18n (1.8.2)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
jwt (2.1.0)
kaminari (1.1.1)
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
kaminari-activerecord (= 1.1.1)
kaminari-core (= 1.1.1)
kaminari-actionview (1.1.1)
kaminari-actionview (= 1.2.1)
kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.1)
kaminari-actionview (1.2.1)
actionview
kaminari-core (= 1.1.1)
kaminari-activerecord (1.1.1)
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
loofah (2.4.0)
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
loofah (2.9.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mimemagic (0.3.4)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.0)
marcel (1.0.0)
method_source (1.0.0)
mini_mime (1.0.3)
mini_portile2 (2.5.0)
minitest (5.14.4)
mongo (2.6.2)
bson (>= 4.3.0, < 5.0.0)
moonrope (2.0.1)
Expand All @@ -158,42 +144,41 @@ GEM
rack (>= 1.4)
multipart-post (2.0.0)
mysql2 (0.5.3)
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0)
nifty-utils (1.1.7)
nilify_blanks (1.3.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
nio4r (2.5.2)
nokogiri (1.10.8)
mini_portile2 (~> 2.4.0)
puma (4.3.3)
nio4r (2.5.7)
nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
puma (4.3.5)
nio4r (~> 2.0)
rack (2.2.2)
racc (1.5.2)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.4.1)
actioncable (= 5.2.4.1)
actionmailer (= 5.2.4.1)
actionpack (= 5.2.4.1)
actionview (= 5.2.4.1)
activejob (= 5.2.4.1)
activemodel (= 5.2.4.1)
activerecord (= 5.2.4.1)
activestorage (= 5.2.4.1)
activesupport (= 5.2.4.1)
rails (5.2.5)
actioncable (= 5.2.5)
actionmailer (= 5.2.5)
actionpack (= 5.2.5)
actionview (= 5.2.5)
activejob (= 5.2.5)
activemodel (= 5.2.5)
activerecord (= 5.2.5)
activestorage (= 5.2.5)
activesupport (= 5.2.5)
bundler (>= 1.3.0)
railties (= 5.2.4.1)
railties (= 5.2.5)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.4.1)
actionpack (= 5.2.4.1)
activesupport (= 5.2.4.1)
railties (5.2.5)
actionpack (= 5.2.5)
activesupport (= 5.2.5)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
Expand Down Expand Up @@ -240,29 +225,24 @@ GEM
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sshkit (1.21.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
temple (0.8.2)
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.10)
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.6)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (4.1.18)
execjs (>= 0.3.0, < 3)
websocket-driver (0.7.1)
websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
whenever (1.0.0)
chronic (>= 0.6.3)
websocket-extensions (0.1.5)

PLATFORMS
ruby
Expand All @@ -276,8 +256,6 @@ DEPENDENCIES
bcrypt
bunny
byebug
capistrano (~> 3.14)
capistrano-rails (~> 1.3)
changey
chronic
clockwork
Expand All @@ -302,15 +280,14 @@ DEPENDENCIES
nilify_blanks
nio4r
puma
rails (= 5.2.4.1)
rails (= 5.2.5)
rspec
rspec-rails
sass-rails (~> 5.0)
secure_headers
sentry-raven
turbolinks (~> 5)
uglifier (>= 1.3.0)
whenever

BUNDLED WITH
1.17.3
1.17.2
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

Postal is a complete and fully featured mail server for use by websites & web servers. Think Sendgrid, Mailgun or Postmark but open source and ready for you to run on your own servers. Postal was developed by aTech Media to serve its own mail processing requirements and we have since decided that it should be released as an open source project for the community.

![Screenshot](https://share.adam.ac/17/k4lA5OuPlU.png)
![Screenshot](https://share.adam.ac/17/k4lA5OuPlU2.png)

The application has been running in production for us for nearly 6 months and we will be continuing to use it ourselves and support its ongoing development. If you have any questions about getting up and running, just post an issue.

* [Read all documentation](https://github.com/atech/postal/wiki)
* [Quick install guide](https://github.com/atech/postal/wiki/Quick-Install)
* [Installation docs](https://github.com/atech/postal/wiki/Installation)
* [FAQs](https://github.com/atech/postal/wiki/FAQs), [Features](https://github.com/atech/postal/wiki/Features) & [Screenshots](https://github.com/atech/postal/wiki/Screenshots)
* [FAQs](https://github.com/atech/postal/wiki/FAQs) & [Features](https://github.com/atech/postal/wiki/Features)
* [Google Group](https://groups.google.com/forum/#!forum/postal-talk) - for support, questions or comments.
Loading

0 comments on commit 9bbef40

Please sign in to comment.