Merge pull request #209 from jasnow/master

Changed 2 view files to fix Travis build and upgraded "mime_types" gem.
This commit is contained in:
Ken Johnson
2015-11-23 09:43:52 -05:00
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -175,7 +175,7 @@ GEM
sqlite3 (~> 1.3)
thin (~> 1.5.0)
method_source (0.8.2)
mime-types (2.6.2)
mime-types (2.99)
mini_portile (0.6.2)
minitest (5.8.3)
multi_json (1.11.2)
+1 -1
View File
@@ -50,7 +50,7 @@
</ul>
<ul class="mini-nav">
<li>
<%= button_to "Login", login_path, {:class => "btn", :method => "get"} %>
<%= button_to "login", login_path, {:class => "btn", :method => "get"} %>
</li>
</ul>
<ul class="mini-nav">
+2 -2
View File
@@ -14,7 +14,7 @@
<tr>
<th style="width:16%">Full Name</th>
<th style="width:16%">Income</th>
<th style="width:16%">Bonuse/th>
<th style="width:16%">Bonus/th>
<th style="width:16%">Years w/ MetaCorp</th>
<th style="width:16%">SSN</th>
<th style="width:16%">DoB</th>
@@ -61,4 +61,4 @@ $(document).ready(function () {
makeActive()
});
</script>
</script>