Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
7959d46a
Commit
7959d46a
authored
Feb 08, 2018
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed typo, updated test, and removed commented code
parent
36a301a3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
app/assets/javascripts/diff.js
app/assets/javascripts/diff.js
+0
-1
app/assets/javascripts/gpg_badges.js
app/assets/javascripts/gpg_badges.js
+1
-1
spec/javascripts/gpg_badges_spec.js
spec/javascripts/gpg_badges_spec.js
+2
-2
No files found.
app/assets/javascripts/diff.js
View file @
7959d46a
...
...
@@ -72,7 +72,6 @@ export default class Diff {
const
view
=
file
.
data
(
'
view
'
);
const
params
=
{
since
,
to
,
bottom
,
offset
,
unfold
,
view
};
// $.get(link, params, response => $target.parent().replaceWith(response));
axios
.
get
(
link
,
{
params
})
.
then
(({
data
})
=>
$target
.
parent
().
replaceWith
(
data
))
.
catch
(()
=>
flash
(
__
(
'
An error occurred while loading diff
'
)));
...
...
app/assets/javascripts/gpg_badges.js
View file @
7959d46a
...
...
@@ -16,6 +16,6 @@ export default class GpgBadges {
badges
.
filter
(
`[data-commit-sha="
${
signature
.
commit_sha
}
"]`
).
replaceWith
(
signature
.
html
);
});
})
.
catch
(()
=>
flash
(
__
(
'
An error occurred while loading comm
'
)));
.
catch
(()
=>
flash
(
__
(
'
An error occurred while loading comm
its
'
)));
}
}
spec/javascripts/gpg_badges_spec.js
View file @
7959d46a
...
...
@@ -40,7 +40,7 @@ describe('GpgBadges', () => {
const
spinners
=
document
.
querySelectorAll
(
'
.js-loading-gpg-badge i.fa.fa-spinner.fa-spin
'
);
expect
(
spinners
.
length
).
toBe
(
1
);
done
();
}).
catch
(
err
=>
done
(
err
)
);
}).
catch
(
done
.
fail
);
});
it
(
'
replaces the loading spinner
'
,
(
done
)
=>
{
...
...
@@ -51,6 +51,6 @@ describe('GpgBadges', () => {
const
parentContainer
=
document
.
querySelector
(
'
.parent-container
'
);
expect
(
parentContainer
.
innerHTML
.
trim
()).
toEqual
(
dummyBadgeHtml
);
done
();
}).
catch
(
err
=>
done
(
err
)
);
}).
catch
(
done
.
fail
);
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment