| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master' | Robert Speicher | 2017-05-18 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Stop MR conflict code from blowing up when branches are missing Closes #32544 See merge request !11501 | ||||
| | * | Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing | Douwe Maan | 2017-05-18 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dm-catch-uri-errors' into 'master' | Robert Speicher | 2017-05-18 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Catch all URI errors in ExternalLinkFilter Closes #32076 See merge request !11494 | ||||
| | * | | Catch all URI errors in ExternalLinkFilterdm-catch-uri-errors | Douwe Maan | 2017-05-18 | 1 | -1/+1 |
| | |/ | |||||
| * | | Fixes for the rename reserved paths helpers | Bob Van Landuyt | 2017-05-18 | 3 | -1/+16 |
| | | | |||||
| * | | Remove Services count from usage ping payload. | Ruben Davila | 2017-05-18 | 1 | -1/+0 |
| | | | | | | | | | | | This query was timing out and is blocking the sync of usage data for GitLab.com | ||||
| * | | Merge branch 'dm-gemfile-viewer' | Rémy Coutable | 2017-05-18 | 1 | -3/+19 |
| |\ \ | |/ |/| | | | See merge request !11346. | ||||
| | * | Add auxiliary blob viewers to dependency files | Douwe Maan | 2017-05-17 | 1 | -3/+19 |
| | | | |||||
| * | | Merge branch 'gitaly-local-branches' into 'master' | Douwe Maan | 2017-05-18 | 4 | -13/+83 |
| |\ \ | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's local_branches operation into repo code Closes #27379 See merge request !10059 | ||||
| | * | | Incorporate Gitaly's local_branches operation into repo codegitaly-local-branches | Alejandro Rodríguez | 2017-05-17 | 4 | -6/+82 |
| | | | | |||||
| | * | | Compare ids of commits if present for equality test | Alejandro Rodríguez | 2017-05-16 | 1 | -7/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This solves a problem where commits populated with Gitaly were not equal to commits populated with Rugged. This is because Gitaly may not return all fields of a commit for optimizations purposes, which resulted in false negatives when comparing the same commit (commits with the same sha) with different sources. | ||||
| * | | | Merge branch 'add-current_user-avatar_url-to-gon' into 'master' | Phil Hughes | 2017-05-18 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | Add current_user_avatar_url to gon See merge request !11474 | ||||
| | * | | | Add current_user_avatar_url to gonadd-current_user-avatar_url-to-gon | Luke "Jared" Bennett | 2017-05-18 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'sh-fix-container-registry-s3-redirects' into 'master' | Kamil Trzciński | 2017-05-18 | 1 | -4/+10 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Properly handle container registry redirects to fix metadata stored on an S3 backend Closes #22403 See merge request !11429 | ||||
| | * | | | Properly handle container registry redirects to fix metadata stored on a S3 ↵sh-fix-container-registry-s3-redirects | Stan Hu | 2017-05-17 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backend The previous behavior would include the Authorization header, which would make fetching an S3 blob fail quietly. Closes #22403 Update sh-fix-container-registry-s3-redirects.yml | ||||
| * | | | | Fix invalid object reference in ee_compat_check scriptrs-fix-ee-compat | Robert Speicher | 2017-05-17 | 1 | -1/+1 |
| | |_|/ |/| | | |||||
| * | | | Merge branch '32085-improve-ee-compat-check' into 'master' | Robert Speicher | 2017-05-17 | 1 | -3/+5 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Fetch CE/branch before running `git apply --check --3way patch` Closes #32085 See merge request !11412 | ||||
| | * | | Fetch CE/branch before running `git apply --check --3way patch`32085-improve-ee-compat-check | Rémy Coutable | 2017-05-16 | 1 | -3/+5 |
| | |/ | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Re-enable gitaly migration for ref_name_for_sha after bugfixesreenable-gitaly-ref-name | Alejandro Rodríguez | 2017-05-16 | 2 | -14/+14 |
| | | | |||||
| * | | Merge branch 'cherry-pick-0663458c' into 'master' | Douwe Maan | 2017-05-16 | 3 | -6/+6 |
| |\ \ | |/ |/| | | | | | | | | | Rename `build_events` to `job_events`, take 2. Closes #31620 See merge request !11403 | ||||
| | * | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458c | Douwe Maan | 2017-05-16 | 3 | -6/+6 |
| | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287 | ||||
| * | | 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 See merge request !11396 | ||||
| | * | Disallow NULL on renamed column after default has been set | Douwe Maan | 2017-05-15 | 1 | -1/+2 |
| | | | |||||
| * | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'" | Douwe Maan | 2017-05-15 | 3 | -6/+6 |
| | | | | | | | This reverts merge request !11287 | ||||
| * | | Merge branch 'use-gitaly-migrate' into 'master' | Douwe Maan | 2017-05-15 | 1 | -3/+3 |
| |\ \ | |/ |/| | | | | | Use gitaly_migrate helper on all current migrations in repository See merge request !11309 | ||||
| | * | 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_changes See merge request !11359 | ||||
| | * | | Rename all references to rendered_title to realtime_changesrename-rendered_title | Luke "Jared" Bennett | 2017-05-13 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' | Douwe Maan | 2017-05-15 | 3 | -6/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287 | ||||
| | * | | | Rename `build_events` to `job_events` in code | Bob Van Landuyt | 2017-05-15 | 3 | -6/+6 |
| | | | | | |||||
| * | | | | Merge branch 'fix-github-import' into 'master' | Douwe Maan | 2017-05-15 | 1 | -1/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix token interpolation when setting the Github remote See merge request !11311 | ||||
| | * | | | | Reset create callbacks for Issues/MRs while importing GitHub projects | Douglas Barbosa Alexandre | 2017-05-11 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | Fix token interpolation when setting the Github remote | Douglas Barbosa Alexandre | 2017-05-11 | 1 | -1/+2 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge branch 'gitaly-reuse-stubs' into 'master' | Robert Speicher | 2017-05-15 | 6 | -52/+36 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse gRPC stubs instead of channels Closes #31991 and gitaly#187 See merge request !11244 | ||||
| | * | | | | Don't reuse gRPC channels | Jacob Vosmaer | 2017-05-15 | 6 | -52/+36 |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | It seems that bad things happen when two gRPC stubs share one gRPC channel so let's stop doing that. The downside of this is that we create more gRPC connections; one per stub. | ||||
| * | | | | Create a Users Finder | George Andrinopoulos | 2017-05-15 | 1 | -10/+1 |
| | | | | | |||||
| * | | | | 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 resolved Closes #24438 See merge request !11356 | ||||
| | * | | | | Allow GitLab instance to start when InfluxDB hostname cannot be resolvedadam-influxdb-hostname | Adam Niedzielski | 2017-05-13 | 1 | -0/+3 |
| | | |_|/ | |/| | | | | | | | | | | Closes #24438 | ||||
| * | | | | Merge branch 'dm-dependency-linker-file-type' into 'master' | Robert Speicher | 2017-05-15 | 3 | -5/+10 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Select dependency linker based on file type See merge request !11357 | ||||
| | * | | | 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 Closes #30017 See merge request !10607 | ||||
| | * | | | | 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 renames See merge request !11335 | ||||
| | * | | | | | Fix adding defaults for concurrent column renamesrename-column-concurrently-defaults | Yorick Peterse | 2017-05-12 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By adding the default value _after_ adding the column we avoid updating all rows in a table, saving a lot of time and unnecessary work in the process. | ||||
| * | | | | | | Merge branch 'dturner/username' into 'master' | Rémy Coutable | 2017-05-15 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add username field to push webhook Closes #32136 See merge request !11272 | ||||
| | * | | | | | | Add username field to push webhook | David Turner | 2017-05-10 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Turner <novalis@novalis.org> | ||||
| * | | | | | | | Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master' | Robert Speicher | 2017-05-14 | 2 | -29/+45 |
| |\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch commit deltas from Gitaly Closes gitaly#199 See merge request !11122 | ||||
| | * | | | | | | Add support for deltas_only under Gitaly | Ahmad Sherif | 2017-05-13 | 2 | -29/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#199 | ||||
| * | | | | | | | Update SystemHooks API to expose and handle new repository_update_events | Gabriel Mazetto | 2017-05-12 | 1 | -1/+1 |
| | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |