Commits · a861b36d573a8a5abc0244f78ee4bbae344d0ba0 · nexedi / gitlab-ce

27 Dec, 2018 2 commits
- Refactor Package.last_of_each_version method · a861b36d
  Dmitriy Zaporozhets authored Dec 27, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a861b36d
- Improve package name regex · e79123fe
  Dmitriy Zaporozhets authored Dec 27, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e79123fe
26 Dec, 2018 14 commits
- Improve npm packages code according to review · fbdd411e
  Dmitriy Zaporozhets authored Dec 26, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fbdd411e
- Move npm packages lookup into own finder · 14e80d14
  Dmitriy Zaporozhets authored Dec 26, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  14e80d14
- Remove npm packages fixtures for another MR · 0425cbf5
  Dmitriy Zaporozhets authored Dec 26, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0425cbf5
- Add frozen_string_literal for newly added specs · 7382ba03
  Dmitriy Zaporozhets authored Dec 26, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7382ba03
- Add image for npm package docs · dbdd7a44
  Dmitriy Zaporozhets authored Dec 26, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  dbdd7a44
- Move stub_packages_object_storage to ee helper · 118a7b9a
  Dmitriy Zaporozhets authored Dec 25, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  118a7b9a
- Restrict npm packages feature to scoped packages only · 505adfc2
  Dmitriy Zaporozhets authored Dec 25, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  505adfc2
- Add basic user docs for npm registry · fadd54bb
  Dmitriy Zaporozhets authored Dec 25, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fadd54bb
- Move package_file_uploader_specin packages dir · 5e90764f
  Dmitriy Zaporozhets authored Dec 25, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5e90764f
- Dry npm_packages_spec a bit · 3be37175
  Dmitriy Zaporozhets authored Dec 25, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3be37175
- Add specs for package_file_uploader · 5c68f074
  Dmitriy Zaporozhets authored Dec 25, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5c68f074
- Add NPM registry support to GitLab packages · f621783f
  Dmitriy Zaporozhets authored Dec 03, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f621783f
- Merge branch 'ce-to-ee-2018-12-25' into 'master' · 809d3914
  Stan Hu authored Dec 26, 2018
```
CE upstream - 2018-12-25 08:11 UTC

Closes gitlab-ce#55676

See merge request gitlab-org/gitlab-ee!8964
```
  809d3914
- Merge branch 'master' into ce-to-ee-2018-12-25 · 71480ea1
  Stan Hu authored Dec 25, 2018
  
  71480ea1
25 Dec, 2018 8 commits
- Fix clone dropdown parent inheritance issues in HAML · 3f85f3e8
  Stan Hu authored Dec 25, 2018
```
The change in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24015
caused some parent relationships to be incorrect. This caused a failure
in the EE failure the Geo button was added because the modal stopped
showing.
```
  3f85f3e8
- Merge branch '8985-fix-due-date-spec-issue-item' into 'master' · f29a7652
  Dmitriy Zaporozhets authored Dec 25, 2018
```
Use date from the past to ensure timeago rendering absolute value

Closes #8985

See merge request gitlab-org/gitlab-ee!8966
```
  f29a7652
- Use date from the past to ensure timeago rendering absolute value · c09a2514
  Kushal Pandya authored Dec 26, 2018
  
  c09a2514
- Resolve conflict in issue_sidebar_extras_entity.rb · 51e35966
  Marin Jankovski authored Dec 25, 2018
  
  51e35966
- Resolve conflict in issue_serializer_spec.rb · 02a0b988
  Marin Jankovski authored Dec 25, 2018
  
  02a0b988
- Resolve conflict in issue_sidebar_basic_entity.rb · e7f72dc4
  Marin Jankovski authored Dec 25, 2018
  
  e7f72dc4
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-12-25 · 82ae861d
  GitLab Bot authored Dec 25, 2018
```
# Conflicts:
#	app/serializers/issue_sidebar_basic_entity.rb
#	app/serializers/issue_sidebar_entity.rb
#	app/serializers/issue_sidebar_extras_entity.rb
#	ee/app/serializers/draft_note_serializer.rb
#	spec/serializers/issue_serializer_spec.rb

[ci skip]
```
  82ae861d
- Merge branch 'fix-ldap-user-leak-2-qa' into 'master' · a682bd4e
  Sanad Liaquat authored Dec 25, 2018
```
Use specific LDAP creds directly in admin_ldap_sync_spec.rb

Closes gitlab-org/quality/nightly#44

See merge request gitlab-org/gitlab-ee!8962
```
  a682bd4e
24 Dec, 2018 16 commits
- Use custom LDAP creds directly · 49a809be
  Mark Lapierre authored Dec 24, 2018
```
Don't override global LDAP creds
```
  49a809be
- Merge branch 'milestones-community-contribution-issues' into 'master' · 5dc656fc
  Lin Jen-Shin authored Dec 24, 2018
```
Milestones on community contribution issues

Closes #55531

See merge request gitlab-org/gitlab-ce!23942
```
  5dc656fc
- Milestones on community contribution issues · 400e612c
  Victor Wu authored Dec 24, 2018
  
  400e612c
- Merge branch '40270-remove-gitlab-upgrader-completely' into 'master' · 7d8881ed
  Lin Jen-Shin authored Dec 24, 2018
```
Removed Gitlab Upgrader found in /lib/gitlab/upgrader.rb

Closes #40270

See merge request gitlab-org/gitlab-ce!23603
```
  7d8881ed
- Removed Gitlab Upgrader found in /lib/gitlab/upgrader.rb · bd3c2f3a
  Jacob Wolen authored Dec 24, 2018
  
  bd3c2f3a
- Merge branch 'ee-40270-remove-gitlab-upgrader-completely' into 'master' · a0d4f2cb
  Lin Jen-Shin authored Dec 24, 2018
```
EE: Remove Gitlab Upgrader found in /lib/gitlab/upgrader.rb

See merge request gitlab-org/gitlab-ee!8787
```
  a0d4f2cb
- Merge branch 'spec-positional-arguments' into 'master' · 157bc81d
  Lin Jen-Shin authored Dec 24, 2018
```
Fix deprecation: Using positional arguments in integration tests

See merge request gitlab-org/gitlab-ce!24009
```
  157bc81d
- Remove Gitlab Upgrader found in /lib/gitlab/upgrader.rb · 06cb0ce4
  Jacob Wolen authored Dec 07, 2018
  
  06cb0ce4
- Merge branch 'patch-35' into 'master' · 86207178
  Marin Jankovski authored Dec 24, 2018
```
Alphabetized and added IBM Kubernetes service (IKS)

See merge request gitlab-org/gitlab-ce!23824
```
  86207178
- Merge branch 'sh-fix-http-clone-panel' into 'master' · f044679c
  Kushal Pandya authored Dec 24, 2018
```
Fix missing Git clone button when protocol restriction setting enabled

Closes #55676

See merge request gitlab-org/gitlab-ce!24015
```
  f044679c
- Fix and move specs into admin_disables_git_access_protocol_spec.rb · 29adade5
  Stan Hu authored Dec 23, 2018
  
  29adade5
- Merge branch 'fix-geo-ssh-push-secondary-clone-qa' into 'master' · 4ae9d26e
  Lin Jen-Shin authored Dec 24, 2018
```
Backport page object changes from EE

See merge request gitlab-org/gitlab-ce!23956
```
  4ae9d26e
- Merge branch 'fix-geo-ssh-push-secondary-clone-qa' into 'master' · 21d2b475
  Lin Jen-Shin authored Dec 24, 2018
```
Fix wait for project replication before getting clone URL

Closes gitlab-org/quality/nightly#51

See merge request gitlab-org/gitlab-ee!8937
```
  21d2b475
- Fix HTTP/SSH clone panel for mobile · 91b0754d
  Stan Hu authored Dec 23, 2018
  
  91b0754d
- Add spec for HTTP/SSH clone panel · f50ee65b
  Stan Hu authored Dec 23, 2018
  
  f50ee65b
- Fix missing Git clone button when protocol restriction setting enabled · 4a8b4d8a
  Stan Hu authored Dec 23, 2018
```
If Git clones are restricted to either HTTP or SSH-only in the
application settings, the clone button would not show. The refactoring
in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22196 broke
this.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55676
```
  4a8b4d8a