Permalink
Commits on Jul 18, 2012
  1. Merge pull request #332 from xsuchy/pull-req-katello-service

    introduce katello-service for managing katello services
    xsuchy committed Jul 18, 2012
  2. do not copy files which we do not need/want

    addressing:
        Installed (but unpackaged) file(s) found:
       /usr/share/katello/etc/service-list
       /usr/share/katello/man/katello-service.8
       /usr/share/katello/man/katello-service.8.asciidoc
       /usr/share/katello/man/katello-service.8.xml
    xsuchy committed Jul 18, 2012
  3. Merge pull request #241 from pitr-ch/808437-RFE-no_notifications_for_…

    …CLI_actions_in_GUI
    
    808437 rfe no notifications for cli actions in gui
    pitr-ch committed Jul 18, 2012
  4. Merge branch 'master' into bug/808437-notifications_after_cli

    * master: (12 commits)
      system groups - move the listing of groups by updates needed to the model
      ...
    
    Conflicts:
    	src/app/controllers/application_controller.rb
    pitr-ch committed Jul 18, 2012
  5. Merge pull request #177 from pitr-ch/profiling

    katello - action profiling
    pitr-ch committed Jul 18, 2012
Commits on Jul 17, 2012
  1. Merge pull request #330 from bbuckingham/fork-system_group_dashboard

    system groups - add portlet to the dashboard
    jlsherrill committed Jul 17, 2012
  2. Merge pull request #325 from jsomara/ldap_test_fix

    Ldap test fix
    thomasmckay committed Jul 17, 2012
  3. Merge pull request #328 from Pajk/840625

    840625 - Post 'import manifest' subscriptions return row:NotFound
    thomasmckay committed Jul 17, 2012
  4. Merge remote-tracking branch 'upstream/master' into fork-system_group…

    …_dashboard
    
    Conflicts:
    	src/public/javascripts/routes.js
    bbuckingham committed Jul 17, 2012
  5. system groups - update dashboard to account for critical/warning/up-t…

    …o-date
    
    This commit contains changes so that the dashboard can accurately reflect
    whether the system group 'update' status of a system group.
    
    i.e.
    Critical (red) - 1 or more security errata need to be applied
    Warning (yellow) - 1 or more non-security errata need to be applied
    Ok/up to date (green) - all systems are current
    bbuckingham committed Jul 17, 2012
  6. Merge branch 'master' into 808437-RFE-no_notifications_for_CLI_action…

    …s_in_GUI
    
    * master: (55 commits)
      add rubygem-activesupport to rhel6 repo
      ...
    
    Conflicts:
    	src/app/controllers/providers_controller.rb
    	src/app/controllers/system_errata_controller.rb
    	src/app/controllers/system_group_errata_controller.rb
    	src/app/controllers/system_group_packages_controller.rb
    	src/app/controllers/system_groups_controller.rb
    	src/app/models/glue/provider.rb
    	src/spec/controllers/gpg_keys_controller_spec.rb
    	src/spec/controllers/systems_controller_spec.rb
    pitr-ch committed Jul 17, 2012
  7. Removing the global after/do for role spec

    Jordan OMara committed Jul 17, 2012
  8. system groups - add portlet to the dashboard for groups

    This is the initial commit to add a portlet to the dashboard
    for system groups.  There will be an additional commit to
    properly handle the 'updates' column.
    bbuckingham committed Jul 17, 2012
  9. Merge pull request #326 from bbuckingham/fork-bug_fixes

    system groups - fix js syntax error
    ehelms committed Jul 17, 2012
  10. from petr; improving config setting in role test for ldap

    Jordan OMara committed Jul 17, 2012
  11. Merge pull request #323 from Pajk/840600

    840600 - Post creating new environment in headpin, webui returns row:NotFound error
    thomasmckay committed Jul 17, 2012
  12. Merge pull request #256 from xsuchy/pull-req-defattr

    %defattr is not needed since rpm 4.4
    xsuchy committed Jul 17, 2012
  13. katello - action profiling

    pitr-ch committed May 14, 2012
  14. Merge pull request #322 from xsuchy/pull-req-rhel6-rubygem-activesupport

    add rubygem-activesupport to rhel6 repo
    xsuchy committed Jul 17, 2012
  15. Merge pull request #318 from xsuchy/pull-req-rubygem-fastercsv-fedora

    rubygem-fastercsv is missing in Fedora 17 (orphaned)
    xsuchy committed Jul 17, 2012
  16. add rubygem-activesupport to rhel6 repo

    addressing:
    Error: Package: rubygem-delayed_job-2.1.4-2.el6.noarch (katello)
               Requires: rubygem(activesupport) >= 3.0
               Installing: 1:rubygem-activesupport-2.3.8-2.el6.noarch (epel)
                   rubygem(activesupport) = 2.3.8
    xsuchy committed Jul 17, 2012
Commits on Jul 16, 2012
  1. Merge pull request #310 from thomasmckay/null_activeBlockId

    null_activeBlockId - fixed case where active block was not known
    thomasmckay committed Jul 16, 2012
  2. Merge pull request #313 from xsuchy/pull-req-comps-ldap_fluff

    add package rubygem-ldap_fluff to comps files
    xsuchy committed Jul 16, 2012
  3. Merge pull request #311 from pitr-ch/make_jshintrb_optional

    katello - make jshintrb optional
    ehelms committed Jul 16, 2012