Commits · 4a1eab090a43ce298671a7667efbd4274b3d5a63 · nexedi / gitlab-ce

06 Oct, 2017 4 commits
- Merge branch 'ee-18608-lock-issues-v2' into 'master' · 4a1eab09
  Sean McGivern authored Oct 06, 2017
```
EE Port of "Lock discussion for issues and merge requests"

See merge request gitlab-org/gitlab-ee!3061
```
  4a1eab09
- Merge branch '3642-assignees-todo-fix' into 'master' · 65e847ac
  Sean McGivern authored Oct 06, 2017
```
Don't create todos for old issue assignees

Closes #3642

See merge request gitlab-org/gitlab-ee!3064
```
  65e847ac
- Fix wording in the js messages · 31ad48c9
  Jarka Kadlecova authored Oct 06, 2017
  
  31ad48c9
- Refactor discussion lock docs · a48c73b3
  Achilleas Pipinellis authored Oct 05, 2017
```
# Conflicts:
#	doc/user/permissions.md
```
  a48c73b3
05 Oct, 2017 24 commits
- Merge branch 'sh-update-geo-arch-doc' · 423f153d
  Stan Hu authored Oct 05, 2017
  
  423f153d
- Update Geo architecture diagram to make Log Cursor in between DBs · 4344b494
  Stan Hu authored Oct 05, 2017
```
[ci skip]
```
  4344b494
- Merge branch 'sh-geo-fix-file-transfer-empty-files' into 'master' · fd0cd37c
  Nick Thomas authored Oct 05, 2017
```
Save Geo files to a temporary file and rename after success

Closes #3618 and #3242

See merge request gitlab-org/gitlab-ee!3058
```
  fd0cd37c
- Merge branch 'sh-fix-geo-file-transfers' into 'master' · 7ed95992
  Nick Thomas authored Oct 05, 2017
```
Geo: Fix attachments/avatars saving to the wrong directory

Closes #3634

See merge request gitlab-org/gitlab-ee!3068
```
  7ed95992
- Check permissions on file · 53e7bad5
  Stan Hu authored Oct 05, 2017
  
  53e7bad5
- Save Geo files to a temporary file and rename after success · faae8fbb
  Stan Hu authored Oct 03, 2017
```
Closes #3618
```
  faae8fbb
- Add documentation on cleaning up attachments on disk · 3a6b7853
  Stan Hu authored Oct 05, 2017
  
  3a6b7853
- Only prune non-LFS files · 7379ac01
  Stan Hu authored Oct 05, 2017
  
  7379ac01
- Clean up tracking DB with FileRegistry entries to redownload files · 19557e8c
  Stan Hu authored Oct 04, 2017
  
  19557e8c
- Geo: Fix attachments/avatars saving to the wrong directory · c3bf1e21
  Stan Hu authored Oct 04, 2017
```
Closes #3634
```
  c3bf1e21
- Merge branch 'ee-34102-online-view-of-artifacts-fe' into 'master' · 90f19538
  Kamil Trzciński authored Oct 05, 2017
```
Add external link for online artifacts -- EE merge edition

See merge request gitlab-org/gitlab-ee!3050
```
  90f19538
- Don't create todos for old issue assignees · 1f24873e
  Jarka Kadlecova authored Oct 04, 2017
  
  1f24873e
- Merge branch '3397-navigating-to-another-group-board-breaks-navigation-sidebar' into 'master' · dda69dbc
  Phil Hughes authored Oct 05, 2017
```
Resolve "Navigating to another group board breaks navigation sidebar"

Closes #3397

See merge request gitlab-org/gitlab-ee!3010
```
  dda69dbc
- Resolve "Navigating to another group board breaks navigation sidebar" · 9dd7f161
  Luke "Jared" Bennett authored Oct 05, 2017
  
  9dd7f161
- Update test to use the new API · 5ba5203c
  Zeger-Jan van de Weg authored Oct 05, 2017
  
  5ba5203c
- Merge branch 'ce_upstream' into 'master' · 1c14ced6
  Sean McGivern authored Oct 05, 2017
```
CE upstream

Closes gitaly#544, gitlab-qa#68, and gitaly#595

See merge request gitlab-org/gitlab-ee!3051
```
  1c14ced6
- Merge branch 'sh-geo-remove-tracking-db-config' into 'master' · 16a9e1d8
  Achilleas Pipinellis authored Oct 05, 2017
```
Remove database_geo.yml from Geo instructions

See merge request gitlab-org/gitlab-ee!3069
```
  16a9e1d8
- Test against public projects · 480426fa
  Zeger-Jan van de Weg authored Oct 05, 2017
  
  480426fa
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream · 0c8f4deb
  Valery Sizov authored Oct 05, 2017
  
  0c8f4deb
- Re-works create security event after failed oauth login spec to still work... · 78215890
  Tiago Botelho authored Oct 05, 2017
```
Re-works create security event after failed oauth login spec to still work after the new OAuth changes.
```
  78215890
- Merge branch 'feature/gb/pipeline-processing-quotas' into 'master' · 7b3aadca
  Kamil Trzciński authored Oct 05, 2017
```
Introduce CI/CD pipeline processing quotas

Closes #3493

See merge request gitlab-org/gitlab-ee!2986
```
  7b3aadca
- Update CHANGELOG.md for 10.0.3 · 5dcf9f18
  Jarka Kadlecova authored Oct 05, 2017
```
[ci skip]
```
  5dcf9f18
- Update CHANGELOG-EE.md for 10.0.3-ee · 8593af5e
  Jarka Kadlecova authored Oct 05, 2017
```
[ci skip]
```
  8593af5e
- Remove database_geo.yml from Geo instructions · 97ed61e2
  Stan Hu authored Oct 04, 2017
```
This is already handled automatically by Omnibus. We forgot to
remove this section when we added support.

[ci skip]
```
  97ed61e2
04 Oct, 2017 12 commits
- Update CHANGELOG.md for 9.5.8 · 39d68e59
  Jose Ivan Vargas authored Oct 04, 2017
```
[ci skip]
```
  39d68e59
- Update CHANGELOG-EE.md for 9.5.8-ee · 5022b917
  Jose Ivan Vargas authored Oct 04, 2017
```
[ci skip]
```
  5022b917
- Incorporate feedback · ecbdca12
  Zeger-Jan van de Weg authored Oct 04, 2017
  
  ecbdca12
- Merge branch 'sh-fix-gitlab-qa-ee-license-add' into 'master' · c2b1be15
  Grzegorz Bizon authored Oct 04, 2017
```
Fix GitLab QA: increase window size to ensure License link shows

See merge request gitlab-org/gitlab-ce!14674
```
  c2b1be15
- Merge branch 'sh-geo-upgrading-consolidation-doc' into 'master' · 7d3614b5
  Achilleas Pipinellis authored Oct 04, 2017
```
Consolidate Geo upgrade instructions into one document

Closes #3628

See merge request gitlab-org/gitlab-ee!3057
```
  7d3614b5
- Merge branch '3521-fix-projects-helper' into 'master' · 2ea8737c
  Douwe Maan authored Oct 04, 2017
```
Fix NoMethodErrors caused by incorrect module loading

Closes #3521

See merge request gitlab-org/gitlab-ee!3062
```
  2ea8737c
- Add extra assertions about how the link will open · 690971c2
  Eric Eastwood authored Oct 04, 2017
  
  690971c2
- Dry up external_link? usage · ace2064a
  Eric Eastwood authored Oct 04, 2017
  
  ace2064a
- Merge branch 'ee-26890-fix-default-branches-sorting' into 'master' · 385c983d
  Robert Speicher authored Oct 04, 2017
```
[EE] Fix the default branches sorting to actually be 'Last updated'

See merge request gitlab-org/gitlab-ee!2931
```
  385c983d
- Merge branch 'tc-geo-use-database-tasks' into 'master' · 29de35a9
  Sean McGivern authored Oct 04, 2017
```
Use ActiveRecord::Tasks::DatabaseTasks directly in geo rake tasks

Closes #3543

See merge request gitlab-org/gitlab-ee!3019
```
  29de35a9
- Merge branch 'docs/images-update-ee' into 'master' · 7a3c2b14
  Job van der Voort authored Oct 04, 2017
```
Update a bunch of docs images

See merge request gitlab-org/gitlab-ee!3063
```
  7a3c2b14
- Update a bunch of docs images · 3a18e6a5
  Achilleas Pipinellis authored Oct 03, 2017
  
  3a18e6a5