Skip to content

Commit

Permalink
Merge pull request #892 from mzazrivec/rename_concurrent_migrations
Browse files Browse the repository at this point in the history
Rename Concurrent Migrations to Migration Throttling
  • Loading branch information
mturley authored Mar 6, 2019
2 parents 55ee3b8 + 6cd27b2 commit 3f58aea
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/javascript/react/screens/App/Settings/Settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ const Settings = props => {
</Toolbar>
{props.hideConversionHostSettings ? (
<React.Fragment>
<h2>{__('Concurrent Migrations')}</h2>
<h2>{__('Migration Throttling')}</h2>
<GeneralSettings />
</React.Fragment>
) : (
<div style={{ marginTop: 10 }}>
<Tabs id="settings-tabs" activeKey={match.path} onSelect={key => redirectTo(key)}>
<Tab eventKey="/settings" title={__('Concurrent Migrations')}>
<Tab eventKey="/settings" title={__('Migration Throttling')}>
<GeneralSettings />
</Tab>
<Tab eventKey="/settings/conversion_hosts" title={__('Conversion Hosts')}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ exports[`Settings component renders correctly 1`] = `
>
<Tab
eventKey="/settings"
title="Concurrent Migrations"
title="Migration Throttling"
>
<Connect(ReduxForm) />
</Tab>
Expand Down

0 comments on commit 3f58aea

Please sign in to comment.