summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Fix typos occured to occurredHiroyuki Sato2018-11-168-13/+13
* Merge branch 'notes-consistent-key-object-case' into 'master'Filipa Lacerda2018-11-1524-269/+252
|\
| * Made diff & note data consistentPhil Hughes2018-11-1424-269/+252
* | Tweak vertical line to line up with system notes and comment avatars53882-extra-container-diff-versionAnnabel Dunstone Gray2018-11-141-1/+1
* | Add back margin on discussion system notesAnnabel Dunstone Gray2018-11-141-1/+1
* | Remove box on diff tab system noteAnnabel Dunstone Gray2018-11-141-0/+17
* | Fix version system noteAnnabel Dunstone Gray2018-11-141-1/+7
* | Merge branch '53918-snippet-commit-comments' into 'master'Fatih Acet2018-11-141-0/+20
|\ \
| * | Fix styling of snippet and commit discussion comments53918-snippet-commit-commentsAnnabel Dunstone Gray2018-11-141-0/+20
* | | Merge branch 'discussion-fixes-2' into 'master'Fatih Acet2018-11-142-2/+2
|\ \ \
| * | | Fix diff border radiusdiscussion-fixes-2Annabel Dunstone Gray2018-11-141-1/+1
| * | | Fix vertical line alignment in discussionAnnabel Dunstone Gray2018-11-141-1/+1
* | | | Add white background to commit diff commentsAnnabel Dunstone Gray2018-11-141-0/+4
|/ / /
* | | Merge branch 'fl-gitlab-ui-cicd' into 'master'Clement Ho2018-11-146-53/+25
|\ \ \ | |_|/ |/| |
| * | Removes jquery as a dependencyFilipa Lacerda2018-11-141-4/+3
| * | Updates pipeline code to use gitlab-uiFilipa Lacerda2018-11-126-50/+23
* | | Merge branch 'mr-expand-all-collapsed-files' into 'master'Filipa Lacerda2018-11-141-3/+15
|\ \ \
| * | | Fix collapsed files not fully fully expandingPhil Hughes2018-11-131-3/+15
* | | | Disable updating appearance of filter tokens for special valuesHeinrich Lee Yu2018-11-141-4/+5
| |_|/ |/| |
* | | Merge branch 'enable-image-comments-for-renamed-files' into 'master'Filipa Lacerda2018-11-131-2/+5
|\ \ \
| * | | Fixed image commenting on moved filesPhil Hughes2018-11-131-2/+5
* | | | Fix broken UI on commit discussionsAnnabel Dunstone Gray2018-11-132-19/+37
* | | | Merge branch '_acet-discussion-redesign-fixes' into 'master'Annabel Dunstone Gray2018-11-131-4/+1
|\ \ \ \
| * | | | Border radius fixes for redesigned discussions_acet-discussion-redesign-fixesFatih Acet2018-11-131-4/+1
* | | | | Merge branch '51259-tooltip' into 'master'Phil Hughes2018-11-131-24/+21
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Updates ci header component with gitlab-ui51259-tooltipFilipa Lacerda2018-11-131-24/+21
| | |_|/ | |/| |
* | | | Merge branch 'remove-mr-version-controls-form-fixed-width-container' into 'ma...Phil Hughes2018-11-131-6/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | remove .mr-version-controls from .fixed-with-containerOren Aksakal2018-11-121-6/+0
| |/ /
* | | Merge branch '53888-missing-favicon' into 'master'Phil Hughes2018-11-131-2/+2
|\ \ \ | |_|/ |/| |
| * | Adds back missing CI favicon53888-missing-faviconFilipa Lacerda2018-11-121-2/+2
| |/
* | Align all avatars and system notes in discussionalign-vertical-discussion-lineAnnabel Dunstone Gray2018-11-121-3/+3
|/
* Removes feature flag for ciEnvironmentsStatusChangesFilipa Lacerda2018-11-121-6/+1
* Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-121-1/+7
|\
| * Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-091-1/+7
* | Merge branch 'mr-tree-filter-path-name' into 'master'Filipa Lacerda2018-11-121-1/+1
|\ \
| * | Changed diff tree filtering to pathPhil Hughes2018-11-121-1/+1
* | | Merge branch 'discussion-perf-improvement' into 'master'Filipa Lacerda2018-11-127-23/+30
|\ \ \ | |/ / |/| |
| * | Consistently use Vue.nexTick when starting taskListdiscussion-perf-improvementPhil Hughes2018-11-091-8/+11
| * | Init task list when creating new note & discussionPhil Hughes2018-11-092-0/+2
| * | Fix TaskList init on update & pollPhil Hughes2018-11-092-11/+5
| * | Improve initial rendering of discussion notesPhil Hughes2018-11-095-13/+21
* | | Use gitlab-ui in jobs and pipelinesFilipa Lacerda2018-11-097-68/+91
* | | Resolve "GitLab Pages settings regressions"Scott Hampton2018-11-091-4/+3
* | | Merge branch '51259-gitlab-ui-replacement' into 'master'Clement Ho2018-11-091-12/+6
|\ \ \
| * | | Updates clipboard button with gitlab-ui51259-gitlab-ui-replacementFilipa Lacerda2018-11-091-12/+6
| |/ /
* | | Merge branch '53768-diff-comment-action-btns' into 'master'Phil Hughes2018-11-092-4/+3
|\ \ \
| * | | Fix alignment of diff comment buttons53768-diff-comment-action-btnsAnnabel Dunstone Gray2018-11-092-4/+3
| |/ /
* | | Merge branch '34758-group-cluster-controller' into 'master'Kamil TrzciƄski2018-11-0911-34/+98
|\ \ \ | |/ / |/| |
| * | Fix vertical padding between clusters in index pageMike Greiling2018-11-081-0/+4
| * | Redesign cluster indexMike Greiling2018-11-081-0/+25