summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Automatically cleanup stale worktrees and lock files upon a pushStan Hu2018-04-063-27/+49
* Merge branch 'jramsay-38830-tarball' into 'master'Douwe Maan2018-04-062-6/+13
|\
| * Add new repository archive routeJames Ramsay2018-04-062-3/+3
| * Add option to suppress archive commit shaJames Ramsay2018-04-042-6/+13
* | Merge branch 'fix/gb/fix-deployment-platform-for-environment' into 'master'Kamil Trzciński2018-04-061-1/+1
|\ \
| * | Fix environment deployment platform filter methodGrzegorz Bizon2018-04-061-1/+1
* | | [Rails5] Update `type_cast_*_database` methodsblackst0ne2018-04-062-12/+41
|/ /
* | Resolve "Show `failure_reason` and upgrade tooltips of jobs"Mayra Cabrera2018-04-055-2/+81
* | Merge branch 'direct-upload-of-artifacts' into 'master'Grzegorz Bizon2018-04-053-5/+3
|\ \
| * | Add `direct_upload` setting for artifactsdirect-upload-of-artifactsKamil Trzciński2018-04-052-5/+1
| * | Remove artifacts_file/metadata from project exportKamil Trzciński2018-04-051-0/+2
| |/
* | Merge branch '44389-always-allow-http-for-ci-git-operations' into 'master'Kamil Trzciński2018-04-051-2/+11
|\ \
| * | Allow HTTP(s) when git request is made by GitLab CITomasz Maczukin2018-04-051-2/+11
* | | Merge branch '44665-fix-db-trace-stream-by-raw-access' into 'master'Kamil Trzciński2018-04-051-1/+5
|\ \ \
| * | | Add testShinya Maeda2018-04-051-2/+6
| * | | FixShinya Maeda2018-04-051-1/+1
| * | | Fix database trace to read rawShinya Maeda2018-04-051-1/+1
* | | | Merge branch 'bvl-override-import-params' into 'master'Douwe Maan2018-04-052-11/+21
|\ \ \ \
| * | | | Don't export `Project#description_html`Bob Van Landuyt2018-04-052-9/+2
| * | | | Override values from JSON with import dataBob Van Landuyt2018-04-051-3/+20
| |/ / /
* | | | Merge branch 'ce-4474-custom-additional-text-in-confirmation-email' into 'mas...Sean McGivern2018-04-052-2/+7
|\ \ \ \
| * | | | Add custom additonal email text to all emailsce-4474-custom-additional-text-in-confirmation-emailEric Eastwood2018-04-042-2/+7
| | |/ / | |/| |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2018-04-055-4/+111
|\ \ \ \
| * \ \ \ Merge branch 'bvl-export-import-lfs' into 'master'Douwe Maan2018-04-054-3/+109
| |\ \ \ \
| | * | | | Add helper for accessing lfs_objects for projectBob Van Landuyt2018-04-053-6/+3
| | * | | | Download LFS-files from object storage for exportsBob Van Landuyt2018-04-051-1/+10
| | * | | | Import projects with LFS objectsBob Van Landuyt2018-04-053-2/+54
| | * | | | Export LFS Objects when exporting a projectBob Van Landuyt2018-04-051-0/+48
| | | |/ / | | |/| |
| * | | | Merge branch 'zj-opt-out-list-commits-by-oid' into 'master'Sean McGivern2018-04-051-1/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Move ListCommitsByOid to OPT_OUTZeger-Jan van de Weg2018-04-041-1/+2
| | | |/ | | |/|
* | | | Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'securit...Douwe Maan2018-04-055-2/+71
* | | | Merge branch '42028-xss-diffs-10-6' into 'security-10-6'Douwe Maan2018-04-051-2/+5
|/ / /
* | | Merge branch 'zj-opt-out-delete-refs' into 'master'Rémy Coutable2018-04-041-1/+2
|\ \ \ | |_|/ |/| |
| * | Bulk deleting refs is handled by Gitaly by defaultZeger-Jan van de Weg2018-04-041-1/+2
| |/
* | Add support for Sidekiq JSON loggingStan Hu2018-04-042-0/+117
|/
* Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' in...Sean McGivern2018-04-046-47/+44
|\
| * Use shard name in Git::GitlabProjects instead of shard pathAhmad Sherif2018-04-036-47/+44
* | Add better LDAP connection handlingFrancisco Javier López2018-04-044-8/+47
* | Backport Gitlab::Git::Checksum to CEDouglas Barbosa Alexandre2018-04-031-0/+82
* | Merge branch 'rs-performance-bar-for-admins' into 'master'Rémy Coutable2018-04-031-0/+1
|\ \
| * | Always allow the performance bar to be enabled for adminsrs-performance-bar-for-adminsRobert Speicher2018-04-021-0/+1
* | | Merge branch 'sh-move-sidekiq-exporter-logs' into 'master'Sean McGivern2018-04-031-1/+9
|\ \ \
| * | | Move Sidekiq exporter logs to log/sidekiq_exporter.logsh-move-sidekiq-exporter-logsStan Hu2018-04-021-1/+9
* | | | Rename allow_private_networks to allow_local_networkDouwe Maan2018-04-022-3/+3
* | | | Make error messages even more descriptiveDouwe Maan2018-04-021-33/+47
* | | | Raise more descriptive errors when URLs are blockedDouwe Maan2018-04-023-20/+40
| |/ / |/| |
* | | Merge branch 'sh-cleanup-crlf-gitmodules' into 'master'Douwe Maan2018-04-021-1/+3
|\ \ \
| * | | Handle CR-LFs properly in .gitmodules filesh-cleanup-crlf-gitmodulesStan Hu2018-03-301-1/+3
| |/ /
* | | Merge branch 'feature/gb/variables-expressions-in-only-except' into 'master'Kamil Trzciński2018-04-0213-32/+75
|\ \ \
| * | | Fix build variables policy after renaming methodsGrzegorz Bizon2018-03-301-1/+1