summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-08-30 21:13:19 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-08-30 21:13:19 +0800
commit86149a82168e9aead7ce6841c69705662f8a6e54 (patch)
tree3578fcf52de007f8f9d845339bc4f2c86e7e8b46 /lib/api/files.rb
parent9954dafda58a0d5d856fdbbef01633e674638aa1 (diff)
parentf431543654f6150bb39b191e8ad9acc0ee651de4 (diff)
downloadgitlab-ce-86149a82168e9aead7ce6841c69705662f8a6e54.tar.gz
Merge remote-tracking branch 'upstream/master' into 36807-gc-unwanted-refs-after-import
* upstream/master: (225 commits) Add changelog entry Backports EE 2756 logic to CE. Make rubocop happy Make profile settings dropdown consistent Add filter by my reaction Update spec initialization with it being a shared component Update identicon path and selector Renamed to `identicon` and make shared component Merge branch 'master-i18n' into 'master' Fix broken Frontend JS guide Replace 'project/star.feature' spinach test with an rspec analog Adds position fixed to right sidebar Fixes the margin of the top buttons of the pipeline page Remove commented out code Better align fallback image emojis Decrease Metrics/CyclomaticComplexity threshold to 15 Add changelog Respect the default visibility level when creating a group Further break with_repo_branch_commit into parts Make sure inspect doesn't generate crazy string ...
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions