PR: Request merge of engine branch to master #3453

bbuckingham · 2013-12-03T18:55:49Z

Team,

This gigantic PR is to merge the current engine branch to master. Due to the number of commits in the engine branch (which consists of engine+devel commits), the PR may not show all changes; however, all changes have been reviewed in previous PRs on those branches.

Requesting developers to ACK/NACK... :)

thanks,
Brad

Merge remote-tracking branch 'upstream/master' into devel-merge

distributor

1017396 - unable to import certv3 subscriptions from linked distributor

Also adding fliter capability to resolve BZ #980160.

Bastion: replacing haml org switcher with html org switcher.

Conflicts: app/controllers/api/v1/systems_controller.rb engines/bastion/app/assets/bastion/products/new/product-form.controller.js

Merge remote-tracking branch 'upstream/master' into devel

This PR also removes several controller functions and tests that are no longer needed because of this new functionality.

Bastion: upgrading ui-router to 0.2.0.

Bastion: replacing transitionTo with ui-sref where possible.

Bastion: adding use of angular-gettext in javascript files to readme.

form submit on enter.

Fixes #3281 - Adds explicit button type to cancel button to allow

and a button to allow users to initiate a sync directly from the repository details page.

Bastion: Converting Menu to loaded HTML.

Repository: Adding sync management crosslink on display of sync status

Conflicts: app/controllers/api/v2/repositories_controller.rb app/models/authorization/repository.rb engines/bastion/app/assets/bastion/systems/details/views/system-info.html engines/bastion/app/assets/bastion/systems/details/views/system-subscriptions.html

Merge remote-tracking branch 'upstream/master' into devel-merge

Since rails 3.2 there were radical improvements in reloading the code, not making the rails-dev-boost as useful as before. Using it however breaks the doc reloading feature in development mode. If somebody misses that, he can still add it to some bundler.d/local_*.rb file

Remove rails-dev-boost gem from default set of gems for development

Bastion: Adding htmlhint grunt task to lint HTML files.

basic structure into directives.

Adding temporary custom replacement for ruport

Bastion: Updating forms to Bootstrap3 styling and encapsulating the

Bastion: fixing issue with template URLs post engine.

Engine: Fixes #3374: Adds a rake task to run rubocop and updates to

waldenraines · 2013-12-03T21:15:54Z

[test]

waldenraines · 2013-12-03T21:18:34Z

Is there any way to get this PR running against Jenkins?

komidore64 · 2013-12-03T21:23:55Z

@waldenraines jenkins is currently watching PRs against the engine branch, so i'm not sure it'll see this one because it's against master

edit: /me could be wrong. it's possible that github isn't geared for displaying test results from multiple services, so the only one we're seeing is travis?

domcleal · 2013-12-03T21:32:25Z

@komidore64 correct on both your points :)

ehelms · 2013-12-03T21:55:11Z

I manually ran it against this branch and PR - http://ci.theforeman.org/view/Katello/job/test_katello_pull_request/386/
As you can see, it can't apply the patch on top of master cleanly. May be better off accepting this to master and cleaning up behind ourselves.

domcleal · 2013-12-03T21:57:29Z

I think it's applying the PR on top of engine still - we can change the config, but it'll affect any other open PRs.

komidore64 · 2013-12-03T22:07:43Z

no merge conflicts and rake test:katello still works.

waldenraines · 2013-12-03T22:08:49Z

I agree with @ehelms but I think we ought to do it tomorrow AM so don't break the nightly. Hopefully we can fix during the day tomorrow.

ehelms · 2013-12-03T22:20:49Z

Nightly is going to be hosed no matter what for a while. We are still working on updates to the spec and installer.

waldenraines · 2013-12-03T22:41:17Z

👍

Engine: include only needed sub-engine files

pitr-ch · 2013-12-04T12:34:09Z

ACK

Engine: Adding Rubocop code style checker for better Jenkins output.

Engine: Fixing lint problems

komidore64 · 2013-12-04T14:30:09Z

ack

bbuckingham · 2013-12-04T14:30:26Z

Thanks for the feedback folks. Merging!

PR: Request merge of engine branch to master

Walden Raines and others added 30 commits October 18, 2013 14:46

Merge pull request #3219 from waldenraines/devel-merge

a4eeb5a

Merge remote-tracking branch 'upstream/master' into devel-merge

1017396 - unable to import certv3 subscriptions from linked

effa801

distributor

Merge pull request #3234 from komidore64/distributor-failsauce

399d9d8

1017396 - unable to import certv3 subscriptions from linked distributor

Bastion: replacing haml org switcher with html org switcher.

55c9ed4

Also adding fliter capability to resolve BZ #980160.

Merge pull request #3245 from waldenraines/org-switcher

a14b582

Bastion: replacing haml org switcher with html org switcher.

Merge remote-tracking branch 'upstream/master' into devel

2bfb8d2

Conflicts: app/controllers/api/v1/systems_controller.rb engines/bastion/app/assets/bastion/products/new/product-form.controller.js

Bastion: upgrading ui-router to 0.2.0.

15cc8e4

Merge pull request #3257 from waldenraines/devel

f4a89b9

Merge remote-tracking branch 'upstream/master' into devel

Bastion: replacing transitionTo with ui-sref where possible.

774e147

This PR also removes several controller functions and tests that are no longer needed because of this new functionality.

Merge pull request #3259 from waldenraines/upgrade-ui-router

f67fc37

Bastion: upgrading ui-router to 0.2.0.

Bastion: removing hrefs from html elements that use ui-sref.

37a1a53

Merge pull request #3264 from waldenraines/ui-sref

b18f682

Bastion: replacing transitionTo with ui-sref where possible.

Bastion: adding use of angular-gettext in javascript files to readme.

b8ba7cb

Merge pull request #3277 from waldenraines/devel

e17a019

Bastion: adding use of angular-gettext in javascript files to readme.

Fixes #3281 - Adds explicit button type to cancel button to allow

958baf3

form submit on enter.

Merge pull request #3282 from ehelms/issue-3281

021f8ec

Fixes #3281 - Adds explicit button type to cancel button to allow

Repository: Adding sync management crosslink on display of sync status

2f6f2a7

and a button to allow users to initiate a sync directly from the repository details page.

Bastion: Converting Menu to loaded HTML.

34f7103

Merge pull request #3286 from ehelms/menu-html

7f22420

Bastion: Converting Menu to loaded HTML.

Merge pull request #3139 from ehelms/repository-details-sync

19b1dd4

Repository: Adding sync management crosslink on display of sync status

Replacing some occurrences of i18n filter with translate directive.

de8837b

Merge pull request #3289 from waldenraines/devel-merge

d55eee1

Merge remote-tracking branch 'upstream/master' into devel-merge

Merge pull request #3300 from iNecas/remove-devel-boost

b29094c

Remove rails-dev-boost gem from default set of gems for development

Bastion: Adding htmlhint grunt task to lint HTML files.

9b3c37f

Merge pull request #3304 from ehelms/htmlhint

f3a5ded

Bastion: Adding htmlhint grunt task to lint HTML files.

adding distributor version display in the UI

006e6cd

adding distributor version output for the API

fc6c797

fixing distributor version minitests

4f3406e

ehelms and others added 6 commits November 26, 2013 11:50

Bastion: Updating forms to Bootstrap3 styling and encapsulating the

ac8179a

basic structure into directives.

Merge pull request #3440 from jlsherrill/ditch_ruport_engine

9c907ab

Adding temporary custom replacement for ruport

Bastion: fixing issue with template URLs post engine.

ae012ce

Merge pull request #3443 from ehelms/engine-forms

8039be3

Bastion: Updating forms to Bootstrap3 styling and encapsulating the

Merge pull request #3439 from waldenraines/engine-templates

d6d7732

Bastion: fixing issue with template URLs post engine.

Merge pull request #3442 from ehelms/engine-rubocop

f8c7b67

Engine: Fixes #3374: Adds a rake task to run rubocop and updates to

komidore64 mentioned this pull request Dec 3, 2013

we have so many branches under Katello/Katello #3445

Closed

Engine: Adding Rubocop code style checker for better Jenkins output.

d008965

Merge pull request #3435 from jlsherrill/engine_update

d2ffbdc

Engine: include only needed sub-engine files

David Davis added 3 commits December 4, 2013 04:35

Merge pull request #3449 from ehelms/engine-checkstyle

628a01a

Engine: Adding Rubocop code style checker for better Jenkins output.

Engine: Fixing lint problems detected by rubocop

fa03ab7

Merge pull request #3456 from daviddavis/temp/20131204071804

5ab01b1

Engine: Fixing lint problems

bbuckingham added a commit that referenced this pull request Dec 4, 2013

Merge pull request #3453 from Katello/engine

1fb20b2

PR: Request merge of engine branch to master

bbuckingham merged commit 1fb20b2 into master Dec 4, 2013

stbenjam deleted the engine branch December 12, 2014 08:46

This was referenced Nov 27, 2023

[Snyk] Fix for 20 vulnerabilities RoshanRajapakse/katello#9

Open

[Snyk] Fix for 25 vulnerabilities RoshanRajapakse/katello#10

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PR: Request merge of engine branch to master #3453

PR: Request merge of engine branch to master #3453

bbuckingham commented Dec 3, 2013

waldenraines commented Dec 3, 2013

waldenraines commented Dec 3, 2013

komidore64 commented Dec 3, 2013

domcleal commented Dec 3, 2013

ehelms commented Dec 3, 2013

domcleal commented Dec 3, 2013

komidore64 commented Dec 3, 2013

waldenraines commented Dec 3, 2013

ehelms commented Dec 3, 2013

waldenraines commented Dec 3, 2013

pitr-ch commented Dec 4, 2013

komidore64 commented Dec 4, 2013

bbuckingham commented Dec 4, 2013

PR: Request merge of engine branch to master #3453

PR: Request merge of engine branch to master #3453

Conversation

bbuckingham commented Dec 3, 2013

waldenraines commented Dec 3, 2013

waldenraines commented Dec 3, 2013

komidore64 commented Dec 3, 2013

domcleal commented Dec 3, 2013

ehelms commented Dec 3, 2013

domcleal commented Dec 3, 2013

komidore64 commented Dec 3, 2013

waldenraines commented Dec 3, 2013

ehelms commented Dec 3, 2013

waldenraines commented Dec 3, 2013

pitr-ch commented Dec 4, 2013

komidore64 commented Dec 4, 2013

bbuckingham commented Dec 4, 2013