summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Filipa Lacerda2017-02-021-2/+2
| | | | | | | | | | '27067-mention-user-dropdown-does-not-suggest-by-non-ascii-characters-in-name' into 'master' Resolve "Mention @user dropdown does not suggest by non-ASCII characters in name" Closes #27067 See merge request !8729
* Merge branch 'fix-filtering-username-with-multiple-words' into 'master' Filipa Lacerda2017-02-021-1/+8
| | | | | | | Fix filtering usernames with multiple words Closes #27404 See merge request !8851
* Merge branch '27089-26860-27151-fix-discussion-note-permalink-collapsed' ↵Filipa Lacerda2017-02-021-10/+16
| | | | | | | | | | into 'master' Fix permalink discussion note being collapsed Closes #26860, #27089, and #27151 See merge request !8773
* Merge branch '19164-mobile-settings' into 'master' Annabel Dunstone Gray2017-02-021-4/+7
| | | | | | | 19164 Add settings dropdown to mobile screens Closes #19164 See merge request !8896
* Merge branch ↵Filipa Lacerda2017-01-311-2/+8
| | | | | | | | | | '27248-filtered-search-does-not-allow-filtering-labels-with-multiple-words' into 'master' Fix filtering label and milestone with multiple words Closes #27248 and #27334 See merge request !8830
* Merge branch '27220-jqxhr-responsejson-message-is-undefined-in-safari' into ↵Fatih Acet2017-01-311-0/+1
| | | | | | | | | | 'master' Prevent form to be submitted twice Closes #27220 See merge request !8825
* Merge branch 'fix-search-bar-search-param' into 'master' Filipa Lacerda2017-01-311-1/+2
| | | | | | | Fix search bar search param encoding Closes #27398 See merge request !8753
* Merge branch '27047-8-16-cannot-login-with-2fa' into 'master' Fatih Acet2017-01-311-12/+12
| | | | | | | Resolve "Cannot login with 2fa" Closes #27047 See merge request !8730
* Merge branch ↵Fatih Acet2017-01-272-4/+7
| | | | | | | | | | '27254-clicking-line-anchor-multiple-times-causes-scroll-position-to-over-correct' into 'master' Resolve "Clicking line anchor multiple times causes scroll position to over-correct" Closes #27254 See merge request !8791
* Merge branch ↵Fatih Acet2017-01-271-1/+14
| | | | | | | | | | '27124-search-bar-does-not-load-discussion-notes-selected-labels' into 'master' Fix filtered search so that labels selected from discussion notes display correctly Closes #27124 See merge request !8756
* Merge branch 'correct-issue-filter-dropdown-user-avatar-stretch' into 'master' Annabel Dunstone Gray2017-01-273-5/+9
| | | | | Fixed flexbox and wrap issues See merge request !8745
* Merge branch '26844-new-search-bar-performs-a-new-request-for-each-tag' into ↵Alfredo Sumaran2017-01-272-39/+63
| | | | | | | | | | 'master' Add caching of droplab ajax requests Closes #26844 See merge request !8725
* Merge branch ↵Jacob Schatz2017-01-271-1/+9
| | | | | | | | | | '26618-search-bar-dropdown-offset-should-not-go-past-search-bar-input' into 'master' Introduced an offset limit to prevent the dropdown from going far right Closes #26618 and #27023 See merge request !8679
* Merge branch '26775-fix-auto-complete-initial-loading' into 'master' Fatih Acet2017-01-271-3/+8
| | | | | | | Fix autocomplete initial undefined state (loading) Closes #26775 See merge request !8667
* Merge branch 'label-select-toggle' into 'master' Fatih Acet2017-01-271-1/+5
| | | | | | | Fixed label select toggle not updating correctly Closes #26119 See merge request !8601
* Merge branch '27066-textarea-border' into 'master' Fatih Acet2017-01-251-1/+0
| | | | | | | Resolve "Comment/Description textarea shows a blue border on the left" Closes #27066 See merge request !8720
* Merge branch 'filtered-search-hidden-dont-render' into 'master'Jacob Schatz2017-01-251-3/+11
| | | | | Only render the list if it is visible See merge request !8710
* Merge branch 'filtered-search-keyboard-navigation' into 'master'Jacob Schatz2017-01-256-32/+101
| | | | | | | Fixed keyboard navigation not working in filtered search bar Closes #26840 See merge request !8656
* Merge branch '25780-reveal-variables-button-may-overrun-width-of-screen' ↵Fatih Acet2017-01-251-1/+25
| | | | | | | | | | into 'master' Resolve "Reveal Variables button may overrun width of screen" Closes #25780 See merge request !8221
* Merge branch 'merge-dropdown-this-context' into 'master' Jacob Schatz2017-01-241-1/+1
| | | | | Fixed bug with merge immediately button not working See merge request !8696
* Merge branch '26785-fix-droplab-in-ie-11-v1' into 'master' Jacob Schatz2017-01-243-21/+45
| | | | | | | Fix DropLab in IE11 v1 (merge edition) Closes #26785 See merge request !8689
* Merge branch 'issue-filter-click-to-search' into 'master' Jacob Schatz2017-01-244-2/+28
| | | | | Allow issue filter submission using mouse only See merge request !8681
* Merge branch 'issue-search-token-position' into 'master' Jacob Schatz2017-01-216-32/+84
| | | | | Filtered search input click back at token See merge request !8617
* Merge branch 'keep_mini_graph_down_pipelines_index' into 'master' Fatih Acet2017-01-211-3/+28
| | | | | Keep mini graph down pipelines index See merge request !8651
* Merge branch ↵Jacob Schatz2017-01-211-7/+7
| | | | | | | | | | '26617-search-bar-filter-dropdown-does-not-dismiss-when-sort-dropdown-is-selected' into 'master' Changed the event listener target from window to document in droplab Closes #26617 See merge request !8670
* Merge branch '26955-handle-legacy-issue-filter-params' into 'master' Jacob Schatz2017-01-211-0/+24
| | | | | | | Resolve "Filter issues input does not show assignee name when there is an assignee ID in the URL" Closes #26955 See merge request !8674
* Merge branch 'fix-upload-group-avatar' into 'master' Stan Hu2017-01-211-2/+2
| | | | | | | Button by itself will submit forms. Button type button willn't Closes #26999 See merge request !8694
* Merge branch 'button-alignment' into 'master' Fatih Acet2017-01-212-2/+1
| | | | | Fix small button alignment issues See merge request !8631
* Merge branch 'fix_auto_merging' into 'master' Grzegorz Bizon2017-01-211-17/+28
| | | | | | | Fix Merge When Pipeline Succeeds immediate merge bug Closes #26969 See merge request !8685
* Merge branch 'fix/revert-removing-build-tab-again' into '8-16-stable' Kamil Trzciński2017-01-213-4/+32
|\ | | | | | | | | Revert removing builds tab on '8-16-stable' See merge request !8661
| * Revert removing builds tab on '8-16-stable'fix/revert-removing-build-tab-againGrzegorz Bizon2017-01-203-4/+32
| | | | | | | | | | | | | | | | This reverts commit 79a816f3bca839aadbaf7af92ac0c0d30dc8a8b7, reversing changes made to 68d89aa96b1ae7ea742cc5ac708bd8d08492826b. Conflicts: app/views/projects/merge_requests/_show.html.haml
* | Merge branch 'participants-list' into 'master' Fatih Acet2017-01-201-0/+4
| | | | | | | | | | Fix participants margins to fit on one line See merge request !8640
* | Merge branch '26066-wrong-messsage-for-unregistered-u2f-device-on-sign-in' ↵Fatih Acet2017-01-203-10/+10
| | | | | | | | | | | | | | | | | | | | into 'master' New U2F ineligible message Closes #26066 See merge request !8392
* | Merge branch '25507-handle-errors-environment-list' into 'master' Fatih Acet2017-01-202-47/+72
| | | | | | | | | | | | | | Resolve "Error handling in environments list" Closes #25507 See merge request !8461
* | Merge branch '26601-dropdown-makes-request-close' into 'master' Fatih Acet2017-01-201-10/+11
| | | | | | | | | | | | | | Fixes builds dropdown making request when clicked to be closed Closes #26601 See merge request !8545
* | Merge branch '26472-math-margin' into 'master' Fatih Acet2017-01-201-1/+1
| | | | | | | | | | | | | | Add margin to math blocks Closes #26472 See merge request !8543
* | Merge branch 'didemacet-markdown-area-height-fix' into 'master' Fatih Acet2017-01-201-0/+11
| | | | | | | | | | | | | | Autoresize markdown preview Closes #24372 See merge request !8607
* | Merge branch '26803-typing-then-tab-in-a-comment-doesn-t-select-the-author' ↵Fatih Acet2017-01-201-1/+2
| | | | | | | | | | | | | | | | | | | | into 'master' Fixed highlightFirst and added specs Closes #26803 See merge request !8622
* | Merge branch 'input-button-hover' into 'master' Fatih Acet2017-01-201-1/+1
| | | | | | | | | | Add hover state to MR comment reply button See merge request !8541
* | Merge branch ↵Fatih Acet2017-01-203-10/+55
|/ | | | | | | | | | '24032-changed-visibility-level-to-public-but-project-is-not-public' into 'master' Update project visibility level ui to use dropdowns Closes #24296, #24123, and #24032 See merge request !7645
* Merge commit 'e7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1' into 8-16-stableJames Lopez2017-01-193-24/+26
|\ | | | | | | | | # Conflicts: # app/assets/javascripts/vue_pipelines_index/stage.js.es6
| * Merge branch '26616-fix-search-group-project-filters' into 'master' Alfredo Sumaran2017-01-162-1/+7
| |\ | | | | | | | | | | | | | | | | | | Fix search group/project filtering to show results Closes #26616 See merge request !8565
| | * Fix dropdown filter input value after blur26616-fix-search-group-project-filtersEric Eastwood2017-01-161-1/+1
| | |
| | * Fix group/project filters on search pageEric Eastwood2017-01-161-0/+6
| | |
| * | Merge branch 'pipeline_index_mini_graph_fix' into 'master' Fatih Acet2017-01-161-13/+6
| |\ \ | | | | | | | | | | | | | | | | Pipeline Index Mini Graph Fix See merge request !8542
| | * | phil said this is good - no need to dynamically update since this is a ↵pipeline_index_mini_graph_fixRegis2017-01-151-49/+7
| | | | | | | | | | | | | | | | static page for now
| | * | works in browsers without sourceCapabilities APIRegis2017-01-151-1/+4
| | | |
| | * | update commented documentation to reflect new changesRegis2017-01-151-2/+3
| | | |
| | * | fix clicking url bar, browser UI, dev tools collapsing the mini_graphRegis2017-01-151-1/+3
| | | |
| | * | fix UI without Promise or timeOut/intervalRegis2017-01-151-2/+9
| | | |