summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* MR widget styling fixes32657-fix-mr-widget-styleskushalpandya2017-05-222-7/+15
* Add users endpoint to frontend API classWinnie Hellmann2017-05-1912-114/+138
* Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-192-2/+1
|\
| * Remove unnecessary initial requestOswaldo Ferreira2017-05-181-1/+0
| * Drop merge_check endpoint and use only MR show insteadOswaldo Ferreira2017-05-181-1/+1
* | Merge branch 'winh-dropdown-ajax-cache' into 'master'Clement Ho2017-05-191-28/+6
|\ \
| * | Use AjaxCache in Droplab Ajax plugin (!11171)winh-dropdown-ajax-cachewinh2017-05-181-28/+6
* | | Refine MR widget styling for buttons and info textKushal Pandya2017-05-193-2/+18
* | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' in...Filipa Lacerda2017-05-191-11/+11
|\ \ \
| * | | Fix system note comparison and standardize note setupEric Eastwood2017-05-191-11/+11
| | |/ | |/|
* | | Merge branch '32556-side-by-side-mr-discussion-should-stretch-to-max-width' i...Annabel Dunstone Gray2017-05-191-1/+0
|\ \ \
| * | | Remove width limit from discussion notes32556-side-by-side-mr-discussion-should-stretch-to-max-widthClement Ho2017-05-191-1/+0
* | | | Replaced duplicate z-index with index of 400Luke "Jared" Bennett2017-05-191-2/+1
|/ / /
* | | Merge branch 'mr-widget-refresh-failed' into 'master'Filipa Lacerda2017-05-191-1/+27
|\ \ \
| * | | 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 'dm-fix-readme-project-view' into 'master'Dmitriy Zaporozhets2017-05-192-22/+2
|\ \ \ \
| * | | | Remove readme project_view optionDouwe Maan2017-05-192-22/+2
* | | | | Merge branch 'dm-render-plain-readme' into 'master'Rémy Coutable2017-05-191-8/+9
|\ \ \ \ \
| * | | | | Render plain README using Markup viewer so it is displayed below treedm-render-plain-readmeDouwe Maan2017-05-181-8/+9
* | | | | | Merge branch 'user-avatar-vue-ce' into 'master'Phil Hughes2017-05-1917-70/+307
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add s selectors for supported avatars.user-avatar-vue-ceBryce Johnson2017-05-181-0/+2
| * | | | | Fixes per feedback on user avatar components.Bryce Johnson2017-05-183-23/+14
| * | | | | Consolidate user avatar Vue logicBryce Johnson2017-05-1817-70/+314
| | |_|/ / | |/| | |
* | | | | Fix JavaScript translations that are using a namespacefix-js-translationsRuben Davila2017-05-186-11/+11
| |_|/ / |/| | |
* | | | Merge branch 'delete-old-mr-widget' into 'master'Fatih Acet2017-05-181-303/+0
|\ \ \ \
| * | | | 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 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 note32424-fix-linking-to-unresolved-expanded-diff-noteEric Eastwood2017-05-172-8/+21
| |/ / /
* | | | Merge branch '32359-align-resolve-btn' into 'master'Filipa Lacerda2017-05-181-3/+3
|\ \ \ \
| * | | | Align resolve comment btn32359-align-resolve-btnAnnabel Dunstone Gray2017-05-171-3/+3
* | | | | Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into 'mas...Phil Hughes2017-05-181-20/+22
|\ \ \ \ \
| * | | | | Fix missing .original-note-content and trailing new line edge case32449-fix-note-comparison-trailing-newline-edge-caseEric Eastwood2017-05-181-20/+22
| | |/ / / | |/| | |
* | | | | Disable reference prefixes in notes for SnippetsSam Rose2017-05-182-5/+13
* | | | | Merge branch '31987-automatically-close-assignee-select-dropdown-after-select...Phil Hughes2017-05-181-0/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 the...Luke "Jared" Bennett2017-05-162-0/+18
| * | | | Merge branch 'master' into '31987-automatically-close-assignee-select-dropdow...Clement Ho2017-05-16122-1273/+1428
| |\ \ \ \
| * | | | | 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 viewdm-consistent-commit-widgetDouwe Maan2017-05-171-30/+0
View Lorry Controller Status