Skip to content

Commit eba2759

Browse files
author
Cameron Dawson
committed
Fixes to push health
1 parent 0e3d7ed commit eba2759

30 files changed

+271
-320
lines changed

‎docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ services:
6767
volumes:
6868
- .:/app
6969
ports:
70-
- '5000:5000'
70+
- '5001:5000'
7171
platform: linux/amd64
7272

7373
postgres:

‎treeherder/config/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
261261

262262
CSRF_TRUSTED_ORIGINS = env.list(
263-
"CSRF_TRUSTED_ORIGINS", default=["http://localhost:8000", "http://localhost:5000"]
263+
"CSRF_TRUSTED_ORIGINS", default=["http://localhost:8000", "http://localhost:5001"]
264264
)
265265

266266
if SITE_URL.startswith("https://"):

‎ui/intermittent-failures/Navigation.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default class Navigation extends React.Component {
2727
menuText="Intermittent Failures View"
2828
colorClass="lightorange"
2929
/>
30-
<Collapse isOpen={this.state.isOpen} navbar>
30+
<Navbar.Collapse in={this.state.isOpen}>
3131
<Nav navbar />
3232
<Dropdown>
3333
<Dropdown.Toggle className="btn-navbar navbar-link" nav caret>
@@ -39,7 +39,7 @@ export default class Navigation extends React.Component {
3939
selectedItem={tree}
4040
/>
4141
</Dropdown>
42-
</Collapse>
42+
</Navbar.Collapse>
4343
<Navbar className="ml-auto">
4444
<HelpMenu />
4545
<Login user={user} setUser={setUser} notify={notify} />

‎ui/job-view/CustomJobActions.jsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,7 @@ class CustomJobActions extends React.PureComponent {
206206
className="mb-1"
207207
id="action-select-input"
208208
>
209-
<Dropdown.Toggle caret outline>
210-
{selectedAction.name}
211-
</Dropdown.Toggle>
209+
<Dropdown.Toggle caret>{selectedAction.name}</Dropdown.Toggle>
212210
<DropdownMenuItems
213211
selectedItem={selectedAction.name}
214212
updateData={this.onChangeAction}

‎ui/job-view/details/tabs/SideBySideVideo.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default class SideBySideVideo extends React.Component {
4848
title={value || videos[0].value}
4949
aria-label={value || videos[0].value}
5050
>
51-
<Dropdown.Toggle size="sm" caret outline>
51+
<Dropdown.Toggle size="sm" caret>
5252
{value || videos[0].value}
5353
</Dropdown.Toggle>
5454
<DropdownMenuItems

‎ui/logviewer/App.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ class App extends React.PureComponent {
372372
copySelectedLogToBugFiler={this.copySelectedLogToBugFiler}
373373
/>
374374
<div className="d-flex flex-column flex-fill">
375-
<Collapse isOpen={!collapseDetails}>
375+
<Collapse in={!collapseDetails}>
376376
<div className="run-data d-flex flex-row mx-1 mb-2">
377377
<div className="d-flex flex-column job-data-panel">
378378
{job && (

‎ui/perfherder/compare/SelectorCard.jsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,7 @@ export default class SelectorCard extends React.Component {
187187
isOpen={buttonDropdownOpen}
188188
toggle={() => this.toggle('buttonDropdownOpen')}
189189
>
190-
<Dropdown.Toggle caret outline>
191-
{selectedRepo}
192-
</Dropdown.Toggle>
190+
<Dropdown.Toggle caret>{selectedRepo}</Dropdown.Toggle>
193191
{projects.length > 0 && (
194192
<Dropdown.Menu className="overflow-auto dropdown-menu-height">
195193
{projects.map((item) => (
@@ -239,7 +237,7 @@ export default class SelectorCard extends React.Component {
239237
isOpen={inputDropdownOpen}
240238
toggle={() => this.toggle('inputDropdownOpen')}
241239
>
242-
<Dropdown.Toggle caret outline disabled={disabled}>
240+
<Dropdown.Toggle caret disabled={disabled}>
243241
Recent
244242
</Dropdown.Toggle>
245243
{!!data.results && data.results.length > 0 && (

‎ui/perfherder/graphs/GraphTooltip.jsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ const GraphTooltip = ({
171171
data-testid="graphTooltip"
172172
>
173173
<Button
174-
outline
175-
variant="secondary"
174+
variant="outline-secondary"
176175
className="close mr-3 my-2 ml-2"
177176
onClick={closeTooltip}
178177
>
@@ -246,7 +245,6 @@ const GraphTooltip = ({
246245
<Clipboard
247246
text={dataPointDetails.revision}
248247
description="Revision"
249-
outline
250248
/>
251249
</span>
252250
{dataPointDetails.alertSummary && (
@@ -281,7 +279,6 @@ const GraphTooltip = ({
281279
<Clipboard
282280
text={dataPointDetails.alertSummary.id.toString()}
283281
description="Alert Summary id"
284-
outline
285282
/>
286283
</p>
287284
)}
@@ -302,7 +299,6 @@ const GraphTooltip = ({
302299
<Clipboard
303300
text={datum.commonAlert.id.toString()}
304301
description="Alert Summary id"
305-
outline
306302
/>
307303
<p className="small text-danger">Common alert</p>
308304
</p>
@@ -311,8 +307,7 @@ const GraphTooltip = ({
311307
<p className="pt-2">
312308
{user.isStaff ? (
313309
<Button
314-
variant="darker-info"
315-
outline
310+
variant="outline-darker-info"
316311
size="sm"
317312
onClick={createAlert}
318313
>

‎ui/perfherder/graphs/GraphsViewControls.jsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,7 @@ export default class GraphsViewControls extends React.Component {
168168
{!showTable && (
169169
<Col sm="auto" className="pl-0">
170170
<Button
171-
variant="darker-info"
172-
outline
171+
variant="outline-darker-info"
173172
onClick={() =>
174173
updateStateParams({
175174
highlightAlerts: !highlightAlerts,
@@ -181,8 +180,7 @@ export default class GraphsViewControls extends React.Component {
181180
</Button>
182181
<Button
183182
className="ml-3"
184-
variant="darker-info"
185-
outline
183+
variant="outline-darker-info"
186184
onClick={() =>
187185
updateStateParams({
188186
highlightChangelogData: !highlightChangelogData,
@@ -194,8 +192,7 @@ export default class GraphsViewControls extends React.Component {
194192
</Button>
195193
<Button
196194
className="ml-3"
197-
variant="darker-info"
198-
outline
195+
variant="outline-darker-info"
199196
onClick={() =>
200197
updateStateParams({
201198
highlightCommonAlerts: !highlightCommonAlerts,
@@ -207,8 +204,7 @@ export default class GraphsViewControls extends React.Component {
207204
</Button>
208205
<Button
209206
className="ml-3"
210-
variant="darker-info"
211-
outline
207+
variant="outline-darker-info"
212208
onClick={() =>
213209
updateStateParams({
214210
replicates: !replicates,

‎ui/perfherder/graphs/LegendCard.jsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ const LegendCard = ({
152152
</Button>
153153
<div className={`${series.color[0]} graph-legend-card p-3`}>
154154
<Button
155-
variant="link"
156-
outline
155+
variant="outline-link"
157156
className={`p-0 mb-0 pointer border-0 ${
158157
series.visible ? series.color[0] : 'text-muted'
159158
} text-left`}
@@ -179,17 +178,15 @@ const LegendCard = ({
179178
)}
180179
</div>
181180
<Button
182-
variant="link"
183-
outline
181+
variant="outline-link"
184182
className={`w-100 ${subtitleStyle}`}
185183
onClick={() => addTestData('addRelatedBranches')}
186184
title="Add related branches"
187185
>
188186
{series.repository_name}
189187
</Button>
190188
<Button
191-
variant="link"
192-
outline
189+
variant="outline-link"
193190
className={`w-100 ${subtitleStyle}`}
194191
onClick={() => addTestData('addRelatedPlatform')}
195192
title="Add related platforms and branches"
@@ -198,8 +195,7 @@ const LegendCard = ({
198195
</Button>
199196
{series.application && (
200197
<Button
201-
variant="link"
202-
outline
198+
variant="outline-link"
203199
className={`w-100 ${subtitleStyle}`}
204200
title="Add related applications"
205201
onClick={() => addTestData('addRelatedApplications')}

0 commit comments

Comments
 (0)