Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fetch CE/branch before running `git apply --check --3way patch`32085-improve-ee-compat-check | Rémy Coutable | 2017-05-16 | 1 | -3/+5 |
* | Update ee_compat_check.rb to include `git apply --reject` suggestion | Luke "Jared" Bennett | 2017-05-16 | 1 | -0/+11 |
* | Merge branch 'dm-rename-column-concurrently-with-null' into 'master' | Yorick Peterse | 2017-05-15 | 1 | -1/+2 |
|\ | |||||
| * | Disallow NULL on renamed column after default has been set | Douwe Maan | 2017-05-15 | 1 | -1/+2 |
* | | Merge branch 'use-gitaly-migrate' into 'master' | Douwe Maan | 2017-05-15 | 1 | -3/+3 |
|\ \ | |/ |/| | |||||
| * | Use gitaly_migrate helper on all current migrations in repositoryuse-gitaly-migrate | Alejandro Rodríguez | 2017-05-11 | 1 | -3/+3 |
* | | Merge branch 'rename-rendered_title' into 'master' | Rémy Coutable | 2017-05-15 | 1 | -3/+3 |
|\ \ | |||||
| * | | Rename all references to rendered_title to realtime_changesrename-rendered_title | Luke "Jared" Bennett | 2017-05-13 | 1 | -3/+3 |
* | | | Merge branch 'gitaly-reuse-stubs' into 'master' | Robert Speicher | 2017-05-15 | 6 | -52/+36 |
|\ \ \ | |||||
| * | | | Don't reuse gRPC channels | Jacob Vosmaer | 2017-05-15 | 6 | -52/+36 |
* | | | | Merge branch 'adam-influxdb-hostname' into 'master' | Douwe Maan | 2017-05-15 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | Allow GitLab instance to start when InfluxDB hostname cannot be resolvedadam-influxdb-hostname | Adam Niedzielski | 2017-05-13 | 1 | -0/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'dm-dependency-linker-file-type' into 'master' | Robert Speicher | 2017-05-15 | 3 | -5/+10 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Select dependency linker based on file typedm-dependency-linker-file-type | Douwe Maan | 2017-05-12 | 3 | -5/+10 |
* | | | | Merge branch 'allow_numeric_values_in_gitlab_ci_yml' into 'master' | Kamil Trzciński | 2017-05-15 | 2 | -1/+11 |
|\ \ \ \ | |||||
| * | | | | Allow numeric values in gitlab-ci.yml | blackst0ne | 2017-05-07 | 2 | -1/+11 |
* | | | | | Merge branch 'rename-column-concurrently-defaults' into 'master' | Rémy Coutable | 2017-05-15 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Fix adding defaults for concurrent column renamesrename-column-concurrently-defaults | Yorick Peterse | 2017-05-12 | 1 | -1/+5 |
* | | | | | | Merge branch 'dturner/username' into 'master' | Rémy Coutable | 2017-05-15 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add username field to push webhook | David Turner | 2017-05-10 | 1 | -0/+2 |
* | | | | | | | Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master' | Robert Speicher | 2017-05-14 | 2 | -29/+45 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Add support for deltas_only under Gitaly | Ahmad Sherif | 2017-05-13 | 2 | -29/+45 |
* | | | | | | | Added repository_update hook | Gabriel Mazetto | 2017-05-12 | 2 | -0/+45 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Remove trailing comma in dependency linker to satisfy Rubocop | Stan Hu | 2017-05-12 | 1 | -1/+1 |
* | | | | | | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' | Douwe Maan | 2017-05-12 | 1 | -8/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos | Sean McGivern | 2017-05-12 | 1 | -8/+34 |
* | | | | | | | Merge branch 'disable-usage-ping' into 'master' | Robert Speicher | 2017-05-12 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add hostname to usage ping | Sean McGivern | 2017-05-11 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'dm-dependency-linker-gemfile' into 'master' | Sean McGivern | 2017-05-12 | 8 | -133/+318 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Link Gemfile git URLs | Douwe Maan | 2017-05-12 | 1 | -0/+3 |
| * | | | | | | | | Autolink package names in Gemfile | Douwe Maan | 2017-05-10 | 4 | -10/+176 |
| * | | | | | | | | Add Gitlab::StringRegexMarker | Douwe Maan | 2017-05-10 | 1 | -0/+13 |
| * | | | | | | | | Extract generic parts of Gitlab::Diff::InlineDiffMarker | Douwe Maan | 2017-05-10 | 3 | -123/+126 |
* | | | | | | | | | Merge branch '27439-performance-deltas' into 'master' | Douwe Maan | 2017-05-12 | 4 | -2/+74 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Avoid comma t the end of hash | Pawel Chojnacki | 2017-05-12 | 2 | -2/+2 |
| * | | | | | | | | | Custom queries for prometheus | Pawel Chojnacki | 2017-05-11 | 4 | -2/+74 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'bvl-fix-dynamic-path-query' into 'master' | Douwe Maan | 2017-05-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Update rename_base.rb | James Lopez | 2017-05-12 | 1 | -1/+1 |
| * | | | | | | | | Only rename namespaces and projects with an invalid path | Bob Van Landuyt | 2017-05-12 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'backport_file_filder_from_ee' into 'master' | Sean McGivern | 2017-05-12 | 2 | -17/+33 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Backport FileFinder from EEbackport_file_filder_from_ee | Valery Sizov | 2017-05-12 | 2 | -17/+33 |
* | | | | | | | | Merge branch 'remove-deltas-only' into 'master' | Sean McGivern | 2017-05-12 | 1 | -11/+0 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Remove deltas_only from DiffCollection | Jacob Vosmaer | 2017-05-11 | 1 | -11/+0 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Add a new column before creating rename triggers | Bob Van Landuyt | 2017-05-11 | 1 | -10/+10 |
|/ / / / / / | |||||
* | | | | | | Implement auxiliary blob viewers | Douwe Maan | 2017-05-10 | 1 | -1/+2 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'mas... | Robert Speicher | 2017-05-10 | 14 | -23/+23 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Enable the Style/TrailingCommaInArguments cop | Rémy Coutable | 2017-05-10 | 7 | -7/+7 |
| * | | | | Enable the Style/TrailingCommaInLiteral cop | Rémy Coutable | 2017-05-10 | 8 | -16/+16 |
* | | | | | Merge branch 'bvl-security-patches' into 'master' | Robert Speicher | 2017-05-10 | 3 | -7/+11 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge branch '31157-respect-project-features-in-wiki-search' into 'security' | Douwe Maan | 2017-05-10 | 1 | -0/+4 |