summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bootstrap4Clement Ho2018-05-164-102/+95
|\
| * Merge branch 'refactor/move-squash-before-merge-vue-component' into 'master'Phil Hughes2018-05-142-4/+4
| |\
| | * Move SquashBeforeMerge vue componentGeorge Tsiolis2018-05-082-4/+4
| * | Merge branch '45462-sha-object' into 'master'Phil Hughes2018-05-143-98/+91
| |\ \
| | * | Fix broken testsFilipa Lacerda2018-05-111-1/+1
| | * | Fixes eslintFilipa Lacerda2018-05-101-36/+37
| | * | Moves mr widget to a vue componentFilipa Lacerda2018-05-103-64/+56
| | |/
* | | Merge branch 'master' into 'bootstrap4'Clement Ho2018-05-111-1/+1
|\ \ \ | |/ /
| * | Moves MR widget external link icon to the rightJacopo2018-05-081-1/+1
| |/
* | Rename btn-secondary to btn-defaultAnnabel Dunstone Gray2018-05-108-14/+14
* | Merge branch 'master' into bootstrap4Clement Ho2018-05-085-38/+63
|\ \ | |/
| * Display merge commit SHA in merge widget after mergeOswaldo Ferreira2018-05-072-0/+16
| * Merge branch 'refactor/move-mr-widget-wip-vue-component' into 'master'Mike Greiling2018-05-023-38/+47
| |\
| | * Move WorkInProgress vue componentGeorge Tsiolis2018-04-163-38/+47
* | | Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-301-49/+53
|\ \ \ | |/ /
| * | Clear refresh interval when MRWidgetFailedToMerge component is destroyedWinnie Hellmann2018-04-261-49/+53
* | | [skip ci] Merge branch 'master' into bootstrap4Clement Ho2018-04-173-19/+26
|\ \ \ | |/ /
| * | Move PipelineFailed vue componentGeorge Tsiolis2018-04-173-19/+26
| |/
* | Fix dropdownsClement Ho2018-04-171-1/+1
* | Merge branch 'master' into bootstrap4Clement Ho2018-04-162-129/+140
|\ \ | |/
| * Merge branch 'refactor/move-mr-widget-ready-to-merge-vue-component' into 'mas...Mike Greiling2018-04-162-129/+140
| |\
| | * Move ReadyToMerge vue componentGeorge Tsiolis2018-03-302-129/+140
* | | Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-161-2/+2
|\ \ \ | |/ /
| * | Fix the metrics link being not rendering the htmlJose Ivan Vargas2018-04-131-2/+2
* | | [skip ci] col-*-push and col-*-pull => order-*Clement Ho2018-04-131-2/+2
* | | [skip ci] Convert btn-xs to btn-smClement Ho2018-04-129-15/+15
* | | Merge branch 'master' into bootstrap4Clement Ho2018-04-121-4/+8
|\ \ \ | |/ /
| * | Merge branch 'unresolved-discussions-vue-component-i18n-and-tests' into 'master'Clement Ho2018-04-111-4/+8
| |\ \
| | * | Add i18n and update specs for UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-271-4/+8
* | | | [skip ci] .control-label to .col-form-labelClement Ho2018-04-111-1/+1
* | | | Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-091-49/+58
|\ \ \ \ | |/ / /
| * | | Checks if commit information exists before trying to render it44296-commit-pathFilipa Lacerda2018-04-061-49/+58
* | | | Rename .btn-default to .btn-secondaryClement Ho2018-04-098-14/+14
* | | | Rename col-xs-* to col-*Clement Ho2018-04-091-2/+2
|/ / /
* | | Added Utility Function for WebIDE URLTim Zallmann2018-03-281-1/+2
* | | Fixed Code review CommentsTim Zallmann2018-03-281-2/+1
* | | Added Changes based on UX ReviewTim Zallmann2018-03-281-1/+1
* | | Re added The Web IDE ButtonTim Zallmann2018-03-281-43/+54
* | | Fix for MR Widget Header resetTim Zallmann2018-03-281-43/+43
* | | Fixes to Formatting to all FilesTim Zallmann2018-03-281-18/+1
* | | Basic Setup for MR ShowingTim Zallmann2018-03-281-43/+60
| |/ |/|
* | Merge branch 'update-unresolved-discussions-vue-component' into 'master'Clement Ho2018-03-271-2/+2
|\ \
| * | Add i18n and update specs for ShaMismatch vue componentGeorge Tsiolis2018-03-271-2/+2
* | | Add i18n support for the mrWidget prometheus memory widget44218-add-internationalization-support-for-the-prometheus-merge-request-widgetJose Ivan Vargas2018-03-231-10/+20
|/ /
* | Move ShaMismatch vue componentGeorge Tsiolis2018-03-195-22/+29
|/
* Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' i...Mike Greiling2018-03-193-28/+34
|\
| * Move UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-083-28/+34
* | removed useless v-ifPhil Hughes2018-03-142-8/+3
* | improved markupPhil Hughes2018-03-131-24/+20
* | fixed breakpointPhil Hughes2018-03-131-44/+59
View Lorry Controller Status