summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-196-18/+13
|\
| * Remove routeOswaldo Ferreira2017-05-191-6/+0
| * Stop loading MergeRequestEntity data on sidebar requestOswaldo Ferreira2017-05-183-2/+2
| * Remove unnecessary initial requestOswaldo Ferreira2017-05-181-1/+0
| * Drop merge_check endpoint and use only MR show insteadOswaldo Ferreira2017-05-182-9/+11
* | 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
* | | Merge branch 'fix-issue-32506' into 'master'Douwe Maan2017-05-196-5/+37
|\ \ \
| * | | Refactor to more robust implementationfix-issue-32506Michael Kozono2017-05-196-13/+33
| * | | Fix ensure_canonical_path for top level routesMichael Kozono2017-05-181-5/+17
| * | | Fix #32506Michael Kozono2017-05-181-1/+1
* | | | 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-192-13/+11
|\ \ \ \
| * | | | Fix system note comparison and standardize note setupEric Eastwood2017-05-192-13/+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
* | | | | Merge branch 'patch-21' into 'master'Clement Ho2017-05-191-1/+1
|\ \ \ \ \
| * | | | | Update edit.html.hamlpatch-21Fabio Busatto2017-05-181-1/+1
* | | | | | 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
* | | | | | Fixes the 500 for custom apearance header logo and logoAlexis Reigel2017-05-191-0/+2
* | | | | | Merge branch 'dm-fix-readme-project-view' into 'master'Dmitriy Zaporozhets2017-05-194-45/+9
|\ \ \ \ \ \
| * | | | | | Remove readme project_view optionDouwe Maan2017-05-194-45/+9
* | | | | | | Merge branch 'dm-render-plain-readme' into 'master'Rémy Coutable2017-05-192-8/+10
|\ \ \ \ \ \ \
| * | | | | | | Render plain README using Markup viewer so it is displayed below treedm-render-plain-readmeDouwe Maan2017-05-182-8/+10
* | | | | | | | 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 'dm-no-conflicts-when-branches-are-missing' into 'master'Robert Speicher2017-05-182-0/+3
|\ \ \ \ \ \
| * | | | | | Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-182-0/+3
* | | | | | | 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 ProjectCacheWorker for plain READMEsToon Claes2017-05-181-0/+3
| |_|_|/ / / |/| | | | |
* | | | | | Fix ability to edit diff notes multiple timesKushal Pandya2017-05-181-3/+3
| |_|/ / / |/| | | |
* | | | | Merge branch 'dm-gemfile-viewer'Rémy Coutable2017-05-1816-3/+268
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add auxiliary blob viewers to dependency filesDouwe Maan2017-05-1716-3/+268
| |/ / /
* | | | 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 'change-url-in-specific-runners-registration-steps' into 'master'Kamil Trzciński2017-05-181-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove references to '/ci' path while describing Runner's registrationchange-url-in-specific-runners-registration-stepsTomasz Maczukin2017-05-151-1/+1
* | | | | Merge branch 'mk-fix-issue-1843' into 'master'Douwe Maan2017-05-182-2/+2
|\ \ \ \ \
| * | | | | Use Namespace.for_user scope (formerly known as Namespace.root)mk-fix-issue-1843Douwe Maan2017-05-182-5/+3
| * | | | | Fixes #32474Michael Kozono2017-05-171-1/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'fix_removing_invited_member' into 'master'Rémy Coutable2017-05-181-1/+1
|\ \ \ \ \
View Lorry Controller Status