summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* MRWidget: Make error message bold and red.mr-widget-refresh-failedFatih Acet2017-05-191-1/+1
|
* MRWidget: Change refresh button place in failed state.Fatih Acet2017-05-191-3/+3
|
* MRWidget: Add refresh button into MR widget failed state.Fatih Acet2017-05-191-0/+26
|
* Merge branch 'delete-old-mr-widget' into 'master'Fatih Acet2017-05-181-303/+0
|\ | | | | | | | | Delete merge_request_widget.js See merge request !11452
| * Delete merge_request_widget.jsdelete-old-mr-widgetLuke "Jared" Bennett2017-05-171-303/+0
| |
* | Fix clicking disabled clipboard button toolipLuke "Jared" Bennett2017-05-181-2/+2
| |
* | Fix ability to edit diff notes multiple timesKushal Pandya2017-05-181-3/+3
| |
* | Merge branch 'fix-trailing-space-mr-widget' into 'master'Fatih Acet2017-05-181-4/+1
|\ \ | | | | | | | | | | | | | | | | | | Refactored the anchor tag to remove the trailing space in the target branch Closes #32445 See merge request !11463
| * | Refactored the anchor tag to remove the trailing space in the target branchfix-trailing-space-mr-widgetJose Ivan Vargas2017-05-171-4/+1
| | |
* | | Merge branch '32424-fix-linking-to-unresolved-expanded-diff-note' into 'master'Phil Hughes2017-05-182-8/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix linking to unresolved/expanded diff note Closes #32424 See merge request !11458
| * | | Fix linking to unresolved/expanded diff note32424-fix-linking-to-unresolved-expanded-diff-noteEric Eastwood2017-05-172-8/+21
| |/ / | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32424 Bug introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327
* | | Merge branch '32359-align-resolve-btn' into 'master'Filipa Lacerda2017-05-181-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Align resolve comment btn Closes #32359 See merge request !11457
| * | | Align resolve comment btn32359-align-resolve-btnAnnabel Dunstone Gray2017-05-171-3/+3
| | | |
* | | | Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into ↵Phil Hughes2017-05-181-20/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix note flicker with note you can't edit and trailing new line edge case Closes #32449 See merge request !11472
| * | | | Fix missing .original-note-content and trailing new line edge case32449-fix-note-comparison-trailing-newline-edge-caseEric Eastwood2017-05-181-20/+22
| | |/ / | |/| | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32449
* | | | Disable reference prefixes in notes for SnippetsSam Rose2017-05-182-5/+13
| | | |
* | | | Merge branch ↵Phil Hughes2017-05-181-0/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabled' into 'master' Automatically close user dropdown for CE Closes #31987 See merge request !11189
| * | | Remove unnecessary hidden()31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabledClement Ho2017-05-171-2/+0
| | | |
| * | | Use to toggle the dropdownClement Ho2017-05-171-1/+1
| | | |
| * | | Add test.js and test.css to disable animations during testing and include ↵Luke "Jared" Bennett2017-05-162-0/+18
| | | | | | | | | | | | | | | | these in _head when testing
| * | | Merge branch 'master' into ↵Clement Ho2017-05-16122-1273/+1428
| |\ \ \ | | | | | | | | | | | | | | | '31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabled'
| * | | | Fix conflict on users_selectClement Ho2017-05-121-606/+599
| | | | |
| * | | | Add additional EE checkClement Ho2017-05-111-1/+3
| | | | |
| * | | | Automatically close user dropdown for CEClement Ho2017-05-091-0/+9
| | | | |
* | | | | Fix Ordered Task List ItemsJared Deckard2017-05-171-2/+2
| |_|_|/ |/| | |
* | | | Merge branch 'dm-consistent-commit-widget' into 'master' Dmitriy Zaporozhets2017-05-171-30/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Use same last commit widget on project homepage and tree view Closes #32245 See merge request !11424
| * | | Use same last commit widget on project homepage and tree viewdm-consistent-commit-widgetDouwe Maan2017-05-171-30/+0
| | | |
* | | | Fix unassigned checkmarkClement Ho2017-05-172-5/+22
| | | |
* | | | Merge branch 'sidebar-spacing-fixes' into 'master' Annabel Dunstone Gray2017-05-171-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed spacing issues in issue sidebar Closes #32357 See merge request !11430
| * | | | Fixed spacing issues in issue sidebarsidebar-spacing-fixesPhil Hughes2017-05-171-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we removed the nicescroll plugin from issues it causes some spacing issues that were added to make nicescroll play nice. This fixes that by fixing some of the padding that was causing the scroll area to be incorrect & the collapsed sidebar to have overflow issues Closes #32357
* | | | | Convert fa-history to svg; tweak alignmentAnnabel Dunstone Gray2017-05-172-14/+13
| | | | |
* | | | | Merge branch 'acet-mr-widget-nothing-to-commit-state' into 'master' Filipa Lacerda2017-05-173-11/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MRWidget: Implement new design for nothing to commit state. Closes #29320 See merge request !11266
| * | | | | Address MR comments.acet-mr-widget-nothing-to-commit-stateFatih Acet2017-05-161-1/+0
| | | | | |
| * | | | | MRWidget: Fix specs and address WIP comments.Fatih Acet2017-05-162-7/+6
| | | | | |
| * | | | | MRWidget: Implement new design for nothing to commit state.Fatih Acet2017-05-163-11/+55
| | | | | |
* | | | | | Merge branch 'dm-scroll-to-blob-user-content' into 'master' Douwe Maan2017-05-171-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scroll to anchor when blob content is loaded See merge request !11427
| * | | | | | Scroll to anchor when blob content is loadeddm-scroll-to-blob-user-contentDouwe Maan2017-05-161-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '32172-improve-responsive-styling-of-pipeline-schedules-form' ↵Tim Zallmann2017-05-174-73/+100
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Polish UI on pipeline schedules form Closes #32172 See merge request !11332
| * | | | | Clean up UI and styles.Bryce Johnson2017-05-154-73/+100
| | | | | |
* | | | | | Merge branch 'ability_to_cancel_attaching_file' into 'master' Douwe Maan2017-05-162-94/+201
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an ability to cancel attaching file and redesign attaching files UI Closes #15611, #24270, and #28905 See merge request !9431
| * | | | | Add an ability to cancel attaching file and redesign attaching files UIblackst0ne2017-05-162-94/+201
| | | | | |
* | | | | | Merge branch '32326-scrollable-tabs-overflow' into 'master' Annabel Dunstone Gray2017-05-162-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent dropdowns from being cut-off by scrollable tab container Closes #32328 and #32326 See merge request !11399
| * | | | | | prevent dropdowns from being cut-off by scrollable tab container32326-scrollable-tabs-overflowSimon Knox2017-05-162-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | rerender scrollable-tab area after Resolve Discussions button is rendered
* | | | | | | Make `gfm_auto_complete` into a module and fix up tech debtEric Eastwood2017-05-166-238/+256
|/ / / / / /
* | | | | | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' Douwe Maan2017-05-162-0/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disable animations for tests Closes #32194 See merge request !11324
| * | | | | | Add test.js and test.css to disable animations during testing and include ↵disable-css-and-jquery-animations-for-capybaraLuke "Jared" Bennett2017-05-152-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | these in _head when testing
* | | | | | | Removes nicescroll from issuable sidebarPhil Hughes2017-05-163-13/+9
| | | | | | |
* | | | | | | Only renders empty state for pipelines table if no pipelines are received ↵Filipa Lacerda2017-05-162-16/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | when request is made
* | | | | | | Merge branch 'environments-button-open-same-tab' into 'master' Annabel Dunstone Gray2017-05-161-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the target=_blank from the monitoring component Closes #32243 See merge request !11386
| * | | | | | | Removed the target=_blank from the monitoring componentenvironments-button-open-same-tabJose Ivan Vargas2017-05-151-1/+0
| | | | | | | |