TravisCi Web enterprise merge. #2814

SebastianKarpetaDev · 2024-03-25T13:47:17Z

No description provided.

* Security updates: rack-> 2.2.3

* Updated GitHubApps Management URL * updated installation check

* security updates [ship:docker]

management link fix for installation without logout/login

* repo settings merge from master * switch for pub repos

* upgrade-gems * updating puma * browserslist fix -v4 * ruby 2.7.5 for Dockerfile * minimist 1.2.6 * removed silent in dockerfile * build fix Co-authored-by: Maciej <[email protected]> Co-authored-by: gabriel-arc <[email protected]>

* gem updates * ansiparse link fix

* merge disable-logs func from master * ship:docker

…nstallation link

Co-authored-by: GbArc <[email protected]>

Show manual builds and restarts (#2712) (#2718)

* skip random failing tests for now

* not closing trigger build dialog if clicked outside * env/requests/repo tooltips --------- Co-authored-by: GbArc <[email protected]>

gbarc-dt · 2024-03-25T14:09:55Z

app/components/owner/repositories.js

@@ -35,7 +35,6 @@ export default Component.extend({
  isMatchGithub: match('owner.vcsType', /Github\S+$/),
  isOwnerVcsTypeEmpty: empty('owner.vcsType'),
  isNotGithubRepository: not('isGithubRepository'),
-  hasGitHubAppsInstallation: notEmpty('owner.installation'),


why is it removed?

Goo question, probably merge issue. Exists on master. Done.

gbarc-dt · 2024-03-25T14:10:43Z

app/styles/app/layouts/settings.scss

@@ -498,3 +498,12 @@ $env-var-value-background: lighten($cement-grey, 20);
    margin-left: 20px;
  }
 }
+
+.ember-tooltip {


this will probably break some tooltips - don't add

Removed, but it's probably responsible for a tool tip added in enterpise .. but .. removed. Done.

gbarc-dt · 2024-03-25T14:13:03Z

app/templates/settings.hbs

@@ -146,6 +146,102 @@
      </li>
    </ul>
  </section>
+  <section class="settings-section">


duplicate? - check with the section above if there aren't any enterprise-only changes and put under a flag if so - if it's the same -> out

Is a additionall condition:

{{#if (or this.features.enterpriseVersion this.repo.private)}}

gbarc-dt · 2024-03-25T14:13:43Z

tests/acceptance/builds/prioritize-test.js

@@ -1,4 +1,4 @@
-import { module, test, skip } from 'qunit';
+import { module, skip, test, skip } from 'qunit';


double skip

gbarc-dt · 2024-03-25T14:15:55Z

waiter/lib/travis/web/app.rb

@@ -207,7 +207,8 @@ def set_config(string, _opts = {}) # rubocop:disable Metrics/CyclomaticComplexit
    if options[:github_apps_app_name]
      config['githubApps'] ||= {}
      config['githubApps']['appName'] = options[:github_apps_app_name]
-    end
+    config['githubApps']['migrationRepositoryCountLimit'] = 50


gbarc-dt · 2024-03-25T14:16:33Z

tests/acceptance/profile/basic-layout-test.js

@@ -291,40 +290,6 @@ module('Acceptance | profile/basic layout', function (hooks) {
    await profilePage.visit();
  });

-  test('view profiles for organizations that do not and do have GitHub Apps installations', async function (assert) {


don't remove, change to 'skip' for now

gbarc-dt · 2024-03-25T14:16:39Z

tests/acceptance/profile/basic-layout-test.js

@@ -342,64 +307,6 @@ module('Acceptance | profile/basic layout', function (hooks) {
    assert.notOk(profilePage.administerableRepositories[2].isActive, 'expected inactive repository to appear inactive');
  });

-  test('view profile when GitHub Apps is present and no legacy repositories exist', async function (assert) {


don't remove, change to 'skip' for now

gbarc-dt · 2024-03-25T14:17:40Z

app/components/github-apps-repository.js

@@ -77,6 +77,28 @@ export default Component.extend({
    }
  }),

+  hasEmailSubscription: computed('repository', 'repository.emailSubscribed', function () {


gbarc-dt · 2024-03-25T14:17:53Z

Makefile

@@ -27,7 +27,7 @@ DOCKER ?= docker

 .PHONY: docker-build
 docker-build:
-	$(DOCKER) build -t $(DOCKER_DEST) .
+	$(DOCKER) build --pull --no-cache -t $(DOCKER_DEST) . -f Dockerfile.ycie


ycie -> typo

DamianSzymanski and others added 30 commits March 18, 2021 21:13

Update OS for enterprise ship:docker

1e6b9a2

security updates (#2607)

5b613ab

gem updates (#2609)

a295ba5

* Security updates: rack-> 2.2.3

app management url and installation check update (#2610)

3fe76b3

* Updated GitHubApps Management URL * updated installation check

docker fix+trivy

0096d05

trivy fix

659da26

Gem update 280721 (#2626)

a61611b

* security updates [ship:docker]

update to use latest docker

ab6dd38

github apps management url update (#2648)

a05bd04

management link fix for installation without logout/login

sharing envs to forks (#2679)

57b7f23

* repo settings merge from master * switch for pub repos

removed user management button

8c7910f

removed stripe script for enterprise

a8df3a3

upgrade-gems (#2677)

f97e687

* upgrade-gems * updating puma * browserslist fix -v4 * ruby 2.7.5 for Dockerfile * minimist 1.2.6 * removed silent in dockerfile * build fix Co-authored-by: Maciej <[email protected]> Co-authored-by: gabriel-arc <[email protected]>

gem updates (#2702)

87ac658

* gem updates * ansiparse link fix

rack update -> 2.2.3.1

b9621c4

up trivy cmd

a68bf27

BSFY-141 merge - add restarted by (#2726)

d50f9e6

reduce image size (#2732)

d6dca64

logs merge from master (#2748)

df54ddb

* merge disable-logs func from master * ship:docker

sinatra 2.2.3 (#2753)

04a2ee9

fix for missing repo migration count max value. Fix for invalid org i…

b7a5f29

…nstallation link

review and add orgs link fix

01aeb68

managing email subscriptions for whole org

cbd8d92

test/lint fixes

55923b0

removed resubscribe list

d74fe51

maintenance mode (#2771)

b20420b

Co-authored-by: GbArc <[email protected]>

dockerfile corrected

a4f5614

Supp-718

36153db

Cherry pick restarted by feature (#2789)

ce6f416

Show manual builds and restarts (#2712) (#2718)

Added log limit using env var (#2792)

a2ae888

piccadilly-circus and others added 3 commits December 6, 2023 13:17

Random failing tests (#2793)

3543d26

* skip random failing tests for now

repo tooltips + trigger build closing (#2798)

984dc45

* not closing trigger build dialog if clicked outside * env/requests/repo tooltips --------- Co-authored-by: GbArc <[email protected]>

TravisCI Web merge. Enterprise to master.

a00dcc6

SebastianKarpetaDev requested a review from GbArc March 25, 2024 13:47

TravisCI Web merge. Enterprise to master.

aa70ef1

gbarc-dt requested changes Mar 25, 2024

View reviewed changes

Sebastian Karpeta and others added 20 commits March 26, 2024 12:12

TravisCI Web merge. Enterprise to master.

6a4be41

TravisCI Web. Removing changes from package.json.

1d915c9

TravisCI Admin v2. Issue with double keys in JS.

3064a32

TravisCI Web. Rollback import.

4bfa8ad

TravisCI Web. Import skip.

f893716

TravisCI Web. Removing duplicated method.

591fd1d

lint fix

dfcabcd

ruby v corrected ship:docker

1a8f4f1

fixes / ship:docker

d39a1db

dbg ship:docker

0e4ff0f

dbg ship:docker

a27c9c7

focal ship:docker

e092bf7

log-scanner config change ship:docker

abc8399

rm subs ship:docker

2ef27f9

typo ship:docker

1dbc73f

publicmode fix ship:docker

d380af1

endpointPortfolio from env

7e8ff28

rmdbg

5141c73

lint fix

746154e

removed duplicate

1c3abc7

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

TravisCi Web enterprise merge. #2814

TravisCi Web enterprise merge. #2814

SebastianKarpetaDev commented Mar 25, 2024

gbarc-dt Mar 25, 2024

SebastianKarpetaDev Mar 26, 2024

gbarc-dt Mar 25, 2024

SebastianKarpetaDev Mar 26, 2024

gbarc-dt Mar 25, 2024

SebastianKarpetaDev Mar 26, 2024

gbarc-dt Mar 25, 2024

SebastianKarpetaDev Mar 26, 2024

gbarc-dt Mar 25, 2024

SebastianKarpetaDev Mar 26, 2024

gbarc-dt Mar 25, 2024

SebastianKarpetaDev Mar 26, 2024

gbarc-dt Mar 25, 2024

SebastianKarpetaDev Mar 26, 2024

gbarc-dt Mar 25, 2024

gbarc-dt Mar 25, 2024

		@@ -1,4 +1,4 @@
		import { module, test, skip } from 'qunit';
		import { module, skip, test, skip } from 'qunit';

TravisCi Web enterprise merge. #2814

Are you sure you want to change the base?

TravisCi Web enterprise merge. #2814

Conversation

SebastianKarpetaDev commented Mar 25, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment