Merge pull request #1 from arbins/addindex

arbins · web-flow · commit 6c0e12fe4656 · 2017-03-22T20:37:00.000+11:00
addindexpage
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 .byebug_history
 .DS_Store
 public/uploads
-tmp/
+tmp/
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -14,4 +14,4 @@
  *= require_self
  */
 @import "bootstrap-sprockets";
-@import "bootstrap";
+@import "bootstrap";
diff --git a/app/views/articles/index.html.haml b/app/views/articles/index.html.haml
@@ -1,5 +1,4 @@
 %h1 Listing articles
-
 %table.table.table-striped
   %tr
     %th Title
diff --git a/app/views/articles/show.html.haml b/app/views/articles/show.html.haml
@@ -12,4 +12,4 @@
 
 = link_to 'Edit', edit_article_path(@article)
 |
-\#{link_to 'Back', articles_path}
+\#{link_to 'Back', articles_path}
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -46,4 +46,3 @@
           .glyphicon.glyphicon-copyright-mark 
           #{app_name} #{Date.today.year}
   = javascript_include_tag 'application'
-

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@`
`12`	`12`
`13`	`13`	`= link_to 'Edit', edit_article_path(@article)`
`14`	`14`	`\|`
`15`		`-\#{link_to 'Back', articles_path}`
	`15`	`+\#{link_to 'Back', articles_path}`