diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-10 21:53:41 +0000 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-10 21:53:41 +0000 |
commit | 9bcc9ec14cf4f120b8e16d5c232f82e1fc5e2cfd (patch) | |
tree | 6ebbaa158b9bf2c71f0046d14eddd07729f62ddd /lib/api/files.rb | |
parent | 42607a7f175ead8494b12f1c94734eb3b6a16ca1 (diff) | |
parent | c1541fdf1ebe15cd6321b0f27337bbcc17891ac8 (diff) | |
download | gitlab-ce-9bcc9ec14cf4f120b8e16d5c232f82e1fc5e2cfd.tar.gz |
Merge branch 'display-mr-link-if-thre-is-one' into 'master'
Replaces "Create merge request" link with one to the MR when one exists
Fixes #3716
* Without MR:

* With MR:

* Without MR:

* With MR:

* Without MR:

* With MR:

See merge request !2670
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions