Skip to content

Merge upstream #40

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.

Sign up for GitHub

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

Open
HOSAKA-HIROKI wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Merge upstream #40

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1e384a8
Add comment!
HOSAKA-HIROKI May 20, 2017
b15af32
Merge pull request #1 from HOSAKA-HIROKI/test
HOSAKA-HIROKI May 20, 2017
cc45771
Update comment_spec.rb
HOSAKA-HIROKI May 20, 2017
02c9368
Update comment_spec.rb
HOSAKA-HIROKI May 30, 2017
686b9dc
Merge pull request #2 from axsh/master
HOSAKA-HIROKI Jun 3, 2017
b7bb829
Update webapi_integration_spec.rb
HOSAKA-HIROKI Jun 3, 2017
a365eaf
Update webapi_integration_spec.rb
HOSAKA-HIROKI Jun 3, 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
3 changes: 2 additions & 1 deletion webapi/config-webapi.ru
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
# HELLO!!

$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)

Expand Down Expand Up @@ -32,4 +33,4 @@ map '/api' do
map '/0.0.1' do
run Webapi::Endpoints::V001::Webapi.new
end
end
end