diff --git a/app/assets/javascripts/discourse/views/combobox_view_category.js b/app/assets/javascripts/discourse/views/combobox_view_category.js index e295a59a1e9..cac5e069a1e 100644 --- a/app/assets/javascripts/discourse/views/combobox_view_category.js +++ b/app/assets/javascripts/discourse/views/combobox_view_category.js @@ -14,7 +14,7 @@ Discourse.ComboboxViewCategory = Discourse.ComboboxView.extend({ if (!templateData.color) return text; var result = "" + text + ""; diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md index 691ca3c4b62..a783c79e6ca 100644 --- a/docs/DEVELOPER-ADVANCED.md +++ b/docs/DEVELOPER-ADVANCED.md @@ -19,8 +19,9 @@ to rails, you are likely much better off with our **[Discourse Vagrant Developer 1. `bundle install` 2. `rake db:migrate` 3. `rake db:test:prepare` -4. Try running the specs: `bundle exec rspec` -5. `bundle exec rails server` +4. `rake db:seed_fu` +5. Try running the specs: `bundle exec rspec` +6. `bundle exec rails server` You should now be able to connect to rails on http://localhost:3000 - try it out! The seed data includes a pinned topic that explains how to get an admin account, so start there! Happy hacking! @@ -38,7 +39,7 @@ Vagrant version 1.0.5. With this Vagrantfile: config.vm.box = 'precise32' config.vm.box_url = 'http://files.vagrantup.com/precise32.box' config.vm.network :hostonly, '192.168.10.200' - + if RUBY_PLATFORM =~ /darwin/ config.vm.share_folder("v-root", "/vagrant", ".", :nfs => true) end @@ -63,21 +64,21 @@ Vagrant version 1.0.5. With this Vagrantfile: export LANGUAGE=en_US.UTF-8 export LANG=en_US.UTF-8 export LC_ALL=en_US.UTF-8 - + locale-gen en_US.UTF-8 dpkg-reconfigure locales ## RVM and Ruby apt-get -yqq install libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison subversion pkg-config curl build-essential git - + su - vagrant -c "sudo bash -s stable < <(curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer)" adduser vagrant rvm source /etc/profile.d/rvm.sh su - vagrant -c "rvm pkg install libyaml" su - vagrant -c "rvm install 1.9.3-p374" su - vagrant -c "rvm use 1.9.3-p374 --default" - + echo "gem: --no-rdoc --no-ri" >> /etc/gemrc su - vagrant -c "echo 'gem: --no-rdoc --no-ri' >> ~/.gemrc" @@ -102,7 +103,7 @@ Also, a user "discourse" is needed when importing a database image. Edit /etc/postgresql/9.1/main/pg_hba.conf to have this: - local all all trust + local all all trust host all all 127.0.0.1/32 trust host all all ::1/128 trust host all all 0.0.0.0/0 trust # wide-open diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 52739bb2d86..7800b9d3969 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -2,11 +2,11 @@ We have deliberately left this section lacking. From our FAQ: -> Discourse is brand new. Discourse is early beta software, and likely to remain so for many months. -> Please experiment with it, play with it, give us feedback, submit pull requests – but any consideration +> Discourse is brand new. Discourse is early beta software, and likely to remain so for many months. +> Please experiment with it, play with it, give us feedback, submit pull requests – but any consideration > of fully adopting Discourse is for people and organizations who are eager to live on the bleeding and broken edge. -When Discourse is ready for primetime we're going to provide several robust and easy ways to install it. +When Discourse is ready for primetime we're going to provide several robust and easy ways to install it. Until then, if you are feeling adventurous you can try to set up following components. - Postgres 9.1 @@ -16,8 +16,9 @@ Until then, if you are feeling adventurous you can try to set up following compo - Ruby 1.9.3 - Install all rubygems via bundler - Edit database.yml and redis.yml and point them at your databases. + - Run `rake db:seed_fu` to add seed data - Prepackage all assets using rake - - Run the Rails database migrations + - Run the Rails database migrations - Run a sidekiq process for background jobs - Run a clockwork process for enqueing scheduled jobs - Run several Rails processes, preferably behind a proxy like Nginx.