summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Enable JUnit results for rspecKamil Trzciński2018-09-035-2/+13
* Merge branch 'sh-improve-system-hook-spec' into 'master'Stan Hu2018-08-221-3/+3
|\
| * Improve system hook spec in spec/services/git_push_service_spec.rbStan Hu2018-08-221-3/+3
* | Merge branch 'dz-bump-gitlab-svg' into 'master'50575-instance-statistics-should-be-available-without-usage-pingFilipa Lacerda2018-08-222-2/+6
|\ \ | |/ |/|
| * Update gitlab-svgs to 1.2.8Dmitriy Zaporozhets2018-08-222-2/+6
|/
* Merge branch 'sh-conditional-system-hook-push' into 'master'Sean McGivern2018-08-223-4/+12
|\
| * Eliminate unnecessary and duplicate system hook firesStan Hu2018-08-213-4/+12
* | Merge branch 'ide-file-templates-store' into 'master'Filipa Lacerda2018-08-2211-0/+591
|\ \
| * | added rewire comment to action default exportide-file-templates-storePhil Hughes2018-08-211-0/+1
| * | fixed static-analysisPhil Hughes2018-08-171-0/+6
| * | Added store for file templates in the Web IDEPhil Hughes2018-08-1710-0/+584
* | | Merge branch 'qa-317' into 'master'Rémy Coutable2018-08-224-4/+4
|\ \ \
| * | | [QA] Fix a 'superclass must be a Class' errorRémy Coutable2018-08-224-4/+4
* | | | Merge branch 'yisiliang/gitlab-ce-avoid-nil-safe_message' into 'master'Rémy Coutable2018-08-223-0/+12
|\ \ \ \
| * | | | Fix changelog's MR referenceSean McGivern2018-08-211-1/+1
| * | | | Make it clearer when Commit#description returns no_commit_messageSean McGivern2018-08-212-9/+7
| * | | | add 16889 MR change log, Avoid nil safe message.yisiliang2018-08-211-0/+5
| * | | | to avoid “NoMethodError (undefined method `split' for nil:NilClass)” whil...yisiliang2018-08-211-0/+5
| * | | | use #blank? instead #nil?yisiliang2018-08-211-1/+1
| * | | | to avoid “NoMethodError (undefined method `split' for nil:NilClass)” whil...yisiliang2018-08-211-1/+5
* | | | | Merge branch 'sh-bump-fog-google' into 'master'Rémy Coutable2018-08-225-15/+20
|\ \ \ \ \
| * | | | | Bump fog-google to 1.7.1 and google-api-client to 0.23.0sh-bump-fog-googleStan Hu2018-08-215-15/+20
| | |_|_|/ | |/| | |
* | | | | Merge branch '41441-add-target-branch-name-to-cherrypick-confirmation' into '...Sean McGivern2018-08-224-6/+11
|\ \ \ \ \
| * | | | | Fix failing testGeorge Andrinopoulos2018-08-201-1/+1
| * | | | | Fix branch name in case of new merge request cherry pickGeorge Andrinopoulos2018-08-191-1/+1
| * | | | | Merge branch '41441-add-target-branch-name-to-cherrypick-confirmation' of git...George Andrinopoulos2018-08-190-0/+0
| |\ \ \ \ \
| | * | | | | Add changelog fileGeorge Andrinopoulos2018-07-271-0/+5
| | * | | | | Fix failing testGeorge Andrinopoulos2018-07-271-1/+1
| | * | | | | Add target branch to cherry pick confirmation messageGeorge Andrinopoulos2018-07-253-6/+6
| * | | | | | Add changelog fileGeorge Andrinopoulos2018-08-191-0/+5
| * | | | | | Fix failing testGeorge Andrinopoulos2018-08-191-1/+1
| * | | | | | Add target branch to cherry pick confirmation messageGeorge Andrinopoulos2018-08-193-6/+6
* | | | | | | Merge branch 'api-empty-commit-message' into 'master'Sean McGivern2018-08-223-18/+47
|\ \ \ \ \ \ \
| * | | | | | | Extend to DELETE endpointRobert Schilling2018-08-211-5/+13
| * | | | | | | Extend to PUT requestRobert Schilling2018-08-212-19/+23
| * | | | | | | API: Catch empty commit messagesRobert Schilling2018-08-213-1/+18
* | | | | | | | Merge branch 'api-empty-project-snippets' into 'master'Sean McGivern2018-08-223-2/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | API: Catch empty code content for project snippetsRobert Schilling2018-08-213-2/+23
| |/ / / / / / /
* | | | | | | | Merge branch 'api-shared_group_expires-at' into 'master'Sean McGivern2018-08-225-2/+27
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | API: Add shared project's expiration dateapi-shared_group_expires-atRobert Schilling2018-08-215-2/+27
| |/ / / / / /
* | | | | | | Update VERSION to 11.3.0-prev11.3.0.preGitLab Release Tools Bot2018-08-221-1/+1
* | | | | | | Update CHANGELOG.md for 11.2.0GitLab Release Tools Bot2018-08-22217-1086/+240
* | | | | | | Merge branch 'docs-update-ha-aws-diagram' into 'master'Mike Lewis2018-08-223-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Docs update ha aws diagramAchilleas Pipinellis2018-08-223-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'dz-fix-sql-error-admin-users-2fa' into 'master'Stan Hu2018-08-214-7/+23
|\ \ \ \ \ \ \
| * | | | | | | Add changelog for 2fa sorting in admin areaDmitriy Zaporozhets2018-08-211-0/+5
| * | | | | | | Fix SQL error when sorting 2FA-enabled users by name in admin areaDmitriy Zaporozhets2018-08-213-7/+18
* | | | | | | | Merge branch 'remove-scss-variables-4' into 'master'Clement Ho2018-08-2120-78/+53
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Remove another batch of reassigned scss variablesAnnabel Dunstone Gray2018-08-2120-78/+53
* | | | | | | | Merge branch 'arguments-keyword-sast' into 'master'Mike Greiling2018-08-212-5/+10
|\ \ \ \ \ \ \ \