Skip to content

Commit

Permalink
convert Glitter Gallery to GlitterGallery across the thing
Browse files Browse the repository at this point in the history
  • Loading branch information
sarupbanskota committed Nov 9, 2013
1 parent e928bf9 commit fdacfdd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.markdown
Expand Up @@ -17,7 +17,7 @@ GlitterGallery runs on OpenShift, so it's really easy to run your own version.
1. Create a new ruby-1.9 application and add MySQL
1. Clone the application repo: `git clone <OpenShift git URL>`
1. Change into the cloned directory
1. Add the Glitter Gallery repo: `git remote add glitter -m master http://github.com/EmilyDirsh/GlitterGallery.git`
1. Add the GlitterGallery repo: `git remote add glitter -m master http://github.com/EmilyDirsh/GlitterGallery.git`
1. Pull: `git pull -s recursive -X theirs glitter master`
1. Push: `git push`

Expand Down
6 changes: 3 additions & 3 deletions README.rdoc
@@ -1,10 +1,10 @@
== Glitter Gallery
== GlitterGallery

Glitter Gallery _will be_ an amazing way to collaborate on design!
GlitterGallery _will be_ an amazing way to collaborate on design!

The goals are to allow designers to easily share their work, gather and parse feedback in a useful way, and version their work just as developers are able to.

Glitter Gallery will be somewhat biased to support SVGs from Inkscape, and to work with the magicmockup rapid prototyping program. That doesn't mean it won't work with other filetypes, though!
GlitterGallery will be somewhat biased to support SVGs from Inkscape, and to work with the magicmockup rapid prototyping program. That doesn't mean it won't work with other filetypes, though!

=== Get involved

Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.haml
Expand Up @@ -27,7 +27,7 @@
- if controller.controller_name != 'home'
= link_to root_url do
%h1.logo
Glitter Gallery
GlitterGallery
.right
- if controller.controller_name != 'dashboard'
= link_to 'Dashboard', dashboard_path
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/glitter.rb
@@ -1,4 +1,4 @@
# Glitter gallery app config goes here
# GlitterGallery app config goes here

# ImageMagick geometry to use for thumbnail generation
# defaults to 100 px width
Expand Down

0 comments on commit fdacfdd

Please sign in to comment.