summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-12-13 16:52:42 +0000
committerRémy Coutable <remy@rymai.me>2016-12-13 16:52:42 +0000
commit75b0627fd4c811d4fae4e85b1e303f2dbcab6786 (patch)
treeb5aee652915e0d52c99eda4124069a28b2c205e2 /app/assets/javascripts/merge_conflicts
parent921673b0da9df73528b3e10e503a2eda4f44b07b (diff)
parent7841be243e5f28828cea95500b554d7f5cc039eb (diff)
downloadgitlab-ce-75b0627fd4c811d4fae4e85b1e303f2dbcab6786.tar.gz
Merge branch 'api-simple-group-project' into 'master'
API: Ability to get group's project in simple representation Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25412 See merge request !8060
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
0 files changed, 0 insertions, 0 deletions