diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 4e7a4358e056972e706d03860cf2609eed260b8a..0000000000000000000000000000000000000000 --- a/Gemfile +++ /dev/null @@ -1,25 +0,0 @@ -source 'https://gems.ruby-china.com' -git_source(:github) { |repo| "https://github.com/#{repo}.git" } - -ruby '2.4.1' - -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.2.2' - -gem 'pg', '>= 0.18', '< 2.0' -# Use Puma as the app server -gem 'puma', '~> 3.11' -# Use SCSS for stylesheets -gem 'sass-rails', '~> 5.0' -# Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' -# See https://github.com/rails/execjs#readme for more supported runtimes -# gem 'mini_racer', platforms: :ruby - -gem 'bootsnap', '>= 1.1.0', require: false - -group :development do - # Access an interactive console on exception pages or by calling 'console' anywhere in the code. - gem 'listen', '>= 3.0.5', '< 3.2' - gem 'annotate', github: 'ctran/annotate_models' -end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index fa04232848896183cf2ebc8024614ae1765c812a..5ebae81b9c0c6d24d71ead5d860d6bcdc084f0cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,6 +51,8 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) arel (9.0.0) + awesome_nested_set (3.2.0) + activerecord (>= 4.0.0, < 7.0) bootsnap (1.4.0) msgpack (~> 1.0) builder (3.2.3) @@ -80,10 +82,10 @@ GEM mini_portile2 (2.4.0) minitest (5.11.3) msgpack (1.2.6) + mysql2 (0.5.3) nio4r (2.3.1) nokogiri (1.10.1) mini_portile2 (~> 2.4.0) - pg (1.1.4) puma (3.12.0) rack (2.0.6) rack-test (1.1.0) @@ -151,9 +153,10 @@ PLATFORMS DEPENDENCIES annotate! + awesome_nested_set bootsnap (>= 1.1.0) listen (>= 3.0.5, < 3.2) - pg (>= 0.18, < 2.0) + mysql2 puma (~> 3.11) rails (~> 5.2.2) sass-rails (~> 5.0) diff --git a/app/models/note.rb b/app/models/note.rb new file mode 100644 index 0000000000000000000000000000000000000000..b6b1e5a072db5a2cd028198246ee15e1a2921714 --- /dev/null +++ b/app/models/note.rb @@ -0,0 +1,2 @@ +class Note < ApplicationRecord +end diff --git a/config/database.yml b/config/database.yml index f5ce3e70a88016d04bbc761d7794efba4b915743..8fe05fd96dd95e931df418268cacf217a8a2f592 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,10 +1,29 @@ -default: &default - adapter: postgresql - encoding: unicode +# default: &default +# adapter: postgresql +# encoding: unicode +# pool: 5 +# username: postgres +# password: postgres + +# development: +# <<: *default +# database: gitos_development + +production: + adapter: mysql2 + encoding: utf8 + reconnect: false + database: gitos_development pool: 5 - username: postgres - password: postgres + username: root + password: "root" development: - <<: *default + adapter: mysql2 + encoding: utf8 + reconnect: false database: gitos_development + pool: 5 + username: root + password: "root" + diff --git a/test/fixtures/notes.yml b/test/fixtures/notes.yml new file mode 100644 index 0000000000000000000000000000000000000000..80aed36e30b2598726b55a90c65850a8f9aeb609 --- /dev/null +++ b/test/fixtures/notes.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value