summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-bw-confidential-titles-through-markdown-api-11-2' into...Bob Van Landuyt2018-10-042-4/+10
* Merge branch 'security-fix-leaking-private-project-namespace-11-2' into 'secu...Bob Van Landuyt2018-10-042-1/+8
* Merge branch 'security-fj-stored-xss-in-repository-imports-11-2' into 'securi...Bob Van Landuyt2018-09-251-1/+1
* Merge branch 'fix-events-finder-incomplete-11-2' into 'security-11-2'Bob Van Landuyt2018-09-241-3/+19
* 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
* Backport issue board milestone lists EE changesOswaldo Ferreira2018-08-073-9/+19
* Merge branch 'todos-visibility-migration' into 'master'Sean McGivern2018-08-071-0/+105
|\
| * Remove todos of users without access to targets migrationJarka Kadlecová2018-08-071-0/+105
* | Create Web IDE MR and branch pickerPaul Slaughter2018-08-071-0/+1
|/
* Merge branch '46535-orphaned-uploads' into 'master'Kamil Trzciński2018-08-072-0/+90
|\
| * Clean orphaned files in object storageJarka Kadlecová2018-08-072-0/+90
* | Resolve "Mutual SSL Auth For Helm TIller"Mayra Cabrera2018-08-077-38/+138
* | Merge branch 'group-todos' into 'master'Sean McGivern2018-08-071-4/+9
|\ \
| * | Revert "Revert "Merge branch 'ee-5481-epic-todos' into 'master'""Jarka Kadlecová2018-08-021-4/+9
* | | 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-0614-9/+1152
|\ \ \
| * | | 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
| * | | Use a case statement to determine pull request stateStan Hu2018-08-021-2/+3
| * | | Keep alignment in lib/gitlab/import_sources.rbStan Hu2018-08-021-9/+9
| * | | Assorted Bitbucket Server importer code cleanup based on reviewStan Hu2018-08-012-5/+5
| * | | Deal with subpaths and trailing slashes properlyStan Hu2018-07-311-3/+20
| * | | 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
| * | | Use URI.join to avoid slash headachesStan Hu2018-07-311-3/+3
| * | | Hide error details if there are noneStan Hu2018-07-311-1/+1
| * | | Give some context on threaded discussionsStan Hu2018-07-311-1/+9
| * | | Track parental relationships in commentsStan Hu2018-07-311-7/+38
| * | | Fix Rubocop complaint about update_attributesStan Hu2018-07-311-1/+1
| * | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-3117-251/+384
| |\ \ \
| * | | | Fix merge request SHAStan Hu2018-07-302-4/+12
| * | | | 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
| * | | | Use raw_commentStan Hu2018-07-281-3/+3
| * | | | Use a class method to consolidate timestamp conversionStan Hu2018-07-284-6/+10
| * | | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-2722-66/+158
| |\ \ \ \
| * | | | | Handle invalid JSON from serverStan Hu2018-07-271-6/+7
View Lorry Controller Status