summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-02 15:28:22 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-02 15:28:22 -0800
commit519ca7bae9b4f929ae135c5b097dd2d329d8f7de (patch)
tree3f96febab61d1fb851427d59b3244dd300237f88 /lib/api/entities.rb
parent33e107127a4c37cefaf24c0f5dd335e782594da3 (diff)
parent55d980905540bae6d02ac104dac5c23e96dd5711 (diff)
downloadgitlab-ce-519ca7bae9b4f929ae135c5b097dd2d329d8f7de.tar.gz
Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq into cirosantilli-link-to-button
Conflicts: app/views/shared/_issuable_filter.html.haml
Diffstat (limited to 'lib/api/entities.rb')
0 files changed, 0 insertions, 0 deletions