Commits · b9e7b2542dd9f2b32d2db7857adc8dfc11283ab6 · nexedi / gitlab-ce

27 Aug, 2018 2 commits
- Fix ./spec/features/projects/features_visibility_spec.rb · b9e7b254
  Dmitriy Zaporozhets authored Aug 27, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b9e7b254
- Make packages_enabled= method public · 8ba4162b
  Dmitriy Zaporozhets authored Aug 27, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8ba4162b
26 Aug, 2018 9 commits
- Fix default value for packages feature and add some spec · 6e157c65
  Dmitriy Zaporozhets authored Aug 26, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6e157c65
- Remove default_value_for packages_enabled · 3cd92aea
  Dmitriy Zaporozhets authored Aug 26, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3cd92aea
- Check for colum existance for packages_enabled default value · 4ba1d451
  Dmitriy Zaporozhets authored Aug 26, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4ba1d451
- Adds a default value to a non required prop · 85dd25f1
  Filipa Lacerda authored Aug 26, 2018
  
  85dd25f1
- Enable packages feature by default for new projects · 49351d24
  Dmitriy Zaporozhets authored Aug 24, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  49351d24
- Remove default value from packages_enabled migration · e5dfba71
  Dmitriy Zaporozhets authored Aug 24, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e5dfba71
- Change project_permissions_panel_data method so you can override it in EE · c6794b33
  Dmitriy Zaporozhets authored Aug 24, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c6794b33
- Enable packages feature for projects by default · 1e02e531
  Dmitriy Zaporozhets authored Aug 23, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1e02e531
- Allow to disable packages feature per project · 47899fb3
  Dmitriy Zaporozhets authored Aug 23, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  47899fb3
25 Aug, 2018 6 commits
- Merge branch 'ce-to-ee-2018-08-25' into 'master' · 0f024c82
  Dmitriy Zaporozhets authored Aug 25, 2018
```
CE upstream - 2018-08-25 06:21 UTC

See merge request gitlab-org/gitlab-ee!6986
```
  0f024c82
- Resolve conflict in lib/api/api.rb · 5c6d5f89
  Dmitriy Zaporozhets authored Aug 25, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5c6d5f89
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-25 · 65971dcc
  GitLab Bot authored Aug 25, 2018
```
# Conflicts:
#	lib/api/api.rb

[ci skip]
```
  65971dcc
- Merge branch 'api-protected-tags' into 'master' · 0fc5bc31
  Nick Thomas authored Aug 25, 2018
```
API: Protected tags

Closes #39144

See merge request gitlab-org/gitlab-ce!14986
```
  0fc5bc31
- API: Protected tags · 08cc6afc
  Robert Schilling authored Aug 25, 2018
  
  08cc6afc
- Merge branch '50345-hashed-storage-feature-flag' into 'master' · 26ea5437
  Nick Thomas authored Aug 25, 2018
```
Feature flag to disable Hashed Storage migration when renaming a repository

Closes #50345

See merge request gitlab-org/gitlab-ce!21291
```
  26ea5437
24 Aug, 2018 23 commits
- Merge branch 'ce-to-ee-2018-08-24' into 'master' · a5ebf492
  Stan Hu authored Aug 24, 2018
```
CE upstream - 2018-08-24 21:21 UTC

See merge request gitlab-org/gitlab-ee!6984
```
  a5ebf492
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-24 · 8eab001f
  GitLab Bot authored Aug 24, 2018
  
  8eab001f
- Merge branch 'winh-danger-changelog-drop-wip' into 'master' · ee2aaa29
  Rémy Coutable authored Aug 24, 2018
```
Drop WIP from changelog command in Danger comment

See merge request gitlab-org/gitlab-ce!21374
```
  ee2aaa29
- Drop WIP from changelog command in Danger comment · 705da921
  Winnie Hellmann authored Aug 24, 2018
  
  705da921
- Merge branch 'dz-refactor-project-permissions-helper-method' into 'master' · 71ba763a
  Rémy Coutable authored Aug 24, 2018
```
Refactor project_permissions_panel_data so it can be extended in EE easily

See merge request gitlab-org/gitlab-ce!21370
```
  71ba763a
- Merge branch 'ce-to-ee-2018-08-24' into 'master' · 2031fb20
  Stan Hu authored Aug 24, 2018
```
CE upstream - 2018-08-24 18:21 UTC

See merge request gitlab-org/gitlab-ee!6980
```
  2031fb20
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-24 · ce2029e8
  GitLab Bot authored Aug 24, 2018
  
  ce2029e8
- Merge branch 'sh-simplify-github-importer-refactor' into 'master' · 452fd703
  Yorick Peterse authored Aug 24, 2018
```
Refactor GitHub Importer database helpers into helper methods

See merge request gitlab-org/gitlab-ce!21357
```
  452fd703
- Merge branch 'mkoszut-master-patch-04745' into 'master' · 12a4ca6f
  Rémy Coutable authored Aug 24, 2018
```
Removing not necessarily indentations in update Ruby code block

See merge request gitlab-org/gitlab-ce!21364
```
  12a4ca6f
- Merge branch 'fix/contributing' into 'master' · 7a9558a1
  Rémy Coutable authored Aug 24, 2018
```
[docs] Update CONTRIBUTING.md

See merge request gitlab-org/gitlab-ce!21355
```
  7a9558a1
- Merge branch 'api-labels-spec' into 'master' · 1887bc4a
  Rémy Coutable authored Aug 24, 2018
```
POST should be PUT in the API labels specs

See merge request gitlab-org/gitlab-ce!21369
```
  1887bc4a
- Merge branch 'ce-to-ee-2018-08-24' into 'master' · 5aa00032
  Sean McGivern authored Aug 24, 2018
```
CE upstream - 2018-08-24 15:22 UTC

See merge request gitlab-org/gitlab-ee!6979
```
  5aa00032
- Fix conflicts in variables.scss and environments.scss · cd9ec9df
  Annabel Dunstone Gray authored Aug 24, 2018
  
  cd9ec9df
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-24 · a4a1812c
  GitLab Bot authored Aug 24, 2018
```
# Conflicts:
#	app/assets/stylesheets/framework/variables.scss
#	app/assets/stylesheets/pages/environments.scss

[ci skip]
```
  a4a1812c
- Merge branch 'ce-to-ee-2018-08-23' into 'master' · 191f7ba0
  Sean McGivern authored Aug 24, 2018
```
CE upstream - 2018-08-23 09:21 UTC

See merge request gitlab-org/gitlab-ee!6976
```
  191f7ba0
- Refactor GitHub Importer database helpers into helper methods · 0377c015
  Stan Hu authored Aug 13, 2018
```
This in preparation for addressing idle-in-transaction timeouts for other importers.

Part of #50021
```
  0377c015
- Resolve conflicts in spec/lib/gitlab/usage_data_spec.rb · c10ca6c2
  Sean McGivern authored Aug 24, 2018
  
  c10ca6c2
- Resolve conflicts in db/schema.rb · 4c618cf3
  Sean McGivern authored Aug 24, 2018
  
  4c618cf3
- Merge branch 'patch-28' into 'master' · 5846c02d
  Stan Hu authored Aug 24, 2018
```
Add link to Profiling doc to README

See merge request gitlab-org/gitlab-ce!21345
```
  5846c02d
- Add link to Profiling doc to README · 9bc960c8
  Tom Atkins authored Aug 24, 2018
  
  9bc960c8
- Merge branch 'ccr/43283_allow_author_upvote' into 'master' · 33a242e9
  Sean McGivern authored Aug 24, 2018
```
Allows author to vote on their own issue

See merge request gitlab-org/gitlab-ce!21203
```
  33a242e9
- Allows author to vote on their own issue · 009c4f7f
  Chantal Rollison authored Aug 24, 2018
  
  009c4f7f
- Merge branch 'patch-29' into 'master' · f4d18201
  Sean McGivern authored Aug 24, 2018
```
documentation: fixes to source installation instructions

Closes #47483

See merge request gitlab-org/gitlab-ce!21359
```
  f4d18201