kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

fixed failing specs 

fixed merge requests not loading
This commit is contained in:
Phil Hughes 2018-05-30 09:40:04 +01:00
parent 234076abcf
commit e6e9706e53
No known key found for this signature in database
GPG Key ID: 32245528C52E0F9F
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/ide/ide_router.js
View File

@ -63,7 +63,7 @@ router.beforeEach((to, from, next) => {
.then(() => {
const fullProjectId = `${to.params.namespace}/${to.params.project}`;
const baseSplit = to.params[0].split('/-/');
const baseSplit = (to.params[0] && to.params[0].split('/-/')) || [''];
const branchId = baseSplit[0].slice(-1) === '/' ? baseSplit[0].slice(0, -1) : baseSplit[0];
if (branchId) {

5
spec/javascripts/ide/components/pipelines/list_spec.js
View File

@ -46,10 +46,11 @@ describe('IDE pipelines list', () => {
});
afterEach(() => {
vm.$store.dispatch('pipelines/stopPipelinePolling');
vm.$store.dispatch('pipelines/clearEtagPoll');
vm.$destroy();
mock.restore();
vm.$store.dispatch('stopPipelinePolling');
vm.$store.dispatch('clearEtagPoll');
});
it('renders pipeline data', () => {