summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ce-5606-issues-and-mr-autocomplete-in-epics' into 'master'Robert Speicher2019-01-081-9/+15
|\ | | | | | | | | CE backport of gitlab-ee!8936 See merge request gitlab-org/gitlab-ce!23976
| * CE backport for `reference` in gfm_autocompletece-5606-issues-and-mr-autocomplete-in-epicsHeinrich Lee Yu2019-01-071-9/+15
| | | | | | | | Currently not used by any CE code
* | Merge branch '49231-import-issues-csv' into 'master'Douwe Maan2019-01-073-0/+47
|\ \ | | | | | | | | | | | | | | | | | | Import issues from CSV Closes #49231 See merge request gitlab-org/gitlab-ce!23532
| * | Add Import CSV FrontendHeinrich Lee Yu2019-01-073-0/+47
| |/ | | | | | | Added button and modal to accept CSV file for uploading
* | Add threshold lines in metrics graphAdriel Santiago2019-01-072-4/+13
| |
* | Merge branch '8535-add-mr-comment-on-ctrl-enter' into 'master'Phil Hughes2019-01-071-2/+5
|\ \ | | | | | | | | | | | | Resolve "Ctrl+Enter immediately adds MR comment" See merge request gitlab-org/gitlab-ce!24053
| * | Added handleKeySubmit method to match EE8535-add-mr-comment-on-ctrl-enterNatalia Tepluhina2019-01-071-2/+5
| | |
* | | Merge branch '55721-externalization-for-pipeline-tags' into 'master'Fatih Acet2019-01-071-11/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Externalization for pipeline tags Closes #55721 See merge request gitlab-org/gitlab-ce!24028
| * | | Correctly externalize pipeline tags55721-externalization-for-pipeline-tagsLukas Eipert2019-01-041-11/+23
| | | |
* | | | Merge branch ↵Fatih Acet2019-01-073-26/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53796-discard-draft-comment-button-to-easy-to-accidentally-hit-on-mobile' into 'master' Resolve "Discard draft comment button to easy to accidentally hit on mobile" Closes #53796 See merge request gitlab-org/gitlab-ce!24185
| * | | | Cancel button for diff notesConstance Okoghenun2019-01-071-0/+4
| | | | | | | | | | | | | | | | | | | | Added "cancel" comment button for inline diff notes for commits
| * | | | Removed discard comment buttonConstance Okoghenun2019-01-073-28/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Removed the button and associated tests form notes on Issues and Merge request page.
* | | | | Merge branch '54311-fix-board-add-label' into 'master'Kushal Pandya2019-01-071-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error when creating labels in a new issue in the boards page Closes #54311 See merge request gitlab-org/gitlab-ce!24039
| * \ \ \ \ Merge branch 'master' into 54311-fix-board-add-labelrubenmoya2019-01-0545-215/+489
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Add assignableLabelsEndpoint to issue after createing itrubenmoya2018-12-261-0/+1
| | | | | |
* | | | | | Merge branch '54981-extended-user-centric-tooltips-add-missing-cases' into ↵Kushal Pandya2019-01-071-8/+25
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Extended user centric tooltips: Add missing cases" Closes #54981 See merge request gitlab-org/gitlab-ce!24132
| * | | | | Dryed code in commit_item by adding another computed propTim Zallmann2019-01-071-9/+8
| | | | | |
| * | | | | Added User Popovers to Commit Items and Member ListsTim Zallmann2019-01-041-1/+19
| | | | | |
* | | | | | Merge branch ↵Filipa Lacerda2019-01-071-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '54142-pages-in-project-s-permission-should-be-named-pages-access-control' into 'master' Resolve "Pages in project's permissions settings should be named Pages access control" Closes #54142 See merge request gitlab-org/gitlab-ce!23146
| * | | | | | Make the Pages permission setting more clear54142-pages-in-project-s-permission-should-be-named-pages-access-controlAchilleas Pipinellis2018-12-281-2/+2
| | | | | | |
* | | | | | | Merge branch 'ee1979-css' into 'master'Kushal Pandya2019-01-074-1/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update common CSS for MR approvals See merge request gitlab-org/gitlab-ce!24141
| * | | | | | | Add shared CSS for MR approvalsee1979-cssPaul Slaughter2019-01-044-1/+44
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds some common classes - Updates common css layout (there's more to be done here) - Adds classes for using <label> to wrap inputs - Adds select2 bootstrap validation support - Fixes select2 in modal z-index - Adds thead-white class
* | | | | | | Merge branch 'ee1979-user-avatar-list-component' into 'master'Kushal Pandya2019-01-071-0/+83
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Create shared user-avatar-list component See merge request gitlab-org/gitlab-ce!24139
| * | | | | | Create shared user-avatar-list componentee1979-user-avatar-list-componentPaul Slaughter2019-01-041-0/+83
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** We need a component that can expand / collapse a list of avatars for approval rules table. See issue https://gitlab.com/gitlab-org/gitlab-ee/issues/1979
* | | | | | Merge branch 'suggestion-dashes' into 'master'Kushal Pandya2019-01-072-4/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes diff sugestions removing dashes from diff Closes #55634 See merge request gitlab-org/gitlab-ce!23994
| * | | | | | Fixes diff sugestions removing dashes from diffPhil Hughes2018-12-212-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55634
* | | | | | | Merge branch 'fl-releases-fix-author' into 'master'Kushal Pandya2019-01-071-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Fixes if case to render author info in releases See merge request gitlab-org/gitlab-ce!23989
| * | | | | | Fixes if case to render author info in releasesfl-releases-fix-authorFilipa Lacerda2018-12-211-1/+1
| | | | | | |
* | | | | | | Require Knative to be installed only on an RBAC kubernetes clusterChris Baumbauer2019-01-043-1/+27
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'ee1979-gl-modal-vuex' into 'master'Kushal Pandya2019-01-046-0/+122
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create shared gl-modal-vuex component and module See merge request gitlab-org/gitlab-ce!24140
| * | | | | | 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 'ce-revert-revert-gold-trial-mrs' into 'master'Kamil Trzciński2019-01-047-37/+62
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Bring back reverted Gold Trial MR (CE backport) See merge request gitlab-org/gitlab-ce!23621
| * | | | | Port GitLab.com gold trial callout changes to CEce-revert-revert-gold-trial-mrsLuke Bennett2019-01-037-37/+62
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8731
* | | | | | 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>