Commits · 53e30e15281f4633a06b73d23ca1a093bb12597c · Boxiang Sun / gitlab-ce

24 May, 2018 31 commits
- Reduce CE/EE diff in spec/controllers/projects/group_links_controller_spec.rb · 53e30e15
  Rémy Coutable authored May 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  53e30e15
- Reduce CE/EE diff in spec/controllers/projects/environments_controller_spec.rb · 660439e9
  Rémy Coutable authored May 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  660439e9
- Reduce CE/EE diff in app/controllers/projects/clusters_controller.rb · 981b8ab7
  Rémy Coutable authored May 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  981b8ab7
- Reduce CE/EE diff in spec/controllers/projects/branches_controller_spec.rb · 248cefc7
  Rémy Coutable authored May 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  248cefc7
- Reduce CE/EE diff in spec/controllers/projects/boards_controller_spec.rb · 2023ac4c
  Rémy Coutable authored May 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2023ac4c
- Reduce CE/EE diff in spec/controllers/boards/issues_controller_spec.rb · 34862867
  Rémy Coutable authored May 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  34862867
- Merge branch 'commit-branch-tag-icon-update' into 'master' · 063ccb3e
  Phil Hughes authored May 24, 2018
```
Updated branches and tag icons in commit details

See merge request gitlab-org/gitlab-ce!18953
```
  063ccb3e
- Updated branches and tag icons in commit details · 68eb9ee3
  Constance Okoghenun authored May 24, 2018
  
  68eb9ee3
- Merge branch 'ce-6127-move-merge-requests-services' into 'master' · 96f54853
  Rémy Coutable authored May 24, 2018
```
CE: Extract EE specific files/lines for some merge requests files

See merge request gitlab-org/gitlab-ce!19107
```
  96f54853
- Merge branch 'issue_38418' into 'master' · 0279a727
  Rémy Coutable authored May 24, 2018
```
Fix sidebar issue count

Closes #38418

See merge request gitlab-org/gitlab-ce!19022
```
  0279a727
- Merge branch '5779_rename_code_quality_job_and_artifact' into 'master' · 6d2a6139
  Achilleas Pipinellis authored May 24, 2018
```
Rename code quality job and artifact.

See merge request gitlab-org/gitlab-ce!19049
```
  6d2a6139
- Merge branch 'docs-backport-ee-5794-to-ce' into 'master' · 04efc4ea
  Achilleas Pipinellis authored May 24, 2018
```
Docs: Updated documentation as per latest missing features on about.gitlab.com

See merge request gitlab-org/gitlab-ce!19134
```
  04efc4ea
- Merge branch 'sh-fix-backup-specific-rake-task' into 'master' · c4a8179f
  Rémy Coutable authored May 24, 2018
```
Fix backup creation and restore for specific Rake tasks

Closes #40617

See merge request gitlab-org/gitlab-ce!19122
```
  c4a8179f
- Fix backup creation and restore for specific Rake tasks · e6fca03b
  Stan Hu authored May 24, 2018
  
  e6fca03b
- Merge branch 'patch-7' into 'master' · 03d5f122
  Marcia Ramos authored May 24, 2018
```
Updated documentation as per latest missing features on about.gitlab.com

See merge request gitlab-org/gitlab-ee!5794
```
  03d5f122
- Fix sidebar issue count · aee2b235
  Felipe Artur authored May 17, 2018
  
  aee2b235
- Extract a do_execute method to be overridden · a7225111
  Lin Jen-Shin authored May 24, 2018
  
  a7225111
- Merge branch... · 1128d0ec
  Achilleas Pipinellis authored May 24, 2018
```
Merge branch '46723-api-created-issue-do-not-get-assigned-to-specified-milestone-docs' into 'master'

Resolve "API created issue do not get assigned to specified milestone"

Closes #46723

See merge request gitlab-org/gitlab-ce!19127
```
  1128d0ec
- Merge branch '5778_rename_container_scanning_job_and_artifact' into 'master' · bc791412
  Achilleas Pipinellis authored May 24, 2018
```
Rename container scanning job and artifact

See merge request gitlab-org/gitlab-ce!19045
```
  bc791412
- Rename container scanning job and artifact · 5ad7ac34
  Olivier Gonzalez authored May 24, 2018
  
  5ad7ac34
- Merge branch 'docs-update-backup-restore-guide' into 'master' · bbeeb182
  Achilleas Pipinellis authored May 24, 2018
```
add info about the current format of the backup name and refresh examples of commands

See merge request gitlab-org/gitlab-ce!18739
```
  bbeeb182
- add info about the current format of the backup name and refresh examples of commands · 317ce917
  Alexander Tanayno authored May 24, 2018
  
  317ce917
- Merge branch '46741-add-access-control-allow-headers-wds' into 'master' · 76b2c31d
  Mike Greiling authored May 24, 2018
```
Add `Access-Control-Allow-Headers` to Webpack Dev Server config

Closes #46741

See merge request gitlab-org/gitlab-ce!19131
```
  76b2c31d
- Add `Access-Control-Allow-Headers` to Webpack Dev Server config · e78b2190
  Kushal Pandya authored May 24, 2018
  
  e78b2190
- Merge branch 'ce-jej/saml-failure-messages' into 'master' · 05170e0d
  Grzegorz Bizon authored May 24, 2018
```
[CE] Backport helpers from GroupSAML failure messages

See merge request gitlab-org/gitlab-ce!19064
```
  05170e0d
- Merge branch 'fl-loading-icon' into 'master' · 942fe5fe
  Phil Hughes authored May 24, 2018
```
Show loading icon only when making the request

See merge request gitlab-org/gitlab-ce!19116
```
  942fe5fe
- Clarify milestone_id scope for API operations on Issuables · be9a7e67
  Mark Fletcher authored May 24, 2018
  
  be9a7e67
- Merge branch 'mr-conflict-notification' into 'master' · e97a8743
  Douwe Maan authored May 24, 2018
```
MR unmergeable notification

See merge request gitlab-org/gitlab-ce!18042
```
  e97a8743
- Merge branch 'jprovazn-fix-resolvable' into 'master' · 56d2d462
  Douwe Maan authored May 24, 2018
```
Check if note's noteable is not nil when checking resolvability

Closes #46573

See merge request gitlab-org/gitlab-ce!19081
```
  56d2d462
- Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master' · c52db71e
  Mike Greiling authored May 24, 2018
```
Resolve "Escape key to close MR check out branch modal"

Closes #45850

See merge request gitlab-org/gitlab-ce!19050
```
  c52db71e
- Add spec · 13aa6f67
  Mark Chao authored May 24, 2018
  
  13aa6f67
23 May, 2018 9 commits
- Add deprecation notice in documentation · 8c8a794f
  Olivier Gonzalez authored May 23, 2018
  
  8c8a794f
- Do not update project's .gitlab-ci.yml right now · 34fc5730
  Olivier Gonzalez authored May 18, 2018
  
  34fc5730
- Rename code quality job and artifact. Refs gitlab-org/gitlab-ee#5779 · dd639aad
  Olivier Gonzalez authored May 18, 2018
  
  dd639aad
- Update CHANGELOG.md for 10.8.1 · 6c51e220
  Mayra Cabrera authored May 23, 2018
```
[ci skip]
```
  6c51e220
- Merge branch '39710-search-placeholder-cut-off' into 'master' · dd512684
  Annabel Gray authored May 23, 2018
```
Resolve "Runners search input placeholder is cut off"

Closes #39710

See merge request gitlab-org/gitlab-ce!19015
```
  dd512684
- Merge branch 'ldap-u2f-fix' into 'master' · 332a16b6
  Mike Greiling authored May 23, 2018
```
Fixed U2F authentication when used with LDAP

Closes #46661

See merge request gitlab-org/gitlab-ce!19115
```
  332a16b6
- Merge branch... · ddc760a0
  Douwe Maan authored May 23, 2018
```
Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master'

Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`"

Closes #45175

See merge request gitlab-org/gitlab-ce!18754
```
  ddc760a0
- Merge branch 'akaemmerle-update-keyboard-shortcuts-doc' into 'master' · 610aefe4
  Achilleas Pipinellis authored May 23, 2018
```
Update keyboard shortcut conventions

See merge request gitlab-org/gitlab-ce!19014
```
  610aefe4
- Update keyboard shortcut conventions · 137c949e
  Andreas Kämmerle authored May 23, 2018
  
  137c949e