summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Fetch CE/branch before running `git apply --check --3way patch`32085-improve-ee-compat-checkRémy Coutable2017-05-161-3/+5
* Update ee_compat_check.rb to include `git apply --reject` suggestionLuke "Jared" Bennett2017-05-161-0/+11
* Merge branch 'dm-rename-column-concurrently-with-null' into 'master' Yorick Peterse2017-05-151-1/+2
|\
| * Disallow NULL on renamed column after default has been setDouwe Maan2017-05-151-1/+2
* | Merge branch 'use-gitaly-migrate' into 'master' Douwe Maan2017-05-151-3/+3
|\ \ | |/ |/|
| * Use gitaly_migrate helper on all current migrations in repositoryuse-gitaly-migrateAlejandro Rodríguez2017-05-111-3/+3
* | Merge branch 'rename-rendered_title' into 'master' Rémy Coutable2017-05-151-3/+3
|\ \
| * | Rename all references to rendered_title to realtime_changesrename-rendered_titleLuke "Jared" Bennett2017-05-131-3/+3
* | | Merge branch 'gitaly-reuse-stubs' into 'master' Robert Speicher2017-05-156-52/+36
|\ \ \
| * | | Don't reuse gRPC channelsJacob Vosmaer2017-05-156-52/+36
* | | | Merge branch 'adam-influxdb-hostname' into 'master' Douwe Maan2017-05-151-0/+3
|\ \ \ \
| * | | | Allow GitLab instance to start when InfluxDB hostname cannot be resolvedadam-influxdb-hostnameAdam Niedzielski2017-05-131-0/+3
| | |/ / | |/| |
* | | | Merge branch 'dm-dependency-linker-file-type' into 'master' Robert Speicher2017-05-153-5/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Select dependency linker based on file typedm-dependency-linker-file-typeDouwe Maan2017-05-123-5/+10
* | | | Merge branch 'allow_numeric_values_in_gitlab_ci_yml' into 'master' Kamil Trzciński2017-05-152-1/+11
|\ \ \ \
| * | | | Allow numeric values in gitlab-ci.ymlblackst0ne2017-05-072-1/+11
* | | | | Merge branch 'rename-column-concurrently-defaults' into 'master' Rémy Coutable2017-05-151-1/+5
|\ \ \ \ \
| * | | | | Fix adding defaults for concurrent column renamesrename-column-concurrently-defaultsYorick Peterse2017-05-121-1/+5
* | | | | | Merge branch 'dturner/username' into 'master' Rémy Coutable2017-05-151-0/+2
|\ \ \ \ \ \
| * | | | | | Add username field to push webhookDavid Turner2017-05-101-0/+2
* | | | | | | Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master' Robert Speicher2017-05-142-29/+45
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add support for deltas_only under GitalyAhmad Sherif2017-05-132-29/+45
* | | | | | | Added repository_update hookGabriel Mazetto2017-05-122-0/+45
| |_|_|_|/ / |/| | | | |
* | | | | | Remove trailing comma in dependency linker to satisfy RubocopStan Hu2017-05-121-1/+1
* | | | | | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-121-8/+34
|\ \ \ \ \ \
| * | | | | | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-8/+34
* | | | | | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-121-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add hostname to usage pingSean McGivern2017-05-111-0/+1
* | | | | | | | Merge branch 'dm-dependency-linker-gemfile' into 'master' Sean McGivern2017-05-128-133/+318
|\ \ \ \ \ \ \ \
| * | | | | | | | Link Gemfile git URLsDouwe Maan2017-05-121-0/+3
| * | | | | | | | Autolink package names in GemfileDouwe Maan2017-05-104-10/+176
| * | | | | | | | Add Gitlab::StringRegexMarkerDouwe Maan2017-05-101-0/+13
| * | | | | | | | Extract generic parts of Gitlab::Diff::InlineDiffMarkerDouwe Maan2017-05-103-123/+126
* | | | | | | | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-124-2/+74
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Avoid comma t the end of hashPawel Chojnacki2017-05-122-2/+2
| * | | | | | | | | Custom queries for prometheusPawel Chojnacki2017-05-114-2/+74
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'bvl-fix-dynamic-path-query' into 'master' Douwe Maan2017-05-121-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Update rename_base.rbJames Lopez2017-05-121-1/+1
| * | | | | | | | Only rename namespaces and projects with an invalid pathBob Van Landuyt2017-05-121-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'backport_file_filder_from_ee' into 'master' Sean McGivern2017-05-122-17/+33
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Backport FileFinder from EEbackport_file_filder_from_eeValery Sizov2017-05-122-17/+33
* | | | | | | | Merge branch 'remove-deltas-only' into 'master' Sean McGivern2017-05-121-11/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove deltas_only from DiffCollectionJacob Vosmaer2017-05-111-11/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | Add a new column before creating rename triggersBob Van Landuyt2017-05-111-10/+10
|/ / / / / /
* | | | | | Implement auxiliary blob viewersDouwe Maan2017-05-101-1/+2
| |_|/ / / |/| | | |
* | | | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'mas...Robert Speicher2017-05-1014-23/+23
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-107-7/+7
| * | | | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-108-16/+16
* | | | | Merge branch 'bvl-security-patches' into 'master' Robert Speicher2017-05-103-7/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-101-0/+4