Commits · 9f5390d81d63ae4186554aced85094a4b08e1aff · nexedi / gitlab-ce

24 Jan, 2018 20 commits
- 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
- 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
- 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
- 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
- Merge branch 'qa-deploy-key-factory-product' into 'master' · f8385188
  Grzegorz Bizon authored Jan 24, 2018
```
Scrap the deploy key title and match it in test

See merge request gitlab-org/gitlab-ce!16554
```
  f8385188
- Merge branch '32546-cannot-copy-paste-on-ios' into 'master' · de2c6421
  Phil Hughes authored Jan 24, 2018
```
Resolve "Cannot copy/paste on iOS"

Closes #32546

See merge request gitlab-org/gitlab-ce!15804
```
  de2c6421
- added missing imports · e22c007f
  Phil Hughes authored Jan 23, 2018
  
  e22c007f
- correctly imports performance bar · aaf03c0c
  Phil Hughes authored Jan 23, 2018
  
  aaf03c0c
- Added imports for dispatcher routes · adf31a57
  Phil Hughes authored Jan 23, 2018
  
  adf31a57
- Make the exposing of the Application secret more explicit · 45b62dfd
  Toon Claes authored Jan 24, 2018
```
To make it more clear to developers that the entity exposes the
application secret, define a separate entity that only should be used
when the secret is needed (probably only on creation).
```
  45b62dfd
- Add documentation about when the application API was added · d38faa30
  Toon Claes authored Jan 23, 2018
  
  d38faa30
- Add application create API · 81bbcfac
  Nicolas MERELLI authored Jan 04, 2017
  
  81bbcfac
- Return a blank JSON response for a missing .js file to prevent Rails CSRF errors · 79a829a0
  Stan Hu authored Jan 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
- add CHANGELOG.md entry for !15804 · 194e1b8f
  Mike Greiling authored Jan 23, 2018
  
  194e1b8f
- disable CopyAsGFM on iOS due to bug in webkit · ac5cbb6c
  Mike Greiling authored Jan 23, 2018
  
  ac5cbb6c
23 Jan, 2018 20 commits
- Merge branch '42251-explicit-timezone-for-karma' into 'master' · 74da7911
  Mike Greiling authored Jan 23, 2018
```
Set timezone for karma CI job to Etc/UTC (UTC+0)

Closes #42251

See merge request gitlab-org/gitlab-ce!16602
```
  74da7911
- Update changelog · c5893d5c
  Oswaldo Ferreira authored Jan 23, 2018
  
  c5893d5c
- GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side · 0b965528
  Ahmad Sherif authored Jan 23, 2018
  
  0b965528
- Merge branch '42340-ci-failing-on-mergerequestdiff-commits_count' into 'master' · fbbd81ee
  Stan Hu authored Jan 23, 2018
```
Resolve "CI failing on MergeRequestDiff#commits_count="

Closes #42340

See merge request gitlab-org/gitlab-ce!16653
```
  fbbd81ee
- Return more consistent values for merge_status on MR API · dc84313e
  Oswaldo Ferreira authored Jan 23, 2018
  
  dc84313e
- Merge branch 'fix-gitlab-runner-2652' into 'master' · 44bdfa1a
  Kamil Trzciński authored Jan 23, 2018
```
Fix docs for GIT_CHECKOUT Gitlab Runner configuration

Closes gitlab-runner#2652

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

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

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

See merge request gitlab-org/gitlab-ce!16638
```
  f34f4ba5
- remove webpack bundle tag for monitoring:environments:metrics · 0b47c94a
  Simon Knox authored Jan 23, 2018
  
  0b47c94a
- Set timezone for karma to UTC · da3faca7
  Takuya Noguchi authored Jan 21, 2018
  
  da3faca7
- Merge branch 'dm-process-feature-deadlines' into 'master' · d3f42147
  Rémy Coutable authored Jan 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
- Merge branch 'fix/adjust-layout-width-for-fixed-layout' into 'master' · 5f9ed9c7
  Phil Hughes authored Jan 23, 2018
```
Adjust layout width for fixed layout #41830

Closes #41830

See merge request gitlab-org/gitlab-ce!16337
```
  5f9ed9c7
- Merge branch 'dispatcher-new' into 'master' · e98aa5e1
  Clement Ho authored Jan 23, 2018
```
consistent function exports for Labels edit/new pages

See merge request gitlab-org/gitlab-ce!16635
```
  e98aa5e1
- Merge branch 'tz-upgrade-jasmine-and-raven' into 'master' · bb365419
  Clement Ho authored Jan 23, 2018
```
Upgrade jasmine + raven to newer versions

See merge request gitlab-org/gitlab-ce!16573
```
  bb365419
- Upgrade jasmine + raven to newer versions · 81bdb6ad
  Tim Zallmann authored Jan 23, 2018
  
  81bdb6ad
- Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the correct location · fca2a752
  Rémy Coutable authored Jan 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  fca2a752
- Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze · 8dd359ab
  Douwe Maan authored Jan 23, 2018
  
  8dd359ab