summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '34028-collapse-sidebar' into 'master'Phil Hughes2017-08-078-2/+155
|\
| * Add changelog34028-collapse-sidebarAnnabel Dunstone Gray2017-08-071-4/+0
| * Make contextual sidebar collapsibleAnnabel Dunstone Gray2017-08-078-2/+159
* | Merge branch 'wiki_title' into 'master'Robert Speicher2017-08-074-39/+50
|\ \
| * | Allow wiki pages to be renamed in the UIwendy04022017-08-034-39/+50
* | | Merge branch 'add-star-for-action-scope' into 'master'Rémy Coutable2017-08-071-0/+7
|\ \ \
| * | | Rename user_can_admin? because it's more accurateadd-star-for-action-scopeLin Jen-Shin2017-08-071-2/+2
| * | | Merge remote-tracking branch 'upstream/master' into add-star-for-action-scopeLin Jen-Shin2017-08-07156-870/+1659
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into add-star-for-action-scopeLin Jen-Shin2017-08-021537-16925/+29614
| |\ \ \ \
| * | | | | fix typo and checkJean Praloran2017-05-301-1/+1
| * | | | | add test and rebaseJean Praloran2017-05-301-1/+6
| * | | | | change ability requirementJean Praloran2017-05-301-1/+1
| * | | | | add star for action scope, in order to delete image from registryjean2017-05-301-0/+2
* | | | | | Merge branch 'dashboard-projects-controller-query-performance' into 'master'Sean McGivern2017-08-077-19/+41
|\ \ \ \ \ \
| * | | | | | Eager load project creators for project dashboardsdashboard-projects-controller-query-performanceYorick Peterse2017-08-071-2/+4
| * | | | | | Memoize a user's personal projects countYorick Peterse2017-08-071-1/+5
| * | | | | | Remove redundant query from User#recent_pushYorick Peterse2017-08-071-10/+8
| * | | | | | Improve checking if projects would be returnedYorick Peterse2017-08-075-6/+24
* | | | | | | Merge branch 'bvl-nfs-circuitbreaker' into 'master'Sean McGivern2017-08-076-26/+123
|\ \ \ \ \ \ \
| * | | | | | | GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandErrorBob Van Landuyt2017-08-071-1/+1
| * | | | | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker'Douwe Maan2017-08-0766-1041/+1162
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-046-26/+123
* | | | | | | | Fixed sidebar context header hover colorsPhil Hughes2017-08-071-24/+13
* | | | | | | | Merge branch '34764-rename-to-overview' into 'master'Annabel Dunstone Gray2017-08-074-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | 34764 Rename about to overview for group and project page34764-rename-to-overviewtauriedavis2017-08-044-7/+7
| |/ / / / / / /
* | | | | | | | Merge branch 'navbar-z-index-higher' into 'master'Annabel Dunstone Gray2017-08-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Increase the z-index of the navbarnavbar-z-index-higherPhil Hughes2017-08-031-1/+1
* | | | | | | | | Merge branch 'winh-fix-duplicate-commits' into 'master'Tim Zallmann2017-08-071-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove gl.Activities from Commits pagewinh2017-08-071-1/+0
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'add-assign-me-alias' into 'master'Rémy Coutable2017-08-071-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add `/assign me` alias support for assigning issuables to oneselfMehdi Lahmam2017-08-071-1/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'remove-tree-holder' into 'master'Phil Hughes2017-08-073-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused #tree-holderremove-tree-holderClement Ho2017-08-073-3/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-35786' into 'master'Rémy Coutable2017-08-071-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add a missing whitespace in "private forks you have no access to"Mehdi Lahmam2017-08-061-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Upgrade haml_lint Gem to 0.26.0Winnie Hellmann2017-08-071-1/+1
* | | | | | | | Merge branch 'gitaly-renames-annotations' into 'master'Sean McGivern2017-08-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename raw -> ruggedJacob Vosmaer2017-08-041-1/+1
* | | | | | | | | Merge branch '33095-mr-widget-ui' into 'master'Phil Hughes2017-08-0732-781/+820
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | clean up merge request widget UISimon Knox2017-08-0732-781/+820
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Fix issues with pdf-js dependenciesMike Greiling2017-08-071-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'ci-lint-fix' into 'master'Tim Zallmann2017-08-062-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix order of CI lint ace editor loadingci-lint-fixPhil Hughes2017-08-042-1/+4
* | | | | | | | Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master'Tim Zallmann2017-08-065-7/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | adjust user contribution calendar time formattingMike Greiling2017-07-311-3/+3
| * | | | | | | | display system timezone underneath activity calendarMike Greiling2017-07-282-0/+6
| * | | | | | | | ensure user profile calendar is generated based on server timezone, not local...Mike Greiling2017-07-283-4/+13
* | | | | | | | | Merge branch 'fix/sm/34547-cannot-connect-to-ci-server-error-messages' into '...Sean McGivern2017-08-041-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | essentialShinya Maeda2017-08-041-1/+6
* | | | | | | | | | Merge branch 'fix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run...Sean McGivern2017-08-041-1/+1
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status