summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tc-no-todo-service-select-mysql' into 'master'Sean McGivern2017-08-034-11/+24
|\
| * Add workaround for UPDATE with subquery when using MySQLToon Claes2017-08-031-2/+11
| * Avoid plucking Todo ids and use sub-queries insteadToon Claes2017-08-033-9/+13
* | Use mixin for new dropdown styleWinnie Hellmann2017-08-034-64/+11
* | Merge branch 'dev.referable-inspect' into 'master'Sean McGivern2017-08-032-0/+17
|\ \
| * | implement #inspect for all Referablesdev.referable-inspecthttp://jneen.net/2017-08-012-0/+17
* | | fix #35133 strip new lines from ssh keyshaseeb2017-08-031-2/+1
* | | Merge branch 'fix-oauth-checkboxes' into 'master'Filipa Lacerda2017-08-031-0/+1
|\ \ \
| * | | Fixed sign-in restrictions buttons not toggling active statefix-oauth-checkboxesPhil Hughes2017-08-031-0/+1
* | | | Merge branch 'merge-request-commits-background-migration' into 'master'Rémy Coutable2017-08-031-5/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Migrate MR commits and diffs to new tablesmerge-request-commits-background-migrationSean McGivern2017-08-031-5/+1
* | | | Merge branch '35232-next-unresolved' into 'master'Clement Ho2017-08-031-5/+5
|\ \ \ \
| * | | | fix Jump to next discussion35232-next-unresolvedSimon Knox2017-07-271-5/+5
* | | | | Make dropdown style on project page consistentWinnie Hellmann2017-08-034-3/+55
* | | | | Merge branch '28472-ignore-auto-generated-mails' into 'master'Sean McGivern2017-08-031-2/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Don't send rejection mails for all auto-generated mails28472-ignore-auto-generated-mailsLin Jen-Shin2017-08-031-2/+0
* | | | | Merge branch 'sidebar-fly-out-sub-nav' into 'master'Filipa Lacerda2017-08-034-38/+155
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into sidebar-fly-out-sub-navsidebar-fly-out-sub-navPhil Hughes2017-08-02330-1627/+3498
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | stop mobile from showing the sub-itemsPhil Hughes2017-08-021-2/+7
| * | | | | changed variable namesPhil Hughes2017-08-021-10/+10
| * | | | | fixed translate3d testPhil Hughes2017-08-011-1/+1
| * | | | | reverted the JS timeout codePhil Hughes2017-08-012-47/+11
| * | | | | added mouseleave timeout with JSPhil Hughes2017-08-012-19/+74
| * | | | | fixed inside padding of fly-out menuPhil Hughes2017-07-281-1/+1
| * | | | | updated hover text color of main links in sidebarPhil Hughes2017-07-281-8/+18
| * | | | | style updatesPhil Hughes2017-07-262-37/+32
| * | | | | added extra padding around fly-out menu to delay hidingPhil Hughes2017-07-251-1/+11
| * | | | | improvements to positioning of the dropdownPhil Hughes2017-07-242-3/+18
| * | | | | Merge branch 'master' into sidebar-fly-out-sub-navPhil Hughes2017-07-24173-531/+1175
| |\ \ \ \ \
| * | | | | | changed text color for reseting & hover on linksPhil Hughes2017-07-191-1/+2
| * | | | | | changed hover color in dropdownPhil Hughes2017-07-191-1/+1
| * | | | | | updated stylesPhil Hughes2017-07-192-36/+12
| * | | | | | moved JS & only run when new_nav cookie existsPhil Hughes2017-07-193-27/+41
| * | | | | | transform the positionPhil Hughes2017-07-192-21/+38
| * | | | | | Fly-out dropdown menu in new sidebarPhil Hughes2017-07-193-2/+62
* | | | | | | Fix Prometheus help link to lead to proper Prometheus help pagepawel/fix_link_to_prometheus_docs-33921Pawel Chojnacki2017-08-021-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Add icons to project sidebarAnnabel Dunstone Gray2017-08-0235-56/+181
* | | | | | Merge branch '35408-group-auto-avatars' into 'master'Filipa Lacerda2017-08-023-0/+62
|\ \ \ \ \ \
| * | | | | | Remove unnecessary component import and registration35408-group-auto-avatarskushalpandya2017-08-021-2/+0
| * | | | | | Use kebab-case for propskushalpandya2017-08-021-2/+2
| * | | | | | Remove unnecessary name propertykushalpandya2017-08-021-1/+0
| * | | | | | Prop name update, minor cleanupkushalpandya2017-08-011-6/+8
| * | | | | | Import `group_identicon` minor clean up and prop updateskushalpandya2017-08-011-7/+7
| * | | | | | Add styles for Identicons for Groupskushalpandya2017-07-311-0/+4
| * | | | | | Use GroupIdenticon for missing avatarskushalpandya2017-07-312-0/+15
| * | | | | | Group Identicon for groups without avatarskushalpandya2017-07-311-0/+44
* | | | | | | Make Delete Merged Branches handle wildcard protected branches correctlyToon Claes2017-08-021-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Extending API for protected branchesEric2017-08-021-5/+7
* | | | | | Merge branch 'rugged-is-ancestor' into 'master'Sean McGivern2017-08-021-1/+1
|\ \ \ \ \ \
| * | | | | | Add rugged_is_ancestor methodJacob Vosmaer2017-08-011-1/+1