summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | Merge branch 'update-installation-doc-for-10-1' into 'master'Rémy Coutable2017-10-122-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update doc accordingly to:update-installation-doc-for-10-1Lin Jen-Shin2017-10-122-6/+6
* | | | | | | | | | | Merge branch 'gitaly-fetch-remote' into 'master'Dmitriy Zaporozhets2017-10-122-0/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add `Gitlab::Git::Repository#fetch` commandgitaly-fetch-remoteAlejandro Rodríguez2017-10-092-0/+21
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '37691-subscription-fires-multiple-notifications' into 'master'Sean McGivern2017-10-124-8/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix a wrong method call in the refactormicael.bergeron2017-10-121-1/+1
| * | | | | | | | | | | [ci-skip] add changelog37691-subscription-fires-multiple-notificationsmicael.bergeron2017-10-101-0/+5
| * | | | | | | | | | | fix multiple notifications from being sent for multiple labelsmicael.bergeron2017-10-103-8/+20
* | | | | | | | | | | | Merge branch 'update-templates' into 'master'Rémy Coutable2017-10-1219-21/+85
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update templates via:Lin Jen-Shin2017-10-1219-21/+85
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'cache-issuable-template-names' into 'master'Douwe Maan2017-10-127-28/+54
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Cache issuable template namesSean McGivern2017-10-126-13/+35
| * | | | | | | | | | | Match full file path in FileDetectorSean McGivern2017-10-123-15/+19
View Lorry Controller Status