提交 · e2a56af930f9f7d17a6a9b638f52007a60e4cc60 · 李少辉-开发者 / gitlab-foss

24 1月, 2018 23 次提交
- R
  Merge branch 'sh-fix-cross-site-forgery-errors' into 'master' · e2a56af9
  由 Rémy Coutable 提交于 1月 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
- F
  Merge branch 'ph-even-more-dispatcher-imports' into 'master' · 47f6dbdf
  由 Filipa Lacerda 提交于 1月 24, 2018
```
Added imports for dispatcher routes

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

See merge request gitlab-org/gitlab-ce!16647
```
  0f5f77a0
- G
  Merge branch 'rc/improve-setup-test-env' into 'master' · 8d338d73
  由 Grzegorz Bizon 提交于 1月 24, 2018
```
Speed-up setup-test-env

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

See merge request gitlab-org/gitlab-ce!16655
```
  d92bd8e2
- G
  Merge branch 'qa-deploy-key-factory-product' into 'master' · f8385188
  由 Grzegorz Bizon 提交于 1月 24, 2018
```
Scrap the deploy key title and match it in test

See merge request gitlab-org/gitlab-ce!16554
```
  f8385188
- P
  Merge branch '32546-cannot-copy-paste-on-ios' into 'master' · de2c6421
  由 Phil Hughes 提交于 1月 24, 2018
```
Resolve "Cannot copy/paste on iOS"

Closes #32546

See merge request gitlab-org/gitlab-ce!15804
```
  de2c6421
- P
  
  added missing imports · e22c007f
  由 Phil Hughes 提交于 1月 23, 2018
  
  e22c007f
- P
  
  correctly imports performance bar · aaf03c0c
  由 Phil Hughes 提交于 1月 23, 2018
  
  aaf03c0c
- P
  
  Added imports for dispatcher routes · adf31a57
  由 Phil Hughes 提交于 1月 23, 2018
  
  adf31a57
- S
  Return a blank JSON response for a missing .js file to prevent Rails CSRF errors · 79a829a0
  由 Stan Hu 提交于 1月 23, 2018
```
The default 404 handler would return the Content-Type format based on the
given format extension. This would cause the Rails CSRF protection to flag an
error, since the .js extension gets mapped to text/javascript format.

Closes #40771
```
  79a829a0
- M
  
  add CHANGELOG.md entry for !15804 · 194e1b8f
  由 Mike Greiling 提交于 1月 23, 2018
  
  194e1b8f
- M
  
  disable CopyAsGFM on iOS due to bug in webkit · ac5cbb6c
  由 Mike Greiling 提交于 1月 23, 2018
  
  ac5cbb6c
- M
  Merge branch '42251-explicit-timezone-for-karma' into 'master' · 74da7911
  由 Mike Greiling 提交于 1月 23, 2018
```
Set timezone for karma CI job to Etc/UTC (UTC+0)

Closes #42251

See merge request gitlab-org/gitlab-ce!16602
```
  74da7911
- A
  
  GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side · 0b965528
  由 Ahmad Sherif 提交于 1月 23, 2018
  
  0b965528
- S
  Merge branch '42340-ci-failing-on-mergerequestdiff-commits_count' into 'master' · fbbd81ee
  由 Stan Hu 提交于 1月 23, 2018
```
Resolve "CI failing on MergeRequestDiff#commits_count="

Closes #42340

See merge request gitlab-org/gitlab-ce!16653
```
  fbbd81ee
- K
  Merge branch 'fix-gitlab-runner-2652' into 'master' · 44bdfa1a
  由 Kamil Trzciński 提交于 1月 23, 2018
```
Fix docs for GIT_CHECKOUT Gitlab Runner configuration

Closes gitlab-runner#2652

See merge request gitlab-org/gitlab-ce!16522
```
  44bdfa1a
- D
  Merge branch 'dm-push-rule-regexp-error-ce' into 'master' · b443c9b0
  由 Douwe Maan 提交于 1月 23, 2018
```
Backport changes to Gitlab::Checks::ChangeAccess from EE

See merge request gitlab-org/gitlab-ce!16652
```
  b443c9b0
- R
  Fix a migration spec messing up the MergeRequestDiff DB schema · d8eb961d
  由 Rémy Coutable 提交于 1月 23, 2018
```
Signed-off-by: NRémy Coutable <remy@rymai.me>
```
  d8eb961d
- J
  Merge branch 'dispatcher-milestones-show-path' into 'master' · f74e431b
  由 Jacob Schatz 提交于 1月 23, 2018
```
Refactor dispatcher milestones show path

See merge request gitlab-org/gitlab-ce!16633
```
  f74e431b
- D
  
  Backport changes to Gitlab::Checks::ChangeAccess from EE · 4ca35889
  由 Douwe Maan 提交于 1月 23, 2018
  
  4ca35889
- P
  Merge branch 'psimyn-webpack-bundle-env-metrics' into 'master' · f34f4ba5
  由 Phil Hughes 提交于 1月 23, 2018
```
remove webpack bundle tag for monitoring:environments:metrics

See merge request gitlab-org/gitlab-ce!16638
```
  f34f4ba5
- S
  
  remove webpack bundle tag for monitoring:environments:metrics · 0b47c94a
  由 Simon Knox 提交于 1月 23, 2018
  
  0b47c94a
23 1月, 2018 17 次提交
- T
  
  Set timezone for karma to UTC · da3faca7
  由 Takuya Noguchi 提交于 1月 21, 2018
  
  da3faca7
- R
  Merge branch 'dm-process-feature-deadlines' into 'master' · d3f42147
  由 Rémy Coutable 提交于 1月 23, 2018
```
Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze

See merge request gitlab-org/gitlab-ce!16650
```
  d3f42147
- P
  Merge branch 'fix/adjust-layout-width-for-fixed-layout' into 'master' · 5f9ed9c7
  由 Phil Hughes 提交于 1月 23, 2018
```
Adjust layout width for fixed layout #41830

Closes #41830

See merge request gitlab-org/gitlab-ce!16337
```
  5f9ed9c7
- C
  Merge branch 'dispatcher-new' into 'master' · e98aa5e1
  由 Clement Ho 提交于 1月 23, 2018
```
consistent function exports for Labels edit/new pages

See merge request gitlab-org/gitlab-ce!16635
```
  e98aa5e1
- C
  Merge branch 'tz-upgrade-jasmine-and-raven' into 'master' · bb365419
  由 Clement Ho 提交于 1月 23, 2018
```
Upgrade jasmine + raven to newer versions

See merge request gitlab-org/gitlab-ce!16573
```
  bb365419
- T
  
  Upgrade jasmine + raven to newer versions · 81bdb6ad
  由 Tim Zallmann 提交于 1月 23, 2018
  
  81bdb6ad
- R
  Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the correct location · fca2a752
  由 Rémy Coutable 提交于 1月 22, 2018
```
Signed-off-by: NRémy Coutable <remy@rymai.me>
```
  fca2a752
- D
  
  Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze · 8dd359ab
  由 Douwe Maan 提交于 1月 23, 2018
  
  8dd359ab
- M
  Merge branch 'vendor-10-4-auto-devops-template' into 'master' · ea14c1e6
  由 Marin Jankovski 提交于 1月 23, 2018
```
Vendor 10.4 Auto DevOps template

See merge request gitlab-org/gitlab-ce!16639
```
  ea14c1e6
- G
  Merge branch 'prevent-high-sierra-fork-crash' into 'master' · 90d0396d
  由 Grzegorz Bizon 提交于 1月 23, 2018
```
Prevent Unicorn crashing in development on macOS

See merge request gitlab-org/gitlab-ce!16649
```
  90d0396d
- J
  
  Prevent Unicorn crashing in development on macOS · d9927162
  由 Jacob Vosmaer (GitLab) 提交于 1月 23, 2018
  
  d9927162
- A
  Merge branch 'sh-s3-digitalocean-howto-docs' into 'master' · 51ce175a
  由 Achilleas Pipinellis 提交于 1月 23, 2018
```
Document how to configure Fog with Digital Ocean Spaces

Closes gitlab-ee#4419

See merge request gitlab-org/gitlab-ce!16597
```
  51ce175a
- A
  Merge branch 'docs/update-rack-attack' into 'master' · 4f6967a8
  由 Achilleas Pipinellis 提交于 1月 23, 2018
```
Update rack attack docs

See merge request gitlab-org/gitlab-ce!16328
```
  4f6967a8
- C
  
  Update rack attack docs · 79cefbf1
  由 Cindy Pallares 🦉 提交于 1月 23, 2018
  
  79cefbf1
- F
  Merge branch... · 9455ef6c
  由 Fatih Acet 提交于 1月 23, 2018
```
Merge branch '42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public' into 'master'

Fix visibility of "Allow users to request access" option in public projects

Closes #42022

See merge request gitlab-org/gitlab-ce!16485
```
  9455ef6c
- F
  Merge branch 'winh-axios-mock-adapter-docs' into 'master' · 33e727de
  由 Filipa Lacerda 提交于 1月 23, 2018
```
Document advantages of axios-mock-adapter

See merge request gitlab-org/gitlab-ce!16645
```
  33e727de
- W
  
  Document advantages of axios-mock-adapter · 9e28ca9d
  由 Winnie Hellmann 提交于 1月 23, 2018
  
  9e28ca9d