summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'winh-ajax-filter-cache' into 'master'Clement Ho2017-05-241-36/+11
|\
| * Use AjaxCache in Droplab AjaxFilterwinh-ajax-filter-cachewinh2017-05-241-36/+11
* | Copy as GFM even when parts of other elements are selectedDouwe Maan2017-05-242-8/+22
* | Merge branch 'dm-copy-as-gfm-without-empty-elements' into 'master'Filipa Lacerda2017-05-241-26/+49
|\ \
| * | Remove unnecessary variabledm-copy-as-gfm-without-empty-elementsDouwe Maan2017-05-241-3/+1
| * | Don't copy empty elements that were not selected on purpose as GFMDouwe Maan2017-05-181-26/+51
* | | Merge branch '32715-fix-note-padding' into 'master'Annabel Dunstone Gray2017-05-242-5/+9
|\ \ \
| * | | 32715 Make all notes use equal padding32715-fix-note-paddingtauriedavis2017-05-233-9/+9
* | | | Merge branch 'dm-outdated-system-note' into 'master'Grzegorz Bizon2017-05-243-9/+16
|\ \ \ \
| * | | | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-233-9/+16
| |/ / /
* | | | Merge branch '32170-assignees-spinner' into 'master'Phil Hughes2017-05-242-1/+6
|\ \ \ \
| * | | | add loading spinner to sidebar assignees32170-assignees-spinnerSimon Knox2017-05-242-1/+6
* | | | | Merge branch 'wait-for-ajax-handling-all-js-requests' into 'master'Douwe Maan2017-05-241-1/+1
|\ \ \ \ \
| * | | | | Use wait_for_requests to wait all JS requestwait-for-ajax-handling-all-js-requestsOswaldo Ferreira2017-05-221-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'dm-paste-code-inside-gfm-code' into 'master'Filipa Lacerda2017-05-242-9/+28
|\ \ \ \ \
| * | | | | Add specdm-paste-code-inside-gfm-codeDouwe Maan2017-05-231-6/+6
| * | | | | Don't wrap pasted code when it's already inside code tagsDouwe Maan2017-05-192-3/+22
| | |_|_|/ | |/| | |
* | | | | Merge branch '32700-extra-nav-border' into 'master'Phil Hughes2017-05-241-11/+11
|\ \ \ \ \
| * | | | | Only show extra nav border on layout nav32700-extra-nav-borderAnnabel Dunstone Gray2017-05-231-11/+11
* | | | | | Merge branch '32563-remove-duplicated-config-code-for-filtered-search-dropdow...Phil Hughes2017-05-2411-32/+48
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Port EE changes32563-remove-duplicated-config-code-for-filtered-search-dropdownsClement Ho2017-05-2311-18/+37
| * | | | | Remove duplicated codeClement Ho2017-05-182-14/+11
| | |/ / / | |/| | |
* | | | | Merge branch 'sentry-clientside-releases' into 'master'Phil Hughes2017-05-242-0/+6
|\ \ \ \ \
| * | | | | Use Gitlab::REVISION over reading HEAD sha from gitsentry-clientside-releasesLuke "Jared" Bennett2017-05-211-2/+2
| * | | | | Read HEAD commit and use as releases valueLuke "Jared" Bennett2017-05-192-0/+6
* | | | | | MRWidget: Change order of if blocks to determine widget state properly.acet-fix-mr-widget-stateFatih Acet2017-05-241-4/+4
| |_|_|_|/ |/| | | |
* | | | | Merge branch '32735-fix-right-sidebar-coming-up-short' into 'master'Annabel Dunstone Gray2017-05-231-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix sidebar coming up short on mobile32735-fix-right-sidebar-coming-up-shortEric Eastwood2017-05-231-0/+4
* | | | | Merge branch 'winh-filters-dropdown-scroll' into 'master'Annabel Dunstone Gray2017-05-231-5/+2
|\ \ \ \ \
| * | | | | Make static filter entries scroll with dynamic oneswinh-filters-dropdown-scrollwinh2017-05-231-5/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch '32738-fix-project-title-ellipsis-doing-nothing' into 'master'Annabel Dunstone Gray2017-05-231-3/+3
|\ \ \ \ \
| * | | | | Fix group/project name ellipsis button doing nothing32738-fix-project-title-ellipsis-doing-nothingEric Eastwood2017-05-221-3/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'winh-frontend-user-cache' into 'master'Filipa Lacerda2017-05-233-14/+51
|\ \ \ \ \
| * | | | | Add frontend UsersCache class (!11404)winh-frontend-user-cachewinh2017-05-231-0/+28
| * | | | | Extract Cache class from AjaxCachewinh2017-05-212-14/+23
| | |/ / / | |/| | |
* | | | | Merge branch '32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widget' i...Fatih Acet2017-05-231-3/+2
|\ \ \ \ \
| * | | | | ensure MergeRequestStore sha value never changes after instantiation32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widgetMike Greiling2017-05-171-3/+2
* | | | | | Merge branch 'prevent-project-transfer' into 'master'Douwe Maan2017-05-232-0/+13
|\ \ \ \ \ \
| * | | | | | Renamed some messages and refactored the project_edit class to a functionJose Ivan Vargas2017-05-222-16/+9
| * | | | | | Prevent project transfer if a new group is not selectedJose Ivan Vargas2017-05-222-0/+20
* | | | | | | Merge branch '32418-make-link-to-self-less-obvious' into 'master'Fatih Acet2017-05-221-5/+1
|\ \ \ \ \ \ \
| * | | | | | | Change links to issuable meta to blackAnnabel Dunstone Gray2017-05-191-5/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '32486-fix-note-emoji-placement' into 'master'Annabel Dunstone Gray2017-05-221-4/+0
|\ \ \ \ \ \ \
| * | | | | | | 32486 Fix placement of note emoji on hover32486-fix-note-emoji-placementtauriedavis2017-05-221-4/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '32657-fix-mr-widget-styles' into 'master'Fatih Acet2017-05-222-7/+15
|\ \ \ \ \ \ \
| * | | | | | | MR widget styling fixes32657-fix-mr-widget-styleskushalpandya2017-05-222-7/+15
| |/ / / / / /
* | | | | | | Merge branch '32631-issue-emoji-wrap' into 'master'Clement Ho2017-05-222-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Fix spacing of issue emojis32631-issue-emoji-wrapAnnabel Dunstone Gray2017-05-192-1/+5
* | | | | | | | Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into 'm...Phil Hughes2017-05-221-2/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix jQuery data attribute caching issue casuing expanding issuesEric Eastwood2017-05-221-2/+3