summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabledLin Jen-Shin2018-07-2012-38/+41
* Merge branch 'tc-pry-docs' into 'master'Sean McGivern2018-07-203-1/+132
|\
| * First version of pry_debugging.mdToon Claes2018-07-203-1/+132
* | Merge branch 'zj-gitaly-migrate-old-migrations' into 'master'Sean McGivern2018-07-204-84/+52
|\ \
| * | Remove direct disk access in RemoveDotGitFromUsernamesZeger-Jan van de Weg2018-07-192-15/+5
| * | MigrateProcessCommitWorkerJobs to use GitalyZeger-Jan van de Weg2018-07-193-70/+48
* | | Update VERSION to 11.2.0-prev11.2.0.preGitLab Release Tools Bot2018-07-201-1/+1
* | | Update CHANGELOG.md for 11.1.0GitLab Release Tools Bot2018-07-20212-1075/+239
* | | Merge branch 'gitaly-remote-mandatory' into 'master'Sean McGivern2018-07-204-107/+7
|\ \ \
| * | | Migrate add_remote, remove_remote, fetch_internal_remote to gitalyAlejandro Rodríguez2018-07-194-107/+7
| | |/ | |/|
* | | Merge branch 'project-dropdown-list-overflow' into 'master'Phil Hughes2018-07-202-5/+7
|\ \ \
| * | | Don't overflow project/group dropdown resultsgfyoung2018-07-192-5/+7
| |/ /
* | | Merge branch '48036-fix-web-ide-blob-crash' into 'master'Phil Hughes2018-07-203-5/+66
|\ \ \
| * | | Fix Web IDE router breaking on files matching "targetmode"Paul Slaughter2018-07-193-5/+66
* | | | Merge branch '49375-css-move' into 'master'Phil Hughes2018-07-201-0/+159
|\ \ \ \ | |_|/ / |/| | |
| * | | Moves security reports CSS into CE folder49375-css-moveFilipa Lacerda2018-07-191-0/+159
* | | | Merge branch '5594-geo-add-repository-verification-failures-to-api' into 'mas...Douglas Barbosa Alexandre2018-07-192-3/+23
|\ \ \ \
| * | | | Backport of gitlab-org/gitlab-ee!6137Valery Sizov2018-07-192-3/+23
|/ / / /
* | | | Merge branch 'gitaly-ff-branch-nil' into 'master'Rémy Coutable2018-07-194-11/+141
|\ \ \ \
| * | | | Add missing Gitaly branch_update nil checksJacob Vosmaer (GitLab)2018-07-194-11/+141
|/ / / /
* | | | Merge branch 'add-total-time-flat-printer-for-profiling' into 'master'Rémy Coutable2018-07-194-0/+81
|\ \ \ \
| * | | | Add a Gitlab::Profiler.print_by_total_time convenience methodSean McGivern2018-07-194-0/+81
| | |_|/ | |/| |
* | | | Merge branch '49413-test-action-no-return' into 'master'Filipa Lacerda2018-07-192-7/+30
|\ \ \ \
| * | | | allow for testAction to wait until all promises are resolvedLukas Eipert2018-07-192-7/+30
| | |_|/ | |/| |
* | | | Merge branch 'frozen-string-enable-apps-services-inner-even-more' into 'master'Rémy Coutable2018-07-1935-0/+73
|\ \ \ \ | |/ / / |/| | |
| * | | Enable more frozen string in app/services/**/*.rbgfyoung2018-07-1835-0/+73
* | | | Merge branch 'remove-duplicated-include' into 'master'Rémy Coutable2018-07-191-1/+0
|\ \ \ \
| * | | | Remove duplicated include IgnorableColumnLin Jen-Shin2018-07-191-1/+0
* | | | | Merge branch 'sh-normalize-urls' into 'master'Grzegorz Bizon2018-07-193-7/+19
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Escape username and password in UrlSanitizer#full_urlStan Hu2018-07-193-7/+19
* | | | | Merge branch 'use-rugged-for-reference-validator' into 'master'Douwe Maan2018-07-192-5/+8
|\ \ \ \ \
| * | | | | Use rugged to validate ref nameAhmad Hassan2018-07-192-5/+8
* | | | | | Merge branch 'rails5-fix-revert-modal-spec' into 'master'Rémy Coutable2018-07-192-0/+8
|\ \ \ \ \ \
| * | | | | | Rails5 fix user sees revert modal specJasper Maes2018-07-192-0/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch '43312-remove_user_activity_workers' into 'master'Rémy Coutable2018-07-1918-333/+66
|\ \ \ \ \ \
| * | | | | | Delete UserActivities and related workers43312-remove_user_activity_workersImre Farkas2018-07-1818-333/+66
* | | | | | | Merge branch 'regen-2fa-codes' into 'master'Douwe Maan2018-07-192-1/+12
|\ \ \ \ \ \ \
| * | | | | | | Add button to regenerate 2FA codes.Luke Picciau2018-07-192-1/+12
|/ / / / / / /
* | | | | | | Merge branch 'accept-rf3-2822-compliant-addresses' into 'master'repo-forks/gitlab-ce-frozen-string-enable-apps-services-inner-even-moreSean McGivern2018-07-194-14/+62
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Improve email address parsingGeorge Thomas2018-07-194-14/+62
* | | | | | | Merge branch 'gitaly-remote-branches' into 'master'Douwe Maan2018-07-199-95/+73
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Incorporate Gitaly's RefService.FindAllRemoteBranches RPCgitaly-remote-branchesAlejandro Rodríguez2018-07-189-95/+73
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sh-limit-unauthenticated-session-times' into 'master'Robert Speicher2018-07-184-0/+51
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Limit the TTL for anonymous sessions to 1 hourStan Hu2018-07-184-0/+51
* | | | | | Merge branch 'leipert-proper-icon-validator' into 'master'Mike Greiling2018-07-1822-61/+123
|\ \ \ \ \ \
| * | | | | | Proper icon validatorLukas Eipert2018-07-1822-61/+123
|/ / / / / /
* | | | | | Merge branch 'toggle-password-cluster' into 'master'Annabel Gray2018-07-184-1/+27
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Toggle Show / Hide Button for Kubernetes Passwordgfyoung2018-07-184-1/+27
* | | | | | Merge branch '41784-monitoring-graph-popovers' into 'master'Clement Ho2018-07-183-8/+40
|\ \ \ \ \ \
| * | | | | | Resolve "Fix arrow for popovers on monitoring graph"Annabel Gray2018-07-183-8/+40
|/ / / / / /
View Lorry Controller Status