-
- Downloads
Non-interactive AWS install by running a single script.
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md
parent
eae41ad1
No related branches found
No related tags found
Showing
- .rails_footnotes 0 additions, 3 deletions.rails_footnotes
- CHANGELOG 24 additions, 0 deletionsCHANGELOG
- Gemfile 6 additions, 4 deletionsGemfile
- Gemfile.lock 12 additions, 11 deletionsGemfile.lock
- README.md 1 addition, 0 deletionsREADME.md
- VERSION 1 addition, 1 deletionVERSION
- app/assets/images/file_dir.png 0 additions, 0 deletionsapp/assets/images/file_dir.png
- app/assets/images/merge.png 0 additions, 0 deletionsapp/assets/images/merge.png
- app/assets/javascripts/application.js 21 additions, 1 deletionapp/assets/javascripts/application.js
- app/assets/javascripts/issues.js 2 additions, 0 deletionsapp/assets/javascripts/issues.js
- app/assets/javascripts/note.js 137 additions, 124 deletionsapp/assets/javascripts/note.js
- app/assets/javascripts/projects.js 3 additions, 1 deletionapp/assets/javascripts/projects.js
- app/assets/stylesheets/common.scss 122 additions, 212 deletionsapp/assets/stylesheets/common.scss
- app/assets/stylesheets/gitlab_bootstrap.scss 0 additions, 818 deletionsapp/assets/stylesheets/gitlab_bootstrap.scss
- app/assets/stylesheets/gitlab_bootstrap/blocks.scss 145 additions, 0 deletionsapp/assets/stylesheets/gitlab_bootstrap/blocks.scss
- app/assets/stylesheets/gitlab_bootstrap/buttons.scss 105 additions, 0 deletionsapp/assets/stylesheets/gitlab_bootstrap/buttons.scss
- app/assets/stylesheets/gitlab_bootstrap/common.scss 52 additions, 0 deletionsapp/assets/stylesheets/gitlab_bootstrap/common.scss
- app/assets/stylesheets/gitlab_bootstrap/files.scss 156 additions, 0 deletionsapp/assets/stylesheets/gitlab_bootstrap/files.scss
- app/assets/stylesheets/gitlab_bootstrap/lists.scss 30 additions, 0 deletionsapp/assets/stylesheets/gitlab_bootstrap/lists.scss
- app/assets/stylesheets/gitlab_bootstrap/tables.scss 41 additions, 0 deletionsapp/assets/stylesheets/gitlab_bootstrap/tables.scss
.rails_footnotes
deleted
100644 → 0
Loading
| @@ -54,7 +54,7 @@ gem "unicorn" | Loading
| @@ -54,7 +54,7 @@ gem "unicorn" |
gem "acts-as-taggable-on", "2.3.1" | gem "acts-as-taggable-on", "2.3.1" | ||
# Decorators | # Decorators | ||
gem "drapper" | gem "draper" | ||
# Background jobs | # Background jobs | ||
gem "resque", "~> 1.20.0" | gem "resque", "~> 1.20.0" | ||
Loading
| @@ -92,7 +92,6 @@ end | Loading
| @@ -92,7 +92,6 @@ end |
group :development do | group :development do | ||
gem "letter_opener" | gem "letter_opener" | ||
gem "rails-footnotes" | |||
gem "annotate", :git => "https://github.com/ctran/annotate_models.git" | gem "annotate", :git => "https://github.com/ctran/annotate_models.git" | ||
gem 'rack-mini-profiler' | gem 'rack-mini-profiler' | ||
end | end | ||
Loading
| @@ -108,15 +107,18 @@ group :development, :test do | Loading
| @@ -108,15 +107,18 @@ group :development, :test do |
gem "awesome_print" | gem "awesome_print" | ||
gem "database_cleaner" | gem "database_cleaner" | ||
gem "launchy" | gem "launchy" | ||
gem 'factory_girl_rails' | |||
end | end | ||
group :test do | group :test do | ||
gem 'cucumber-rails', :require => false | gem 'cucumber-rails', :require => false | ||
gem 'minitest', ">= 2.10" | |||
gem "turn", :require => false | |||
gem "simplecov", :require => false | gem "simplecov", :require => false | ||
gem "shoulda-matchers" | gem "shoulda-matchers" | ||
gem 'email_spec' | gem 'email_spec' | ||
gem 'resque_spec' | gem 'resque_spec' | ||
gem "webmock" | gem "webmock" | ||
end | end | ||
group :production do | |||
gem "gitlab_meta", '2.9' | |||
end |

| W: | H:
| W: | H:


app/assets/images/merge.png
0 → 100644
593 B