summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '35955-searchable-settings-puts-expand-collapse-toggle-in-an-inv...Mike Greiling2017-10-238-51/+55
|\
| * Stop sections from expanding when scrolling over the 1px sectionEric Eastwood2017-10-171-0/+4
| * update settings panels to place "expanded" class on the correct elementMike Greiling2017-10-146-24/+24
| * remove needlessly complicated, duplicate css class for expanded settings panelsMike Greiling2017-10-142-27/+27
* | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-23182-2348/+3438
|\ \
| * \ Merge branch 'sh-fix-container-registry-destroy' into 'master'Filipa Lacerda2017-10-231-4/+2
| |\ \
| | * | Fix deletion of container registry or images returning an errorStan Hu2017-10-231-4/+2
| * | | Merge branch 'bvl-fix-group-atom-feed' into 'master'Douwe Maan2017-10-221-0/+11
| |\ \ \
| | * | | Make sure we render events for projects within a groupBob Van Landuyt2017-10-201-0/+11
| * | | | Fix the external URLs generated for online view of HTML artifactsNick Thomas2017-10-201-6/+11
| * | | | Merge branch 'multi-file-editor-submodules' into 'master'Filipa Lacerda2017-10-204-3/+26
| |\ \ \ \
| | * | | | Added submodule support in multi-file editorPhil Hughes2017-10-204-3/+26
| * | | | | Use title as placeholder instead of issue title for reusabilityClement Ho2017-10-201-4/+4
| * | | | | Merge branch 'fix-application-setting-nil-cache' into 'master'Winnie Hellmann2017-10-201-1/+4
| |\ \ \ \ \
| | * | | | | Prevent ApplicationSetting to cache nil valueKamil Trzcinski2017-10-191-1/+4
| * | | | | | URI decode Page-Title header to preserve UTF-8 charactersToon Claes2017-10-202-2/+2
| * | | | | | Decrease Perceived Complexity threshold to 14Maxim Rydkin2017-10-201-8/+21
| * | | | | | Resolve "Remove help text regarding group issues on group issues page (and gr...Victor Wu2017-10-202-14/+0
| | |_|_|/ / | |/| | | |
| * | | | | Force non diff resolved discussion to display when collapse toggledClement Ho2017-10-201-1/+1
| * | | | | Merge branch '37391-wiki-disk-path-helper' into 'master'Nick Thomas2017-10-201-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Use wiki.disk_pathNick Thomas2017-10-181-1/+1
| * | | | | Merge branch 'animate-auto-devops' into 'master'Annabel Dunstone Gray2017-10-202-2/+13
| |\ \ \ \ \
| | * | | | | Animate auto devops graphicanimate-auto-devopsClement Ho2017-10-182-2/+13
| * | | | | | Merge branch 'update-nav-sidebar-hover' into 'master'Annabel Dunstone Gray2017-10-191-3/+3
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | update nav sidebar hover color to increase contrastupdate-nav-sidebar-hovertauriedavis2017-10-111-3/+3
| * | | | | | Merge branch 'not-found-in-commits' into 'master'Douwe Maan2017-10-191-0/+2
| |\ \ \ \ \ \
| | * | | | | | Renders 404 in commits controller if no commits are foundGuilherme Vieira2017-10-181-0/+2
| * | | | | | | Merge branch 'sh-fix-broken-docker-delete' into 'master'Grzegorz Bizon2017-10-193-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Fix broken function invocationsh-fix-broken-docker-deleteFilipa Lacerda2017-10-192-2/+2
| | * | | | | | | Fix inability to delete container registry tagsStan Hu2017-10-181-1/+1
| * | | | | | | | Merge branch '38648-members-sidebar' into 'master'Phil Hughes2017-10-191-0/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add members flyout on collapsed sidebar38648-members-sidebarAnnabel Dunstone Gray2017-10-181-0/+5
| | |/ / / / / / /
| * | | | | | | | Remove dropzoneInput from global namespaceFilipa Lacerda2017-10-195-306/+268
| * | | | | | | | Merge branch '36160-zindex' into 'master'Annabel Dunstone Gray2017-10-181-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Decreases z-index of select2 to a lower number of our navigation bar36160-zindexFilipa Lacerda2017-10-181-0/+5
| * | | | | | | | Merge branch 'pms-fix-tooltip-padding' into 'master'Annabel Dunstone Gray2017-10-181-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix tooltip padding to align to 8px gridpms-fix-tooltip-paddingPedro Moreira da Silva2017-10-181-1/+1
| * | | | | | | | | Merge branch 'bvl-fix-locale-path' into 'master'Tim Zallmann2017-10-182-1/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Build the locale path with an `_` instead of a `-`Bob Van Landuyt2017-10-182-1/+5
| * | | | | | | | | | Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master'Tim Zallmann2017-10-181-8/+23
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-componentEric Eastwood2017-10-171-8/+23
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Fix resolved discussions not expanding on side by side viewClement Ho2017-10-181-2/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Fix PikadayFilipa Lacerda2017-10-188-46/+70
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch '39201-improve-google-image' into 'master'35616-gke-1st-iterationPhil Hughes2017-10-182-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Replace google login image39201-improve-google-imageFilipa Lacerda2017-10-172-1/+1
| * | | | | | | | | Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-186-20/+15
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-17105-1340/+2337
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-176-20/+15
| * | | | | | | | | | Merge branch '30140-restore-readme-only-preference' into 'master'Douwe Maan2017-10-183-8/+27
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Small code style changesDouwe Maan2017-10-181-2/+2