Permalink
Browse files

Merge branch 'master' into stable

Conflicts:
	doc/install/installation.md
  • Loading branch information...
dzaporozhets committed Nov 22, 2012
2 parents e469084 + ced242a commit 319f0c30573d1f2158adf52276981b2c7780392f
Showing 508 changed files with 105,194 additions and 3,009 deletions.
View
@@ -3,8 +3,11 @@ env:
- DB=mysql
before_install:
- sudo apt-get install libicu-dev -y
- - sudo apt-get install libqt4-dev libqtwebkit-dev -y
- - gem install charlock_holmes -v="0.6.8"
+ - wget -P /tmp http://phantomjs.googlecode.com/files/phantomjs-1.7.0-linux-i686.tar.bz2
+ - tar -xf /tmp/phantomjs-1.7.0-linux-i686.tar.bz2 -C /tmp/
+ - sudo rm -rf /usr/local/phantomjs
+ - sudo mv /tmp/phantomjs-1.7.0-linux-i686 /usr/local/phantomjs
+ - gem install charlock_holmes -v="0.6.9"
branches:
only:
- 'master'
View
@@ -1,3 +1,21 @@
+v 3.1.0
+ - Updated gems
+ - Services: Gitlab CI integration
+ - Events filter on dashboard
+ - Own namespace for redis/resque
+ - Optimized commit diff views
+ - add alphabetical order for projects admin page
+ - Improved web editor
+ - Commit stats page
+ - Documentation split and cleanup
+ - Link to commit authors everywhere
+ - Restyled milestones list
+ - added Milestone to Merge Request
+ - Restyled Top panel
+ - Refactored Satellite Code
+ - Added file line links
+ - moved from capybara-webkit to poltergeist + phantomjs
+
v 3.0.3
- Fixed bug with issues list in Chrome
- New Feature: Import team from another project
@@ -28,7 +46,7 @@ v 3.0.0
- Reject ssh keys that break gitolite
- [API] list one project hook
- [API] edit project hook
- - [API] add project snippets list
+ - [API] list project snippets
- [API] allow to authorize using private token in HTTP header
- [API] add user creation
View
@@ -1,4 +1,4 @@
-## Contribute to GitLab
+## Contribute to GitLab
If you want to contribute to GitLab, follow this process:
@@ -7,24 +7,20 @@ If you want to contribute to GitLab, follow this process:
3. Code
4. Create a pull request
-We will only accept pull requests if:
+We will only accept pull requests if:
* Your code has proper tests and all tests pass
-* Your code can be merged w/o problems
+* Your code can be merged w/o problems
* It won't break existing functionality
* It's quality code
* We like it :)
-## [You may need a developer VM](https://github.com/gitlabhq/developer-vm)
+For examples of feedback on pull requests please look at the [closed pull requests](https://github.com/gitlabhq/gitlabhq/pulls?direction=desc&page=1&sort=created&state=closed).
-## Running tests
-
-To run the specs for GitLab, you need to run seeds for test db.
+## Installation
- cd gitlabhq
- rake db:seed_fu RAILS_ENV=test
+Install the Gitlab development in a virtual machine with the [Gitlab Vagrant virtual machine](https://github.com/gitlabhq/gitlab-vagrant-vm). Installing it in a virtual machine makes it much easier to set up all the dependencies for integration testing.
-Then you can run the test suite with rake:
-
- rake gitlab:test
+## Running tests
+For more information on running the tests please read the [development tips](https://github.com/gitlabhq/gitlabhq/blob/master/doc/development.md)
View
88 Gemfile
@@ -8,34 +8,35 @@ def linux_only(require_as)
RUBY_PLATFORM.include?('linux') && require_as
end
-gem "rails", "3.2.8"
+gem "rails", "3.2.9"
# Supported DBs
-gem "sqlite3", :group => :sqlite
-gem "mysql2", :group => :mysql
-gem "pg", :group => :postgres
+gem "sqlite3", group: :sqlite
+gem "mysql2", group: :mysql
+gem "pg", group: :postgres
# Auth
gem "devise", "~> 2.1.0"
-gem 'omniauth'
+gem 'omniauth', "~> 1.1.1"
gem 'omniauth-google-oauth2'
gem 'omniauth-twitter'
gem 'omniauth-github'
# GITLAB patched libs
-gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
-gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e"
-gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
-gem 'grack', :git => "https://github.com/gitlabhq/grack.git"
+gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: '7f35cb98ff17d534a07e3ce6ec3d580f67402837'
+gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e'
+gem 'yaml_db', git: "https://github.com/gitlabhq/yaml_db.git", ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd'
+gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
+gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '212fd40bea61f3c6a167223768e7295dc32bbc10'
# Gitolite client (for work with gitolite-admin repo)
gem "gitolite", '1.1.0'
# Syntax highlighter
-gem "pygments.rb", "0.3.1"
+gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", ref: '4db80c599067e2d5f23c5c243bf85b8ca0368ad4'
# Language detection
-gem "github-linguist", "~> 2.3.4" , :require => "linguist"
+gem "github-linguist", "~> 2.3.4" , require: "linguist"
# API
gem "grape", "~> 0.2.1"
@@ -45,13 +46,13 @@ gem "grape", "~> 0.2.1"
gem "stamp"
# Pagination
-gem "kaminari"
+gem "kaminari", "~> 0.14.1"
# HAML
-gem "haml-rails"
+gem "haml-rails", "~> 0.3.5"
# Files attachments
-gem "carrierwave"
+gem "carrierwave", "~> 0.7.1"
# Authorization
gem "six"
@@ -63,59 +64,57 @@ gem "ffaker"
gem "seed-fu"
# Markdown to HTML
-gem "redcarpet", "~> 2.1.1"
+gem "redcarpet", "~> 2.2.2"
gem "github-markup", "~> 0.7.4", require: 'github/markup'
# Servers
-gem "thin"
-gem "unicorn"
+gem "thin", '~> 1.5.0'
+gem "unicorn", "~> 4.4.0"
# Issue tags
-gem "acts-as-taggable-on", "2.3.1"
+gem "acts-as-taggable-on", "2.3.3"
# Decorators
-gem "draper"
+gem "draper", "~> 0.18.0"
# Background jobs
-gem "resque", "~> 1.20.0"
+gem "resque", "~> 1.23.0"
gem 'resque_mailer'
# HTTP requests
gem "httparty"
-# Handle encodings
-gem "charlock_holmes"
-
# Colored output to console
gem "colored"
-# GITLAB settings
+# GitLab settings
gem 'settingslogic'
# Misc
gem "foreman"
-gem 'gemoji', require: 'emoji/railtie'
gem "git"
group :assets do
- gem "sass-rails", "3.2.5"
- gem "coffee-rails", "3.2.2"
- gem "uglifier", "1.0.3"
+ gem "sass-rails", "~> 3.2.5"
+ gem "coffee-rails", "~> 3.2.2"
+ gem "uglifier", "~> 1.3.0"
gem "therubyracer"
- gem 'chosen-rails'
- gem 'jquery-atwho-rails', '0.1.6'
- gem "jquery-rails", "2.0.2"
- gem "jquery-ui-rails", "0.5.0"
- gem "modernizr", "2.5.3"
- gem "raphael-rails", "1.5.2"
- gem 'bootstrap-sass', "2.0.4"
+ gem 'chosen-rails', "0.9.8"
+ gem 'jquery-atwho-rails', "0.1.6"
+ gem "jquery-rails", "2.1.3"
+ gem "jquery-ui-rails", "2.0.2"
+ gem "modernizr", "2.6.2"
+ gem "raphael-rails", "2.1.0"
+ gem 'bootstrap-sass', "2.2.1.1"
gem "font-awesome-sass-rails", "~> 2.0.0"
+ gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
end
group :development do
+ gem "annotate", git: "https://github.com/ctran/annotate_models.git"
gem "letter_opener"
- gem "annotate", :git => "https://github.com/ctran/annotate_models.git"
+ gem 'quiet_assets', '~> 1.0.1'
gem 'rack-mini-profiler'
end
@@ -124,8 +123,6 @@ group :development, :test do
gem 'spinach-rails'
gem "rspec-rails"
gem "capybara"
- gem "capybara-webkit"
- gem "headless"
gem "pry"
gem "awesome_print"
gem "database_cleaner"
@@ -137,20 +134,23 @@ group :development, :test do
gem 'guard-spinach'
# Notification
- gem 'rb-fsevent', :require => darwin_only('rb-fsevent')
- gem 'growl', :require => darwin_only('growl')
- gem 'rb-inotify', :require => linux_only('rb-inotify')
+ gem 'rb-fsevent', require: darwin_only('rb-fsevent')
+ gem 'growl', require: darwin_only('growl')
+ gem 'rb-inotify', require: linux_only('rb-inotify')
+
+ # PhantomJS driver for Capybara
+ gem 'poltergeist'
end
group :test do
- gem "simplecov", :require => false
- gem "shoulda-matchers"
+ gem "simplecov", require: false
+ gem "shoulda-matchers", "1.3.0"
gem 'email_spec'
gem 'resque_spec'
gem "webmock"
gem 'test_after_commit'
end
group :production do
- gem "gitlab_meta", '3.0'
+ gem "gitlab_meta", '3.1'
end
Oops, something went wrong.

0 comments on commit 319f0c3

Please sign in to comment.