Remove duplicate settings menus

app/styles/_settings.scss

@@ -1,9 +1,5 @@
-.settings-menu {
-  @include span-columns(2.5);
-}
-
 .settings {
-  @include span-columns(9.5);
+  @include span-columns(12);
 }
 
 .settings-main {

app/templates/components/organization-settings.hbs

@@ -1,3 +1,2 @@
 {{organization-header organization=organization}}
 {{organization-menu organization=organization membership=membership}}
-{{organization-settings-menu organization=organization}}

app/templates/components/project-menu.hbs

@@ -6,7 +6,10 @@
       {{#link-to 'project.settings.contributors' project}}Contributors {{#if project.hasPendingMembers}}<span class="info"><strong>{{project.pendingMembersCount}}</strong> pending</span>{{/if}}{{/link-to}}
     </li>
     <li>
-      {{link-to 'Donations' 'project.settings.donations' project}}
+      {{link-to 'Donations' 'project.settings.donations.goals' project}}
+    </li>
+    <li>
+      {{link-to 'Payments' 'project.settings.donations.payments' project}}
     </li>
     <li>
       {{link-to 'Settings' 'project.settings.profile' project}}

app/templates/organizations/slugged-route/settings.hbs

@@ -1,2 +1 @@
-{{organization-settings-menu organization=model}}
-{{outlet}}
+{{outlet}}

app/templates/project/settings.hbs

@@ -2,7 +2,6 @@
 
 {{project-details project=model}}
 {{project-menu project=model}}
-{{project-settings-menu project=model}}
 <div class="settings">
   {{outlet}}
 </div>

tests/integration/components/organization-settings-test.js

@@ -7,7 +7,7 @@ moduleForComponent('organization-settings', 'Integration | Component | organizat
 });
 
 test('it renders properly', function(assert) {
-  assert.expect(3);
+  assert.expect(2);
 
   stubService(this, 'store');
   stubService(this, 'session');
@@ -17,5 +17,4 @@ test('it renders properly', function(assert) {
 
   assert.equal(this.$('.organization-header').length, 1, 'The header renders');
   assert.equal(this.$('.organization-menu').length, 1, 'The menu renders');
-  assert.equal(this.$('.organization-settings-menu').length, 1, 'The settings menu renders');
 });

tests/integration/components/project-menu-test.js

@@ -69,19 +69,20 @@ test('when authenticated, and user cannot manage organization, it renders proper
 });
 
 test('when authenticated, and user can manage organization, it renders properly', function(assert) {
-  assert.expect(6);
+  assert.expect(7);
 
   stubService(this, 'session', { isAuthenticated: true });
   this.register('ability:organization', Ability.extend({ canManage: true }));
 
   this.render(hbs`{{project-menu}}`);
 
-  assert.equal(this.$('.project-menu li a').length, 5, 'The correct number of links render');
+  assert.equal(this.$('.project-menu li a').length, 6, 'The correct number of links render');
   assert.equal(this.$('.project-menu li a:contains("About")').length, 1, 'The about link is rendered');
   assert.equal(this.$('.project-menu li a:contains("Tasks")').length, 1, 'The tasks link is rendered');
   assert.equal(this.$('.project-menu li a:contains("Contributors")').length, 1, 'The contributors link is rendered');
   assert.equal(this.$('.project-menu li a:contains("Settings")').length, 1, 'The settings link is rendered');
   assert.equal(this.$('.project-menu li a:contains("Donations")').length, 1, 'The donations link is rendered');
+  assert.equal(this.$('.project-menu li a:contains("Payments")').length, 1, 'The payments link is rendered');
 });
 
 test('when authenticated, and user can manage organization, and project has pending members', function(assert) {