summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Fixes the top position of job log topbarFilipa Lacerda2019-02-191-1/+5
| | | | | | The top bar of the job log was always expecting the performance bar to be enabled. This commit adds CSS to fix the top position for both scenarios.
* Fixes some requests not being tracked in performance barPhil Hughes2019-02-191-1/+2
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57886
* Merge branch 'fix-diffs-not-rendering' into 'master'Filipa Lacerda2019-02-182-5/+6
|\ | | | | | | | | Fix diff files not rendering See merge request gitlab-org/gitlab-ce!25358
| * Fix diff files not renderingPhil Hughes2019-02-182-5/+6
| | | | | | | | | | | | | | Fixes some diff files not rendering when the renderIt property is updated. Previously it was using a local copy of renderIt which meant Vue wouldn't update it when the files renderIt property was updates
* | Merge branch 'diff-tree-resizable' into 'master'Filipa Lacerda2019-02-189-39/+94
|\ \ | |/ |/| | | | | | | | | Make the file tree in merge requests resizable Closes #51857 See merge request gitlab-org/gitlab-ce!25097
| * Make the file tree in merge requests resizablePhil Hughes2019-02-159-39/+94
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51857
* | Merge branch 'fix-job-name-overflow' into 'master'Kushal Pandya2019-02-182-1/+5
|\ \ | | | | | | | | | | | | | | | | | | Fix job name overflow in Firefox, Safari and IE Closes #56426 See merge request gitlab-org/gitlab-ce!24707
| * | Update text-break-word rulefix-job-name-overflowFernando Arias2019-02-131-1/+1
| | | | | | | | | | | | * change to break-all for proper wrapping across all browsers
| * | Fix job name overflow in Firefox, Safari and IEFernando Arias2019-02-132-1/+5
| | |
* | | Merge branch '55312-svg' into 'master'Kushal Pandya2019-02-181-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use export-import svg from gitlab-svgs Closes #55312 See merge request gitlab-org/gitlab-ce!24954
| * | | Use export-import svg from gitlab-svgsRajat Jain2019-02-181-3/+4
| | | | | | | | | | | | | | | | | | | | Use SVG assets from @gitlab/svgs instead of using svg illustrations from project folder
* | | | Remove noteId prop from ReplyButton componentWinnie Hellmann2019-02-185-31/+33
| | | | | | | | | | | | | | | | Move convertToDiscussion call from ReplyButton to NoteApp component
* | | | Merge branch ↵Phil Hughes2019-02-184-0/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '57123-revert-single-comments-to-initial-state-after-cancelling-reply' into 'master' Resolve "Revert single comments to initial state after cancelling reply" Closes #57123 See merge request gitlab-org/gitlab-ce!25339
| * | | | Cancelling reply reverts comment to initial stateConstance Okoghenun2019-02-184-0/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | When converting a comment to a discussion if the "Cancel" button is used to exit the new discussion note, the comment would revert back to its initial state
* | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Ehsan Abdulqader2019-02-182-0/+65
|/ / / | | | | | | | | | feature/56787-realtime-validation-for-user-fullname-and-username
* | | Merge branch '57768-remove-vertical-line' into 'master'Fatih Acet2019-02-151-5/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove vertical connecting line placeholder from diff discussion notes Closes #57768 See merge request gitlab-org/gitlab-ce!25292
| * | | Remove vertical connecting line placeholder from diff discussion notesAnnabel Dunstone Gray2019-02-151-5/+0
| | | |
* | | | Merge branch '54725-fix-emoji-button-active-state' into 'master'Phil Hughes2019-02-151-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve "Add reaction emoji styling is off" See merge request gitlab-org/gitlab-ce!25295
| * | | | Fix hover and active state colors of award emoji buttonAnnabel Dunstone Gray2019-02-151-3/+7
| |/ / /
* | | | Replaced part of diff file properties with diff viewerNatalia Tepluhina2019-02-1511-68/+118
| | | | | | | | | | | | | | | | | | | | | | | | - replaced file.too_large - replaced file.text - replaced file.collapsed
* | | | Merge branch '50433-make-emoji-picker-bigger' into 'master'Annabel Dunstone Gray2019-02-152-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make emoji picker bigger" Closes #50433 See merge request gitlab-org/gitlab-ce!25187
| * | | | Make emoji picker biggerJacopo2019-02-152-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | The emoji picker shows 9 emoji for each row. On mobile devices the width is reduced to 7 emoji for each row.
* | | | | Merge branch '55893-artifacts-download' into 'master'Phil Hughes2019-02-152-16/+19
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fixes dropdowns not working in Pipelines pages Closes #55893 and #56071 See merge request gitlab-org/gitlab-ce!25043
| * | | | Fixes not working dropdowns in pipelines page55893-artifacts-downloadFilipa Lacerda2019-02-132-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | glbutton is not meant to work with old dropdowns This commit reverts the update to use gl button and adds i18n to some missing strings
* | | | | Merge branch '55206-discussion-text-alignment' into 'master'Annabel Dunstone Gray2019-02-152-25/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly align resolved discussion text Closes #55206 See merge request gitlab-org/gitlab-ce!25001
| * | | | | Prevent line breaks in note timestamp55206-discussion-text-alignmentMark Florian2019-02-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | For better readability.
| * | | | | Allow wrapping of note headlineMark Florian2019-02-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents a horizontal scrollbar from appearing in Firefox in certain situations. See the [merge request][1] for more details and discussion. [1]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25001#note_141208011
| * | | | | Correctly align resolved discussion textMark Florian2019-02-122-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The header of the `NoteableDiscussion` component is really a media object[1], but it didn't have the right DOM or styling to correctly achieve it. This change wraps all the children of the media object (except the floated image) in a dedicated `.timeline-content` element, which is styled to establish its own block formatting context[2]. This ensures *all* of its children sit left-aligned to the right edge of the float. In short, the DOM used to look like this: .discussion-header .timeline-icon note-header note-edited-text and now it looks like this: .discussion-header .timeline-icon .timeline-content (with own formatting context) note-header note-edited-text This is also now more consistent with the DOM of `NoteableNote`, in that `.timeline-icon` and `.timeline-content` seem to want to be siblings. [1]: http://www.stubbornella.org/content/2010/06/25/the-media-object-saves-hundreds-of-lines-of-code/ [2]: https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
* | | | | | Merge branch 'import-go-to-project-cta-nibble-backend' into 'master'Lin Jen-Shin2019-02-1518-11/+728
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | BE Improve the GitHub and Gitea import feature table interface See merge request gitlab-org/gitlab-ce!24606
| * | | | | Improve the GitHub and Gitea import feature table interfaceimport-go-to-project-cta-nibble-frontendLuke Bennett2019-02-1318-11/+728
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are frontend changes. Use Vue for the import feature UI for "githubish" providers (GitHub and Gitea). Add "Go to project" button after a successful import. Use CI-style status icons and improve spacing of the table and its component. Adds ETag polling to the github and gitea import jobs endpoint.
* | | | | Merge branch 'ce-1979-fe-multiple-approval-rules' into 'master'Phil Hughes2019-02-151-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE Port of Multiple merge request approval rules See merge request gitlab-org/gitlab-ce!25193
| * | | | | CE Port of Multiple merge request approval rulesPaul Slaughter2019-02-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9001
* | | | | | Merge branch '57692-fix-rendering-of-none-any' into 'master'Phil Hughes2019-02-151-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Search bar rendering `none` and `any` as users" Closes #57692 See merge request gitlab-org/gitlab-ce!25235
| * | | | | | Fix rendering of user token special valuesHeinrich Lee Yu2019-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Include capitalized `none` and `any` as special values
* | | | | | | Merge branch 'web-ide-commit-header-icon-alignment-fix' into 'master'Filipa Lacerda2019-02-142-2/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes alignment of changed icon in Web IDE Closes #57649 See merge request gitlab-org/gitlab-ce!25202
| * | | | | | | Fixes alignment of changed icon in Web IDEPhil Hughes2019-02-132-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57649
* | | | | | | | Merge branch 'tz-stylelint' into 'master'Annabel Dunstone Gray2019-02-1414-46/+40
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Stylelint Setup See merge request gitlab-org/gitlab-ce!25148
| * | | | | | | | Added Stylelint SetupTim Zallmann2019-02-1414-46/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added stylelint to static-analysis Updated yarn dependencies CSS Fixes and rule adoptions of stylelint Added stylelint-scss Deduplicated yarn.lock to clear dependencies
* | | | | | | | | Add fix for suggested changes syntax highlightingAnnabel Dunstone Gray2019-02-143-5/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Removed the `note-text` class since it conflicted other classes.
* | | | | | | | Merge branch '9721-cannot-scroll-forwards-in-time-for-roadmap-view-ce' into ↵Phil Hughes2019-02-141-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE Port of fix for roadmap forward timeline scroll See merge request gitlab-org/gitlab-ce!25217
| * | | | | | | | CE Port of fix for roadmap forward timeline scrollConstance Okoghenun2019-02-131-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9530
* | | | | | | | Fix polling for replies to individual notesHeinrich Lee Yu2019-02-146-24/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets `updated_at` so that the transformed note is returned together with the new reply
* | | | | | | | Merge branch '57544-web-ide-new-directory-dialog-shows-file-templates' into ↵Phil Hughes2019-02-141-4/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Web IDE new directory dialog shows file templates" Closes #57544 See merge request gitlab-org/gitlab-ce!25119
| * | | | | | | | Dont show file template options for new directorySam Bigelow2019-02-131-4/+10
| | | | | | | | |
* | | | | | | | | Fixed link alignmentNatalia Tepluhina2019-02-142-2/+7
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch '57160-merge-request-tabs-header-is-missing-bottom-border' into ↵Annabel Dunstone Gray2019-02-131-5/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Merge Request Tabs Header is missing bottom border" Closes #57160 See merge request gitlab-org/gitlab-ce!25198
| * | | | | | | Return border bottom on MR TabsSam Bigelow2019-02-131-5/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'diff-fix-duplicate-key-error' into 'master'Filipa Lacerda2019-02-132-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed diff rendering causing a duplicate key warning Closes #56797 See merge request gitlab-org/gitlab-ce!24634
| * | | | | | Fixed diff rendering causing a duplicate key warningPhil Hughes2019-02-132-0/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56797
* | | | | | add title attr to display file nameSatoshi Nakamatsu2019-02-131-0/+1
|/ / / / /
View Lorry Controller Status