TravisCi Web enterprise merge. #2814
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
Co-authored-by: GbArc <[email protected]>
* 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
requested changes
Mar 25, 2024
| @@ -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'), | |||
There was a problem hiding this comment.
Goo question, probably merge issue. Exists on master. Done.
app/styles/app/layouts/settings.scss
Outdated
| @@ -498,3 +498,12 @@ $env-var-value-background: lighten($cement-grey, 20); | |||
| margin-left: 20px; | |||
| } | |||
| } | |||
|
|
|||
| .ember-tooltip { | |||
There was a problem hiding this comment.
this will probably break some tooltips - don't add
There was a problem hiding this comment.
Removed, but it's probably responsible for a tool tip added in enterpise .. but .. removed. Done.
app/templates/settings.hbs
Outdated
| @@ -146,6 +146,102 @@ | |||
| </li> | |||
| </ul> | |||
| </section> | |||
| <section class="settings-section"> | |||
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Is a additionall condition:
{{#if (or this.features.enterpriseVersion this.repo.private)}}
| @@ -1,4 +1,4 @@ | |||
| import { module, test, skip } from 'qunit'; | |||
| import { module, skip, test, skip } from 'qunit'; | |||
waiter/lib/travis/web/app.rb
Outdated
| @@ -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 | |||
| @@ -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) { | |||
There was a problem hiding this comment.
don't remove, change to 'skip' for now
| @@ -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) { | |||
There was a problem hiding this comment.
don't remove, change to 'skip' for now
| @@ -77,6 +77,28 @@ export default Component.extend({ | |||
| } | |||
| }), | |||
|
|
|||
| hasEmailSubscription: computed('repository', 'repository.emailSubscribed', function () { | |||
Makefile
Outdated
| @@ -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 | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.