summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* more readable changelog39366-email-confirmation-failsBrett Walker2017-10-281-1/+1
* remove extra whitespaceBrett Walker2017-10-271-2/+2
* use a delegate for `username` to be more future friendlyBrett Walker2017-10-273-2/+11
* add changelog entryBrett Walker2017-10-271-0/+5
* fix to pass static-analysisBrett Walker2017-10-241-2/+2
* grab the correct username when confirming secondary emailBrett Walker2017-10-231-1/+2
* Merge branch '35644-refactor-have-http-status-into-have-gitlab-http-status' i...Rémy Coutable2017-10-23179-2658/+2663
|\
| * Refactor `have_http_status` into `have_gitlab_http_status` in the specsJacopo2017-10-20179-2658/+2663
* | Merge branch 'cs-docs-fixes' into 'master'Achilleas Pipinellis2017-10-234-8/+8
|\ \
| * | Simple docs fixesConnor Shea2017-10-234-8/+8
|/ /
* | Merge branch '38869-group-files' into 'master'Phil Hughes2017-10-234-33/+20
|\ \
| * | Removes group_avatar & group_label_subscription from global namespaceFilipa Lacerda2017-10-234-33/+20
* | | Merge branch 'docs-fix-delete-merged-branches-typo' into 'master'Achilleas Pipinellis2017-10-231-1/+1
|\ \ \
| * | | Fix a small typo in the delete merged branches documentationMark Fletcher2017-10-231-1/+1
| |/ /
* | | Merge branch 'docs-fix-issue-new-branch-format' into 'master'Achilleas Pipinellis2017-10-231-1/+1
|\ \ \
| * | | Fix the description of the new branch created by an issue's new branch buttonMark Fletcher2017-10-231-1/+1
| |/ /
* | | Merge branch '39369-document-vue-resource-http' into 'master'Phil Hughes2017-10-233-50/+76
|\ \ \
| * | | Moves vue resource docs into a new file.Filipa Lacerda2017-10-233-50/+76
* | | | Merge branch 'backort_routes_group_routes_from_ee' into 'master'Douwe Maan2017-10-232-44/+38
|\ \ \ \
| * | | | Backport EE changes to group routesbackort_routes_group_routes_from_eeValery Sizov2017-10-222-44/+38
* | | | | Merge branch 'bvl-fix-push-event-service-for-forks' into 'master'Douwe Maan2017-10-233-3/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Only cache the event for the fork-source when it existsbvl-fix-push-event-service-for-forksBob Van Landuyt2017-10-223-3/+7
* | | | | Merge branch 'fix-escaped-text-replacement' into 'master'Filipa Lacerda2017-10-232-3/+15
|\ \ \ \ \
| * | | | | notes.js: use the original content when resetting the formBen Boeckel2017-10-192-2/+12
| * | | | | notes.js: also return the original content when getting form dataBen Boeckel2017-10-191-1/+3
| |/ / / /
* | | | | Merge branch 'create-new-branch-repo-editor' into 'master'Filipa Lacerda2017-10-2310-9/+449
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Create new branch from dropdown.Jacob Schatz2017-10-2310-9/+449
|/ / / /
* | | | Merge branch 'zj-peek-gitaly' into 'master'Rémy Coutable2017-10-235-0/+56
|\ \ \ \
| * | | | Add Gitaly data to the Peek performance barZeger-Jan van de Weg2017-10-235-0/+56
* | | | | Merge branch 'add-shared-vue-loading-button' into 'master'Filipa Lacerda2017-10-237-5/+184
|\ \ \ \ \
| * | | | | Add loading buttonadd-shared-vue-loading-buttonEric Eastwood2017-10-237-5/+184
* | | | | | Merge branch 'patch-8' into 'master'Achilleas Pipinellis2017-10-231-4/+0
|\ \ \ \ \ \
| * | | | | | Update using_docker_images.mdPaul2017-10-231-4/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '38869-diff' into 'master'Phil Hughes2017-10-236-26/+18
|\ \ \ \ \ \
| * | | | | | Remove Diff class from globalnamespaceFilipa Lacerda2017-10-196-26/+18
* | | | | | | Merge branch '39308-fix-broken-master' into 'master'Sean McGivern2017-10-231-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix the broken .tests-metadata-state definitionRémy Coutable2017-10-201-1/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'sh-fix-container-registry-destroy' into 'master'Filipa Lacerda2017-10-232-4/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix deletion of container registry or images returning an errorStan Hu2017-10-232-4/+7
* | | | | | | | Merge branch 'fix-fog-aliyun-39126' into 'master'Stan Hu2017-10-232-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This...Paul B2017-10-232-3/+3
|/ / / / / / /
* | | | | | | Merge branch '28202_decrease_abc_threshold_step5' into 'master'Robert Speicher2017-10-223-5/+12
|\ \ \ \ \ \ \
| * | | | | | | Decrease ABC threshold to 54.28Maxim Rydkin2017-10-223-5/+12
|/ / / / / / /
* | | | | | | Merge branch 'bvl-fix-group-atom-feed' into 'master'Douwe Maan2017-10-223-0/+41
|\ \ \ \ \ \ \
| * | | | | | | Make sure we render events for projects within a groupBob Van Landuyt2017-10-203-0/+41
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Update VERSION to 10.2.0-prev10.2.0.preStan Hu2017-10-211-1/+1
* | | | | | | Update CHANGELOG.md for 10.1.0Stan Hu2017-10-21187-932/+192
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2017-10-210-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`Alessio Caiazza2017-10-211-0/+2
| * | | | | | | Fix the external URLs generated for online view of HTML artifactsNick Thomas2017-10-213-10/+19