Merge branch 'master' into stable
Conflicts: doc/install/installation.md
Showing
... | ... | @@ -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,14 +134,17 @@ 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" | ||
... | ... | @@ -152,5 +152,5 @@ group :test do |
end | ||
group :production do | ||
gem "gitlab_meta", '3.0' | ||
gem "gitlab_meta", '3.1' | ||
end |
This diff is collapsed.
Procfile.production
deleted
100644 → 0
ROADMAP.md
0 → 100644
750 Bytes
463 Bytes
632 Bytes
1.31 KB
2.98 KB
6.28 KB
3.8 KB
| W: | H:
| W: | H:
| W: | H:
| W: | H:
2.13 KB
2.34 KB
58 Bytes
app/models/service.rb
0 → 100644
This diff is collapsed.
app/models/service_hook.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/README_FOR_APP
deleted
100644 → 0
This diff is collapsed.
doc/api/merge_requests.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/Ability.html
0 → 100644
This diff is collapsed.
doc/app/Account.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/Admin.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/AdminController.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/Authority.html
0 → 100644
This diff is collapsed.
doc/app/BaseContext.html
0 → 100644
This diff is collapsed.
doc/app/BlameController.html
0 → 100644
This diff is collapsed.
doc/app/BlobController.html
0 → 100644
This diff is collapsed.
doc/app/Commit.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/CommitDecorator.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/CommitsHelper.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/Event.html
0 → 100644
This diff is collapsed.
doc/app/EventDecorator.html
0 → 100644
This diff is collapsed.
doc/app/EventsHelper.html
0 → 100644
This diff is collapsed.
doc/app/ExtractsPath.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/GitHost.html
0 → 100644
This diff is collapsed.
doc/app/Gitlab.html
0 → 100644
This diff is collapsed.
doc/app/Gitlab/API.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/Gitlab/Auth.html
0 → 100644
This diff is collapsed.
doc/app/Gitlab/Encode.html
0 → 100644
This diff is collapsed.
doc/app/Gitlab/Entities.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/Gitlab/Gitolite.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/Gitlab/Issues.html
0 → 100644
This diff is collapsed.
doc/app/Gitlab/Logger.html
0 → 100644
This diff is collapsed.
doc/app/Gitlab/Markdown.html
0 → 100644
This diff is collapsed.
doc/app/Gitlab/Merge.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/Gitlab/Projects.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/Gitlab/Session.html
0 → 100644
This diff is collapsed.
doc/app/Gitlab/Theme.html
0 → 100644
This diff is collapsed.
doc/app/Gitlab/Users.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/Grack.html
0 → 100644
This diff is collapsed.
doc/app/Grack/Auth.html
0 → 100644
This diff is collapsed.
doc/app/Group.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/HelpController.html
0 → 100644
This diff is collapsed.
doc/app/HooksController.html
0 → 100644
This diff is collapsed.
doc/app/Issue.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/IssueObserver.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/IssuesHelper.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/Key.html
0 → 100644
This diff is collapsed.
doc/app/KeyObserver.html
0 → 100644
This diff is collapsed.
doc/app/KeysController.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/MergeRequest.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/Milestone.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/Note.html
0 → 100644
This diff is collapsed.
doc/app/NoteObserver.html
0 → 100644
This diff is collapsed.
doc/app/Notes.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/NotesController.html
0 → 100644
This diff is collapsed.
doc/app/NotesHelper.html
0 → 100644
This diff is collapsed.
doc/app/Notify.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/PostReceive.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/ProfileHelper.html
0 → 100644
This diff is collapsed.
doc/app/Project.html
0 → 100644
This diff is collapsed.
doc/app/ProjectHook.html
0 → 100644
This diff is collapsed.
doc/app/ProjectObserver.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/ProjectsHelper.html
0 → 100644
This diff is collapsed.
doc/app/ProtectedBranch.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/PushEvent.html
0 → 100644
This diff is collapsed.
doc/app/PushObserver.html
0 → 100644
This diff is collapsed.
doc/app/Redcarpet.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/RefsController.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/Repository.html
0 → 100644
This diff is collapsed.
doc/app/SearchContext.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/Snippet.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/SnippetsHelper.html
0 → 100644
This diff is collapsed.
doc/app/StaticModel.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/SystemHook.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/TabHelper.html
0 → 100644
This diff is collapsed.
doc/app/TagsHelper.html
0 → 100644
This diff is collapsed.
doc/app/Team.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/TestHookContext.html
0 → 100644
This diff is collapsed.
doc/app/Tree.html
0 → 100644
This diff is collapsed.
doc/app/TreeController.html
0 → 100644
This diff is collapsed.
doc/app/TreeDecorator.html
0 → 100644
This diff is collapsed.
doc/app/TreeHelper.html
0 → 100644
This diff is collapsed.
doc/app/User.html
0 → 100644
This diff is collapsed.
doc/app/UserObserver.html
0 → 100644
This diff is collapsed.
doc/app/UsersProject.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/Votes.html
0 → 100644
This diff is collapsed.
doc/app/WebHook.html
0 → 100644
This diff is collapsed.
doc/app/Wiki.html
0 → 100644
This diff is collapsed.
doc/app/WikisController.html
0 → 100644
This diff is collapsed.
doc/app/created.rid
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/images/add.png
0 → 100755
This diff is collapsed.
doc/app/images/brick.png
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/images/bug.png
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/images/date.png
0 → 100644
This diff is collapsed.
doc/app/images/delete.png
0 → 100755
This diff is collapsed.
doc/app/images/find.png
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/images/package.png
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/app/images/plugin.png
0 → 100644
This diff is collapsed.
doc/app/images/ruby.png
0 → 100644
This diff is collapsed.
doc/app/images/tag_blue.png
0 → 100755
This diff is collapsed.
doc/app/images/tag_green.png
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/images/wrench.png
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/app/images/zoom.png
0 → 100644
This diff is collapsed.
doc/app/index.html
0 → 100644
This diff is collapsed.
doc/app/js/darkfish.js
0 → 100644
This diff is collapsed.
doc/app/js/jquery.js
0 → 100644
This diff is collapsed.
doc/app/js/navigation.js
0 → 100644
This diff is collapsed.
doc/app/js/search.js
0 → 100644
This diff is collapsed.
doc/app/js/search_index.js
0 → 100644
This diff is collapsed.
doc/app/js/searcher.js
0 → 100644
This diff is collapsed.
doc/app/rdoc.css
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/install/databases.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/install/requirements.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
gitlab
deleted
100755 → 0
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/api/merge_requests.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/event_filter.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/encode.rb
deleted
100644 → 0
This diff is collapsed.
This diff is collapsed.
lib/gitlab/git_stats.rb
0 → 100644
This diff is collapsed.
lib/gitlab/graph/commit.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/merge.rb
deleted
100644 → 0
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/seeder.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/support/rewrite-hooks.sh
0 → 100755
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/tasks/gitlab/import.rake
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
spec/models/service_spec.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.