summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Use diff_discussion? instead of is_a?(DiffDiscussion)38677-render-new-discussions-on-diff-tabLuke "Jared" Bennett2017-11-021-1/+1
* Remove trailing commaLuke "Jared" Bennett2017-10-211-1/+1
* Improve discussion_line_code set and update notes_controller_specLuke "Jared" Bennett2017-10-211-1/+2
* Added discussion_line_code value to note response and use it to query the rig...Luke "Jared" Bennett2017-10-211-1/+2
* 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
| | * | | | Remove the subgroups path on a groupBob Van Landuyt2017-10-041-4/+0
| | * | | | Fetch children using new finder for the `show` of a group.Bob Van Landuyt2017-10-041-7/+4
* | | | | | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-172-10/+10
|/ / / / /
* | | | | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-1/+1
* | | | | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'move_markdown_preview_to_concern' into 'master'Sean McGivern2017-10-115-34/+27
|\ \ \ \
| * | | | Add support for markdown preview to group milestonesmove_markdown_preview_to_concernVitaliy @blackst0ne Klachkov2017-10-115-34/+27
* | | | | Merge branch '38720-sort-admin-runners' into 'master'Rémy Coutable2017-10-111-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add sort runners on admin runnersTakuya Noguchi2017-10-041-1/+2
* | | | | Merge branch 'master' into 'group-sort-dropdown-blank'Robert Speicher2017-10-0914-31/+269
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'tc-geo-read-only-idea' into 'master'Douwe Maan2017-10-075-17/+56
| |\ \ \ \
| | * | | | Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-065-17/+56
| * | | | | Find branches in all projects in the fork networkBob Van Landuyt2017-10-071-2/+5
| * | | | | Commenting on image diffsFelipe Artur2017-10-071-3/+8
| * | | | | Show confirmation modal before deleting accountWinnie Hellmann2017-10-061-7/+22
| |/ / / /
View Lorry Controller Status