summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge branch '32236-fix-typo-in-helm-chart-installation-doc' into 'master' Achilleas Pipinellis2017-05-151-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo See merge request !11361
| | * | | | | | | | | | | Fix typoJoshua Lambert2017-05-151-2/+2
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch '32184-retried-jobs' into 'master' Phil Hughes2017-05-152-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use fa-refresh on retried jobs Closes #32184 See merge request !11337
| | * | | | | | | | | | | Use fa-refresh on retried jobs32184-retried-jobsAnnabel Dunstone Gray2017-05-122-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'fix-github-import' into 'master' Douwe Maan2017-05-152-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix token interpolation when setting the Github remote See merge request !11311
| | * | | | | | | | | | | | Add CHANGELOGfix-github-importDouglas Barbosa Alexandre2017-05-111-0/+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-1512-66/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse gRPC stubs instead of channels Closes #31991 and gitaly#187 See merge request !11244
| | * | | | | | | | | | | | Log gitaly output during testingJacob Vosmaer2017-05-151-1/+2
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Don't reuse gRPC channelsJacob Vosmaer2017-05-1512-65/+57
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | Merge branch '31886-remover-comment-load-spinner' into 'master' Annabel Dunstone Gray2017-05-152-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31886 Remove spinner from loading comment Closes #31886 See merge request !11339
| | * | | | | | | | | | | | 31886 Remove spinner from loading comment31886-remover-comment-load-spinnertauriedavis2017-05-122-3/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | 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 'master' into 'add-index-for-auto_canceled_by_id-mysql'Kamil Trzciński2017-05-09509-3138/+13663
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'add-index-for-auto_canceled_by_id-mysql'add-index-for-auto_canceled_by_id-mysqlKamil Trzciński2017-05-06961-5060/+26039
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * | | | | | | | | | | | | | | | | | Add indices for auto_canceled_by_id for PostgreSQLLin Jen-Shin2017-05-024-1/+49
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'issue-edit-inline-title-field' into 'issue-edit-inline' Filipa Lacerda2017-05-168-42/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue inline edit title field See merge request !11331
| * | | | | | | | | | | | | | | | | | | | Created form component instead of using :is incorrectlyPhil Hughes2017-05-163-47/+57
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | | Stop passing through the store objectissue-edit-inline-title-fieldPhil Hughes2017-05-155-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | | for open.form eventPhil Hughes2017-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | | Fixed form not sending correct dataPhil Hughes2017-05-151-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | | Issue inline edit title fieldPhil Hughes2017-05-158-36/+131
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | | | | | | | | | | | | | | | | | * Added markdown docs linkPhil Hughes2017-05-157-26/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | | | | | | | | | | | | | | | | | * Added sr-only to label for descriptionPhil Hughes2017-05-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | | | | | | | | | | | | | | | | | * Added accessibility data to description fieldPhil Hughes2017-05-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | | | | | | | | | | | | | | | | | * Added description field to inline edit formPhil Hughes2017-05-1511-30/+372
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]