Skip to content

Commit 7107a7e

Browse files
authored
Merge pull request #1 from su-u/dev
Dev
2 parents fea01c2 + c1ab20a commit 7107a7e

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

hello_app/Gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ group :development, :test do
3939
# Adds support for Capybara system testing and selenium driver
4040
gem 'capybara', '~> 2.13'
4141
gem 'selenium-webdriver'
42+
gem 'sqlite3'
4243
end
4344

4445
group :development do
@@ -50,5 +51,9 @@ group :development do
5051
gem 'spring-watcher-listen', '~> 2.0.0'
5152
end
5253

54+
group :production do
55+
gem 'pg', '0.20.0'
56+
end
57+
5358
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
5459
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

hello_app/Gemfile.lock

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ GEM
8686
nio4r (2.5.2)
8787
nokogiri (1.10.7)
8888
mini_portile2 (~> 2.4.0)
89+
pg (0.20.0)
8990
public_suffix (4.0.1)
9091
puma (3.12.2)
9192
rack (2.0.7)
@@ -176,6 +177,7 @@ DEPENDENCIES
176177
coffee-rails (~> 4.2)
177178
jbuilder (~> 2.5)
178179
listen (>= 3.0.5, < 3.2)
180+
pg (= 0.20.0)
179181
puma (~> 3.7)
180182
rails (~> 5.1.6)
181183
sass-rails (~> 5.0)
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
class ApplicationController < ActionController::Base
22
protect_from_forgery with: :exception
3+
4+
def hello
5+
render html: 'holamunda!'
6+
end
37
end

hello_app/config/routes.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
Rails.application.routes.draw do
22
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
3+
root 'application#hello'
34
end

0 commit comments

Comments
 (0)