summaryrefslogtreecommitdiff
path: root/lib/api/notes.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-20 09:34:54 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-20 09:34:54 +0000
commit61ebd14d5d8d07e0174f9cc76e3c973b9982050c (patch)
treeab6ecb1f13c661566d75babf25840c3250d6bf36 /lib/api/notes.rb
parent0e9d52f33d9c5cfe859da80628b46338a39f1134 (diff)
parent865444f1d80b3e8b114b1aa5418984a8264a8bf1 (diff)
downloadgitlab-ce-61ebd14d5d8d07e0174f9cc76e3c973b9982050c.tar.gz
Merge branch 'gitlab_git-7.1.10' into 'master'
Ignore submodules that are defined in .gitmodules but are checked in as directories. Pulls in gitlab_git 7.1.10 which contains gitlab-org/gitlab_git!26. Fixes #1439 and https://github.com/gitlabhq/gitlabhq/issues/9140 See merge request !540
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions