summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-2564-79/+214
|\
| * Merge branch 'sh-use-wiki-limit-parameter-gitaly' into 'master'Sean McGivern2018-07-252-6/+6
| |\
| | * Use limit parameter to retrieve Wikis from Gitalysh-use-wiki-limit-parameter-gitalyStan Hu2018-07-242-6/+6
| * | Fix: redirect non-SSL request for gitlab registry to valid URLjelhan2018-07-241-1/+1
| * | Fix slow Markdown renderingStan Hu2018-07-241-1/+1
| |/
| * Merge branch 'backport-gitlab-database' into 'master'Rémy Coutable2018-07-241-0/+26
| |\
| | * Backport various EE changes to Gitlab::Databasebackport-gitlab-databaseYorick Peterse2018-07-241-0/+26
| * | Merge branch 'zj-backup-timeout' into 'master'Rémy Coutable2018-07-242-4/+8
| |\ \
| | * | Remove timeouts for long running requestsZeger-Jan van de Weg2018-07-242-4/+8
| | |/
| * | Add an option to have a private profile on GitLabJX Terry2018-07-243-7/+9
| * | Make repository cleanup mandatoryZeger-Jan van de Weg2018-07-241-4/+2
| |/
| * Annotate Gitlab::Git::Repository#fetch_refJacob Vosmaer (GitLab)2018-07-242-0/+5
| * Merge branch 'api-minimal-access-level' into 'master'Robert Speicher2018-07-234-1/+5
| |\
| | * Add min_access_level filter to projects APIMarko, Peter2018-07-233-0/+3
| | * Add min_access_level filter to groups APIMarko, Peter2018-07-231-1/+2
| * | Merge branch 'sh-enable-frozen-literals-banzi-filters' into 'master'Rémy Coutable2018-07-233-3/+9
| |\ \ | | |/ | |/|
| | * Enable frozen strings in remaining lib/banzai/filter/*.rb filessh-enable-frozen-literals-banzi-filtersStan Hu2018-07-233-3/+9
| * | Merge branch 'sh-freeze-banzai-filter-strings' into 'master'Rémy Coutable2018-07-2338-0/+76
| |\ \
| | * | Enable frozen strings in lib/banzai/filter/*.rbsh-freeze-banzai-filter-stringsStan Hu2018-07-2338-0/+76
| | |/
| * | Merge branch 'da-feature-flags' into 'master'Rémy Coutable2018-07-231-1/+1
| |\ \
| | * | Allow feature flag names to be a symbolda-feature-flagsDouglas Barbosa Alexandre2018-07-191-1/+1
| * | | Merge branch 'gitaly-add-remote-mandatory' into 'master'Sean McGivern2018-07-231-8/+0
| |\ \ \
| | * | | Remove unused rugged code that is currently on GitalyAlejandro Rodríguez2018-07-201-8/+0
| * | | | Merge branch 'hangouts_chat_integration' into 'master'Sean McGivern2018-07-231-0/+9
| |\ \ \ \
| | * | | | Add dummy Google Hangouts Chat integrationKukovskii Vladimir2018-07-141-0/+9
| * | | | | Fix gitlab import project loadFrancisco Javier López2018-07-232-14/+18
| * | | | | Merge branch 'rs-web_url-for-pipelines-and-jobs' into 'master'Douwe Maan2018-07-232-1/+9
| |\ \ \ \ \
| | * | | | | Ensure a job preloads the project's namespace to avoid N+1Robert Speicher2018-07-201-1/+1
| | * | | | | Expose web_url attribute in PipelineBasic and JobBasicrs-web_url-for-pipelines-and-jobsRobert Speicher2018-07-181-0/+8
| * | | | | | Merge branch '48932-disable-saml-if-omniauth-is-disabled' into 'master'Douwe Maan2018-07-235-28/+29
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabledLin Jen-Shin2018-07-205-28/+29
* | | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Bring JsonLogger to CEStan Hu2018-07-201-0/+22
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-206-121/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixing bug with wiki ref in ProjectSearchResultsFrancisco Javier López2018-07-201-7/+12
| * | | | | Merge branch 'fix/gb/fix-deserializing-ci-yaml-variables' into 'master'Kamil Trzciński2018-07-202-3/+4
| |\ \ \ \ \
| | * | | | | Fix passing a hash with string keys when fabricating a variableGrzegorz Bizon2018-07-191-1/+1
| | * | | | | Fix deserializing yaml variables in imported projectsGrzegorz Bizon2018-07-191-2/+3
| * | | | | | Merge branch 'zj-remove-refs-cleanup' into 'master'Kamil Trzciński2018-07-201-23/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Remove refs cleanup jobZeger-Jan van de Weg2018-07-191-23/+0
| * | | | | | Merge branch 'zj-gitaly-migrate-old-migrations' into 'master'Sean McGivern2018-07-201-1/+0
| |\ \ \ \ \ \
| | * | | | | | MigrateProcessCommitWorkerJobs to use GitalyZeger-Jan van de Weg2018-07-191-1/+0
| * | | | | | | Migrate add_remote, remove_remote, fetch_internal_remote to gitalyAlejandro Rodríguez2018-07-192-87/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Backport of gitlab-org/gitlab-ee!6137Valery Sizov2018-07-191-3/+18
| * | | | | | Add missing Gitaly branch_update nil checksJacob Vosmaer (GitLab)2018-07-192-5/+8