summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Create shared gl-modal-vuex component and moduleee1979-gl-modal-vuexPaul Slaughter2019-01-036-0/+122
| | | | | | | **Why?** It is significantly easier to manage the visibility of the modal in Vuex. The module contains the state and mutations to manage this. The component wraps GlModal and syncs the visibility with the module.
* Merge branch '27861-add-markdown-editing-buttons-to-the-file-editor' into ↵Fatih Acet2019-01-035-38/+159
|\ | | | | | | | | | | | | | | | | 'master' Resolve "Add markdown editing buttons to the file editor" Closes #27861 See merge request gitlab-org/gitlab-ce!23480
| * Add markdown buttons to file editor27861-add-markdown-editing-buttons-to-the-file-editorSam Bigelow2019-01-025-38/+159
| | | | | | | | | | | | | | Currently, we have markdown files in many places (e.g. comments, new issues, etc.). This Merge Request detects if the file being edited is a markdown file and adds markdown buttons and their functionality to the single file editor (Not the web IDE)
* | Merge branch 'tz-user-popover-follow-up' into 'master'Clement Ho2019-01-032-5/+11
|\ \ | | | | | | | | | | | | Added Comment to user avatar Image, Changed Fixtures to created ones, added shadow color See merge request gitlab-org/gitlab-ce!23768
| * | Comment user avatar Image, Changed Fixtures, added new shadow colortz-user-popover-follow-upTim Zallmann2018-12-122-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | Needed to reorder css variables Neede to reorder vars again Added Changelog
* | | Merge branch '54386-integrate-mobile-css-framework-into-specific-frameworks' ↵Annabel Dunstone Gray2019-01-036-90/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Integrate mobile CSS framework into specific frameworks Closes #54386 See merge request gitlab-org/gitlab-ce!23301
| * | | Remove framework/mobile.scssTakuya Noguchi2018-12-122-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Move .container .title CSS for mobile to the specific CSSTakuya Noguchi2018-12-122-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Move .container .content CSS for mobile to the specific CSSTakuya Noguchi2018-12-122-4/+2
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Integrate .nav-links li a CSS for mobile to the specific CSSTakuya Noguchi2018-12-122-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Remove .nav-links li a CSS for mobileTakuya Noguchi2018-12-121-10/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Replace .check-all-holder with display propertiesTakuya Noguchi2018-12-121-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Remove .dash-projects-filters CSS for mobileTakuya Noguchi2018-12-121-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Remove .issues-details-filters:not(.filtered-search-block) CSS for mobileTakuya Noguchi2018-12-121-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Replace .rss-btn with display propertiesTakuya Noguchi2018-12-121-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Remove .project-home-links CSS for mobileTakuya Noguchi2018-12-121-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Remove .project-home-panel CSS for mobileTakuya Noguchi2018-12-121-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Remove .git-clone-holder CSS for mobileTakuya Noguchi2018-12-121-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Remove non-effective .project-repo-buttons CSSTakuya Noguchi2018-12-121-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Replace .group-buttons with display propertiesTakuya Noguchi2018-12-121-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Replace .activity-filter-block with display propertiesTakuya Noguchi2018-12-121-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Remove .projects-search-formTakuya Noguchi2018-12-121-6/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Replace aside:not(.right-sidebar) with display propertiesTakuya Noguchi2018-12-122-7/+1
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Remove .note-created-agoTakuya Noguchi2018-12-121-6/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Remove .new-issue-linkTakuya Noguchi2018-12-121-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Move .referenced-usersTakuya Noguchi2018-12-122-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Remove .milestone-filterTakuya Noguchi2018-12-121-6/+0
| | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | Force popover-header to size 14px instead of remsClement Ho2019-01-031-1/+2
| | | |
* | | | Merge branch 'ce-1979-fe-settings-empty' into 'master'Kushal Pandya2019-01-032-2/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE Port of "(Part 1) FE multiple approval rules settings - empty state" See merge request gitlab-org/gitlab-ce!24087
| * | | | Update callout component to receive slotce-1979-fe-settings-emptyPaul Slaughter2019-01-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | **Why?** - This is needed to add buttons to the callout
| * | | | Add gl-spinner animation classPaul Slaughter2019-01-021-0/+22
| | | | |
* | | | | Merge branch '55883-modal-header-titles-have-an-unnecessary-top-margin' into ↵Clement Ho2019-01-032-5/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove unnecessary top margin in modal header titles Closes #55883 See merge request gitlab-org/gitlab-ce!24108
| * | | | | Remove top margin in modal header titles55883-modal-header-titles-have-an-unnecessary-top-marginLukas Eipert2019-01-032-5/+14
| | | | | |
* | | | | | Collapsible Comments Test for IssuesRamya Authappan2019-01-032-3/+7
| | | | | |
* | | | | | Merge branch 'ccr/49289_milestone_link' into 'master'Mike Greiling2019-01-022-5/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project milestone link Closes #49289 See merge request gitlab-org/gitlab-ce!22552
| * | | | | Add project milestone link to dashboard milestonesccr/49289_milestone_linkFatih Acet2018-12-202-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the steps to deprecate dashboard milestones. Links do dashboard milestone are replaced with links for each project milestone
* | | | | | Merge branch '55266-fix-incorrect-due-date-parsing' into 'master'Clement Ho2019-01-021-2/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `parsePikadayDate` to parse due date string Closes #55266 See merge request gitlab-org/gitlab-ce!24045
| * | | | | Use `parsePikadayDate` to parse due date stringKushal Pandya2018-12-271-2/+7
| | | | | |
* | | | | | Merge branch ↵Kushal Pandya2019-01-022-2/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '54206-show-the-activity-filter-dropdown-in-discussion-tab-only' into 'master' Resolve "Show the activity filter dropdown in discussion tab only, show all discussions always in changes tab" Closes #54206 See merge request gitlab-org/gitlab-ce!24082
| * | | | | | Made discussion filters only visible in merge request discussions tabConstance Okoghenun2019-01-022-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussion filters will be hidden on Commits, Pipelines, and Changes tabs on merge requests page. This does not affect its behavior on issues page
* | | | | | | Resolve "User activity is stuck loading when there is none"Martin Wortschack2019-01-021-6/+9
| | | | | | |
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJohn Jarvis2019-01-011-7/+10
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'security-54377-label-milestone-name-xss' into 'master'John Jarvis2019-01-011-7/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Escape label and milestone titles to prevent XSS in GFM autocomplete See merge request gitlab/gitlabhq!2693
| | * | | | | | | Escape label and milestone titles to prevent XSSKushal Pandya2018-12-201-7/+10
| | | | | | | | |
* | | | | | | | | Fix commit SHA not showing in merge request compare dropdownStan Hu2018-12-311-1/+1
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17011 in GitLab 11.1 refactored the merge request diff comparison functionality but omitted the commit SHA due to a change in the API (truncated_commit_sha -> short_commit_sha). Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55822
* | | | | | | | Resolve "Status emoji should not update awards section on issue page"Brandon Labuschagne2018-12-311-2/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'fj-fix-lfs-image-comments-diffs' into 'master'Douwe Maan2018-12-281-1/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug commenting LFS images and displaying LFS files Closes #43783 See merge request gitlab-org/gitlab-ce!23812
| * | | | | | Fixing image lfs bug and also displaying text lfsFrancisco Javier López2018-12-271-1/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812, fixes a problem creating a displaying image diff notes when the image is stored in LFS. The main problem was that `Gitlab::Diff::File` was returning an invalid valid in `text?` for this kind of files. It also fixes a rendering problem with other LFS files, like text ones. They LFS pointer shouldn't be shown when LFS is enabled for the project, but they were.
* | | | | | Merge branch 'ci-dropdown-hidden-bug' into 'master'Kushal Pandya2018-12-281-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't hide CI dropdown behind diff summary See merge request gitlab-org/gitlab-ce!24014
| * | | | | | Don't hide CI dropdown behind diff summarygfyoung2018-12-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Occurs on a repository commit page
View Lorry Controller Status