summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Fix MR target branch selector dropdown placement cut-off31271-fixmr-target-branch-selector-dropdownEric Eastwood2017-05-013-0/+44
* Merge branch 'dm-snippet-blob-viewers' into 'master' Sean McGivern2017-05-013-5/+11
|\
| * Use blob viewers for snippetsDouwe Maan2017-04-303-5/+11
* | Fix emoji alignment31595-emoji-btnAnnabel Dunstone Gray2017-04-281-2/+2
|/
* Display video blobs in-line like imagesdm-video-viewerDouwe Maan2017-04-281-2/+4
* Merge branch 'make_markdown_tables_thinner' into 'master' Sean McGivern2017-04-284-0/+21
|\
| * Make markdown tables thinnerblackst0ne2017-04-274-0/+21
* | Merge branch 'dm-blob-viewers' into 'master' Tim Zallmann2017-04-284-8/+137
|\ \
| * | Add variable to save us a double lookupDouwe Maan2017-04-271-2/+3
| * | Fixed failing JS testsPhil Hughes2017-04-271-1/+1
| * | Add specsDouwe Maan2017-04-271-1/+1
| * | Render viewer error synchronously so that 'view the source' link will workDouwe Maan2017-04-271-12/+13
| * | Satisfy eslintDouwe Maan2017-04-271-18/+7
| * | Add BlobViewer JSDouwe Maan2017-04-272-0/+132
| * | Allow LineHighlighter to be triggered by eventDouwe Maan2017-04-271-7/+13
* | | Merge branch 'fix_build_header_line_height' into 'master' Annabel Dunstone Gray2017-04-271-0/+1
|\ \ \
| * | | Increase line-height in build-header so elements don't overlapdixpac2017-04-251-0/+1
| | |/ | |/|
* | | Merge branch 'related-branch-ci-status-icon-alignment' into 'master' Annabel Dunstone Gray2017-04-271-4/+9
|\ \ \ | |_|/ |/| |
| * | Fixed alignment of CI icon in related issues sectionrelated-branch-ci-status-icon-alignmentPhil Hughes2017-04-271-4/+9
* | | Remove unused codeFilipa Lacerda2017-04-276-98/+93
* | | Use vue files for vue components.Filipa Lacerda2017-04-274-139/+160
|/ /
* | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser'Sean McGivern2017-04-272-1/+20
|\ \
| * | Fix rendering emoji inside a stringblackst0ne2017-04-252-1/+20
* | | Add button to delete filters from filtered search barClement Ho2017-04-263-14/+60
* | | Resolve "Jobs dropdown in mini graph should close when we receive an error"Filipa Lacerda2017-04-263-18/+39
* | | Merge branch '26509-show-update-time' into 'master' Annabel Dunstone Gray2017-04-261-0/+1
|\ \ \
| * | | Add updated time to project listJeff Stubler2017-04-211-0/+1
* | | | Merge branch '22826-ui-inconsistency-different-files-views-find-file-button-m...Clement Ho2017-04-261-1/+0
|\ \ \ \
| * | | | [#22826] Ensure find_file_link and download button is part of file tree headerTM Lee2017-04-231-1/+0
* | | | | Merge branch 'group-assignee-dropdown-send-group-id' into 'master' Filipa Lacerda2017-04-261-0/+1
|\ \ \ \ \
| * | | | | Assignee filter on group issues/merge requests only loads group usersgroup-assignee-dropdown-send-group-idPhil Hughes2017-04-241-0/+1
* | | | | | Update MR diff blob_fork_suggestion after jQuery updateupdate-mr-diff-blob-fork-suggestion-after-jquery-udpateEric Eastwood2017-04-251-1/+2
* | | | | | Metrics graph error fixJose Ivan Vargas Lopez2017-04-251-29/+34
* | | | | | Resolve "Clean up padding with Markdown headers"Taurie Davis2017-04-259-36/+42
* | | | | | Merge branch '31276-fix-diffs-with-edit-forking-needs' into 'master' Douwe Maan2017-04-251-0/+11
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix diffs with edit-forking needs31276-fix-diffs-with-edit-forking-needsEric Eastwood2017-04-241-0/+11
* | | | | | Merge branch 'use-jquery-on-blob-fork-suggestion' into 'master' Jacob Schatz2017-04-242-29/+27
|\ \ \ \ \ \
| * | | | | | Use jQuery niceness on blob_fork_suggestionuse-jquery-on-blob-fork-suggestionEric Eastwood2017-04-222-29/+27
| |/ / / / /
* | | | | | Merge branch '31269-task-scroll' into 'master' Jacob Schatz2017-04-241-0/+4
|\ \ \ \ \ \
| * | | | | | Add normal wrapping to task lists31269-task-scrollAnnabel Dunstone Gray2017-04-211-0/+4
| |/ / / / /
* | | | | | Merge branch 'notebooklab-in-repo' into 'master' Jacob Schatz2017-04-2411-2/+478
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into notebooklab-in-reponotebooklab-in-repoPhil Hughes2017-04-1332-1897/+1854
| |\ \ \ \ \ \
| * | | | | | | Pulled in latest changesPhil Hughes2017-04-131-14/+59
| * | | | | | | Pulled in latest changes from NotebookLabPhil Hughes2017-04-131-0/+4
| * | | | | | | Merge branch 'master' into notebooklab-in-repoPhil Hughes2017-04-138-83/+103
| |\ \ \ \ \ \ \
| * | | | | | | | Moved NotebookLab assets into repoPhil Hughes2017-04-1111-2/+429
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Fixes the spacing around diff discussion buttonsdiff-discussion-buttons-spacingPhil Hughes2017-04-241-0/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch '31072-activity-border' into 'master' Phil Hughes2017-04-242-2/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix border color on activities page31072-activity-borderAnnabel Dunstone Gray2017-04-212-2/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '30618-change-placeholder-color' into 'master' Annabel Dunstone Gray2017-04-212-0/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | |