Commits · b38b7e68f45535234ef5a7f09f0616d4eb18e210 · Boxiang Sun / gitlab-ce

15 Aug, 2017 4 commits
- Merge branch 'master' into 33329-tech-article-deploying-maven-artifacts · b38b7e68
  Achilleas Pipinellis authored Aug 15, 2017
  
  b38b7e68
- Merge branch 'docs-correct-filetree' into 'master' · de0d0e4e
  Achilleas Pipinellis authored Aug 15, 2017
```
Docs correct filetree

Closes #36428

See merge request !13545
```
  de0d0e4e
- Merge branch 'update-vue-docs' into 'master' · ae81bfd3
  Stan Hu authored Aug 15, 2017
```
Update docs with Javascript accord.

See merge request !13440
```
  ae81bfd3
- Update docs with Javascript accord. · 73c29645
  Jacob Schatz authored Aug 15, 2017
  
  73c29645
14 Aug, 2017 36 commits
- Merge branch 'repo-fixes-e' into 'master' · 0ec54b8f
  Jacob Schatz authored Aug 14, 2017
```
Repo fixes part E

See merge request !13472
```
  0ec54b8f
- Merge branch 'bvl-use-no-wrap-for-pot-file' into 'master' · 1983043c
  Rubén Dávila authored Aug 14, 2017
```
Remove newlines in translations

See merge request !13531
```
  1983043c
- Merge branch '36378-error-raising-expectation-in-spec-fix' into 'master' · 87bd9c56
  Robert Speicher authored Aug 14, 2017
```
Fix positive raise_error expectation without specifying the error type expected…

Closes #36378

See merge request !13542
```
  87bd9c56
- update remaining links for add-user.md · 20f5bd64
  Marcia Ramos authored Aug 14, 2017
  
  20f5bd64
- add file finder to repo index · 4f2df247
  Marcia Ramos authored Aug 14, 2017
  
  4f2df247
- delete duplicate content · 48f451bf
  Marcia Ramos authored Aug 14, 2017
```
delete old doc, update links to the current doc
```
  48f451bf
- move "share projects with groups" docs · 65d6f873
  Marcia Ramos authored Aug 14, 2017
```
- correct the file tree
- remove duplicate doc
- move to project/members/
- move images
- update links
```
  65d6f873
- Fix positive raise_error expectation without specifying the error type... · 9371cf3a
  Tiago Botelho authored Aug 14, 2017
```
Fix positive raise_error expectation without specifying the error type expected in Project::DestroyService specs
```
  9371cf3a
- Merge branch '35804-document-table-based-tests' into 'master' · bd36637b
  Robert Speicher authored Aug 14, 2017
```
Use rspec-parameterized for table-based tests

Closes #35804

See merge request !13469
```
  bd36637b
- link file moved to members/index from project's index · 0edc0e27
  Marcia Ramos authored Aug 14, 2017
  
  0edc0e27
- move doc from /workflow/ to /project/ · f3250561
  Marcia Ramos authored Aug 14, 2017
```
fix the file tree
```
  f3250561
- Merge branch '36385-pipeline-graph-dropdown' into 'master' · b5bc0fca
  Phil Hughes authored Aug 14, 2017
```
Stops propagation for dropdown content in pipeline graph.

Closes #36385

See merge request !13536
```
  b5bc0fca
- Merge branch '34527-make-edit-comment-button-always-available-outside-of-dropdown' into 'master' · cf55fb9b
  Clement Ho authored Aug 14, 2017
```
Resolve "Make edit comment button always available outside of dropdown"

Closes #34527

See merge request !12931
```
  cf55fb9b
- Merge branch '7-days-cycle-analytics' into 'master' · 3248911c
  Rémy Coutable authored Aug 14, 2017
```
Add a `Last 7 days` option for Cycle Analytics view

Closes #36300

See merge request !13443
```
  3248911c
- Merge branch 'rs-remove-username-from-sanitize-attrs' into 'master' · be22bf5c
  Rémy Coutable authored Aug 14, 2017
```
Remove `username` from `User#sanitize_attrs` callback

See merge request !13511
```
  be22bf5c
- Merge branch '36404-do-not-run-flaky-examples-check-for-docs-changes' into 'master' · d1e1139e
  Robert Speicher authored Aug 14, 2017
```
Don't run the `flaky-examples-check` job for docs branches

Closes #36404

See merge request !13525
```
  d1e1139e
- Merge branch 'gitaly-test-bundle-path' into 'master' · 004d335f
  Rémy Coutable authored Aug 14, 2017
```
Use existing BUNDLE_PATH for gitaly in local tests

See merge request !13493
```
  004d335f
- Merge branch '36236-auto-detect-metrics-for-auto-deployed-environments' into 'master' · 19c47551
  Rémy Coutable authored Aug 14, 2017
```
Improve Prometheus docs, include nginx ingress

Closes #36236

See merge request !13438
```
  19c47551
- Improve Prometheus docs, include nginx ingress · 69c9c83a
  Joshua Lambert authored Aug 14, 2017
  
  69c9c83a
- Merge branch '36089-handle-ref-failure-better' into 'master' · 7963e2bb
  Douwe Maan authored Aug 14, 2017
```
Refactor how we fetch ref for merge requests

Closes #36089 and #36296

See merge request !13416
```
  7963e2bb
- Merge branch 'mk-enforce-boolean-defaults' into 'master' · 62216af8
  Douwe Maan authored Aug 14, 2017
```
Enforce boolean defaults on Application Settings

Closes #2750

See merge request !13144
```
  62216af8
- Add shared getFileExtension helper method · 5bf22c86
  Eric Eastwood authored Aug 11, 2017
```
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146854
```
  5bf22c86
- Remove unused repo store keys · fd8388d8
  Eric Eastwood authored Aug 11, 2017
```
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37147332
```
  fd8388d8
- Add comment about why we need to stop parsing JSON · 51c8f9e1
  Eric Eastwood authored Aug 10, 2017
```
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146815

See https://gitlab.slack.com/archives/C0GQHHPGW/p1501779964878178
```
  51c8f9e1
- Use single js- wrapper class to show/hide · a2cb73b8
  Eric Eastwood authored Aug 10, 2017
```
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146360
```
  a2cb73b8
- Scroll total scroll width instead of fixed value · d15b5c7f
  Eric Eastwood authored Aug 10, 2017
```
Fixed value could potentially be not enough

Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145886
```
  d15b5c7f
- Switch single fa icon generation to inline · bff7c007
  Eric Eastwood authored Aug 10, 2017
```
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145729
```
  bff7c007
- Remove duplicate setting of variable · 1e593a40
  Eric Eastwood authored Aug 10, 2017
```
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145640
```
  1e593a40
- Reset monacoLoading on failure · cdd28b30
  Eric Eastwood authored Aug 10, 2017
```
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37144070
```
  cdd28b30
- Remove overflow tabs logic (no longer used) · 6bf4a06e
  Eric Eastwood authored Aug 10, 2017
```
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143794
```
  6bf4a06e
- Remove loading state from repo_tab · 15f37411
  Eric Eastwood authored Aug 10, 2017
```
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143710
```
  15f37411
- Make close/changed icon more accessible · a081a60d
  Eric Eastwood authored Aug 10, 2017
```
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143527
```
  a081a60d
- Use promise syntax with Helper.getContent · ecb7c534
  Eric Eastwood authored Aug 10, 2017
```
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143217
```
  ecb7c534
- Split out linkClicked and add tests · f1e1113b
  Eric Eastwood authored Aug 10, 2017
```
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143174
```
  f1e1113b
- Use v-else instead of duplicating logic · 06c33095
  Eric Eastwood authored Aug 10, 2017
```
Fix
http://192.168.1.135:3000/gitlab-org/gitlab-ce/blob/master/app/assets/javascripts/broadcast_message.js
```
  06c33095
- Merge branch 'gitaly-404-commit-list-files' into 'master' · a64760d6
  Douwe Maan authored Aug 14, 2017
```
Migrate `Git::Repository.ls_files` to Gitaly

Closes gitaly#404

See merge request !13302
```
  a64760d6