diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 0000000..a2fce5a --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1,2 @@ +repo_token: A7Lqg8jeO7rhmK7XVR8Suagc5LzpuM2pZ + diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..9b759a8 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +language: ruby +rvm: + - 2.0.0 +before_install: + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" +before_script: + - psql -c 'create database starterapp_test;' -U postgres diff --git a/CHANGELOG.md b/CHANGELOG.md index f98aee6..46972d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ Changelog ========= +0.1.3 +----- +* Added LICENSE file +* Added Travis CI +* Added Coveralls +* Added badges +* Removed unneeded gem + 0.1.2 ----- * Trying to solve assets issue on heroku diff --git a/Gemfile b/Gemfile index 4412f5f..0aec8c5 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,6 @@ gem 'pg' # Performance and Exception management gem 'airbrake' gem 'newrelic_rpm' -gem 'newrelic_moped' # Security gem 'secure_headers' diff --git a/Gemfile.lock b/Gemfile.lock index 1971e18..9d13e1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -137,11 +137,7 @@ GEM mime-types (1.22) minitest (4.7.2) mono_logger (1.0.1) - moped (1.4.5) multi_json (1.7.2) - newrelic_moped (0.0.6) - moped - newrelic_rpm (~> 3.6.0) newrelic_rpm (3.6.0.83) nokogiri (1.5.9) pg (0.15.1) @@ -305,7 +301,6 @@ DEPENDENCIES launchy less-rails meta_request - newrelic_moped newrelic_rpm nokogiri pg diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a6ebdc6 --- /dev/null +++ b/LICENSE @@ -0,0 +1,65 @@ +Copyright (c) 2013, diowa +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +airbrake is licensed by Airbrake + +FontAwesome is licensed under the MIT License + +FontAwesome font is licensed under the SIL Open Font License + +FontAwesome pictograms are licensed under the CC BY 3.0 License + +haml is licensed under the MIT License + +google-analytics-rails is licensed under the MIT license + +http_accept_language is licensed under the MIT License + +i18n-js is licensed under the MIT License + +jquery-rails is licensed under the MIT License + +jquery is licensed under the MIT License + +kaminari is licensed under the MIT License + +newrelic_rpm is licensed by New Relic + +nokogiri is licensed under the MIT License + +pg is licensed under the 2-clause BSD License + +resque is licensed under the MIT License + +rabl is licensed under the MIT License + +rest-client is licensed under the MIT License + +simpleconfig is licensed under the MIT License + +Twitter Bootstrap is licensed under the Apache License, Version 2.0 + +unicorn is licensed under the GPLv2 License + +validates_timeliness is licensed under the MIT License diff --git a/README.md b/README.md index 707bcdf..674b0ed 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Starter App +Starter App [![Build Status](https://travis-ci.org/diowa/ruby2-rails4-bootstrap-heroku.png?branch=master)](https://travis-ci.org/diowa/ruby2-rails4-bootstrap-heroku) [![Dependency Status](https://gemnasium.com/diowa/ruby2-rails4-bootstrap-heroku.png)](https://gemnasium.com/diowa/ruby2-rails4-bootstrap-heroku) [![Code Climate](https://codeclimate.com/github/diowa/ruby2-rails4-bootstrap-heroku.png)](https://codeclimate.com/github/diowa/ruby2-rails4-bootstrap-heroku) [![Coverage Status](https://coveralls.io/repos/diowa/ruby2-rails4-bootstrap-heroku/badge.png?branch=master)](https://coveralls.io/r/diowa/ruby2-rails4-bootstrap-heroku) =========== * Ruby 2 diff --git a/VERSION b/VERSION index d917d3e..b1e80bb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.2 +0.1.3 diff --git a/app/views/pages/home.html.haml b/app/views/pages/home.html.haml index eb1d247..e142ef4 100644 --- a/app/views/pages/home.html.haml +++ b/app/views/pages/home.html.haml @@ -1 +1,2 @@ +- title t('hello') %h1= t('hello') diff --git a/config/database.yml b/config/database.yml index 1596b42..d058fd0 100644 --- a/config/database.yml +++ b/config/database.yml @@ -19,7 +19,7 @@ development: encoding: unicode database: starterapp_development pool: 5 - username: starterapp + username: postgres password: # Connect on a TCP socket. Omitted by default since the client uses a @@ -48,7 +48,7 @@ test: encoding: unicode database: starterapp_test pool: 5 - username: starterapp + username: postgres password: production: @@ -56,5 +56,5 @@ production: encoding: unicode database: starterapp_production pool: 5 - username: starterapp + username: postgres password: