| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Replace ci_status_path with pipeline_pathrc/use-existing-url-helper | Rémy Coutable | 2017-11-14 | 1 | -1/+0 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch 'remove-ineffective-service-specs' into 'master' | Filipa Lacerda | 2017-11-08 | 1 | -47/+0 |
| |\ | | | | | | | | | Remove ineffective Vue service specs See merge request gitlab-org/gitlab-ce!15277 | ||||
| | * | Remove ineffective Vue service specsremove-ineffective-service-specs | Eric Eastwood | 2017-11-08 | 1 | -47/+0 |
| | | | |||||
| * | | Resolve "Merge request widget - CI information has different margins" | Filipa Lacerda | 2017-11-08 | 1 | -82/+89 |
| | | | |||||
| * | | Update mr_widget_options_spec.jsfl-cleanup-test | Filipa Lacerda | 2017-11-07 | 1 | -1/+0 |
| | | | |||||
| * | | Cleanup tests | Filipa Lacerda | 2017-11-07 | 1 | -22/+0 |
| |/ | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2017-11-06 | 2 | -9/+47 |
| |\ | | | | | | | 38394-smarter-interval | ||||
| | * | Fixing Icons | Tim Zallmann | 2017-10-30 | 1 | -9/+1 |
| | | | |||||
| | * | Change default disabled merge request widget message to "Merge is not ↵39188-change-default-disabled-merge-message | Eric Eastwood | 2017-10-27 | 1 | -0/+46 |
| | | | | | | | | | | | | | allowed yet" Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39188 | ||||
| * | | remove global export from SmartInterval | Simon Knox | 2017-10-31 | 1 | -7/+11 |
| |/ | |||||
| * | Merge branch 'ide-fix-back-btn' into 'master' | Fatih Acet | 2017-10-06 | 1 | -0/+1 |
| |\ | | | | | | | | | Repo Editor : Fixes Back Button for files + line number jumping for preview and editor See merge request gitlab-org/gitlab-ce!14508 | ||||
| | * | Fixes the unhandled promise rejection | Tim Zallmann | 2017-10-04 | 1 | -0/+1 |
| | | | |||||
| * | | Allow merge when no pipeline success38389-allow-merge-without-success | Eric Eastwood | 2017-10-05 | 1 | -31/+9 |
| | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38389 | ||||
| * | | Merge branch '37229-mr-widget-status-icon' into 'master' | Jacob Schatz | 2017-10-05 | 1 | -11/+60 |
| |\ \ | |/ |/| | | | | | | | | | improve merge request widget status icon UX Closes #37229 See merge request gitlab-org/gitlab-ce!14200 | ||||
| | * | Merge remote-tracking branch 'origin' into 37229-mr-widget-status-icon | Simon Knox | 2017-10-03 | 1 | -8/+20 |
| | |\ | |||||
| | * | | improve merge request widget status icon UX | Simon Knox | 2017-09-20 | 1 | -11/+60 |
| | | | | | | | | | | | | | x to indicate failure or cannot merge | ||||
| * | | | Merge branch 'mr-widget-merged-date-tooltip' into 'master' | Filipa Lacerda | 2017-10-03 | 2 | -11/+40 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes merge request widget date tooltip inconsistencies Closes #38545 See merge request gitlab-org/gitlab-ce!14578 | ||||
| | * | | | Fixes merge request widget date tooltip inconsistencies | Phil Hughes | 2017-09-29 | 2 | -11/+40 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the merge request widget would use the `updated_at` date as the tooltip text for both closed & merged states. This is incorrect as the `updated_at` date is actually changed when a user updates merge request through commenting, description changes or anything else. The widget states for merged & closed events now use their own event object which holds their own `updated_at` date string. Also this text has been correctly formatted through our date utilities to correctly display the right timezone data in a user friendly way. Closes #38545 | ||||
| * | | | Port semi-linear merge strategy to CE (mostly FE) | Eric Eastwood | 2017-09-29 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into ff_port_from_ee | Eric Eastwood | 2017-09-26 | 1 | -8/+20 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch '37220-es-modules' into 'master' | Phil Hughes | 2017-09-21 | 1 | -8/+20 |
| | |\ \ | | |/ | |/| | | | | | | | Use modules in common utils See merge request gitlab-org/gitlab-ce!14074 | ||||
| | | * | fixed mr widget options spec | Phil Hughes | 2017-09-13 | 1 | -3/+2 |
| | | | | |||||
| | | * | Import modules instead of using the ones in global namespace | Filipa Lacerda | 2017-09-09 | 1 | -7/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes set favicon related methods from global scope Improves test related with favicon Removes convertPermissionToBoolean from global scope. Adds tests for convertPermissionToBoolean - were non existant Removes setParamInURL from gl.utils Removes parseIntPagination from gl.utils namespace Remove normalizeCRLFHeaders from gl.utils namespace Removes normalizeHeaders from gl.utils namespace Use gl.utils for filtered search Fix bad import Fix broken test by cleaning window.history namespace Adds changelog | ||||
| * | | | Use js- classes instead of Vue refs in tests for some perf | Eric Eastwood | 2017-09-26 | 2 | -11/+23 |
| | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272#note_41419104 | ||||
| * | | | Use new shared Vue mountComponent method | Eric Eastwood | 2017-09-20 | 1 | -15/+5 |
| | | | | |||||
| * | | | Port fast-forward MR widget states from EE | Eric Eastwood | 2017-09-19 | 2 | -63/+116 |
| |/ / | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/20076 | ||||
| * | | Change all instances of btn-sm to btn-small to keep things consistent | Jedidiah | 2017-09-19 | 1 | -1/+1 |
| | | | |||||
| * | | Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-services | Eric Eastwood | 2017-09-18 | 4 | -16/+110 |
| |/ | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33287 The MR widget was trying to render the pipelines section when there are no GitLab CI pipelines which was throwing some NPE errors. | ||||
| * | Store MergeWorker JID on merge request, and clean up stuck merges | Oswaldo Ferreira | 2017-08-07 | 3 | -7/+6 |
| | | |||||
| * | clean up merge request widget UI | Simon Knox | 2017-08-07 | 19 | -94/+63 |
| | | |||||
| * | Resolve "Memory usage notice doesn't link anywhere" | Tim Zallmann | 2017-07-26 | 2 | -0/+3 |
| | | |||||
| * | Make commits behind text a link to the target branch commits page | Clement Ho | 2017-07-11 | 1 | -2/+5 |
| | | |||||
| * | Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"revert-018f7e46 | Kamil Trzciński | 2017-07-06 | 1 | -48/+18 |
| | | | | This reverts merge request !12127 | ||||
| * | Handle Promise rejections in mr_widget_pipeline_spec.js | winh | 2017-06-26 | 1 | -24/+35 |
| | | |||||
| * | Add failing test for #32987 | winh | 2017-06-22 | 1 | -0/+19 |
| | | |||||
| * | Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4d | winh | 2017-06-21 | 3 | -188/+77 |
| | | | | | | This reverts commit 6ac777a7592533d9c7b3682b2b9ca8caccca3f4d, reversing changes made to 025cbc2ad4dc175634676ff8a6955e043512d8bf. | ||||
| * | Adjust position and wording for related issues in merge requests | Winnie Hellmann | 2017-06-19 | 3 | -77/+188 |
| | | |||||
| * | Merge branch ↵ | Fatih Acet | 2017-05-30 | 1 | -0/+37 |
| |\ | | | | | | | | | | | | | | | | | '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone' into 'master' Resolve "Browser notifications for pipeline running in a MR is gone" Closes #32916 See merge request !11734 | ||||
| | * | Added specs for handleNotifications in mr_widget_options_spec.js | Luke "Jared" Bennett | 2017-05-26 | 1 | -0/+37 |
| | | | |||||
| * | | Add performance deltas between app deployments on Merge Request widget | Kushal Pandya | 2017-05-29 | 1 | -2/+49 |
| | | | |||||
| * | | Merge branch ↵ | Fatih Acet | 2017-05-26 | 1 | -2/+35 |
| |\ \ | |/ |/| | | | | | | | | | | | | | '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master' Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form Closes #32447 and #32907 See merge request !11558 | ||||
| | * | Don't use getElementById in specs. | Bryce Johnson | 2017-05-22 | 1 | -2/+2 |
| | | | |||||
| | * | Upgrade Remove Source Branch checkbox UX. | Bryce Johnson | 2017-05-22 | 1 | -2/+35 |
| | | | |||||
| * | | MRWidget: Change order of if blocks to determine widget state properly.acet-fix-mr-widget-state | Fatih Acet | 2017-05-24 | 1 | -6/+6 |
| |/ | |||||
| * | Merge branch '32536-mr-widget-performance-improvements' into 'master' | Fatih Acet | 2017-05-19 | 1 | -2/+0 |
| |\ | | | | | | | | | Load improvements related to MR widget See merge request !11518 | ||||
| | * | Fix Karma expect | Oswaldo Ferreira | 2017-05-18 | 1 | -1/+0 |
| | | | |||||
| | * | Remove unnecessary initial request | Oswaldo Ferreira | 2017-05-18 | 1 | -1/+0 |
| | | | |||||
| * | | Refine MR widget styling for buttons and info text | Kushal Pandya | 2017-05-19 | 1 | -1/+1 |
| |/ | |||||
| * | Address MR comments.acet-mr-widget-nothing-to-commit-state | Fatih Acet | 2017-05-16 | 1 | -1/+1 |
| | | |||||
| * | MRWidget: Fix specs and address WIP comments. | Fatih Acet | 2017-05-16 | 1 | -2/+14 |
| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |