summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'update-external-link-icon-in-merge-request-widget' into 'master'Phil Hughes2018-07-021-5/+6
|\ | | | | | | | | Update external link icon in merge request widget See merge request gitlab-org/gitlab-ce!20154
| * Update external link icon in merge request widgetGeorge Tsiolis2018-06-271-5/+6
| |
* | Resolve "Cancel automatic merge button gets a bigger height than it should ↵Simon Knox2018-07-022-3/+3
|/ | | | when content overflows"
* Enable "prefer-destructuring" in JS filesgfyoung2018-06-251-2/+2
| | | | Partially addresses #47006.
* Changes tab VUE refactoringFelipe Artur2018-06-211-0/+15
|
* remove all unused eslint-disable rulesLukas Eipert2018-06-201-1/+1
|
* Uses long sha version of the merged commit in MR widget copy to clipboard ↵48050-add-full-commit-shaFilipa Lacerda2018-06-182-1/+2
| | | | button
* Enable no-multi-assignment in JS filesgfyoung2018-06-151-1/+1
| | | | Partially addresses #47006.
* Remove the btn-xs class from the stylesheetsJose2018-06-131-1/+1
|
* Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-121-1/+5
|\ | | | | | | | | | | | | * master: mergeError message has been binded using v-html directive Find and mark more Git disk access locations, part 2 Ensure MR diffs always exist in the PR importer
| * mergeError message has been binded using v-html directiveMurat Dogan2018-06-121-2/+6
| |
* | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-113-7/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (48 commits) Avoid checking the user format in every url validation Migrate CycleAnalytics::CommitCount to Gitaly Hide project name if searching against a project Unify app/views/search/results by using EE Resolve "Table on Failed Jobs tab is overflowing in IE11 and sm screens" Update MrWidgetAuthorTime and MRWidgetMerged spec fixed specs Fix IDE pipelines eTagPoll not stopping Don't use Gitlab::Utils.nlbr in Gitlab::Git Move gitaly_blame, gitaly_count_commits, gitaly_commit_count to opt-out Rename MrWidgetAuthorTime vue component Use Tooltip component in MrWidgetAuthorTime vue component set max_old_space_size to 3.5 GB for compile-assets job Remove SCLAU to mirror https://gitlab.com/gitlab-org/gitlab-ee/commit/cd5cef8f84a2b8c58a741e90afec232243a9f3a9 Add missing `:comment` attribute Prevent ENV from leaking variables in CI output Bump grape-path-helpers to 1.0.5 Add more logging before a project is destroyed Bump Google Chrome to V67 Upgrade gitlab-markup to fix render issue with reStructuredText ...
| * Rename MrWidgetAuthorTime vue componentGeorge Tsiolis2018-06-113-5/+5
| |
| * Use Tooltip component in MrWidgetAuthorTime vue componentGeorge Tsiolis2018-06-111-2/+5
| |
* | Updates eslint vue plugin versionFilipa Lacerda2018-06-1122-62/+62
|/
* Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-071-2/+3
|\ | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
| * create favicon overlay on the clientAlexis Reigel2018-06-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | the initial reason for this change was that graphicsmagick does not support writing to ico files. this fact lead to a chain of changes: 1. use png instead of ico (browser support is good enough) 2. render the overlays on the client using the canvas API. this way we only need to store the original favion and generate the overlay versions dynamically. this change also enables (next step) to simplify the handling of the stock favicons as well, as we don't need to generate all the versions upfront.
* | Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-pushMark Chao2018-06-012-3/+3
|/ | | | | | branch" "Maintainer" will be freed to be used for #42751
* Remove whitespaceFilipa Lacerda2018-05-301-1/+1
|
* Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-293-18/+78
|
* Merge branch 'master' into bootstrap4Clement Ho2018-05-223-5/+5
|\
| * Rename merge request widget author componentGeorge Tsiolis2018-05-223-5/+5
| |
* | 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 component See merge request gitlab-org/gitlab-ce!18813
| | * Move SquashBeforeMerge vue componentGeorge Tsiolis2018-05-082-4/+4
| | |
| * | Merge branch '45462-sha-object' into 'master'Phil Hughes2018-05-143-98/+91
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "`sha-mismatch` vue component is rendering an empty block" Closes #45462 See merge request gitlab-org/gitlab-ce!18884
| | * | 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
| | |/ | | | | | | | | | | | | Prevents maintainer edit to render a blank div Properly names sha mismatch component
* | | Merge branch 'master' into 'bootstrap4'Clement Ho2018-05-111-1/+1
|\ \ \ | |/ / | | | | | | # Conflicts: # app/views/groups/group_members/index.html.haml
| * | 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 component See merge request gitlab-org/gitlab-ce!17536
| | * Move WorkInProgress vue componentGeorge Tsiolis2018-04-163-38/+47
| | |
* | | Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-301-49/+53
|\ \ \ | |/ / | | | | | | # Conflicts: # app/views/ci/variables/_variable_row.html.haml
| * | 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 ↵Mike Greiling2018-04-162-129/+140
| |\ | | | | | | | | | | | | | | | | | | 'master' Move ReadyToMerge vue component See merge request gitlab-org/gitlab-ce!17545
| | * Move ReadyToMerge vue componentGeorge Tsiolis2018-03-302-129/+140
| | |
* | | Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-161-2/+2
|\ \ \ | |/ / | | | | | | # Conflicts: # app/views/admin/application_settings/_signin.html.haml
| * | 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 component See merge request gitlab-org/gitlab-ce!17866
View Lorry Controller Status