Commits · f1ad362e3ee2bccdf86513c24578f1d497b9d91d · nexedi / gitlab-ce

13 Mar, 2018 1 commit
- Merge branch 'ce-40781-os-to-ce' into ee-40781-os-to-ce · f1ad362e
  Micaël Bergeron authored Mar 13, 2018
  
  f1ad362e
12 Mar, 2018 1 commit
- fix an indentation problem · e1f076ec
  Micaël Bergeron authored Mar 12, 2018
  
  e1f076ec
09 Mar, 2018 4 commits
- Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into ce-40781-os-to-ce · 4155f5ca
  Micaël Bergeron authored Mar 09, 2018
  
  4155f5ca
- apply feedback · f7b8ae3f
  Micaël Bergeron authored Mar 09, 2018
  
  f7b8ae3f
- refactor Projects::JobsController · f444f274
  Micaël Bergeron authored Mar 09, 2018
  
  f444f274
- Add proxy_download to perform proxied sending of all files · fc6587f1
  Micaël Bergeron authored Mar 09, 2018
  
  fc6587f1
08 Mar, 2018 34 commits
- Merge remote-tracking branch 'origin/master' into 40781-os-to-ce · 6466739e
  Micaël Bergeron authored Mar 08, 2018
  
  6466739e
- [cherry-pick] '4862-verify-file-checksums' · a4e24b59
  Sean McGivern authored Mar 05, 2018
```
See merge request gitlab-org/gitlab-ee!4753
```
  a4e24b59
- [cherry-pick] '4862-verify-file-checksums' · edbcde88
  Sean McGivern authored Mar 05, 2018
```
See merge request gitlab-org/gitlab-ee!4753
```
  edbcde88
- Merge branch 'update-templates-and-dependencies-10-6' into 'master' · ac1f3bc3
  Robert Speicher authored Mar 08, 2018
```
Update templates and licenses

See merge request gitlab-org/gitlab-ce!17637
```
  ac1f3bc3
- Merge branch 'update-guides-10-6' into 'master' · 10a795b6
  Robert Speicher authored Mar 08, 2018
```
Update guides for 10.6

See merge request gitlab-org/gitlab-ce!17635
```
  10a795b6
- Merge branch 'poc-upload-hashing-path' into 'master' · 2387ef2b
  Sean McGivern authored Mar 02, 2018
```
File uploads on objects storage should use hashed storage

Closes #4952

See merge request gitlab-org/gitlab-ee!4597
```
  2387ef2b
- rework the migration to use the EE ones · 17c48435
  Micaël Bergeron authored Feb 27, 2018
  
  17c48435
- add the Ci::Build `*_store` columns · c94a6a07
  Micaël Bergeron authored Feb 26, 2018
  
  c94a6a07
- make the db migration idempotent · a68b0014
  Micaël Bergeron authored Feb 22, 2018
  
  a68b0014
- porting spec/support/db · 272af7a2
  Micaël Bergeron authored Feb 21, 2018
  
  272af7a2
- [cherry-pick] wip: port object storage to ce · b47d64b0
  Micaël Bergeron authored Feb 21, 2018
  
  b47d64b0
- Merge branch 'gitlab-git-duplicate-code' into 'master' · cb1538bb
  Sean McGivern authored Mar 08, 2018
```
Remove duplicate method definitions

See merge request gitlab-org/gitlab-ce!17478
```
  cb1538bb
- Merge branch '40525-listing-user-activity-timeouts' into 'master' · aec3e1dd
  Yorick Peterse authored Mar 08, 2018
```
Improve database response time for listing user activity

Closes #40525

See merge request gitlab-org/gitlab-ce!17454
```
  aec3e1dd
- Merge branch 'ce-to-ee-2018-03-08' into 'master' · 85b228af
  James Lopez authored Mar 08, 2018
```
CE upstream - 2018-03-08 12:23 UTC

See merge request gitlab-org/gitlab-ee!4897
```
  85b228af
- Merge branch 'jprovazn-revert-commit-cleanup' into 'master' · fcda1e96
  Sean McGivern authored Mar 08, 2018
```
Revert "Cleanup after adding MR diff's commit_count"

See merge request gitlab-org/gitlab-ce!17639
```
  fcda1e96
- Merge branch '43802-ensure-foreign-keys-on-clusters-applications' into 'master' · f9dfe343
  Yorick Peterse authored Mar 08, 2018
```
Resolve "Add missing foreign key constraint in clusters_applications_ingress"

Closes #43802

See merge request gitlab-org/gitlab-ce!17488
```
  f9dfe343
- Merge branch 'ce-rubocop-naming-filename' into 'master' · d1a968d4
  Nick Thomas authored Mar 08, 2018
```
[CE] Add Naming/FileName rule checking expected class/module per filename

See merge request gitlab-org/gitlab-ce!17631
```
  d1a968d4
- [CE] Add Naming/FileName rule checking expected class/module per filename · 5c7a7381
  Gabriel Mazetto authored Mar 08, 2018
  
  5c7a7381
- Merge branch 'ee-ce-rubocop-naming-filename' into 'master' · 8f90840c
  Nick Thomas authored Mar 08, 2018
```
[EE] Add Naming/FileName rule checking expected class/module per filename

See merge request gitlab-org/gitlab-ee!4892
```
  8f90840c
- Merge branch 'sh-add-missing-acts-as-taggable-indices' into 'master' · a2844000
  Yorick Peterse authored Mar 08, 2018
```
Adding missing indexes migrations from taggings table

Closes #43927

See merge request gitlab-org/gitlab-ce!17563
```
  a2844000
- Merge branch 'sh-add-section-name-index' into 'master' · 4eaa7dcc
  Yorick Peterse authored Mar 08, 2018
```
Add index on section_name_id on ci_build_trace_sections table

Closes #44008

See merge request gitlab-org/gitlab-ce!17632
```
  4eaa7dcc
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-08 · e1e45fc1
  GitLab Bot authored Mar 08, 2018
  
  e1e45fc1
- Remove duplicate method definitions · f45c66e5
  Jacob Vosmaer authored Mar 02, 2018
  
  f45c66e5
- Revert "Cleanup after adding MR diff's commit_count" · 7db225e4
  Jan Provaznik authored Mar 08, 2018
```
This reverts commit 0b7d1085.
```
  7db225e4
- Update templates and licenses · b7c47d95
  James Lopez authored Mar 08, 2018
  
  b7c47d95
- Merge branch 'docs-exception-request-labels' into 'master' · 0f26f968
  Sean McGivern authored Mar 08, 2018
```
Clarify that the Pick Into X.Y label is added after approval

See merge request gitlab-org/gitlab-ce!17636
```
  0f26f968
- Merge branch 'sh-remove-double-caching-repo-empty' into 'master' · 15b4e981
  Sean McGivern authored Mar 08, 2018
```
Remove double caching of Repository#empty?

Closes #43882

See merge request gitlab-org/gitlab-ce!17588
```
  15b4e981
- Clarify that the Pick Into X.Y label is added after approval · 94390001
  Sean McGivern authored Mar 08, 2018
  
  94390001
- Merge branch 'ce-to-ee-2018-03-08' into 'master' · 38c08da7
  Lin Jen-Shin authored Mar 08, 2018
```
CE upstream - 2018-03-08 00:26 UTC

Closes gitaly#1057

See merge request gitlab-org/gitlab-ee!4891
```
  38c08da7
- Merge branch 'patch-28' into 'master' · 0a6c82ea
  Filipa Lacerda authored Mar 08, 2018
```
Fix link to Merge Request Coach

See merge request gitlab-org/gitlab-ce!17633
```
  0a6c82ea
- Merge branch '43770-change-clear-runners-cache-ujs-action-to-an-axios-request' into 'master' · 96a3847e
  Kamil Trzciński authored Mar 08, 2018
```
Resolve "Change Clear Runners cache UJS action to an API request"

Closes #43770

See merge request gitlab-org/gitlab-ce!17466
```
  96a3847e
- update guides for 10.6 · 6041d449
  James Lopez authored Mar 08, 2018
  
  6041d449
- Merge branch 'fix-mattermost-delete-team' into 'master' · 9df3aaae
  Sean McGivern authored Mar 08, 2018
```
Add missing delete method in mattermost session

Closes #37367 and #40660

See merge request gitlab-org/gitlab-ce!16209
```
  9df3aaae
- Add missing delete method in mattermost session · 7fcf3560
  julien MILLAU authored Mar 08, 2018
  
  7fcf3560