summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master'Robert Speicher2017-05-181-1/+1
|\
| * Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-181-1/+1
* | Merge branch 'dm-catch-uri-errors' into 'master'Robert Speicher2017-05-181-1/+1
|\ \
| * | Catch all URI errors in ExternalLinkFilterdm-catch-uri-errorsDouwe Maan2017-05-181-1/+1
| |/
* | Fixes for the rename reserved paths helpersBob Van Landuyt2017-05-183-1/+16
* | Remove Services count from usage ping payload.Ruben Davila2017-05-181-1/+0
* | Merge branch 'dm-gemfile-viewer'Rémy Coutable2017-05-181-3/+19
|\ \ | |/ |/|
| * Add auxiliary blob viewers to dependency filesDouwe Maan2017-05-171-3/+19
* | Merge branch 'gitaly-local-branches' into 'master'Douwe Maan2017-05-184-13/+83
|\ \
| * | Incorporate Gitaly's local_branches operation into repo codegitaly-local-branchesAlejandro Rodríguez2017-05-174-6/+82
| * | Compare ids of commits if present for equality testAlejandro Rodríguez2017-05-161-7/+1
* | | Merge branch 'add-current_user-avatar_url-to-gon' into 'master'Phil Hughes2017-05-181-0/+1
|\ \ \
| * | | Add current_user_avatar_url to gonadd-current_user-avatar_url-to-gonLuke "Jared" Bennett2017-05-181-0/+1
* | | | Merge branch 'sh-fix-container-registry-s3-redirects' into 'master'Kamil Trzciński2017-05-181-4/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Properly handle container registry redirects to fix metadata stored on a S3 b...sh-fix-container-registry-s3-redirectsStan Hu2017-05-171-4/+10
* | | | Fix invalid object reference in ee_compat_check scriptrs-fix-ee-compatRobert Speicher2017-05-171-1/+1
| |_|/ |/| |
* | | Merge branch '32085-improve-ee-compat-check' into 'master' Robert Speicher2017-05-171-3/+5
|\ \ \ | |/ / |/| |
| * | Fetch CE/branch before running `git apply --check --3way patch`32085-improve-ee-compat-checkRémy Coutable2017-05-161-3/+5
| |/
* | Re-enable gitaly migration for ref_name_for_sha after bugfixesreenable-gitaly-ref-nameAlejandro Rodríguez2017-05-162-14/+14
* | Merge branch 'cherry-pick-0663458c' into 'master' Douwe Maan2017-05-163-6/+6
|\ \ | |/ |/|
| * Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458cDouwe Maan2017-05-163-6/+6
* | 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
* | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"Douwe Maan2017-05-153-6/+6
* | 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 'bvl-rename-build-events-to-job-events' into 'master' Douwe Maan2017-05-153-6/+6
|\ \ \
| * | | Rename `build_events` to `job_events` in codeBob Van Landuyt2017-05-153-6/+6
* | | | Merge branch 'fix-github-import' into 'master' Douwe Maan2017-05-151-1/+4
|\ \ \ \
| * | | | Reset create callbacks for Issues/MRs while importing GitHub projectsDouglas Barbosa Alexandre2017-05-111-0/+2
| * | | | Fix token interpolation when setting the Github remoteDouglas Barbosa Alexandre2017-05-111-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'gitaly-reuse-stubs' into 'master' Robert Speicher2017-05-156-52/+36
|\ \ \ \
| * | | | Don't reuse gRPC channelsJacob Vosmaer2017-05-156-52/+36
| | |/ / | |/| |
* | | | Create a Users FinderGeorge Andrinopoulos2017-05-151-10/+1
* | | | 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
* | | | | | | Update SystemHooks API to expose and handle new repository_update_eventsGabriel Mazetto2017-05-121-1/+1
View Lorry Controller Status