summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix_pat_auth-11-2' into 'security-11-2'Robert Speicher2018-10-261-1/+1
* Merge branch 'security-redact-links-11-2' into 'security-11-2'Jan Provaznik2018-10-241-0/+62
* Merge branch 'security-11-2-junit-test-report-exposes-stacktrace' into 'secur...Jan Provaznik2018-10-241-4/+4
* Merge branch 'security-if-51113-hash_tokens-11-2' into 'security-11-2'Jan Provaznik2018-10-243-1/+56
* Merge branch 'security-fj-stored-xss-in-repository-imports-11-2' into 'securi...Bob Van Landuyt2018-09-251-1/+1
* Merge branch 'sh-sh-block-other-localhost-11-2' into 'security-11-2'Bob Van Landuyt2018-09-241-0/+7
* Merge branch 'security-security-2697-code-highlight-timeout-11-2' into 'secur...Bob Van Landuyt2018-09-241-1/+13
* Merge branch 'security-diff-cache-fix-11-2' into 'security-11-2'José Iván Vargas López2018-08-281-3/+4
* Merge branch 'security-mk-exclude-orphaned-upload-files-from-export-11-2' int...José Iván Vargas López2018-08-241-8/+11
* Merge branch 'security-2694-pipeline-11-2' into 'security-11-2'José Iván Vargas López2018-08-241-1/+1
* Merge branch 'security-49085-11.2-persistent-xss-rendering' into 'security-11-2'José Iván Vargas López2018-08-242-2/+2
* Merge branch 'sh-block-link-local-master-11-2-port' into 'security-11-2'Nick Thomas2018-08-241-0/+8
* Merge branch 'sh-fix-broken-ldap-clones' into 'master'11-2-stable-patch-1Alejandro Rodríguez2018-08-221-0/+1
* Merge branch '49907-commits-and-merge-requests-does-not-list-all-files-when-o...11-2-stable-prepare-rc10Sean McGivern2018-08-202-1/+2
* Merge branch 'rd-fix-bug-when-authenticating-user-for-repo-with-size-check-en...Stan Hu2018-08-091-1/+1
* Remove todos of users without access to targets migrationJarka Kadlecová2018-08-071-0/+105
* Merge branch '46535-orphaned-uploads' into 'master'Kamil Trzciński2018-08-071-0/+80
|\
| * Clean orphaned files in object storageJarka Kadlecová2018-08-071-0/+80
* | Resolve "Mutual SSL Auth For Helm TIller"Mayra Cabrera2018-08-077-38/+138
* | Backport some changes from gitlab-org/gitlab-ee!6767Rubén Dávila2018-08-073-3/+30
* | Merge branch 'sh-support-bitbucket-server-import' into 'master'Tim Zallmann2018-08-063-9/+373
|\ \
| * | Remove date from author line since that is already present in `created_at`Stan Hu2018-08-031-1/+1
| * | Add a comment when user can't be identifiedStan Hu2018-08-021-2/+10
| * | Keep alignment in lib/gitlab/import_sources.rbStan Hu2018-08-021-9/+9
| * | Revert "Remove unnecessary lookup for merge request SHAs"Stan Hu2018-07-311-2/+7
| * | Fix failing spec in fallback diff note changeStan Hu2018-07-311-2/+2
| * | Improve formatting of fallback diff noteStan Hu2018-07-311-1/+6
| * | Remove unnecessary lookup for merge request SHAsStan Hu2018-07-311-7/+2
| * | Fix bug where fallback diff notes would not have an associated positionStan Hu2018-07-311-3/+3
| * | Handle empty description fieldStan Hu2018-07-311-1/+1
| * | Give some context on threaded discussionsStan Hu2018-07-311-1/+9
| * | Fix Rubocop complaint about update_attributesStan Hu2018-07-311-1/+1
| * | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-3110-40/+237
| |\ \
| * | | Fix merge request SHAStan Hu2018-07-301-1/+1
| * | | No need to look up commit SHA since Bitbucket has a full-length SHAStan Hu2018-07-301-2/+0
| * | | Restrict to confirmed users and allow memoization of unkonwn e-mailsStan Hu2018-07-281-2/+2
| * | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-2719-62/+114
| |\ \ \
| * \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-2512-61/+91
| |\ \ \ \
| * | | | | Remove merge request deletion codeStan Hu2018-07-201-2/+0
| * | | | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-201-0/+22
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-205-98/+22
| |\ \ \ \ \ \
| * | | | | | | Disable recovery of missing SHAs by defaultStan Hu2018-07-201-2/+9
| * | | | | | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-196-43/+57
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-192-41/+29
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Escape username and password in UrlSanitizer#full_urlStan Hu2018-07-191-6/+4
| * | | | | | | | | Fix and clean up code for deleting branchesStan Hu2018-07-181-20/+27
| * | | | | | | | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-187-204/+63
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Escape username and password in UrlSanitizer#full_urlStan Hu2018-07-181-4/+9
| * | | | | | | | | | Improve formatting of diff notes that could not be importedStan Hu2018-07-171-1/+1
| * | | | | | | | | | Some formatting cleanupStan Hu2018-07-172-9/+5
View Lorry Controller Status