summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Add Accept header for JSONStan Hu2018-07-271-1/+6
| * | | Consolidate server errors and add specsStan Hu2018-07-261-3/+17
| * | | Use project key instead of project name for importsStan Hu2018-07-261-0/+4
| * | | Fix failing specStan Hu2018-07-251-4/+4
| * | | Add comment about why using `first`Stan Hu2018-07-251-0/+2
| * | | Add spec for pull request comments and add commentsStan Hu2018-07-251-4/+28
| * | | Clean up implementationStan Hu2018-07-252-7/+20
| * | | Add spec for pull request activityStan Hu2018-07-251-28/+8
| * | | Enable frozen_string_literalStan Hu2018-07-2511-2/+24
| * | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-2564-79/+214
| |\ \ \
| * | | | Remove merge request deletion codeStan Hu2018-07-201-2/+0
| * | | | Add spec for BitBucketServer pull reuest parsingStan Hu2018-07-201-12/+12
| * | | | Add spec for BitbucketServer::Representation::RepoStan Hu2018-07-201-9/+1
| * | | | 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-206-121/+22
| |\ \ \ \ \
| * | | | | | Disable recovery of missing SHAs by defaultStan Hu2018-07-201-2/+9
| * | | | | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-197-46/+75
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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
| * | | | | | | | Fix URL for deleting branchesStan Hu2018-07-181-1/+1
| * | | | | | | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-189-206/+75
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Escape username and password in UrlSanitizer#full_urlStan Hu2018-07-181-4/+9
| * | | | | | | | | Fix identation in lib/bitbucket_server/connection.rbStan Hu2018-07-171-6/+6