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

29 Aug, 2017 18 commits
- Resolve new N+1 by adding preloads and metadata to issues end points · ce1ce820
  Travis Miller authored Aug 21, 2017
  
  ce1ce820
- Add missing N+1 test to issues spec · 2531fb3b
  Travis Miller authored Aug 28, 2017
  
  2531fb3b
- Add time stats to API schema for issue and merge request end points · 6782b406
  Travis Miller authored Aug 19, 2017
  
  6782b406
- Add time stats documentation to issue and merge request end points · 8cbc9c4e
  Travis Miller authored Aug 19, 2017
  
  8cbc9c4e
- Merge branch... · 01785533
  Kamil Trzciński authored Aug 29, 2017
```
Merge branch 'fix/sm/37040-regression-pipeline-trigger-via-api-fails-with-500-internal-server-error-in-9-5-1' into 'master'

Fix pipeline trigger via API fails with 500 Internal Server Error in 9.5.1

Closes #37040

See merge request !13861
```
  01785533
- Merge branch '36882-disable-gitlab-project-import-button-if-source-disabled' into 'master' · 418f01a6
  Filipa Lacerda authored Aug 29, 2017
```
Disable GitLab Project Import Button if source disabled

Closes #36882

See merge request !13789
```
  418f01a6
- Merge branch 'winh-member-search-dropdown' into 'master' · 1b9c318c
  Phil Hughes authored Aug 29, 2017
```
Make member search dropdown consistent

See merge request !13546
```
  1b9c318c
- Merge branch 'docs-update-dind-overlay2' into 'master' · 9e7e0496
  Achilleas Pipinellis authored Aug 29, 2017
```
Update doc for dind using overlay2

See merge request !13885
```
  9e7e0496
- Merge branch '37069-remove-li' into 'master' · 3c25806a
  Phil Hughes authored Aug 29, 2017
```
Remove unnecessary divider

Closes #37069

See merge request !13841
```
  3c25806a
- Merge branch '37102-fix-prometheus-graph-cursor-flag' into 'master' · 5f60b9b6
  Phil Hughes authored Aug 29, 2017
```
Ensure Prometheus graph overlay is in front of cursor flag

Closes #37102

See merge request !13867
```
  5f60b9b6
- Merge branch '37104-fix-graph-date-format' into 'master' · c00a5e86
  Phil Hughes authored Aug 29, 2017
```
Resolve "Monitoring graph date formatting is wrong"

Closes #37104

See merge request !13865
```
  c00a5e86
- Resolve "Monitoring graph date formatting is wrong" · 596fe67a
  Mike Greiling authored Aug 29, 2017
  
  596fe67a
- Merge branch '36114-stuck-mrs-job-follow-up' into 'master' · f0d22bb6
  Sean McGivern authored Aug 29, 2017
```
Present enqueued merge jobs as "Merging" as well (https://gitlab.com/gitlab-org/gitlab-ce/issues/31207 follow-up)

Closes #36114

See merge request !13483
```
  f0d22bb6
- Merge branch 'short-code' into 'master' · edd56aea
  Phil Hughes authored Aug 29, 2017
```
Add styles for shorter code

See merge request !13612
```
  edd56aea
- Add styles for shorter code · 1335ba69
  Jacob Schatz authored Aug 29, 2017
  
  1335ba69
- Merge branch '34413-move-convdev-index-location-to-after-cohorts' into 'master' · c274da06
  Phil Hughes authored Aug 29, 2017
```
Move ConvDev Index location to after Cohorts

Closes #34413

See merge request !13398
```
  c274da06
- Merge branch 'rs-update-rubocop-gitlab-security' into 'master' · e599281e
  Douwe Maan authored Aug 29, 2017
```
Update rubocop-gitlab-security to 0.1.0

See merge request !13879
```
  e599281e
- Update doc for dind using overlay2 · bb1a72c9
  Fabio Busatto authored Aug 29, 2017
  
  bb1a72c9
28 Aug, 2017 22 commits
- Cleans merge_jid when possible on MergeService · 86f43912
  Oswaldo Ferreira authored Aug 28, 2017
  
  86f43912
- Rename MergeRequest#async_merge to merge_async · ffc576d7
  Oswaldo Ferreira authored Aug 28, 2017
  
  ffc576d7
- Add changelog · 9068083f
  Oswaldo Ferreira authored Aug 10, 2017
  
  9068083f
- Track enqueued and ongoing MRs · 4f17c6b7
  Oswaldo Ferreira authored Aug 10, 2017
  
  4f17c6b7
- Remove locked? check when unlocking a merge request · d7f61bae
  Oswaldo Ferreira authored Aug 10, 2017
```
Our state machine shall have enough knowledge to not allow states other
than locked from transitioning to opened (e.g. MergeRequest#unlock_mr).
```
  d7f61bae
- Merge branch '36582-fix-note-resolved-icon' into 'master' · 6f0f65be
  Fatih Acet authored Aug 28, 2017
```
Update and fix resolvable note icons for easier recognition

Closes #36582

See merge request !13821
```
  6f0f65be
- Merge branch 'zj-update-templates-with-warning-header' into 'master' · 5f88660a
  Stan Hu authored Aug 28, 2017
```
Update templates to include header in the README

Closes #36904

See merge request !13785
```
  5f88660a
- Update CHANGELOG.md for 9.5.2 · fed2623d
  Jose Ivan Vargas authored Aug 28, 2017
```
[ci skip]
```
  fed2623d
- Merge branch 'rs-transient-mini-pipeline-graph-failure' into 'master' · b3a52448
  Douwe Maan authored Aug 28, 2017
```
Fix a transient failure in mini_pipeline_graph_spec

Closes #34323

See merge request !13844
```
  b3a52448
- Merge branch 'group-mr-search-bar' into 'master' · 1a09c207
  Clement Ho authored Aug 28, 2017
```
Add filtered search to group merge requests dashboard

Closes #36703

See merge request !13688
```
  1a09c207
- Merge branch 'sh-add-spec-to-protected-tags-deletion' into 'master' · df677647
  Robert Speicher authored Aug 28, 2017
```
Add spec for deleting protected tags

See merge request !13693
```
  df677647
- Merge branch 'fix/import-events' into 'master' · fde60479
  Sean McGivern authored Aug 28, 2017
```
Fix events error importing GitLab projects

Closes #36965

See merge request !13868
```
  fde60479
- Update rubocop-gitlab-security to 0.1.0 · bed27b6a
  Robert Speicher authored Aug 28, 2017
  
  bed27b6a
- Fix spec · 4401b759
  Shinya Maeda authored Aug 29, 2017
  
  4401b759
- Fix changelog · 9b7a0ecf
  Shinya Maeda authored Aug 28, 2017
  
  9b7a0ecf
- Fix spec · 1d7a1e9c
  Shinya Maeda authored Aug 28, 2017
  
  1d7a1e9c
- Add changelog · 2b3b5c3b
  Shinya Maeda authored Aug 28, 2017
  
  2b3b5c3b
- Remove trigger_request.trigger.owner · 815483b3
  Shinya Maeda authored Aug 28, 2017
  
  815483b3
- Reproduced bug · 84ab8a71
  Shinya Maeda authored Aug 28, 2017
  
  84ab8a71
- Fix a transient failure in mini_pipeline_graph_spec · 8d72f097
  Robert Speicher authored Aug 25, 2017
```
This spec failed reliably with a specific run order (see issue), the
reasons for which are still unknown. This simplification resolves the
failure.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/34323
```
  8d72f097
- Merge branch 'sh-improve-flaky-ace-editor-spec' into 'master' · 3e0757f2
  Robert Speicher authored Aug 28, 2017
```
Improve flaky ACE editor spec

See merge request !13854
```
  3e0757f2
- Merge branch 'fix-flakes' into 'master' · 3dd1efe6
  Robert Speicher authored Aug 28, 2017
```
fix transient dropdown test failures

Closes #37052 and #34436

See merge request !13862
```
  3dd1efe6