summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Backport canEdit changes for conditional remove buttonback-port-locked-milestones-to-ceEric Eastwood2017-05-268-40/+83
| | | | | | | | | | | | | Backport Fix locked milestone in boards being remove-able. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1963 Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/2433 Conflicts: app/assets/javascripts/boards/boards_bundle.js app/assets/javascripts/boards/filtered_search_boards.js app/assets/javascripts/filtered_search/filtered_search_manager.js spec/features/boards/boards_spec.rb
* Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-254-8/+3
|\ | | | | | | | | Clean up diff rendering See merge request !11390
| * Clean up diff renderingDouwe Maan2017-05-232-5/+1
| |
| * Consistently style image in blob and diffDouwe Maan2017-05-233-3/+2
| |
* | Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into ↵Annabel Dunstone Gray2017-05-251-2/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix note header author and time ago wrapping in parallel diff Closes #32801 See merge request !11702
| * | Fix note header author and time ago wrapping in parallel diff32801-fix-discussion-header-wrapping-in-parallel-diffEric Eastwood2017-05-251-2/+7
| | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32801
* | | Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'Phil Hughes2017-05-251-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix filtered search issuable empty state exception Closes #31455 See merge request !11347
| * | | Check for filtered-search before constructing filteredsearchmanagerLuke "Jared" Bennett2017-05-121-1/+1
| | | |
* | | | Merge branch 'add-back-margin-to-note-text' into 'master'Annabel Dunstone Gray2017-05-251-6/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove 0 margin bottom for last paragraph on note text See merge request !11699
| * | | | Remove 0 margin bottom for last paragraph on note textadd-back-margin-to-note-texttauriedavis2017-05-241-6/+0
| | | | |
* | | | | Merge branch '32850-award-emoji-off' into 'master'Phil Hughes2017-05-251-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of hover state on emoji button Closes #32850 See merge request !11691
| * | | | | Fix alignment of hover state on emoji button32850-award-emoji-offAnnabel Dunstone Gray2017-05-241-2/+3
| | | | | |
* | | | | | Use non-global jQuery reference within raven bundleLuke "Jared" Bennett2017-05-251-1/+2
| |/ / / / |/| | | |
* | | | | Merge branch 'winh-ajax-filter-cache' into 'master'Clement Ho2017-05-241-36/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use AjaxCache in Droplab AjaxFilter See merge request !11643
| * | | | | 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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Don't copy empty elements that were not selected on purpose as GFM See merge request !11520
| * | | | | 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 padding Closes #32715 and #32467 See merge request !11616
| * | | | | | 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 outdated Closes #30058 See merge request !11584
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show loading indicator while waiting for assignees first fetch Closes #32170 See merge request !11434
| * | | | | | add loading spinner to sidebar assignees32170-assignees-spinnerSimon Knox2017-05-242-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | store isFetching state to indicate if assignees has initial data
* | | | | | | Merge branch 'wait-for-ajax-handling-all-js-requests' into 'master'Douwe Maan2017-05-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use wait_for_requests for checking Vue resource and $.ajax requests [CE] Closes #31946 and #31555 See merge request !11451
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't wrap pasted code when it's already inside code tags Closes #32507 See merge request !11524
| * | | | | | | 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 nav Closes #32700 See merge request !11657
| * | | | | | | Only show extra nav border on layout nav32700-extra-nav-borderAnnabel Dunstone Gray2017-05-231-11/+11
| | | | | | | |
* | | | | | | | Merge branch ↵Phil Hughes2017-05-2411-32/+48
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32563-remove-duplicated-config-code-for-filtered-search-dropdowns' into 'master' Resolve "Remove duplicated config code for filtered search dropdowns" Closes #32563 See merge request !11512
| * | | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read HEAD commit and use as sentry releases value Closes #32535 See merge request !11565
| * | | | | | 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 right-sidebar gap on mobile Closes #32735 See merge request !11625
| * | | | | Fix sidebar coming up short on mobile32735-fix-right-sidebar-coming-up-shortEric Eastwood2017-05-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/32735
* | | | | | Merge branch 'winh-filters-dropdown-scroll' into 'master'Annabel Dunstone Gray2017-05-231-5/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make static filter entries scroll with dynamic ones See merge request !11640
| * | | | | | 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 nothing Closes #32738 See merge request !11623
| * | | | | | Fix group/project name ellipsis button doing nothing32738-fix-project-title-ellipsis-doing-nothingEric Eastwood2017-05-221-3/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32738
* | | | | | Merge branch 'winh-frontend-user-cache' into 'master'Filipa Lacerda2017-05-233-14/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce UsersCache for storing user entities in frontend See merge request !11404
| * | | | | | 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' ↵Fatih Acet2017-05-231-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Follow-up from "Add "SHA mismatch" state to the MR widget"" Closes #32480 See merge request !11466
| * | | | | | ensure MergeRequestStore sha value never changes after instantiation32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widgetMike Greiling2017-05-171-3/+2
| | | | | | |
View Lorry Controller Status