Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vote 12 logging #13

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
5f5bea6
updating css
davidshares Nov 5, 2016
43f484e
Merge pull request #1 from davidshares/davidshares-patch-1
davidshares Nov 5, 2016
4e3a1ef
Updating css with new changes
davidshares Nov 6, 2016
714312f
Merge pull request #2 from davidshares/davidshares-patch-2
davidshares Nov 6, 2016
ec30b1f
Merge pull request #2 from davidshares/davidshares-patch-2
magmahindenburg Nov 7, 2016
82b28a5
Adds analytics tracking code to application template
clarkmoody Nov 10, 2016
4e4fa06
css (#11)
arsenische Nov 10, 2016
c59aa6b
css: wide footer on the bottom; #toggle_button font size
arsenische Nov 10, 2016
30dcf3a
Merge branch 'vote.bitcoin.com' of https://github.com/arsenische/bitc…
arsenische Nov 11, 2016
c0bd92e
merge wide footer on the bottom and #toggle_button font size
arsenische Nov 11, 2016
efe6df4
css -> scss; integrate bitcoin.com images to the app; use nav_bar hel…
arsenische Nov 11, 2016
7703e24
Updating header image url
davidshares Nov 14, 2016
33c4fd0
Updating error template
davidshares Nov 14, 2016
d3b082b
Updating error pages
davidshares Nov 14, 2016
f0e118e
Updating error pages
davidshares Nov 14, 2016
5f116fd
resolved conflicts while merging pr#5
arsenische Nov 14, 2016
ce4c713
Merge branch 'davidshares-master'
arsenische Nov 14, 2016
3780099
Merge branch 'master' into ga
arsenische Nov 14, 2016
573a72b
embed google analytics as partial and make it compatible with turbolinks
arsenische Nov 14, 2016
18c4a8f
Merge branch 'ga'
arsenische Nov 14, 2016
6b23f37
link to bitcoin forum
arsenische Nov 14, 2016
bbe1cbc
move the links 'See all signatures' and 'Discuss this on the forum' u…
arsenische Nov 17, 2016
effb45b
fix controversial sorting
arsenische Nov 17, 2016
a59e30e
admins that can hide/unhide arguments ('hidden' arguments are still p…
arsenische Nov 20, 2016
5e06a3b
/arguments.json
arsenische Nov 20, 2016
f926984
FAQ
arsenische Nov 22, 2016
7d59f80
h2 -> h3
arsenische Nov 22, 2016
7adc8d3
add dummy SECRET_KEY_BASE to fix a problem with assets:precompile
arsenische Dec 5, 2016
1cc73fb
Vote bitcoin com (#7)
arsenische Dec 11, 2016
4ecb0d4
Rename it back from Vote to Bitcoinocracy
arsenische Dec 16, 2016
617d59f
replace Ƀ with a more common BTC
arsenische Dec 16, 2016
2983c12
Fix footer
arsenische Dec 27, 2016
9af0939
auto-hide unpopular old arguments
arsenische Jan 29, 2017
045fee4
removed quotes from .env.sample
arsenische Jan 31, 2017
1192c4d
Added systemd service config
magmahindenburg Feb 8, 2017
898ecbe
Changed port from 80 to 3000
magmahindenburg Feb 8, 2017
02ea39f
Made so postgres is restarted after starting bitcoinocracy so it will…
magmahindenburg Feb 8, 2017
0021424
Use sentry-raven gem to report errors (#10)
arsenische Feb 10, 2017
f63b677
logentries for logging (and a few minor changes)
arsenische Feb 10, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
SECRET_KEY_BASE=4c047431559b10dfd6fc5c27d586fec43f749c9d47b3041adb0daf26e27dc440fc3808d571b923610580426aecd1bcfe4ae704348a7a1c873223643265f65f25
DATABASE_URL=postgres://username:[email protected]:5432/database
RACK_ENV=production
RAILS_ENV=production
RAILS_SERVE_STATIC_FILES=enabled
[email protected]
ADMIN_PASSWORD=your-admin-password
SENTRY_DSN=https://[email protected]/137766
LOGENTRIES_TOKEN=token_from_logentries.com
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp

# Ignore local docker-compose .env settings
/.env
5 changes: 1 addition & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,4 @@ RUN bundle install
ADD . $APP_HOME

# Precompile Rails assets
RUN bundle exec rake assets:precompile

# Start puma
CMD bundle exec puma -C config/puma.rb
RUN SECRET_KEY_BASE=tmp bundle exec rake assets:precompile
18 changes: 14 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ gem 'rails', '4.2.2'
# Use sqlite3 as the database for Active Record
group :development do
gem 'sqlite3'
gem 'pry-rails'
gem 'pry-nav'
gem 'i18n-tasks'
end
gem 'pg'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.3'
gem 'sass-rails'
gem 'bourbon'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .js.coffee assets and views
Expand All @@ -30,9 +34,9 @@ gem 'sdoc', '~> 0.4.0', group: :doc
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring', group: :development

gem "bitcoin-cigs"
gem "slim-rails"
gem "twitter-bootstrap-rails"
gem 'bitcoin-cigs'
gem 'slim-rails'
gem 'twitter-bootstrap-rails'

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
Expand All @@ -54,3 +58,9 @@ gem 'friendly_id', '~> 5.1.0'
gem 'meta-tags'
gem 'kaminari'
gem 'bootstrap-kaminari-views'
gem 'administrate', '~> 0.3.0'
gem 'aasm'
gem 'audited'
gem 'devise'
gem 'sentry-raven'
gem 'le'
219 changes: 156 additions & 63 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
aasm (4.11.1)
actionmailer (4.2.2)
actionpack (= 4.2.2)
actionview (= 4.2.2)
Expand Down Expand Up @@ -36,12 +37,35 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
administrate (0.3.0)
autoprefixer-rails (~> 6.0)
bourbon (~> 4.2)
datetime_picker_rails (~> 0.0.7)
jquery-rails (~> 4.0)
kaminari (~> 0.16)
momentjs-rails (~> 2.8)
neat (~> 1.1)
normalize-rails (~> 3.0)
rails (>= 4.2, < 5.1)
sass-rails (~> 5.0)
selectize-rails (~> 0.6)
arel (6.0.3)
ast (2.3.0)
audited (4.3.0)
activerecord (>= 4.0, < 5.1)
rails-observers (~> 0.1.2)
autoprefixer-rails (6.5.3)
execjs
bcrypt (3.1.11)
bitcoin-cigs (0.0.7)
bootstrap-kaminari-views (0.0.5)
kaminari (>= 0.13)
rails (>= 3.1)
bourbon (4.2.7)
sass (~> 3.4)
thor (~> 0.19)
builder (3.2.2)
coderay (1.1.1)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
Expand All @@ -50,47 +74,94 @@ GEM
execjs
coffee-script-source (1.10.0)
commonjs (0.2.7)
concurrent-ruby (1.0.2)
datetime_picker_rails (0.0.7)
momentjs-rails (>= 2.8.1)
devise (4.2.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.1)
responders
warden (~> 1.2.3)
easy_translate (0.5.0)
json
thread
thread_safe
erubis (2.7.0)
execjs (2.6.0)
execjs (2.7.0)
faraday (0.11.0)
multipart-post (>= 1.2, < 3)
friendly_id (5.1.0)
activerecord (>= 4.0.0)
globalid (0.3.6)
globalid (0.3.7)
activesupport (>= 4.1.0)
hike (1.2.3)
highline (1.7.8)
i18n (0.7.0)
jbuilder (2.3.2)
activesupport (>= 3.0.0, < 5)
i18n-tasks (0.9.6)
activesupport (>= 4.0.2)
ast (>= 2.1.0)
easy_translate (>= 0.5.0)
erubis
highline (>= 1.7.3)
i18n
parser (>= 2.2.3.0)
term-ansicolor (>= 1.3.2)
terminal-table (>= 1.5.1)
jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.0.5)
rails-dom-testing (~> 1.0)
jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
kaminari (0.16.3)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
le (2.7.4)
less (2.6.0)
commonjs (~> 0.2.7)
less-rails (2.7.0)
less-rails (2.8.0)
actionpack (>= 4.0)
less (~> 2.6.0)
sprockets (> 2, < 4)
tilt
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
meta-tags (2.1.0)
actionpack (>= 3.0.0)
mime-types (2.99)
mini_portile2 (2.0.0)
minitest (5.8.3)
multi_json (1.11.2)
nokogiri (1.6.7)
mini_portile2 (~> 2.0.0.rc2)
pg (0.18.4)
puma (2.15.3)
rack (1.6.4)
mail (2.6.4)
mime-types (>= 1.16, < 4)
meta-tags (2.3.1)
actionpack (>= 3.2.0, <= 5.1.0)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.1)
momentjs-rails (2.15.1)
railties (>= 3.1)
multi_json (1.12.1)
multipart-post (2.0.0)
neat (1.8.0)
sass (>= 3.3)
thor (~> 0.19)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
normalize-rails (3.0.3)
orm_adapter (0.5.0)
parser (2.3.1.4)
ast (~> 2.2)
pg (0.19.0)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-nav (0.2.4)
pry (>= 0.9.10, < 0.11.0)
pry-rails (0.3.4)
pry (>= 0.9.10)
puma (3.6.0)
rack (1.6.5)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.2)
Expand All @@ -110,88 +181,110 @@ GEM
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-observers (0.1.2)
activemodel (~> 4.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.4)
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.2)
actionpack (= 4.2.2)
activesupport (= 4.2.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rdoc (4.2.0)
json (~> 1.4)
responders (2.1.0)
railties (>= 4.2.0, < 5)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
sdoc (0.4.1)
rake (11.3.0)
rdoc (4.3.0)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
sass (3.4.22)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
slim (3.0.6)
temple (~> 0.7.3)
selectize-rails (0.12.4)
sentry-raven (2.3.0)
faraday (>= 0.7.6, < 1.0)
slim (3.0.7)
temple (~> 0.7.6)
tilt (>= 1.3.3, < 2.1)
slim-rails (3.0.1)
actionmailer (>= 3.1, < 5.0)
actionpack (>= 3.1, < 5.0)
activesupport (>= 3.1, < 5.0)
railties (>= 3.1, < 5.0)
slim-rails (3.1.1)
actionpack (>= 3.1)
railties (>= 3.1)
slim (~> 3.0)
spring (1.5.0)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.11)
temple (0.7.6)
slop (3.6.0)
spring (2.0.0)
activesupport (>= 4.2)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.12)
temple (0.7.7)
term-ansicolor (1.4.0)
tins (~> 1.0)
terminal-table (1.7.3)
unicode-display_width (~> 1.1.1)
thor (0.19.1)
thread (0.2.2)
thread_safe (0.3.5)
tilt (1.4.1)
turbolinks (2.5.3)
coffee-rails
tilt (2.0.5)
tins (1.12.0)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
twitter-bootstrap-rails (3.2.2)
actionpack (>= 3.1)
execjs (>= 2.2.2, >= 2.2)
less-rails (>= 2.5.0)
railties (>= 3.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
uglifier (3.0.3)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.1.1)
warden (1.2.6)
rack (>= 1.0)

PLATFORMS
ruby

DEPENDENCIES
aasm
administrate (~> 0.3.0)
audited
bitcoin-cigs
bootstrap-kaminari-views
bourbon
coffee-rails (~> 4.0.0)
devise
friendly_id (~> 5.1.0)
i18n-tasks
jbuilder (~> 2.0)
jquery-rails
kaminari
le
meta-tags
pg
pry-nav
pry-rails
puma
rails (= 4.2.2)
rails_12factor
responders (~> 2.0)
sass-rails (~> 4.0.3)
sass-rails
sdoc (~> 0.4.0)
sentry-raven
slim-rails
spring
sqlite3
Expand Down
Loading