summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rename issue_show to issuable_showrefactor-issuable-showClement Ho2017-10-1628-18/+18
* Merge branch 'gitlab-ee-1312-time-spent-at' into 'master'Sean McGivern2017-10-1311-11/+227
|\
| * added date parameter for time trackinggitlab-ee-1312-time-spent-atVlad2017-10-1311-11/+227
* | Merge branch '39096-upgrade-vuex' into 'master'Phil Hughes2017-10-132-4/+4
|\ \
| * | Update Vuex version39096-upgrade-vuexFilipa Lacerda2017-10-132-4/+4
* | | Merge branch '37571-replace-wikipage-createservice-with-factory' into 'master'Rémy Coutable2017-10-138-27/+12
|\ \ \
| * | | Replaces 'WikiPage::CreateService' calls with 'wiki_page' factoryJacopo2017-10-138-27/+12
* | | | Merge branch 'gitaly-merge' into 'master'Sean McGivern2017-10-139-17/+143
|\ \ \ \
| * | | | Merge Merge Requests via GitalyJacob Vosmaer2017-10-139-17/+143
| | |/ / | |/| |
* | | | Merge branch 'grpc-1.6.6' into 'master'Rémy Coutable2017-10-131-1/+4
|\ \ \ \
| * | | | Use grpc 1.6.6Jacob Vosmaer2017-10-131-1/+4
* | | | | Merge branch 'server-flash-click-remove' into 'master'Filipa Lacerda2017-10-133-2/+34
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed server rendered flash not being removed on clickserver-flash-click-removePhil Hughes2017-10-133-2/+34
* | | | | Merge branch 'backport-ee-2869' into 'master'Sean McGivern2017-10-133-16/+34
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | backport for gitlab-ee!2869backport-ee-2869Simon Knox2017-10-133-16/+34
* | | | | Merge branch 'google-protobuf-3.4.1.1' into 'master'Rémy Coutable2017-10-131-1/+1
|\ \ \ \ \
| * | | | | Use google-protobuf 3.4.1.1google-protobuf-3.4.1.1Jacob Vosmaer2017-10-111-1/+1
* | | | | | Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'Sean McGivern2017-10-135-2/+46
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistencyOswaldo Ferreira2017-10-134-3/+22
| * | | | | Make "merge ongoing" check more consistentOswaldo Ferreira2017-10-113-2/+27
* | | | | | Merge branch 'es-module-broadcast_message' into 'master'Phil Hughes2017-10-134-26/+29
|\ \ \ \ \ \
| * | | | | | Refactor broadcast_message.jsMike Greiling2017-10-134-26/+29
|/ / / / / /
* | | | | | Merge branch '38869-members' into 'master'Phil Hughes2017-10-134-120/+110
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove members and memberExpirationDate from window object38869-membersFilipa Lacerda2017-10-124-120/+110
* | | | | | Merge branch 'revert-8ae7963c' into 'master'Rémy Coutable2017-10-132-6/+0
|\ \ \ \ \ \
| * | | | | | Revert "Merge branch '36160-select2-dropdown' into 'master'"revert-8ae7963cFilipa Lacerda2017-10-122-6/+0
* | | | | | | Merge branch 'fix-cursor-path' into 'master'Tim Zallmann2017-10-131-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Use image-url instead of url so that asset pipeline can do it's thingfix-cursor-pathClement Ho2017-10-101-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'evn-add-profiler' into 'master'Stan Hu2017-10-121-0/+10
|\ \ \ \ \ \
| * | | | | | Different wording to make it more generalevn-add-profilerernstvn2017-10-091-3/+3
| * | | | | | Add link to gitlab-profilerernstvn2017-10-091-0/+10
* | | | | | | Merge branch 'new-mr-repo-editor' into 'master'Clement Ho2017-10-1211-68/+260
|\ \ \ \ \ \ \
| * | | | | | | Add create merge checkbox.Jacob Schatz2017-10-1211-68/+260
|/ / / / / / /
* | | | | | | Merge branch '26763-grant-registry-auth-scope-to-admins' into 'master'Kamil Trzciński2017-10-123-4/+68
|\ \ \ \ \ \ \
| * | | | | | | fix code style issuesVratislav Kalenda2017-10-101-2/+10
| * | | | | | | fill in changelog entryVratislav Kalenda2017-10-101-2/+2
| * | | | | | | refactor access handlingVratislav Kalenda2017-10-101-5/+12
| * | | | | | | fix lintVratislav Kalenda2017-10-081-6/+3
| * | | | | | | remove whitespaceVratislav Kalenda2017-10-082-4/+1
| * | | | | | | Issue JWT token with registry:catalog:* scope when requested by GitLab adminVratislav Kalenda2017-10-083-0/+55
* | | | | | | | Merge branch 'update-licenses.csv' into 'master'Rémy Coutable2017-10-121-102/+52
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Update licensesLin Jen-Shin2017-10-121-102/+52
* | | | | | | | Merge branch 'fix/rugged-alternate-paths' into 'master'Douwe Maan2017-10-122-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix the format of rugged alternate directory listfix/rugged-alternate-pathsAhmad Sherif2017-10-122-2/+3
* | | | | | | | | Merge branch '34897-delete-branch-after-merge' into 'master'Sean McGivern2017-10-124-14/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix a whitespace34897-delete-branch-after-mergeMicael Bergeron2017-10-121-1/+1
| * | | | | | | | | fix for discussionMicael Bergeron2017-10-121-3/+4
| * | | | | | | | | [ci-skip] add changelogmicael.bergeron2017-10-111-0/+5
| * | | | | | | | | fix the merger override to remove source branchmicael.bergeron2017-10-111-5/+8
| * | | | | | | | | add specmicael.bergeron2017-10-112-7/+22