summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove singleton guidelinesupdate-singleton-pattern-docsLuke "Jared" Bennett2017-05-151-46/+0
|
* Update singleton pattern docs in design_patterns.mdLuke "Jared" Bennett2017-05-151-13/+12
|
* Merge branch 'spec-minor-fix' into 'master' Rémy Coutable2017-05-151-8/+1
|\ | | | | | | | | Minor spec improvement See merge request !11373
| * Minor spec improvementspec-minor-fixValery Sizov2017-05-151-8/+1
| |
* | Merge branch 'fix-merge-request-show-component-z-indices' into 'master' Annabel Dunstone Gray2017-05-153-2/+4
|\ \ | | | | | | | | | | | | | | | | | | MR zindex regression Closes #32216 See merge request !11344
| * | MR zindex regressionLuke "Jared" Bennett2017-05-153-2/+4
|/ /
* | Merge branch '30893-create-users-finder' into 'master' Rémy Coutable2017-05-153-10/+141
|\ \ | | | | | | | | | | | | | | | | | | Create a Users Finder Closes #30893 See merge request !10852
| * | Create a Users FinderGeorge Andrinopoulos2017-05-153-10/+141
|/ /
* | Merge branch 'adam-influxdb-hostname' into 'master' Douwe Maan2017-05-152-0/+7
|\ \ | | | | | | | | | | | | | | | | | | 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-132-0/+7
| | | | | | | | | | | | 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 'dz-fix-file-mode' into 'master' Douwe Maan2017-05-151-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Ruby files that are not meant to be executable should be 644 not 755 See merge request !11369
| * | | | Ruby files that are not meant to be executable should be 644 not 755dz-fix-file-modeDmitriy Zaporozhets2017-05-151-0/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'patch-17' into 'master' Rémy Coutable2017-05-151-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Runners tab is now CI/CD Pipelines See merge request !11326
| * | | | | Runners tab is now CI/CD PipelinesBen Bodenmiller2017-05-121-3/+3
| | | | | |
* | | | | | Merge branch 'update-seed-repo-rb' into 'master' Rémy Coutable2017-05-152-1/+172
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add script to regenerate seed_repo.rb for Gitlab::Git tests See merge request !11301
| * | | | | | Add script to regenerate seed_repo.rb for Gitlab::Git testsJacob Vosmaer (GitLab)2017-05-152-1/+172
|/ / / / / /
* | | | | | Merge branch 'enable-auto-cancelling-by-default' into 'master' Kamil Trzciński2017-05-155-3/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make auto-cancelling pending pipelines on by default Closes #30656 See merge request !11023
| * | | | | | Disable transaction for updating the tableLin Jen-Shin2017-05-151-0/+2
| | | | | | |
| * | | | | | Move to post_migrate and use update_column_in_batchesLin Jen-Shin2017-05-151-2/+1
| | | | | | |
| * | | | | | Disable auto_cancel_pending_pipelines in PostReceive testLin Jen-Shin2017-05-151-2/+5
| | | | | | |
| * | | | | | Make auto-cancelling pending pipelines on by defaultLin Jen-Shin2017-05-154-1/+32
| | | | | | |
* | | | | | | Merge branch 'add-index-for-auto_canceled_by_id-mysql' into 'master' Kamil Trzciński2017-05-154-0/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add indices for auto_canceled_by_id for PostgreSQL Closes #31233 See merge request !11034
| * | | | | | | Add missing newline in schemaLin Jen-Shin2017-05-151-1/+1
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-05-15785-4639/+8634
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-index-for-auto_canceled_by_id-mysql * upstream/master: (224 commits) Added balsamiq jasmine integration test Add support for deltas_only under Gitaly Codestyle Update CHANGELOG.md for 9.1.4 Update CHANGELOG.md for 9.1.4 Update CHANGELOG.md for 9.1.4 Update CHANGELOG.md for 9.1.4 Minor cosmetic fixes in hooks admin screen Documentation for repository_update_events Changelog Update SystemHooks API to expose and handle new repository_update_events Make the new repository_update_events configurable in System Hooks UI Added repository_update hook Wait for requests after each Spinach scenario instead of feature Remove trailing comma in dependency linker to satisfy Rubocop Fix specs New branch new mr docs Relax rake backup regex to handle CE and EE RCs Fix conflict resolution from corrupted upstream Removed all instances of Object.assign by using es6 classes, also includes some … ...
* | | | | | | | Merge branch 'allow_numeric_values_in_gitlab_ci_yml' into 'master' Kamil Trzciński2017-05-156-4/+30
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow numeric values in gitlab-ci.yml Closes #30017 See merge request !10607
| * | | | | | | Allow numeric values in gitlab-ci.ymlblackst0ne2017-05-076-4/+30
| | | | | | | |
* | | | | | | | Merge branch 'rename-column-concurrently-defaults' into 'master' Rémy Coutable2017-05-152-3/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix adding defaults for concurrent column renames See merge request !11335
| * | | | | | | | Fix adding defaults for concurrent column renamesrename-column-concurrently-defaultsYorick Peterse2017-05-122-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'add-balsamiq-integration-test' into 'master' Phil Hughes2017-05-158-48/+119
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added balsamiq jasmine integration test Closes #31889 See merge request !11257
| * | | | | | | | | Added balsamiq jasmine integration testLuke "Jared" Bennett2017-05-158-48/+119
|/ / / / / / / / /
* | | | | | | | | Merge branch 'dturner/username' into 'master' Rémy Coutable2017-05-154-0/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add username field to push webhook Closes #32136 See merge request !11272
| * | | | | | | | | Add username field to push webhookDavid Turner2017-05-104-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Turner <novalis@novalis.org>
* | | | | | | | | | Merge branch 'master' into 'master' Rémy Coutable2017-05-151-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in code snippet to match text below See merge request !11101
| * | | | | | | | | | Fix typo in code snippet to match text belowSteve Hall2017-05-041-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-18' into 'master' Rémy Coutable2017-05-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the GitLab EE link See merge request !11021
| * | | | | | | | | | | Fix the GitLab EE linkSota Yamashita2017-05-021-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'patch-8' into 'master' Rémy Coutable2017-05-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix $CI_JOB_ID variable See merge request !10966
| * | | | | | | | | | | fix $CI_JOB_ID variable Elan Ruusamäe2017-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introduced with rename variables commit: a084437b5c1b7226ce64e74bab1972bb1dbd49e0
* | | | | | | | | | | | Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master' Robert Speicher2017-05-147-58/+99
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch commit deltas from Gitaly Closes gitaly#199 See merge request !11122
| * | | | | | | | | | | Add support for deltas_only under GitalyAhmad Sherif2017-05-137-58/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#199
* | | | | | | | | | | | Merge branch 'use-common-vue-for-pipeline-schedule-bundles' into 'master' Filipa Lacerda2017-05-143-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure schedule_form and schedules_index both utilize common_vue bundle See merge request !11274
| * | | | | | | | | | | ensure schedule_form and schedules_index both utilize common_vue bundleuse-common-vue-for-pipeline-schedule-bundlesMike Greiling2017-05-123-4/+7
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '26325-system-hooks' into 'master' Robert Speicher2017-05-1319-11/+230
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport New SystemHook: `repository_update` Closes #26325 See merge request !11140
| * | | | | | | | | | | CodestyleGabriel Mazetto2017-05-131-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Minor cosmetic fixes in hooks admin screenGabriel Mazetto2017-05-122-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Documentation for repository_update_eventsGabriel Mazetto2017-05-121-1/+49
| | | | | | | | | | | |
| * | | | | | | | | | | ChangelogGabriel Mazetto2017-05-121-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Update SystemHooks API to expose and handle new repository_update_eventsGabriel Mazetto2017-05-123-3/+5
| | | | | | | | | | | |