summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* fix typorefactor-services-for-audit-events-ceJames Lopez2017-11-021-1/+1
* fix specsJames Lopez2017-11-021-1/+1
* fix specsJames Lopez2017-11-021-1/+1
* refactor codeJames Lopez2017-10-312-3/+2
* fix spinach failureJames Lopez2017-10-311-0/+2
* uypdated keys controller logicJames Lopez2017-10-311-8/+2
* add applications controller logicJames Lopez2017-10-312-22/+15
* Merge branch '39366-email-confirmation-fails' into 'master'Douwe Maan2017-10-301-1/+1
|\
| * use a delegate for `username` to be more future friendlyBrett Walker2017-10-271-2/+1
| * fix to pass static-analysisBrett Walker2017-10-241-2/+2
| * grab the correct username when confirming secondary emailBrett Walker2017-10-231-1/+2
* | Fetch the merged branches at onceLin Jen-Shin (godfat)2017-10-271-0/+2
* | Revert "Merge branch '36670-remove-edit-form' into 'master'"39441-bring-edit-form-backSean McGivern2017-10-261-1/+9
* | Added ssh fingerprint, gitlab ci and pages information in an instance configu...Francisco Lopez2017-10-251-0/+4
* | added feature specPhil Hughes2017-10-231-1/+0
* | fixed bug with tabs not switching correctlyPhil Hughes2017-10-231-0/+1
|/
* 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
* | URI decode Page-Title header to preserve UTF-8 charactersToon Claes2017-10-201-1/+1
|/
* 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 'master' into sh-security-fix-backports-masterStan Hu2017-10-177-72/+76
|\ \
| * \ Merge branch 'ph-multi-file-editor-restructure-data' into 'master'Filipa Lacerda2017-10-171-0/+1
| |\ \
| | * | Fixed bug when clicking file link causing user to navigate awayPhil Hughes2017-10-171-1/+1
| | * | Refactored multi-file data structurePhil Hughes2017-10-161-0/+1
| * | | Change project deletion message from alert to noticeWinnie Hellmann2017-10-171-1/+1
| * | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-175-71/+74
| |\ \ \
| | * | | Nest the group_children_path inside the canonical group pathBob Van Landuyt2017-10-122-32/+39
| | * | | Pass `archived:` as a keyword argumentBob Van Landuyt2017-10-121-1/+1
| | * | | Fix spinach featuresBob Van Landuyt2017-10-111-1/+1
| | * | | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1021-60/+344
| | |\ \ \
| | * | | | Don't load unneeded elements in GroupsController#showBob Van Landuyt2017-10-101-18/+5
| | * | | | Use `GroupFinder` to check if a user can read a groupBob Van Landuyt2017-10-101-2/+4
| | * | | | Only expand ancestors when searchingBob Van Landuyt2017-10-091-7/+7
| | * | | | Load counts everywhere we render a group treeBob Van Landuyt2017-10-051-1/+1
| | * | | | Make sure all ancestors are loaded when searching groupsBob Van Landuyt2017-10-051-1/+1
| | * | | | Stylize `GroupTree` concernBob Van Landuyt2017-10-041-2/+2
| | * | | | Rename `GroupHierarchy` to `GroupDescendant`Bob Van Landuyt2017-10-041-3/+3
| | * | | | `current_user:` as a keyword argumentBob Van Landuyt2017-10-041-1/+3
| | * | | | Setup children in a a method and reuse for both callsBob Van Landuyt2017-10-041-4/+7
| | * | | | Search subgroups on dashboard and explore viewsBob Van Landuyt2017-10-041-3/+8
| | * | | | Reuse the groups tree for explore and dashboard.Bob Van Landuyt2017-10-043-29/+26
| | * | | | Use the default sort set by the `Sortable` concernBob Van Landuyt2017-10-041-3/+1
| | * | | | Only show root groups on the dashboardBob Van Landuyt2017-10-041-13/+3
| | * | | | Use same response-body in groups-dashboard as we do for group-homeBob Van Landuyt2017-10-041-5/+4
| | * | | | Allow filtering children for a groupBob Van Landuyt2017-10-041-5/+5
| | * | | | Merge group hierarchies when parents are sharedBob Van Landuyt2017-10-041-0/+1
| | * | | | Add pagination for childrenBob Van Landuyt2017-10-041-1/+1
| | * | | | Update `children` route to handle projects and groupsBob Van Landuyt2017-10-041-2/+6
| | * | | | Add serializer for group childrenBob Van Landuyt2017-10-041-0/+15
View Lorry Controller Status