Skip to content

Commit

Permalink
fixing merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
maxdemarzi committed Apr 11, 2013
2 parents b651d7b + 414674a commit e89353f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
coverage
.DS_Store
TAGS
*.rbc
Gemfile.lock
.idea
*.iml
Expand Down
6 changes: 5 additions & 1 deletion lib/neography/connection.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
module Neography
module WasCreated
end
class Connection
USER_AGENT = "Neography/#{Neography::VERSION}"

Expand Down Expand Up @@ -104,7 +106,9 @@ def evaluate_response(response)
@parser.json(body) #response.parsed_response
when 201
@logger.debug "OK, created #{body}" if @log_enabled
@parser.json(body) #response.parsed_response
r = @parser.json(body) #response.parsed_response
r.extend(WasCreated)
r
when 204
@logger.debug "OK, no content returned" if @log_enabled
nil
Expand Down

0 comments on commit e89353f

Please sign in to comment.