Commits · 49e9347e73bf5e69202d53b7b9058ad423aea997 · Léo-Paul Géneau / gitlab-ce

25 Jan, 2018 8 commits
- Make Gitlab::Git::Repository#run_git private · 49e9347e
  Jacob Vosmaer authored Jan 22, 2018
  
  49e9347e
- Merge branch 'qa/gb/ci-cd-qa-pipelines' into 'master' · dcb79741
  Rémy Coutable authored Jan 25, 2018
```
CI/CD end-to-end tests

Closes gitlab-qa#18

See merge request gitlab-org/gitlab-ce!16619
```
  dcb79741
- Merge branch '42053-link-to-clusters-in-auto-devops-instead-of-kubernetes-service' into 'master' · 944c1eb6
  Rémy Coutable authored Jan 25, 2018
```
Link Auto DevOps settings to Clusters page

Closes #42053

See merge request gitlab-org/gitlab-ce!16641
```
  944c1eb6
- Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service" · 9eed610f
  Fabio Busatto authored Jan 25, 2018
  
  9eed610f
- Merge branch... · 567b3826
  Rémy Coutable authored Jan 25, 2018
```
Merge branch '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master'

Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT"

Closes #42161

See merge request gitlab-org/gitlab-ce!16637
```
  567b3826
- Merge branch 'fl-mr-widget-refactor' into 'master' · aff9ecef
  Phil Hughes authored Jan 25, 2018
```
Moves more mr widget components into vue files

See merge request gitlab-org/gitlab-ce!16677
```
  aff9ecef
- Merge branch 'sh-add-gitaly-health-check' into 'master' · 8f5d1d13
  Robert Speicher authored Jan 25, 2018
```
Add a gRPC health check to ensure Gitaly is up

See merge request gitlab-org/gitlab-ce!16606
```
  8f5d1d13
- Update CHANGELOG.md for 10.4.1 · db00a135
  Robert Speicher authored Jan 24, 2018
```
[ci skip]
```
  db00a135
24 Jan, 2018 32 commits
- Add a gRPC health check to ensure Gitaly is up · 86712613
  Stan Hu authored Jan 21, 2018
```
This will enable Geo to skip shards that not operational.

Relates to gitlab-org/gitlab-ee#4329
```
  86712613
- Merge branch '39917-revert-this-merge-request-text' into 'master' · 44728e05
  Fatih Acet authored Jan 24, 2018
```
Resolve ""Revert this merge request" modal has confusing string"

Closes #39917

See merge request gitlab-org/gitlab-ce!16611
```
  44728e05
- Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master' · caf84a03
  Robert Speicher authored Jan 24, 2018
```
Add formatted_data attribute to Git::WikiPage

Closes #39805

See merge request gitlab-org/gitlab-ce!16682
```
  caf84a03
- Merge branch 'search-100' into 'master' · a349a426
  Yorick Peterse authored Jan 24, 2018
```
Use limit for search count queries

See merge request gitlab-org/gitlab-ce!16502
```
  a349a426
- Add formatted_data attribute to Git::WikiPage · 57357470
  Ahmad Sherif authored Jan 24, 2018
```
Related to #39805
```
  57357470
- Merge branch '40744-idempotent-ids' into 'master' · f35bac57
  Robert Speicher authored Jan 24, 2018
```
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'

Closes #30783

See merge request gitlab-org/gitlab-ce!16516
```
  f35bac57
- Merge branch 'feature/migrate-get-lfs-ptrs-to-gitaly' into 'master' · 8fe314e4
  Robert Speicher authored Jan 24, 2018
```
Migrate .batch_lfs_pointers to Gitaly

Closes gitaly#921

See merge request gitlab-org/gitlab-ce!16517
```
  8fe314e4
- Merge branch 'dm-project-system-hooks-in-transaction' into 'master' · 956c55e2
  Robert Speicher authored Jan 24, 2018
```
Execute system hooks after-commit when executing project hooks

See merge request gitlab-org/gitlab-ce!16673
```
  956c55e2
- Avoid array indices to fixtures in JS specs · 2fe57353
  Nick Thomas authored Jan 24, 2018
  
  2fe57353
- Migrate .batch_lfs_pointers to Gitaly · 29fa930b
  Ahmad Sherif authored Jan 17, 2018
```
Closes gitaly#921
```
  29fa930b
- Updates `Revert this merge request` text · eceeafb6
  Jacopo authored Jan 22, 2018
```
Changes the text in the Revert merge request modal: `Start a new merge request with these changes` => `Start a new merge request with the revert changes`.
```
  eceeafb6
- Merge branch '42361-workaround' into 'master' · a403011e
  Robert Speicher authored Jan 24, 2018
```
Resolve "Spec failure in ./spec/features/issues/spam_issues_spec.rb"

Closes #42361

See merge request gitlab-org/gitlab-ce!16671
```
  a403011e
- Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL · bbe00038
  Nick Thomas authored Jan 22, 2018
  
  bbe00038
- Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' · 93ea3234
  Nick Thomas authored Jan 17, 2018
  
  93ea3234
- Merge branch 'rc/move-one-spinach-job-to-rspec' into 'master' · 5a4fb8f0
  Robert Speicher authored Jan 24, 2018
```
Remove one Spinach job and add one RSpec job

See merge request gitlab-org/gitlab-ce!16675
```
  5a4fb8f0
- Merge branch 'feature/migrate-bundle-to-disk-to-gitaly' into 'master' · f441fe7b
  Robert Speicher authored Jan 24, 2018
```
Migrate repository bundling to Gitaly

Closes gitaly#929

See merge request gitlab-org/gitlab-ce!16563
```
  f441fe7b
- Workaround a recaptcha pop-up that cannot be tested · c0d7dd38
  Rémy Coutable authored Jan 24, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c0d7dd38
- Merge branch 'patch-28' into 'master' · 59a13575
  Robert Speicher authored Jan 24, 2018
```
Fix typo in `.gitlab-ci.yml` heading

See merge request gitlab-org/gitlab-ce!16668
```
  59a13575
- Merge branch 'osw-updates-merge-status-on-api-actions' into 'master' · 9f5390d8
  Douwe Maan authored Jan 24, 2018
```
Return more consistent values for merge_status on V4 MR APIs

Closes #20639

See merge request gitlab-org/gitlab-ce!16626
```
  9f5390d8
- Moves more mr widget components into vue files · 09babc57
  Filipa Lacerda authored Jan 24, 2018
```
Adds i18n
Adds better test coverage
```
  09babc57
- Merge branch 'PNSalocin/gitlab-ce-24035-api-create-application' into 'master' · c28ffa1d
  Rémy Coutable authored Jan 24, 2018
```
Add application create API

Closes #24035

See merge request gitlab-org/gitlab-ce!16643
```
  c28ffa1d
- Execute system hooks after-commit when executing project hooks · 45647951
  Douwe Maan authored Jan 24, 2018
  
  45647951
- Remove one Spinach job and add one RSpec job · 4a3e22a9
  Rémy Coutable authored Jan 24, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  4a3e22a9
- Remove callback as we already update accordingly on services · 38ef3955
  Oswaldo Ferreira authored Jan 24, 2018
  
  38ef3955
- Merge branch 'groups-webpack-bundle' into 'master' · 09da89e6
  Filipa Lacerda authored Jan 24, 2018
```
Added dispatcher imports for groups webpack bundle

See merge request gitlab-org/gitlab-ce!16644
```
  09da89e6
- Fix typo in `.gitlab-ci.yml` heading · 8a852dee
  Mathijs de Kruyf authored Jan 24, 2018
  
  8a852dee
- Migrate repository bundling to Gitaly · 24625323
  Ahmad Sherif authored Jan 18, 2018
```
Closes gitaly#929
```
  24625323
- Merge branch 'sh-fix-cross-site-forgery-errors' into 'master' · e2a56af9
  Rémy Coutable authored Jan 24, 2018
```
Return a blank JSON response for a missing .js file to prevent Rails CSRF errors

Closes #40771

See merge request gitlab-org/gitlab-ce!16664
```
  e2a56af9
- Merge branch 'ph-even-more-dispatcher-imports' into 'master' · 47f6dbdf
  Filipa Lacerda authored Jan 24, 2018
```
Added imports for dispatcher routes

See merge request gitlab-org/gitlab-ce!16640
```
  47f6dbdf
- Merge branch 'winh-axios-mock-restore' into 'master' · 0f5f77a0
  Filipa Lacerda authored Jan 24, 2018
```
Use restore() instead of reset() for removing axios MockAdapter

See merge request gitlab-org/gitlab-ce!16647
```
  0f5f77a0
- Merge branch 'rc/improve-setup-test-env' into 'master' · 8d338d73
  Grzegorz Bizon authored Jan 24, 2018
```
Speed-up setup-test-env

See merge request gitlab-org/gitlab-ce!16621
```
  8d338d73
- Merge branch 'fix/gitaly-can-be-merged-for-missing-conflict-files' into 'master' · d92bd8e2
  Grzegorz Bizon authored Jan 24, 2018
```
GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side

See merge request gitlab-org/gitlab-ce!16655
```
  d92bd8e2