summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'refactor-realtime-issue' into 'master' Filipa Lacerda2017-05-121-1/+0
|\
| * Merge branch 'master' into refactor-realtime-issuePhil Hughes2017-05-1119-44/+39
| |\
| * | Fixed tests on textarea looking for innerText instead of valuePhil Hughes2017-05-101-1/+0
* | | Fix redirect message for groups and usersMichael Kozono2017-05-111-4/+4
* | | Merge branch 'dm-auxiliary-viewers' into 'master' Sean McGivern2017-05-111-1/+4
|\ \ \ | |_|/ |/| |
| * | Implement auxiliary blob viewersDouwe Maan2017-05-101-1/+4
* | | Merge branch '31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-tha...Phil Hughes2017-05-111-0/+2
|\ \ \ | |/ / |/| |
| * | Keep input data after creating existing tagSam Rose2017-05-101-0/+2
| |/
* | Merge branch 'enforce-current-user-usage-on-entities' into 'master' Kamil Trzciński2017-05-101-1/+1
|\ \
| * | Remove unnecessary user hash being passed to DeploymentSerializerenforce-current-user-usage-on-entitiesOswaldo Ferreira2017-05-101-1/+1
| * | Ensure all Serializers receive `current_user` instead `user`Oswaldo Ferreira2017-05-101-1/+1
| |/
* | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'mas...Robert Speicher2017-05-1010-14/+14
|\ \
| * | Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-102-2/+2
| * | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-109-12/+12
| |/
* | Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-102-2/+2
* | Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-105-18/+11
* | Merge branch 'snippets_visibility' into 'security'Sean McGivern2017-05-101-9/+9
|/
* Merge branch '20517-delete-projects-issuescontroller-redirect_old' into 'mast...Dmitriy Zaporozhets2017-05-101-16/+1
|\
| * Remove redirect for old issue url containing id instead of iidblackst0ne2017-05-101-16/+1
* | Merge branch '26944-prometheus-memory-sparkline' into 'master' Fatih Acet2017-05-091-4/+4
|\ \
| * | Add Prometheus memory sparkline to MR widgetkushalpandya2017-05-091-4/+4
* | | Merge branch 'issue_27168_2' into 'master' Sean McGivern2017-05-091-1/+1
|\ \ \ | |/ / |/| |
| * | Preloads head pipeline for each merge requestFelipe Artur2017-05-081-1/+1
* | | Merge request widget redesignFatih Acet2017-05-098-105/+110
|/ /
* | Add confirm delete protected branch modalSam Rose2017-05-082-6/+10
* | Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-071-0/+68
* | Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ...Kamil Trzciński2017-05-062-7/+23
|\ \
| * | Require build to be present in the controllerGrzegorz Bizon2017-05-051-2/+1
| * | Authorize build update on per object basisGrzegorz Bizon2017-05-052-7/+24
* | | Real time pipeline show actionZeger-Jan van de Weg2017-05-061-5/+17
* | | Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-066-57/+67
|\ \ \
| * | | Resolve discussionsMichael Kozono2017-05-051-6/+5
| * | | Resolve discussionsMichael Kozono2017-05-053-25/+16
| * | | Dry up routable lookups. Fixes #30317Michael Kozono2017-05-054-51/+54
| * | | Add “project moved” flash message on redirectMichael Kozono2017-05-051-0/+1
| * | | Resolve discussionsMichael Kozono2017-05-051-8/+10
| * | | RefactorMichael Kozono2017-05-051-5/+3
| * | | Redirect from redirect routes to canonical routesMichael Kozono2017-05-056-23/+39
* | | | Colorize labels in issue search fieldWinnie Hellmann2017-05-053-3/+3
* | | | Merge branch '29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-g...Sean McGivern2017-05-051-1/+1
|\ \ \ \
| * | | | Pass GL_REPOSITORY in Workhorse responses29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ceAlejandro Rodríguez2017-05-051-1/+1
* | | | | Merge branch 'fix/admin-integrations' into 'master' Sean McGivern2017-05-051-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | refactor code based on feedbackJames Lopez2017-05-051-1/+1
| * | | | refactor code based on feedbackJames Lopez2017-05-051-1/+1
| * | | | refactor a few things based on feedbackJames Lopez2017-05-041-1/+3
| * | | | add propagate service worker and updated spec and controllerJames Lopez2017-05-031-1/+1
* | | | | Merge branch 'mia_backort' into 'master' Jacob Schatz2017-05-054-5/+6
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ...Valery Sizov2017-05-0516-96/+185
| |\ \ \ \ \
| * | | | | | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-044-5/+6
* | | | | | | Merge branch '24883-build-failure-summary-page' into 'master' Phil Hughes2017-05-051-5/+17
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |