summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-12 16:06:16 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-12 16:06:16 +0000
commit6a82c9f01868b419975409a6819aa88dd973240d (patch)
treed9765c483585c3e20f1f7315e9c3eca15e7ed6ae /lib/api/files.rb
parentcd579cb2ff45f3fc1513bb6ea74b53a2229276ae (diff)
parent3c036ea1576349d2e26f82a119f8c79e12daecb2 (diff)
downloadgitlab-ce-6a82c9f01868b419975409a6819aa88dd973240d.tar.gz
Merge branch 'mr-merge-manually-2' into 'master'
Move merge manually text below merge widget Replace !1121 Screenshot: #### Before ![Screenshot_2015-08-10_18.25.22](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ac7df8dd03104b3b44c61b3bff709653/Screenshot_2015-08-10_18.25.22.png) #### After ![Screenshot_2015-08-10_18.28.30](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c92b8eaeadb842705577dba1f52b67e5/Screenshot_2015-08-10_18.28.30.png) See merge request !1141
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions