Commit a0656d87 authored by Rémy Coutable's avatar Rémy Coutable

Merge remote-tracking branch 'ce/master' into rc/ce-to-ee-monday

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parents e8138840 7c57e099
......@@ -5,7 +5,10 @@ entry.
## 8.16.6 (2017-02-17)
- API: Fix file downloading. !0 (8267)
<<<<<<< HEAD
- Read true-up info from license and validate it. !1159
=======
>>>>>>> ce/master
- Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms. !8752
- Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory. !8891
- Fix wrong call to ProjectCacheWorker.perform. !8910
......
......@@ -61,4 +61,4 @@
return Admin;
})();
}).call(this);
}).call(window);
......@@ -165,4 +165,4 @@
};
window.Api = Api;
}).call(this);
}).call(window);
......@@ -248,4 +248,4 @@ require('es6-promise').polyfill();
gl.utils.initTimeagoTimeout();
});
}).call(this);
}).call(window);
......@@ -22,4 +22,4 @@
return Aside;
})();
}).call(this);
}).call(window);
......@@ -59,4 +59,4 @@
return Autosave;
})();
}).call(this);
}).call(window);
......@@ -377,4 +377,4 @@ var emojiAliases = require('emoji-aliases');
return AwardsHandler;
})();
}).call(this);
}).call(window);
......@@ -25,4 +25,4 @@ var autosize = require('vendor/autosize');
autosize.update($fields);
return $fields.css('resize', 'vertical');
});
}).call(this);
}).call(window);
......@@ -23,4 +23,4 @@
return e.preventDefault();
});
});
}).call(this);
}).call(window);
......@@ -74,4 +74,4 @@ require('../extensions/jquery');
return $this.tooltip('hide');
});
});
}).call(this);
}).call(window);
......@@ -59,4 +59,4 @@ require('../extensions/jquery');
return hideOrShowHelpBlock($form);
});
});
}).call(this);
}).call(window);
......@@ -63,4 +63,4 @@
return BlobFileDropzone;
})();
}).call(this);
}).call(window);
......@@ -20,4 +20,4 @@ require('./template_selector');
return BlobGitignoreSelector;
})(gl.TemplateSelector);
}).call(this);
}).call(window);
......@@ -23,4 +23,4 @@
return BlobGitignoreSelectors;
})();
}).call(this);
}).call(window);
......@@ -25,4 +25,4 @@ require('./template_selector');
return BlobLicenseSelector;
})(gl.TemplateSelector);
}).call(this);
}).call(window);
......@@ -12,4 +12,4 @@ require('./edit_blob');
var blob = new EditBlob(url, $('.js-edit-blob-form').data('blob-language'));
new NewCommitForm($('.js-edit-blob-form'));
});
}).call(this);
}).call(window);
......@@ -85,4 +85,4 @@
return EditBlob;
})();
}).call(this);
}).call(window);
......@@ -69,4 +69,4 @@
})(this));
window.Breakpoints = Breakpoints;
}).call(this);
}).call(window);
......@@ -31,4 +31,4 @@
}
});
});
}).call(this);
}).call(window);
......@@ -275,4 +275,4 @@
return Build;
})();
}).call(this);
}).call(window);
......@@ -23,4 +23,4 @@
return BuildArtifacts;
})();
}).call(this);
}).call(window);
......@@ -11,4 +11,4 @@
return Commit;
})();
}).call(this);
}).call(window);
......@@ -11,4 +11,4 @@
return CommitFile;
})();
}).call(this);
}).call(window);
......@@ -173,4 +173,4 @@
return ImageFile;
})();
}).call(this);
}).call(window);
......@@ -65,4 +65,4 @@
return CommitsList;
})();
}).call(this);
}).call(window);
......@@ -88,4 +88,4 @@
return Compare;
})();
}).call(this);
}).call(window);
......@@ -66,4 +66,4 @@
return CompareAutocomplete;
})();
}).call(this);
}).call(window);
......@@ -32,4 +32,4 @@
return ConfirmDangerModal;
})();
}).call(this);
}).call(window);
......@@ -46,4 +46,4 @@ window.Clipboard = require('vendor/clipboard');
clipboard.on('success', genericSuccess);
return clipboard.on('error', genericError);
});
}).call(this);
}).call(window);
......@@ -97,7 +97,7 @@ $(() => {
}
this.isLoadingStage = true;
cycleAnalyticsStore.setStageEvents([]);
cycleAnalyticsStore.setStageEvents([], stage);
cycleAnalyticsStore.setActiveStage(stage);
cycleAnalyticsService
......@@ -107,7 +107,7 @@ $(() => {
})
.done((response) => {
this.isEmptyStage = !response.events.length;
cycleAnalyticsStore.setStageEvents(response.events);
cycleAnalyticsStore.setStageEvents(response.events, stage);
})
.error(() => {
this.isEmptyStage = true;
......
/* eslint-disable no-param-reassign */
require('../lib/utils/text_utility');
const DEFAULT_EVENT_OBJECTS = require('./default_event_objects');
((global) => {
global.cycleAnalytics = global.cycleAnalytics || {};
......@@ -34,11 +38,12 @@
});
newData.stages.forEach((item) => {
const stageName = item.title.toLowerCase();
const stageSlug = gl.text.dasherize(item.title.toLowerCase());
item.active = false;
item.isUserAllowed = data.permissions[stageName];
item.emptyStageText = EMPTY_STAGE_TEXTS[stageName];
item.component = `stage-${stageName}-component`;
item.isUserAllowed = data.permissions[stageSlug];
item.emptyStageText = EMPTY_STAGE_TEXTS[stageSlug];
item.component = `stage-${stageSlug}-component`;
item.slug = stageSlug;
});
newData.analytics = data;
return newData;
......@@ -58,31 +63,33 @@
this.deactivateAllStages();
stage.active = true;
},
setStageEvents(events) {
this.state.events = this.decorateEvents(events);
setStageEvents(events, stage) {
this.state.events = this.decorateEvents(events, stage);
},
decorateEvents(events) {
decorateEvents(events, stage) {
const newEvents = [];
events.forEach((item) => {
if (!item) return;
item.totalTime = item.total_time;
item.author.webUrl = item.author.web_url;
item.author.avatarUrl = item.author.avatar_url;
const eventItem = Object.assign({}, DEFAULT_EVENT_OBJECTS[stage.slug], item);
eventItem.totalTime = eventItem.total_time;
eventItem.author.webUrl = eventItem.author.web_url;
eventItem.author.avatarUrl = eventItem.author.avatar_url;
if (item.created_at) item.createdAt = item.created_at;
if (item.short_sha) item.shortSha = item.short_sha;
if (item.commit_url) item.commitUrl = item.commit_url;
if (eventItem.created_at) eventItem.createdAt = eventItem.created_at;
if (eventItem.short_sha) eventItem.shortSha = eventItem.short_sha;
if (eventItem.commit_url) eventItem.commitUrl = eventItem.commit_url;
delete item.author.web_url;
delete item.author.avatar_url;
delete item.total_time;
delete item.created_at;
delete item.short_sha;
delete item.commit_url;
delete eventItem.author.web_url;
delete eventItem.author.avatar_url;
delete eventItem.total_time;
delete eventItem.created_at;
delete eventItem.short_sha;
delete eventItem.commit_url;
newEvents.push(item);
newEvents.push(eventItem);
});
return newEvents;
......
module.exports = {
issue: {
created_at: '',
url: '',
iid: '',
title: '',
total_time: {},
author: {
avatar_url: '',
id: '',
name: '',
web_url: '',
},
},
plan: {
title: '',
commit_url: '',
short_sha: '',
total_time: {},
author: {
name: '',
id: '',
avatar_url: '',
web_url: '',
},
},
code: {
title: '',
iid: '',
created_at: '',
url: '',
total_time: {},
author: {
name: '',
id: '',
avatar_url: '',
web_url: '',
},
},
test: {
name: '',
id: '',
date: '',
url: '',
short_sha: '',
commit_url: '',
total_time: {},
branch: {
name: '',
url: '',
},
},
review: {
title: '',
iid: '',
created_at: '',
url: '',
state: '',
total_time: {},
author: {
name: '',
id: '',
avatar_url: '',
web_url: '',
},
},
staging: {
id: '',
short_sha: '',
date: '',
url: '',
commit_url: '',
total_time: {},
author: {
name: '',
id: '',
avatar_url: '',
web_url: '',
},
branch: {
name: '',
url: '',
},
},
production: {
title: '',
created_at: '',
url: '',
iid: '',
total_time: {},
author: {
name: '',
id: '',
avatar_url: '',
web_url: '',
},
},
};
......@@ -396,4 +396,4 @@ const ShortcutsBlob = require('./shortcuts_blob');
return Dispatcher;
})();
}).call(this);
}).call(window);
......@@ -216,4 +216,4 @@ require('./preview_markdown');
return DropzoneInput;
})();
}).call(this);
}).call(window);
......@@ -13,4 +13,4 @@
return $(this).removeAttr('disabled').removeClass('disabled');
}
});
}).call(this);
}).call(window);
......@@ -144,4 +144,4 @@
}
});
};
}).call(this);
}).call(window);
......@@ -39,4 +39,4 @@
return Flash;
})();
}).call(this);
}).call(window);
......@@ -83,12 +83,12 @@
_a = decodeURI("%C3%80");
_y = decodeURI("%C3%BF");
regexp = new RegExp("^(?:\\B|[^a-zA-Z0-9_" + atSymbolsWithoutBar + "]|\\s)" + flag + "(?![" + atSymbolsWithBar + "])(([A-Za-z" + _a + "-" + _y + "0-9_\'\.\+\-]|[^\\x00-\\x7a])*)$", 'gi');
regexp = new RegExp("^(?:\\B|[^a-zA-Z0-9_" + atSymbolsWithoutBar + "]|\\s)" + flag + "(?!" + atSymbolsWithBar + ")((?:[A-Za-z" + _a + "-" + _y + "0-9_\'\.\+\-]|[^\\x00-\\x7a])*)$", 'gi');
match = regexp.exec(subtext);
if (match) {
return (match[1] || match[1] === "") ? match[1] : match[2];
return match[1];
} else {
return null;
}
......@@ -380,4 +380,4 @@
(dataToInspect === loadingState || dataToInspect.name === loadingState);
}
};
}).call(this);
}).call(window);
......@@ -846,4 +846,4 @@
}
});
};
}).call(this);
}).call(window);
......@@ -15,4 +15,4 @@
return StatGraph;
})();
}).call(this);
}).call(window);
......@@ -113,4 +113,4 @@ window.d3 = require('d3');
return ContributorsStatGraph;
})();
}).call(this);
}).call(window);
......@@ -273,4 +273,4 @@ window.d3 = require('d3');
return ContributorsAuthorGraph;
})(ContributorsGraph);
}).call(this);
}).call(window);
......@@ -135,4 +135,4 @@
}
}
};
}).call(this);
}).call(window);
......@@ -17,4 +17,4 @@
return GroupAvatar;
})();
}).call(this);
}).call(window);
......@@ -68,4 +68,4 @@
return GroupsSelect;
})();
}).call(this);
}).call(window);
......@@ -78,4 +78,4 @@
new window.ImporterStatus(jobsImportPath, importPath);
}
});
}).call(this);
}).call(window);
......@@ -76,4 +76,4 @@
return IssuableContext;
})();
}).call(this);
}).call(window);
......@@ -158,4 +158,4 @@
return IssuableForm;
})();
}).call(this);
}).call(window);
......@@ -132,4 +132,4 @@ require('./task_list');
return Issue;
})();
}).call(this);
}).call(window);
......@@ -31,4 +31,4 @@
return IssueStatusSelect;
})();
}).call(this);
}).call(window);
......@@ -43,4 +43,4 @@
return Labels;
})();
}).call(this);
}).call(window);
......@@ -504,4 +504,4 @@
return LabelsSelect;
})();
}).call(this);
}).call(window);
......@@ -44,4 +44,4 @@
}
});
});
}).call(this);
}).call(window);
......@@ -4,4 +4,4 @@
(function() {
}).call(this);
}).call(window);
......@@ -6,4 +6,4 @@
(function() {
}).call(this);
}).call(window);
......@@ -46,4 +46,4 @@
return dfd.promise();
};
})(window);
}).call(this);
}).call(window);
......@@ -297,4 +297,4 @@
*/
w.gl.utils.convertPermissionToBoolean = permission => permission === 'true';
})(window);
}).call(this);
}).call(window);
......@@ -123,4 +123,4 @@ window.dateFormat = require('vendor/date.format');
return Math.floor((date2 - date1) / millisecondsPerDay);
};
})(window);
}).call(this);
}).call(window);
......@@ -44,4 +44,4 @@
w.notify = notifyMe;
return w.notifyPermissions = notifyPermissions;
})(window);
}).call(this);
}).call(window);
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, quotes, one-var, one-var-declaration-per-line, operator-assignment, no-else-return, prefer-template, prefer-arrow-callback, no-empty, max-len, consistent-return, no-unused-vars, no-return-assign, max-len */
require('vendor/latinise');
(function() {
(function(w) {
var base;
......@@ -164,8 +166,14 @@
gl.text.pluralize = function(str, count) {
return str + (count > 1 || count === 0 ? 's' : '');
};
return gl.text.truncate = function(string, maxLength) {
gl.text.truncate = function(string, maxLength) {
return string.substr(0, (maxLength - 3)) + '...';
};
gl.text.dasherize = function(str) {
return str.replace(/[_\s]+/g, '-');
};
gl.text.slugify = function(str) {
return str.trim().toLowerCase().latinise();
};
})(window);
}).call(this);
}).call(window);
......@@ -12,4 +12,4 @@
return (obj != null) && (obj.constructor === Object);
};
})(window);
}).call(this);
}).call(window);
......@@ -83,4 +83,4 @@
document.location.href = url;
};
})(window);
}).call(this);
}).call(window);
......@@ -179,4 +179,4 @@ require('vendor/jquery.scrollTo');
return LineHighlighter;
})();
}).call(this);
}).call(window);
......@@ -4,4 +4,4 @@
window.addEventListener('beforeunload', function() {
$('.tanuki-logo').addClass('animate');
});
}).call(this);
}).call(window);
......@@ -49,4 +49,4 @@
inputs.each(toggleClearInput);
};
}).call(this);
}).call(window);
......@@ -108,4 +108,4 @@ require('./merge_request_tabs');
return MergeRequest;
})();
}).call(this);
}).call(window);
......@@ -269,7 +269,6 @@ require('./smart_interval');
$('.ci_widget.ci-error').show();
this.setMergeButtonClass('btn-danger');
}
this.initMiniPipelineGraph();
};
MergeRequestWidget.prototype.showCICoverage = function(coverage) {
......
......@@ -42,4 +42,4 @@
return MergedButtons;
})();
}).call(this);
}).call(window);
......@@ -172,4 +172,4 @@
return Milestone;
})();
}).call(this);
}).call(window);
......@@ -199,4 +199,4 @@
return MilestoneSelect;
})();
}).call(this);
}).call(window);
......@@ -28,7 +28,7 @@
* All dropdown events are fired at the .dropdown-menu's parent element.
*/
bindEvents() {
$(document).on('shown.bs.dropdown', this.container, this.getBuildsList);
$(document).off('shown.bs.dropdown', this.container).on('shown.bs.dropdown', this.container, this.getBuildsList);
}
/**
......
......@@ -83,4 +83,4 @@
return NamespaceSelects;
})();
}).call(this);
}).call(window);
......@@ -421,4 +421,4 @@
y: h
});
};
}).call(this);
}).call(window);
......@@ -17,4 +17,4 @@
return Network;
})();
}).call(this);
}).call(window);
......@@ -19,4 +19,4 @@ requireAll(require.context('.', false, /^\.\/(?!network_bundle).*\.(js|es6)$/));
});
return new ShortcutsNetwork(network_graph.branch_graph);
});
}).call(this);
}).call(window);
......@@ -100,4 +100,4 @@
return NewBranchForm;
})();
}).call(this);
}).call(window);
......@@ -30,4 +30,4 @@
return NewCommitForm;
})();
}).call(this);
}).call(window);
......@@ -937,4 +937,4 @@ require('./task_list');
return Notes;
})();
}).call(this);
}).call(window);
......@@ -28,4 +28,4 @@
return NotificationsDropdown;
})();
}).call(this);
}).call(window);
......@@ -54,4 +54,4 @@
return NotificationsForm;
})();
}).call(this);
}).call(window);
......@@ -133,4 +133,4 @@
return Project;
})();
}).call(this);
}).call(window);
......@@ -17,4 +17,4 @@
return ProjectAvatar;
})();
}).call(this);
}).call(window);
......@@ -168,4 +168,4 @@
return ProjectFindFile;
})();
}).call(this);
}).call(window);
......@@ -10,4 +10,4 @@
return ProjectFork;
})();
}).call(this);
}).call(window);
......@@ -10,4 +10,4 @@
return ProjectImport;
})();
}).call(this);
}).call(window);
......@@ -101,4 +101,4 @@
return ProjectNew;
})();
}).call(this);
}).call(window);
......@@ -101,4 +101,4 @@
return ProjectSelect;
})();
}).call(this);
}).call(window);
......@@ -6,6 +6,6 @@
return ProjectShow;
})();
}).call(this);
}).call(window);
// I kept class for future
......@@ -47,4 +47,4 @@
});
}
};
}).call(this);
}).call(window);
......@@ -12,4 +12,4 @@
$(document).on('ready load', function() {
return $('body').renderGFM();
});
}).call(this);
}).call(window);
......@@ -51,4 +51,4 @@
});
}
};
}).call(this);
}).call(window);
......@@ -217,4 +217,4 @@
return Sidebar;
})();
}).call(this);
}).call(window);
......@@ -97,4 +97,4 @@
return Search;
})();
}).call(this);
}).call(window);
......@@ -97,4 +97,4 @@
}
};
})();
}).call(this);
}).call(window);
......@@ -37,4 +37,4 @@ require('./shortcuts');
return ShortcutsDashboardNavigation;
})(Shortcuts);
}).call(this);
}).call(window);
......@@ -35,4 +35,4 @@ require('./shortcuts_navigation');
return ShortcutsFindFile;
})(ShortcutsNavigation);
}).call(this);
}).call(window);
......@@ -89,4 +89,4 @@ require('./shortcuts_navigation');
return ShortcutsIssuable;
})(ShortcutsNavigation);
}).call(this);
}).call(window);
......@@ -65,4 +65,4 @@ require('./shortcuts');
return ShortcutsNavigation;
})(Shortcuts);
}).call(this);
}).call(window);
......@@ -25,4 +25,4 @@ require('./shortcuts_navigation');
return ShortcutsNetwork;
})(ShortcutsNavigation);
}).call(this);
}).call(window);
......@@ -95,4 +95,4 @@
}
});
};
}).call(this);
}).call(window);
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment