summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | Add readme title and check for rich_viewer30140-restore-readme-only-preferenceAnnabel Dunstone Gray2017-10-171-1/+6
| * | | | | Fix specAnnabel Dunstone Gray2017-10-161-1/+0
| * | | | | Add readme only option as project viewAnnabel Dunstone Gray2017-10-163-8/+23
* | | | | | Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'Grzegorz Bizon2017-10-182-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add short_revision and use total_sizeKamil Trzcinski2017-10-172-2/+2
* | | | | | Merge branch 'ph-multi-file-editor-restructure-data' into 'master'Filipa Lacerda2017-10-1721-508/+358
|\ \ \ \ \ \
| * | | | | | Fixed bug when clicking file link causing user to navigate awayPhil Hughes2017-10-1711-33/+45
| * | | | | | fixed prev directory row not correctly having colspanPhil Hughes2017-10-163-9/+9
| * | | | | | made serializing genericPhil Hughes2017-10-164-26/+26
| * | | | | | fixed rendering bugsPhil Hughes2017-10-165-18/+6
| * | | | | | Spec updatesPhil Hughes2017-10-163-26/+25
| * | | | | | Refactored multi-file data structurePhil Hughes2017-10-1616-450/+301
* | | | | | | Add inline edit button to issue_show appClement Ho2017-10-174-14/+72
* | | | | | | Change project deletion message from alert to noticeWinnie Hellmann2017-10-171-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'bvl-fix-deleting-forked-projects' into 'master'Douwe Maan2017-10-172-2/+2
|\ \ \ \ \ \
| * | | | | | Fix errors when deleting a forked projectBob Van Landuyt2017-10-172-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '38156-breadcrumbs-margin' into 'master'Tim Zallmann2017-10-171-1/+1
|\ \ \ \ \ \
| * | | | | | Use variable for mobile breadcrumbs padding38156-breadcrumbs-marginAnnabel Dunstone Gray2017-10-161-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'prevent-creating-multiple-application-settings' into 'master'Yorick Peterse2017-10-171-0/+2
|\ \ \ \ \ \
| * | | | | | Prevent creating multiple ApplicationSetting by forcing it to always have id=1prevent-creating-multiple-application-settingsKamil Trzcinski2017-10-161-0/+2
* | | | | | | Adds collapsible sections in cluster pageFilipa Lacerda2017-10-174-44/+67
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-173-0/+65
|\ \ \ \ \ \
| * | | | | | Allow configuring the circuitbreaker through the API and UIBob Van Landuyt2017-10-173-0/+65
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-1755-729/+1696
|\ \ \ \ \ \
| * | | | | | Preserve `archived` param only when sort order is changedbvl-group-treeskushalpandya2017-10-131-3/+3
| * | | | | | Make sure we always return an array of hierarchiesBob Van Landuyt2017-10-131-1/+3
| * | | | | | Remove unnecessary `Flash` importkushalpandya2017-10-131-1/+0
| * | | | | | Add `archived` related options in sort dropdownkushalpandya2017-10-133-14/+47
| * | | | | | Add support for `archived` paramkushalpandya2017-10-133-5/+13
| * | | | | | Update preloaded count queries for MySQLBob Van Landuyt2017-10-121-3/+3
| * | | | | | Nest the group_children_path inside the canonical group pathBob Van Landuyt2017-10-122-32/+39
| * | | | | | Use Arel to build preloaded countsBob Van Landuyt2017-10-121-48/+45
| * | | | | | Pass `archived:` as a keyword argumentBob Van Landuyt2017-10-123-6/+6
| * | | | | | Use polymorphism for common attributes in `GroupChildEntity`Bob Van Landuyt2017-10-121-16/+12
| * | | | | | Fix spinach featuresBob Van Landuyt2017-10-112-2/+1
View Lorry Controller Status