Skip to content
This repository has been archived by the owner on Jul 11, 2020. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubygems/rubygems-chef
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c05d697612de
Choose a base ref
...
head repository: rubygems/rubygems-chef
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eed20b3ba2fd
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 19, 2014

  1. Copy the full SHA
    67828fb View commit details
  2. Merge branch 'master' of github.com:skottler/rubygems-infrastructure

    * 'master' of github.com:skottler/rubygems-infrastructure:
      cleanup unicorn/delayed_job
      add unicorn run script
    Sam Kottler committed Jun 19, 2014
    Copy the full SHA
    eed20b3 View commit details
Showing with 2 additions and 11 deletions.
  1. +1 −1 Berksfile.lock
  2. +1 −1 cookbooks/rubygems-people/metadata.rb
  3. +0 −9 cookbooks/rubygems-people/templates/default/bashrc.erb
2 changes: 1 addition & 1 deletion Berksfile.lock
Original file line number Diff line number Diff line change
@@ -207,7 +207,7 @@ GRAPH
slack_handler (>= 0.0.0)
rubygems-ntp (0.0.1)
ntp (>= 0.0.0)
rubygems-people (0.0.11)
rubygems-people (0.0.12)
sudo (>= 0.0.0)
user (>= 0.0.0)
rubygems-redis (0.0.1)
2 changes: 1 addition & 1 deletion cookbooks/rubygems-people/metadata.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
maintainer 'RubyGems.org Ops Team'
license 'MIT'
description 'RubyGems user recipes'
version '0.0.11'
version '0.0.12'

depends 'user'
depends 'sudo'
9 changes: 0 additions & 9 deletions cookbooks/rubygems-people/templates/default/bashrc.erb
Original file line number Diff line number Diff line change
@@ -81,15 +81,6 @@ alias ll='ls -alF'
alias la='ls -A'
alias l='ls -CF'

# Add an "alert" alias for long running commands. Use like so:
# sleep 10; alert
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'

# Alias definitions.
# You may want to put all your additions into a separate file like
# ~/.bash_aliases, instead of adding them here directly.
# See /usr/share/doc/bash-doc/examples in the bash-doc package.

if [ -f ~/.bash_aliases ]; then
. ~/.bash_aliases
fi