Skip to content
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.

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

446 new ontohub oms generalization #1104

Merged
merged 14 commits into from
Nov 22, 2014

Conversation

hardik101
Copy link
Contributor

This is clean pull request without any mixed commit w.r.t indefinite article.

@@ -75,7 +75,7 @@ def show

def destroy
if resource.is_imported?
flash[:error] = "Can't delete an ontology that is imported by another one."
flash[:error] = "Can't delete an #{Settings.OMS} that is imported by another one."

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Metrics/LineLength: Line is too long. [88/80]

@tillmo
Copy link
Member

tillmo commented Nov 3, 2014

please address the issues found by hound

@tillmo
Copy link
Member

tillmo commented Nov 3, 2014

we need to get this long story to an end. Please solve all remaining points until Wednesday. The travis issue is caused by a wrong fixture and will be fixed by someone else quickly.

@hardik101 hardik101 force-pushed the 446-new_ontohub_oms_generalization branch from 7faba4e to 03cf757 Compare November 4, 2014 22:45
@@ -24,7 +24,7 @@ def show
end
end
rescue Errno::ENOENT, NoMethodError => e
redirect_to collection_path, flash: { error: "The file was not found: #{e.message}" }
redirect_to collection_path, flash: {error: "The file was not found: #{e.message}"}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Metrics/LineLength: Line is too long. [87/80]

- else
= link_to "show only Logics with Ontologies", logics_path
= link_to "show only logics with "+Settings.OMS.pluralize, logics_path
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please prefer String interpolation.

@hardik101 hardik101 force-pushed the 446-new_ontohub_oms_generalization branch from f7b0a64 to 16183b5 Compare November 19, 2014 12:34
@@ -24,7 +24,10 @@ def show
end
end
rescue Errno::ENOENT, NoMethodError => e
redirect_to collection_path, flash: { error: "The file was not found: #{e.message}" }
redirect_to collection_path
,flash: {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unexpected token tCOMMA

@hardik101 hardik101 force-pushed the 446-new_ontohub_oms_generalization branch from 16183b5 to 0a4c9ec Compare November 19, 2014 12:45
redirect_to collection_path, flash: { error: "The file was not found: #{e.message}" }
redirect_to collection_path,
flash: {
error: "The file was not found: #{e.message}"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style/TrailingComma: Put a comma after the last item of a multiline hash.

@SGraef
Copy link
Member

SGraef commented Nov 22, 2014

👍

hardik101 added a commit that referenced this pull request Nov 22, 2014
@hardik101 hardik101 merged commit aeb32ce into staging Nov 22, 2014
@hardik101 hardik101 deleted the 446-new_ontohub_oms_generalization branch December 2, 2014 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants