summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_request_widget.js.es6
Commit message (Expand)AuthorAgeFilesLines
* Port of 25624-anticipate-obstacles-to-removing-turbolinks to EE.turbolinks-ee-compatBryce Johnson2017-01-301-3/+2
* Fixed incorrect class names used in merge request widgetPhil Hughes2017-01-221-1/+3
* Port of simple-eslint-fixes to EEMike Greiling2017-01-181-8/+6
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstreamValery Sizov2016-12-221-2/+1
|\
| * Remove builds from merge request tabs fileFilipa Lacerda2016-12-211-1/+0
| * Removes builds tab from merge requestFilipa Lacerda2016-12-211-2/+2
* | All conflicts resolvedDouglas Barbosa Alexandre2016-12-171-3/+2
* | Merge remote-tracking branch 'ce/master' into ce-to-eeDouglas Barbosa Alexandre2016-12-171-56/+38
|\ \ | |/
| * expand remaining non-explicit eslint-disable blocks and factor out globals wh...Mike Greiling2016-12-131-9/+14
| * Added hiddenInterval and immediateExecution settings, fixed visibilitychange ...24807-stop-ddosing-ourselvesLuke "Jared" Bennett2016-12-121-49/+25
* | Merge remote-tracking branch 'ce/master' into ce-to-eeDouglas Barbosa Alexandre2016-12-121-1/+1
|\ \ | |/
| * fix display hook error messagebasyura2016-12-051-1/+1
* | Merge remote-tracking branch 'ce/master' into ce-upstreamAlejandro Rodríguez2016-11-241-3/+3
|\ \ | |/
| * Merge branch '24266-afraid-to-press-the-orange-button-on-merge-request-screen...Fatih Acet2016-11-221-3/+3
| |\
| | * Use btn-primary for running builds btnAnnabel Dunstone Gray2016-11-221-3/+3
* | | Merge remote-tracking branch 'ce/master' into ce-upstreamAlejandro Rodríguez2016-11-211-1/+1
|\ \ \ | |/ /
| * | Fix timeago rendering for environment timeago24552-js-environment-timeago-is-not-rendered-and-text-shows-object-object-in-mr-widgetClement Ho2016-11-191-1/+1
| |/
* | Merge remote-tracking branch 'ce/master' into ce-to-eeAlejandro Rodríguez2016-11-091-1/+1
|\ \ | |/
| * Replace jQuery.timeago with timeago.jsClement Ho2016-11-071-1/+1
* | Merge branch 'remove-dead-js-and-align-with-ce' into 'master' Robert Speicher2016-11-011-3/+3
|\ \
| * | Remove dead code and align with some JS code from CERémy Coutable2016-10-311-3/+3
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstreamValery Sizov2016-10-281-0/+1
|\ \ \ | |/ / |/| / | |/
| * disable ESLint for all JavaScript fileswinniehell2016-10-261-0/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstreamValery Sizov2016-10-211-0/+11
|\ \ | |/
| * Updates class name for consistencyFilipa Lacerda2016-10-171-2/+2
| * Improve after code reviewKamil Trzcinski2016-10-171-1/+1
| * Updates MR template to include stop linkFilipa Lacerda2016-10-171-0/+11
* | Merge remote-tracking branch 'ce/master' into ce-to-eeRémy Coutable2016-10-181-1/+18
|/
* Added safety check for formatted valuesLuke Bennett2016-10-141-2/+2
* Moved ci_status environments logic to new action ci_envrionments_status and s...Luke Bennett2016-10-141-16/+37
* Show what time ago a MR was deployedZ.J. van de Weg2016-10-141-0/+240