summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '9-2-stable' into fix-9-2-stable-conflicts-for-mr-11744Clement Ho2017-06-1218-69/+105
|\
| * Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into '...Clement Ho2017-06-121-1/+1
| * Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'Phil Hughes2017-06-121-1/+1
| * Merge branch 'fix-9-2-stable-conflicts-for-mr-11702' into '9-2-stable'Annabel Dunstone Gray2017-06-091-2/+7
| |\
| | * Fix conflicts in notes.scssfix-9-2-stable-conflicts-for-mr-11702Eric Eastwood2017-06-081-7/+0
| | * Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into 'ma...Annabel Dunstone Gray2017-06-081-2/+14
| * | Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11793' i...Timothy Andrew2017-06-081-1/+1
| |\ \
| | * | Fix conflict in app/assets/javascripts/blob/viewer/index.jsfix-9-2-stable-conflicts-for-mr-11793Sean McGivern2017-06-081-40/+1
| | * | Merge branch '33048-markdown-rendering-of-md-files-has-ceased-to-display-late...Douwe Maan2017-06-081-0/+39
| * | | Merge branch 'issue-boards-label-filtering' into 'master' Filipa Lacerda2017-06-081-1/+4
| * | | Merge branch '32850-award-emoji-off' into 'master'Phil Hughes2017-06-081-2/+3
| * | | Merge branch 'add-back-margin-to-note-text' into 'master'Annabel Dunstone Gray2017-06-081-6/+0
| * | | Merge branch 'issue-title-fade-fix' into '9-2-stable'Filipa Lacerda2017-06-081-1/+1
| * | | Merge branch 'winh-merge-request-tree-symbols' into 'master'Annabel Dunstone Gray2017-06-081-6/+2
| * | | Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-a...Fatih Acet2017-06-082-3/+7
| * | | Merge branch 'fix-emoji-menu-z-index' into 'master'Annabel Dunstone Gray2017-06-081-1/+1
| | |/ | |/|
| * | Merge branch '32683-resolved-discussions-icon-is-misaligned' into 'master'Annabel Dunstone Gray2017-06-081-1/+9
| * | Merge branch '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gon...Fatih Acet2017-06-086-43/+60
| * | Merge branch '32954-loading-icon' into 'master'Phil Hughes2017-06-082-0/+8
* | | Fix conflictsClement Ho2017-06-081-256/+32
* | | Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' i...Phil Hughes2017-06-082-2/+262
|/ /
* | Merge branch '30502-fix-bottom-padding-job-page' into 'master'Annabel Dunstone Gray2017-06-081-0/+4
|/
* Merge branch 'winh-filter-dropdown-spinner' into 'master'Annabel Dunstone Gray2017-06-081-0/+1
* Merge branch '33265-fix-9-2-stable-issue-description-flash-newlines' into '9-...Phil Hughes2017-06-083-5/+9
|\
| * Fix description flash with newline differences (HTML entities)33265-fix-9-2-stable-issue-description-flash-newlinesEric Eastwood2017-06-063-5/+9
* | Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'Timothy Andrew2017-05-311-2/+2
* | Revert "Merge branch 'issue-title-fade-fix' into '9-2-stable'"Timothy Andrew2017-05-301-1/+1
|/
* Replace nextTick with setTimeoutPhil Hughes2017-05-261-1/+1
* Merge branch '32170-assignees-spinner' into 'master'Phil Hughes2017-05-252-1/+6
* Merge branch '32715-fix-note-padding' into 'master'Annabel Dunstone Gray2017-05-252-5/+9
* Merge branch 'sentry-clientside-releases' into 'master'Phil Hughes2017-05-242-0/+6
* Merge branch '32735-fix-right-sidebar-coming-up-short' into 'master'Annabel Dunstone Gray2017-05-241-0/+4
* Merge branch 'acet-fix-mr-widget-state' into 'master'Douwe Maan2017-05-241-4/+4
* Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-232-2/+1
* Merge branch '32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widget' i...Fatih Acet2017-05-231-3/+2
* Merge branch '32631-issue-emoji-wrap' into 'master'Clement Ho2017-05-222-1/+5
* Merge branch '32486-fix-note-emoji-placement' into 'master'Annabel Dunstone Gray2017-05-221-4/+0
* Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into 'm...Phil Hughes2017-05-221-2/+3
* Merge branch '32657-fix-mr-widget-styles' into 'master'Fatih Acet2017-05-222-7/+15
* Merge branch '32595-fix-vertical-misalignment-mr-widget' into 'master'Filipa Lacerda2017-05-192-1/+17
* Remove incorrectly picked styles9-2-stable-fix-conflicts-for-mr-11189kushalpandya2017-05-201-4/+0
* Merge branch '9-2-stable' into 9-2-stable-fix-conflicts-for-mr-11189Clement Ho2017-05-192-1/+14
|\
| * Merge branch 'dm-copy-mr-source-branch-as-gfm' into 'master' Sean McGivern2017-05-191-0/+9
| * Merge branch '9-2-stable-fix-conflicts-for-mr-11547' into '9-2-stable'Regis Boudinot2017-05-191-1/+5
| |\
| | * Resolve header.scss conflictsLuke "Jared" Bennett2017-05-191-3/+0
| | * Merge branch 'fix-header-z-index' into 'master'9-2-stable-fix-conflicts-for-mr-11547Annabel Dunstone Gray2017-05-191-1/+8
* | | Merge branch '9-2-stable' into 9-2-stable-fix-conflicts-for-mr-11189Clement Ho2017-05-1947-542/+524
|\ \ \ | |/ /
| * | Merge branch 'tab-title-blank' into '9-2-stable'Regis Boudinot2017-05-191-2/+2
| |\ \
| | * | Correctly set title_text with API datatab-title-blankPhil Hughes2017-05-191-2/+2
| | |/
| * | Merge branch '9-2-stable-fix-conflicts-for-mr-11391' into '9-2-stable'Clement Ho2017-05-192-5/+22
| |\ \