summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'winh-indeterminate-dropdown' into 'master'Phil Hughes2017-10-182-0/+6
* Merge branch 'an/popen-deadline' into 'master'Sean McGivern2017-10-185-1/+208
* Merge branch 'implements-closing-docs' into 'master'Sean McGivern2017-10-181-1/+2
* Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cl...Kamil Trzciński2017-10-184-0/+31
* Merge branch '39111-remove-n-shortcut' into 'master'Filipa Lacerda2017-10-181-4/+0
* Update VERSION to 10.1.0-rc2v10.1.0-rc2Lin Jen-Shin2017-10-171-1/+1
* Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-1716-80/+141
|\
| * Those tests were tested under authenticatedLin Jen-Shin2017-10-161-21/+21
| * Fix bad merge with spec/models/namespace_spec.rbStan Hu2017-10-151-1/+1
| * Merge branch 'port-ee-3435' into 'security-10-0'Robert Speicher2017-10-154-30/+10
| * Merge branch '38126-security-username-change' into 'security-10-0'Douwe Maan2017-10-154-16/+49
| * Merge branch 'rs-sanitize-unicode-in-protocol' into 'security-10-0'Douwe Maan2017-10-153-2/+22
| * Merge branch 'fix-arbitrary-redirect-vulnerability' into 'security-10-0'Robert Speicher2017-10-153-10/+15
| * Merge branch 'winh-search-bar-xss' into 'security-10-0'Phil Hughes2017-10-152-2/+25
* | Update VERSION to 10.1.0-rc1v10.1.0-rc1Lin Jen-Shin2017-10-161-1/+1
* | Merge branch '10-1-stable-prepare-rc1' into '10-1-stable'Lin Jen-Shin (godfat)2017-10-1698-623/+1352
|\ \ | |/
| * Merge branch '39001-mr-tabs-hover' into 'master'10-1-stable-prepare-rc1Phil Hughes2017-10-131-0/+2
| * Merge branch 'cache-issuable-template-names' into 'master'Douwe Maan2017-10-137-28/+54
| * Merge branch 'docs-patch-28' into 'master'Achilleas Pipinellis2017-10-131-1/+2
| * Merge branch 'fix-cursor-path' into 'master'Tim Zallmann2017-10-131-2/+2
| * Merge branch 'milestones-permissions-docs' into 'master'Sean McGivern2017-10-131-1/+2
| * Merge branch 'add-resolve-discussion-test' into 'master'Filipa Lacerda2017-10-131-5/+15
| * Merge branch '38941-lock-note-fix' into 'master'Sean McGivern2017-10-133-3/+41
| * Merge branch '38574-superfluous-export-in-advanced-settings-of-project-settin...Tim Zallmann2017-10-131-1/+1
| * Merge branch 'wiki-empty-page-heading' into 'master'Filipa Lacerda2017-10-131-1/+1
| * Merge branch 'docs-image-discussion' into 'master'Achilleas Pipinellis2017-10-136-3/+40
| * Merge branch 'lock-discussion-docs' into 'master'Clement Ho2017-10-132-24/+16
| * Merge branch 'backport-ee-2869' into 'master'Sean McGivern2017-10-133-16/+34
| * Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'Douwe Maan2017-10-1315-18/+67
| * Merge branch '37691-subscription-fires-multiple-notifications' into 'master'Sean McGivern2017-10-134-8/+25
| * Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'Sean McGivern2017-10-135-2/+46
| * Merge branch 'update-licenses.csv' into 'master'Rémy Coutable2017-10-131-102/+52
| * Merge branch '39028-repo-by-url-fields' into 'master'Tim Zallmann2017-10-133-50/+56
| * Merge branch '37399-simplify-project-page' into 'master'Phil Hughes2017-10-1318-187/+313
| * Merge branch '35580-cannot-import-project-with-milestones' into 'master'Sean McGivern2017-10-126-98/+333
| * Merge branch 'docs/gke-cluster' into 'master'Achilleas Pipinellis2017-10-124-59/+172
| * Merge branch 'update-installation-doc-for-10-1' into 'master'Rémy Coutable2017-10-122-6/+6
| * Merge branch 'update-templates' into 'master'Rémy Coutable2017-10-1219-21/+85
|/
* Merge branch 'fix-dropdown' into 'master'Annabel Dunstone Gray2017-10-112-2/+3
* Merge branch 'fix-resolved-discussion' into 'master'Filipa Lacerda2017-10-114-10/+6
* Merge branch 'fix/sm/move-callback-route-google_api-auth-callback-for-oauth-u...Kamil Trzciński2017-10-112-4/+5
* Merge branch 'rs-mysql-groups-dashboard-failure' into 'master'Douwe Maan2017-10-111-10/+10
* Merge branch '38534-minigraph' into 'master'Phil Hughes2017-10-093-4/+14
|\
| * Fixes mini graph in commit view38534-minigraphFilipa Lacerda2017-10-093-4/+14
* | Merge branch 'jk-assignees-todos-fix' into 'master'Sean McGivern2017-10-093-5/+30
|\ \
| * | Don't create todos for old issue assigneesJarka Kadlecova2017-10-093-5/+30
* | | Merge branch '23888-fix-unsubscription-link-for-snippet-notification' into 'm...Sean McGivern2017-10-094-234/+390
|\ \ \
| * | | Don't show an "Unsubscribe" link in snippet comment notificationsRémy Coutable2017-10-094-234/+390
| |/ /
* | | Merge branch 'rs-qa-sandbox-group' into 'master'Grzegorz Bizon2017-10-098-14/+138
|\ \ \
| * | | Add QA::Scenario::Gitlab::Group::CreateRobert Speicher2017-10-097-59/+87
View Lorry Controller Status