summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Separate artifacts from builds, reusing artifacts_action_pathLin Jen-Shin2017-05-191-16/+33
|
* Complete all legacy builds URL. Tests are addedLin Jen-Shin2017-05-191-0/+44
|
* Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-181-3/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (31 commits) Remove 'no changes' entries from changelog Check if OLD is set when migrating issue assignees Fix data migration from trigger schedules Replace EFS section in AWS guide Add warning about AWS EFS and performance Consolidate opening text from about.gitlab.com and add active/passive note Fix invalid object reference in ee_compat_check script Fix Ordered Task List Items Add auxiliary viewer for README Update fe_guide testing.md Add auxiliary blob viewer for CHANGELOG Add spec for last commit info when browsing repository files Show last commit for current tree on tree page Use same last commit widget on project homepage and tree view Fix unassigned checkmark Add missing changelog for iPython notebook rendering feature Convert fa-history to svg; tweak alignment Get rid of pluck in app/services/members/authorized_destroy_service.rb Removes duplicate environment variable in documentation Fixed spacing issues in issue sidebar ...
| * 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` Closes #32085 See merge request !11412
| | * Fetch CE/branch before running `git apply --check --3way patch`32085-improve-ee-compat-checkRémy Coutable2017-05-161-3/+5
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-175-5/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | Rename other URL generators admin_builds_path -> admin_jobs_path Fix tests and more renaming Fix more tests Also change build_id to job_id in the controller
* | 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
|\ \ | |/ |/| | | | | | | | | 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-0663458cDouwe Maan2017-05-163-6/+6
| | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287
* | 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 set See merge request !11396
| * 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
| | | | | | This reverts merge request !11287
* | Merge branch 'use-gitaly-migrate' into 'master' Douwe Maan2017-05-151-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-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_changes See merge request !11359
| * | 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` Closes #31620 See merge request !11287
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix token interpolation when setting the Github remote See merge request !11311
| * | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse gRPC stubs instead of channels Closes #31991 and gitaly#187 See merge request !11244
| * | | | Don't reuse gRPC channelsJacob Vosmaer2017-05-156-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 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 resolved Closes #24438 See merge request !11356
| * | | | Allow GitLab instance to start when InfluxDB hostname cannot be resolvedadam-influxdb-hostnameAdam Niedzielski2017-05-131-0/+3
| | |_|/ | |/| | | | | | | | | | Closes #24438
* | | | Merge branch 'dm-dependency-linker-file-type' into 'master' Robert Speicher2017-05-153-5/+10
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Select dependency linker based on file type See merge request !11357
| * | | 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.yml Closes #30017 See merge request !10607
| * | | | 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 renames See merge request !11335
| * | | | | Fix adding defaults for concurrent column renamesrename-column-concurrently-defaultsYorick Peterse2017-05-121-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 Coutable2017-05-151-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add username field to push webhook Closes #32136 See merge request !11272
| * | | | | | Add username field to push webhookDavid Turner2017-05-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Turner <novalis@novalis.org>
* | | | | | | Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master' Robert Speicher2017-05-142-29/+45
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch commit deltas from Gitaly Closes gitaly#199 See merge request !11122
| * | | | | | Add support for deltas_only under GitalyAhmad Sherif2017-05-132-29/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#199
* | | | | | | Update SystemHooks API to expose and handle new repository_update_eventsGabriel Mazetto2017-05-121-1/+1
| | | | | | |
* | | | | | | 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 upstream Closes gitlab-ee#2128 See merge request !11298
| * | | | | | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way.
* | | | | | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-121-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage ping updates Closes #31741 and #31453 See merge request !11231
| * | | | | | | Add hostname to usage pingSean McGivern2017-05-111-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'dm-dependency-linker-gemfile' into 'master' Sean McGivern2017-05-128-133/+318
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autolink package names in Gemfile See merge request !11224
| * | | | | | | | 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
| | | | | | | | |
View Lorry Controller Status