Commit 61cfa2a7 authored by Sebastian Ziebell's avatar Sebastian Ziebell

Merge branch 'master' into fixes/api

Conflicts:
	lib/api/projects.rb
parents d269d107 6beae84e
# Contact & support # Contribute to GitLab
If you want quick help, head over to our [Support Forum](https://groups.google.com/forum/#!forum/gitlabhq). If you have a question or want to contribute to GitLab this guide show you the appropriate channel to use.
Otherwise you can follow our [Issue Submission Guide](https://github.com/gitlabhq/gitlabhq/wiki/Issue-Submission-Guide) for a more systematic and thorough guide to solving your issues.
## Ruling out common errors
Some errors are common and it may so happen, that you are not the only one who stumbled over a particular issue. We have [collected several of those and documented quick solutions](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide) for them.
# Contribute to GitLab ## Support forum
Please visit our [Support Forum](https://groups.google.com/forum/#!forum/gitlabhq) for any kind of question regarding the usage or adiministration/configuration of GitLab.
### Use the support forum if ...
## Recipes * You get permission denied errors
* You can't see your repos
* You have issues cloning, pulling or pushing
* You have issues with web_hooks not firing
We collect user submitted installation scripts and config file templates for platforms we don't support officially. **Search** for similar issues before posting your own, there's a good chance somebody else had the same issue you have now and had it resolved.
We believe there is merit in allowing a certain amount of diversity.
You can get and submit your solution to running/configuring GitLab with your favorite OS/distro, database, web server, cloud hoster, configuration management tool, etc.
Help us improve the collection of [GitLab Recipes](https://github.com/gitlabhq/gitlab-recipes/) ## Paid support
Community support in the [Support Forum](https://groups.google.com/forum/#!forum/gitlabhq) is done by volunteers. Paid support is available from [GitLab.com](http://blog.gitlab.com/services/)
## Feature suggestions ## Feature suggestions
Follow the [Issue Submission Guide](https://github.com/gitlabhq/gitlabhq/wiki/Issue-Submission-Guide) and support other peoples ideas or propose your own. Feature suggestions don't belong in issues but can go to [Feedback forum](http://gitlab.uservoice.com/forums/176466-general) where they can be voted on.
## Pull requests
Code speaks louder than words. If you can please submit a pull request with the fix including tests. The workflow to make a pull request is as follows:
1. Fork the project on GitHub
1. Create a feature branch
1. Write tests and code
1. If you have multiple commits please combine them into one commit by [squashing them](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
1. Push the commit to your fork
1. Submit a pull request
We will accept pull requests if:
* The code has proper tests and all tests pass
* It can be merged without problems (if not please use: git rebase master)
* It doesn't break any existing functionality
* It's quality code that conforms to the [Rails style guide](https://github.com/bbatsov/rails-style-guide) and best practices
* The description includes a motive for your change and the method you used to achieve it
* It keeps the GitLab code base clean and well structured
* We think other users will need the same functionality
* If it makes changes to the UI the pull request should include screenshots
For examples of feedback on pull requests please look at already [closed pull requests](https://github.com/gitlabhq/gitlabhq/pulls?direction=desc&page=1&sort=created&state=closed).
## Submitting via GitHub's issue tracker
* For obvious bugs or misbehavior in GitLab in the master branch. Please include the revision id and a reproducible test case.
* For problematic or insufficient documentation. Please give a suggestion on how to improve it.
If you're unsure where to post, post it to the [Support Forum](https://groups.google.com/forum/#!forum/gitlabhq) first.
There are a lot of helpful GitLab users there who may be able to help you quickly.
If your particular issue turns out to be a bug, it will find its way from there to the [issue tracker on GitHub](https://github.com/gitlabhq/gitlabhq/issues).
### When submitting an issue
**Search** for similar entries before submitting your own, there's a good chance somebody else had the same issue or idea. Show your support with `:+1:` and/or join the discussion.
Please consider the following points when submitting an **issue**:
* Summarize your issue in one sentence (what happened wrong, when you did/expected something else)
* Describe your issue in detail (including steps to reproduce)
* Add logs or screen shots when possible
* Describe your setup (use relevant parts from `sudo -u gitlab -H bundle exec rake gitlab:env:info`)
## Code ## Thank you!
Follow our [Developer Guide](https://github.com/gitlabhq/gitlabhq/wiki/Developer-Guide) to set you up for hacking on GitLab. By taking the time to use the right channel, you help the development team to organize and prioritize issues and suggestions in order to make GitLab a better product for us all.
...@@ -15,16 +15,18 @@ gem "mysql2", group: :mysql ...@@ -15,16 +15,18 @@ gem "mysql2", group: :mysql
gem "pg", group: :postgres gem "pg", group: :postgres
# Auth # Auth
gem "devise", "~> 2.1.0" gem "devise"
gem 'omniauth', "~> 1.1.1" gem 'omniauth', "~> 1.1.3"
gem 'omniauth-google-oauth2' gem 'omniauth-google-oauth2'
gem 'omniauth-twitter' gem 'omniauth-twitter'
gem 'omniauth-github' gem 'omniauth-github'
# GITLAB patched libs # Extracting information from a git repository
gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: '9e98418ce2d654485b967003726aa2706a10060b' gem "gitlab-grit", '~> 1.0.0', require: 'grit'
gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8' gem 'grit_ext', '~> 0.6.2'
gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '8e6afc2da821354774aa4d1ee8a1aa2082f84a3e'
# Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
# LDAP Auth # LDAP Auth
gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap" gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
...@@ -33,7 +35,7 @@ gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap" ...@@ -33,7 +35,7 @@ gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
gem 'gitlab_yaml_db', '1.0.0', require: "yaml_db" gem 'gitlab_yaml_db', '1.0.0', require: "yaml_db"
# Syntax highlighter # Syntax highlighter
gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", branch: "master" gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb'
# Language detection # Language detection
gem "github-linguist", "~> 2.3.4" , require: "linguist" gem "github-linguist", "~> 2.3.4" , require: "linguist"
...@@ -46,14 +48,17 @@ gem "grape-entity", "~> 0.2.0" ...@@ -46,14 +48,17 @@ gem "grape-entity", "~> 0.2.0"
# based on human-friendly examples # based on human-friendly examples
gem "stamp" gem "stamp"
# Enumeration fields
gem 'enumerize'
# Pagination # Pagination
gem "kaminari", "~> 0.14.1" gem "kaminari", "~> 0.14.1"
# HAML # HAML
gem "haml-rails", "~> 0.3.5" gem "haml-rails"
# Files attachments # Files attachments
gem "carrierwave", "~> 0.7.1" gem "carrierwave"
# Authorization # Authorization
gem "six" gem "six"
...@@ -69,7 +74,7 @@ gem "redcarpet", "~> 2.2.2" ...@@ -69,7 +74,7 @@ gem "redcarpet", "~> 2.2.2"
gem "github-markup", "~> 0.7.4", require: 'github/markup' gem "github-markup", "~> 0.7.4", require: 'github/markup'
# Servers # Servers
gem "unicorn", "~> 4.4.0" gem "unicorn"
# State machine # State machine
gem "state_machine" gem "state_machine"
...@@ -78,12 +83,12 @@ gem "state_machine" ...@@ -78,12 +83,12 @@ gem "state_machine"
gem "acts-as-taggable-on", "2.3.3" gem "acts-as-taggable-on", "2.3.3"
# Decorators # Decorators
gem "draper", "~> 0.18.0" gem "draper"
# Background jobs # Background jobs
gem 'slim' gem 'slim'
gem 'sinatra', require: nil gem 'sinatra', require: nil
gem 'sidekiq', '2.7.3' gem 'sidekiq'
# HTTP requests # HTTP requests
gem "httparty" gem "httparty"
...@@ -113,6 +118,7 @@ group :assets do ...@@ -113,6 +118,7 @@ group :assets do
gem 'bootstrap-sass', "2.2.1.1" gem 'bootstrap-sass', "2.2.1.1"
gem "font-awesome-sass-rails", "~> 3.0.0" gem "font-awesome-sass-rails", "~> 3.0.0"
gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
gem "gon"
end end
group :development do group :development do
...@@ -140,7 +146,7 @@ group :development, :test do ...@@ -140,7 +146,7 @@ group :development, :test do
gem "capybara", '2.0.2' gem "capybara", '2.0.2'
gem "pry" gem "pry"
gem "awesome_print" gem "awesome_print"
gem "database_cleaner", ref: "9f898fc50d87a5d51760f9dcf374bf5ffda21baf", git: "https://github.com/bmabey/database_cleaner.git" gem "database_cleaner"
gem "launchy" gem "launchy"
gem 'factory_girl_rails' gem 'factory_girl_rails'
......
GIT
remote: https://github.com/bmabey/database_cleaner.git
revision: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
ref: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
specs:
database_cleaner (0.9.1)
GIT GIT
remote: https://github.com/ctran/annotate_models.git remote: https://github.com/ctran/annotate_models.git
revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e
...@@ -13,41 +6,6 @@ GIT ...@@ -13,41 +6,6 @@ GIT
activerecord (>= 2.3.0) activerecord (>= 2.3.0)
rake (>= 0.8.7) rake (>= 0.8.7)
GIT
remote: https://github.com/gitlabhq/grack.git
revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
ref: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
specs:
grack (1.0.0)
rack (~> 1.4.1)
GIT
remote: https://github.com/gitlabhq/grit.git
revision: 9e98418ce2d654485b967003726aa2706a10060b
ref: 9e98418ce2d654485b967003726aa2706a10060b
specs:
grit (2.5.0)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3.6)
GIT
remote: https://github.com/gitlabhq/grit_ext.git
revision: 8e6afc2da821354774aa4d1ee8a1aa2082f84a3e
ref: 8e6afc2da821354774aa4d1ee8a1aa2082f84a3e
specs:
grit_ext (0.6.1)
charlock_holmes (~> 0.6.9)
GIT
remote: https://github.com/gitlabhq/pygments.rb.git
revision: db1da0343adf86b49bdc3add04d02d2e80438d38
branch: master
specs:
pygments.rb (0.3.2)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
GIT GIT
remote: https://github.com/gitlabhq/raphael-rails.git remote: https://github.com/gitlabhq/raphael-rails.git
revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58 revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
...@@ -89,12 +47,13 @@ GEM ...@@ -89,12 +47,13 @@ GEM
addressable (2.3.2) addressable (2.3.2)
arel (3.0.2) arel (3.0.2)
awesome_print (1.1.0) awesome_print (1.1.0)
backports (2.6.5) backports (2.6.7)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
better_errors (0.3.2) better_errors (0.3.2)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubis (>= 2.7.0) erubis (>= 2.7.0)
binding_of_caller (0.6.8) binding_of_caller (0.7.1)
debug_inspector (>= 0.0.1)
bootstrap-sass (2.2.1.1) bootstrap-sass (2.2.1.1)
sass (~> 3.2) sass (~> 3.2)
builder (3.0.4) builder (3.0.4)
...@@ -105,7 +64,7 @@ GEM ...@@ -105,7 +64,7 @@ GEM
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0) selenium-webdriver (~> 2.0)
xpath (~> 1.0.0) xpath (~> 1.0.0)
carrierwave (0.7.1) carrierwave (0.8.0)
activemodel (>= 3.2.0) activemodel (>= 3.2.0)
activesupport (>= 3.2.0) activesupport (>= 3.2.0)
celluloid (0.12.4) celluloid (0.12.4)
...@@ -132,18 +91,24 @@ GEM ...@@ -132,18 +91,24 @@ GEM
connection_pool (1.0.0) connection_pool (1.0.0)
crack (0.3.1) crack (0.3.1)
daemons (1.1.9) daemons (1.1.9)
devise (2.1.2) database_cleaner (0.9.1)
debug_inspector (0.0.2)
descendants_tracker (0.0.1)
devise (2.2.3)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (~> 3.1) railties (~> 3.1)
warden (~> 1.2.1) warden (~> 1.2.1)
diff-lcs (1.1.3) diff-lcs (1.1.3)
draper (0.18.0) draper (1.1.0)
actionpack (~> 3.2) actionpack (>= 3.0)
activesupport (~> 3.2) activesupport (>= 3.0)
request_store (~> 1.0.3)
email_spec (1.4.0) email_spec (1.4.0)
launchy (~> 2.1) launchy (~> 2.1)
mail (~> 2.2) mail (~> 2.2)
enumerize (0.5.1)
activesupport (>= 3.2)
erubis (2.7.0) erubis (2.7.0)
escape_utils (0.2.4) escape_utils (0.2.4)
eventmachine (1.0.0) eventmachine (1.0.0)
...@@ -155,7 +120,7 @@ GEM ...@@ -155,7 +120,7 @@ GEM
factory_girl_rails (4.1.0) factory_girl_rails (4.1.0)
factory_girl (~> 4.1.0) factory_girl (~> 4.1.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.8.4) faraday (0.8.6)
multipart-post (~> 1.1) multipart-post (~> 1.1)
faye-websocket (0.4.7) faye-websocket (0.4.7)
eventmachine (>= 0.12.0) eventmachine (>= 0.12.0)
...@@ -164,7 +129,7 @@ GEM ...@@ -164,7 +129,7 @@ GEM
font-awesome-sass-rails (3.0.0.1) font-awesome-sass-rails (3.0.0.1)
railties (>= 3.1.1) railties (>= 3.1.1)
sass-rails (>= 3.1.1) sass-rails (>= 3.1.1)
foreman (0.60.2) foreman (0.61.0)
thor (>= 0.13.6) thor (>= 0.13.6)
gemoji (1.2.1) gemoji (1.2.1)
gherkin-ruby (0.2.1) gherkin-ruby (0.2.1)
...@@ -174,7 +139,16 @@ GEM ...@@ -174,7 +139,16 @@ GEM
escape_utils (~> 0.2.3) escape_utils (~> 0.2.3)
mime-types (~> 1.19) mime-types (~> 1.19)
pygments.rb (>= 0.2.13) pygments.rb (>= 0.2.13)
github-markup (0.7.4) github-markup (0.7.5)
gitlab-grack (1.0.0)
rack (~> 1.4.1)
gitlab-grit (1.0.0)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3.6)
gitlab-pygments.rb (0.3.2)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
gitlab_meta (5.0) gitlab_meta (5.0)
gitlab_omniauth-ldap (1.0.2) gitlab_omniauth-ldap (1.0.2)
net-ldap (~> 0.2.2) net-ldap (~> 0.2.2)
...@@ -182,17 +156,22 @@ GEM ...@@ -182,17 +156,22 @@ GEM
pyu-ruby-sasl (~> 0.0.3.1) pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1) rubyntlm (~> 0.1.1)
gitlab_yaml_db (1.0.0) gitlab_yaml_db (1.0.0)
grape (0.3.1) gon (4.0.2)
grape (0.3.2)
activesupport activesupport
grape-entity (~> 0.2.0) builder
hashie (~> 1.2) hashie (>= 1.2.0)
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
multi_xml multi_xml (>= 0.5.2)
rack rack
rack-accept rack-accept
rack-mount rack-mount
virtus virtus
grape-entity (0.2.0) grape-entity (0.2.0)
activesupport
multi_json (>= 1.3.2)
grit_ext (0.6.2)
charlock_holmes (~> 0.6.9)
growl (1.0.3) growl (1.0.3)
guard (1.5.4) guard (1.5.4)
listen (>= 0.4.2) listen (>= 0.4.2)
...@@ -205,20 +184,21 @@ GEM ...@@ -205,20 +184,21 @@ GEM
guard-spinach (0.0.2) guard-spinach (0.0.2)
guard (>= 1.1) guard (>= 1.1)
spinach spinach
haml (3.1.7) haml (4.0.0)
haml-rails (0.3.5) tilt
haml-rails (0.4)
actionpack (>= 3.1, < 4.1) actionpack (>= 3.1, < 4.1)
activesupport (>= 3.1, < 4.1) activesupport (>= 3.1, < 4.1)
haml (~> 3.1) haml (>= 3.1, < 4.1)
railties (>= 3.1, < 4.1) railties (>= 3.1, < 4.1)
hashie (1.2.0) hashie (1.2.0)
hike (1.2.1) hike (1.2.1)
http_parser.rb (0.5.3) http_parser.rb (0.5.3)
httparty (0.9.0) httparty (0.10.2)
multi_json (~> 1.0) multi_json (~> 1.0)
multi_xml multi_xml (>= 0.5.2)
httpauth (0.2.0) httpauth (0.2.0)
i18n (0.6.1) i18n (0.6.4)
journey (1.0.4) journey (1.0.4)
jquery-atwho-rails (0.1.7) jquery-atwho-rails (0.1.7)
jquery-rails (2.1.3) jquery-rails (2.1.3)
...@@ -233,7 +213,7 @@ GEM ...@@ -233,7 +213,7 @@ GEM
kaminari (0.14.1) kaminari (0.14.1)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
kgio (2.7.4) kgio (2.8.0)
launchy (2.1.2) launchy (2.1.2)
addressable (~> 2.3) addressable (~> 2.3)
letter_opener (1.0.0) letter_opener (1.0.0)
...@@ -250,22 +230,22 @@ GEM ...@@ -250,22 +230,22 @@ GEM
modernizr (2.6.2) modernizr (2.6.2)
sprockets (~> 2.0) sprockets (~> 2.0)
multi_json (1.6.1) multi_json (1.6.1)
multi_xml (0.5.1) multi_xml (0.5.3)
multipart-post (1.1.5) multipart-post (1.2.0)
mysql2 (0.3.11) mysql2 (0.3.11)
net-ldap (0.2.2) net-ldap (0.2.2)
nokogiri (1.5.6) nokogiri (1.5.6)
oauth (0.4.7) oauth (0.4.7)
oauth2 (0.8.0) oauth2 (0.8.1)
faraday (~> 0.8) faraday (~> 0.8)
httpauth (~> 0.1) httpauth (~> 0.1)
jwt (~> 0.1.4) jwt (~> 0.1.4)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.2) rack (~> 1.2)
omniauth (1.1.1) omniauth (1.1.3)
hashie (~> 1.2) hashie (~> 1.2)
rack rack
omniauth-github (1.0.3) omniauth-github (1.1.0)
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1) omniauth-oauth2 (~> 1.1)
omniauth-google-oauth2 (0.1.13) omniauth-google-oauth2 (0.1.13)
...@@ -293,6 +273,9 @@ GEM ...@@ -293,6 +273,9 @@ GEM
coderay (~> 1.0.5) coderay (~> 1.0.5)
method_source (~> 0.8) method_source (~> 0.8)
slop (~> 3.3.1) slop (~> 3.3.1)
pygments.rb (0.4.2)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
quiet_assets (1.0.1) quiet_assets (1.0.1)
railties (~> 3.1) railties (~> 3.1)
...@@ -305,7 +288,7 @@ GEM ...@@ -305,7 +288,7 @@ GEM
rack (>= 1.1.3) rack (>= 1.1.3)
rack-mount (0.8.3) rack-mount (0.8.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-protection (1.3.2) rack-protection (1.4.0)
rack rack
rack-ssl (1.3.3) rack-ssl (1.3.3)
rack rack
...@@ -342,12 +325,13 @@ GEM ...@@ -342,12 +325,13 @@ GEM
rb-fsevent (0.9.2) rb-fsevent (0.9.2)
rb-inotify (0.8.8) rb-inotify (0.8.8)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rdoc (3.12.1) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
redcarpet (2.2.2) redcarpet (2.2.2)
redis (3.0.2) redis (3.0.2)
redis-namespace (1.2.1) redis-namespace (1.2.1)
redis (~> 3.0.0) redis (~> 3.0.0)
request_store (1.0.5)
rspec (2.12.0) rspec (2.12.0)
rspec-core (~> 2.12.0) rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0) rspec-expectations (~> 2.12.0)
...@@ -381,11 +365,11 @@ GEM ...@@ -381,11 +365,11 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
websocket (~> 1.0.4) websocket (~> 1.0.4)
settingslogic (2.0.8) settingslogic (2.0.9)
sexp_processor (4.1.3) sexp_processor (4.1.3)
shoulda-matchers (1.3.0) shoulda-matchers (1.3.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
sidekiq (2.7.3) sidekiq (2.7.5)
celluloid (~> 0.12.0) celluloid (~> 0.12.0)
connection_pool (~> 1.0) connection_pool (~> 1.0)
multi_json (~> 1) multi_json (~> 1)
...@@ -395,9 +379,9 @@ GEM ...@@ -395,9 +379,9 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
simplecov-html (~> 0.7.1) simplecov-html (~> 0.7.1)
simplecov-html (0.7.1) simplecov-html (0.7.1)
sinatra (1.3.3) sinatra (1.3.5)
rack (~> 1.3, >= 1.3.6) rack (~> 1.4)
rack-protection (~> 1.2) rack-protection (~> 1.3)
tilt (~> 1.3, >= 1.3.3) tilt (~> 1.3, >= 1.3.3)
six (0.2.0) six (0.2.0)
slim (1.3.6) slim (1.3.6)
...@@ -416,7 +400,7 @@ GEM ...@@ -416,7 +400,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
stamp (0.3.0) stamp (0.5.0)
state_machine (1.1.2) state_machine (1.1.2)
temple (0.5.5) temple (0.5.5)
test_after_commit (0.0.1) test_after_commit (0.0.1)
...@@ -427,7 +411,7 @@ GEM ...@@ -427,7 +411,7 @@ GEM
eventmachine (>= 0.12.6) eventmachine (>= 0.12.6)
rack (>= 1.0.0) rack (>= 1.0.0)
thor (0.17.0) thor (0.17.0)
tilt (1.3.3) tilt (1.3.4)
timers (1.1.0) timers (1.1.0)
treetop (1.4.12) treetop (1.4.12)
polyglot polyglot
...@@ -436,12 +420,13 @@ GEM ...@@ -436,12 +420,13 @@ GEM
uglifier (1.3.0) uglifier (1.3.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2) multi_json (~> 1.0, >= 1.0.2)
unicorn (4.4.0) unicorn (4.6.2)
kgio (~> 2.6) kgio (~> 2.6)
rack rack
raindrops (~> 0.7) raindrops (~> 0.7)
virtus (0.5.2) virtus (0.5.4)
backports (~> 2.6.1) backports (~> 2.6.1)
descendants_tracker (~> 0.0.1)
warden (1.2.1) warden (1.2.1)
rack (>= 1.0) rack (>= 1.0)
webmock (1.9.0) webmock (1.9.0)
...@@ -463,14 +448,15 @@ DEPENDENCIES ...@@ -463,14 +448,15 @@ DEPENDENCIES
binding_of_caller binding_of_caller
bootstrap-sass (= 2.2.1.1) bootstrap-sass (= 2.2.1.1)
capybara (= 2.0.2) capybara (= 2.0.2)
carrierwave (~> 0.7.1) carrierwave
chosen-rails (= 0.9.8) chosen-rails (= 0.9.8)
coffee-rails (~> 3.2.2) coffee-rails (~> 3.2.2)
colored colored
database_cleaner! database_cleaner
devise (~> 2.1.0) devise
draper (~> 0.18.0) draper
email_spec email_spec
enumerize
factory_girl_rails factory_girl_rails
ffaker ffaker
font-awesome-sass-rails (~> 3.0.0) font-awesome-sass-rails (~> 3.0.0)
...@@ -479,18 +465,20 @@ DEPENDENCIES ...@@ -479,18 +465,20 @@ DEPENDENCIES
git git
github-linguist (~> 2.3.4) github-linguist (~> 2.3.4)
github-markup (~> 0.7.4) github-markup (~> 0.7.4)
gitlab-grack (~> 1.0.0)
gitlab-grit (~> 1.0.0)
gitlab-pygments.rb (~> 0.3.2)
gitlab_meta (= 5.0) gitlab_meta (= 5.0)
gitlab_omniauth-ldap (= 1.0.2) gitlab_omniauth-ldap (= 1.0.2)
gitlab_yaml_db (= 1.0.0) gitlab_yaml_db (= 1.0.0)
grack! gon
grape (~> 0.3.1) grape (~> 0.3.1)
grape-entity (~> 0.2.0) grape-entity (~> 0.2.0)
grit! grit_ext (~> 0.6.2)
grit_ext!
growl growl
guard-rspec guard-rspec
guard-spinach guard-spinach
haml-rails (~> 0.3.5) haml-rails
httparty httparty
jquery-atwho-rails (= 0.1.7) jquery-atwho-rails (= 0.1.7)
jquery-rails (= 2.1.3) jquery-rails (= 2.1.3)
...@@ -500,14 +488,13 @@ DEPENDENCIES ...@@ -500,14 +488,13 @@ DEPENDENCIES
letter_opener letter_opener
modernizr (= 2.6.2) modernizr (= 2.6.2)
mysql2 mysql2
omniauth (~> 1.1.1) omniauth (~> 1.1.3)
omniauth-github omniauth-github
omniauth-google-oauth2 omniauth-google-oauth2
omniauth-twitter omniauth-twitter
pg pg
poltergeist (= 1.1.0) poltergeist (= 1.1.0)
pry pry
pygments.rb!
quiet_assets (~> 1.0.1) quiet_assets (~> 1.0.1)
rack-mini-profiler rack-mini-profiler
rails (= 3.2.12) rails (= 3.2.12)
...@@ -523,7 +510,7 @@ DEPENDENCIES ...@@ -523,7 +510,7 @@ DEPENDENCIES
seed-fu seed-fu
settingslogic settingslogic
shoulda-matchers (= 1.3.0) shoulda-matchers (= 1.3.0)
sidekiq (= 2.7.3) sidekiq
simplecov simplecov
sinatra sinatra
six six
...@@ -535,5 +522,5 @@ DEPENDENCIES ...@@ -535,5 +522,5 @@ DEPENDENCIES
therubyracer therubyracer
thin thin
uglifier (~> 1.3.0) uglifier (~> 1.3.0)
unicorn (~> 4.4.0) unicorn
webmock webmock
# Welcome to GitLab! Self hosted Git management software ## GitLab: self hosted Git management software
![logo](https://raw.github.com/gitlabhq/gitlabhq/master/public/gitlab_logo.png)
## Badges: ### GitLab allows you to
* keep your code secure on your own server
* manage repositories, users and access permissions
* communicate though issues, line-comments and wiki's
* perform code reviews with merge requests
### GitLab is
* powered by Ruby on Rails
* completely free and open source (MIT license)
* used by 10.000 organization to keep their code secure
### Code status
* [![build status](http://ci.gitlab.org/projects/1/status?ref=master)](http://ci.gitlab.org/projects/1?ref=master) ci.gitlab.org (master branch)
* [![build status](https://secure.travis-ci.org/gitlabhq/gitlabhq.png)](https://travis-ci.org/gitlabhq/gitlabhq) travis-ci.org (master branch)
* [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.png)](https://codeclimate.com/github/gitlabhq/gitlabhq)
* master: travis-ci.org [![build status](https://secure.travis-ci.org/gitlabhq/gitlabhq.png)](https://travis-ci.org/gitlabhq/gitlabhq)a
* master: ci.gitlab.org [![CI](http://ci.gitlab.org/projects/1/status?ref=master)](http://ci.gitlab.org/projects/1?ref=master)
* [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/gitlabhq/gitlabhq)
* [![Dependency Status](https://gemnasium.com/gitlabhq/gitlabhq.png)](https://gemnasium.com/gitlabhq/gitlabhq) * [![Dependency Status](https://gemnasium.com/gitlabhq/gitlabhq.png)](https://gemnasium.com/gitlabhq/gitlabhq)
GitLab is a free project and repository management application ### Resources
* GitLab.org community site: [Homepage](http://gitlab.org) [Screenshots](http://gitlab.org/screenshots/) [Blog](http://blog.gitlab.org/) [Demo](http://demo.gitlabhq.com/users/sign_in)
## Application details * GitLab.com: [Homepage](http://blog.gitlab.com/) [Hosted pricing](http://blog.gitlab.com/pricing/) [Services](http://blog.gitlab.com/services/) [Blog](http://blog.gitlab.com/blog/)
* powered by Ruby on Rails * GitLab CI: [Readme](https://github.com/gitlabhq/gitlab-ci/blob/master/README.md) of the GitLab open-source continuous integration server
* its completely free and open source
* distributed under the MIT License
## Requirements ### Requirements
* Ubuntu/Debian * Ubuntu/Debian*
* ruby 1.9.3+ * ruby 1.9.3+
* MySQL * MySQL
* git * git
* gitlab-shell * gitlab-shell
* redis * redis
## Install * More details are in the [requirements doc](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/requirements.md)
### Installation
You can either follow the "ordinary" Installation guide to install it on a machine or use the Vagrant virtual machine. The Installation guide is recommended to set up a production server. The Vargrant virtual machine is recommended for development since it makes it much easier to set up all the dependencies for integration testing.
* [Installation guide for latest stable release](https://github.com/gitlabhq/gitlabhq/blob/4-2-stable/doc/install/installation.md)
* [Installation guide for the current master branch](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md)
* [Vagrant virtual machine](https://github.com/gitlabhq/gitlab-vagrant-vm)
### Starting
1. The Installation guide contains instructions to download an init script and run that on boot. With the init script you can also start GitLab with:
sudo service gitlab start
or
sudo /etc/init.d/gitlab restart
2. Start it with [Foreman](https://github.com/ddollar/foreman) in development model
bundle exec foreman start -p 3000
3. Start it manually in development mode
bundle exec rails s
bundle exec rake sidekiq:start
### Running the tests
* Seed the database with
bundle exec rake db:setup RAILS_ENV=test
bundle exec rake db:seed_fu RAILS_ENV=test
* Run all tests
bundle exec rake gitlab:test
* Rspec unit and functional tests
bundle exec rake spec
* Spinach integration tests
bundle exec rake spinach
### Getting help
* [Troubleshooting guide](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide)
* [Support forum](https://groups.google.com/forum/#!forum/gitlabhq)
* [Feedback and suggestions forum](http://gitlab.uservoice.com/forums/176466-general)
* [Paid support](http://blog.gitlab.com/support/)
* [Paid services](http://blog.gitlab.com/services/)
### New versions and the API
Each month on the 22th a new version is released together with an upgrade guide.
* [Upgrade guides](https://github.com/gitlabhq/gitlabhq/wiki)
* [Roadmap](https://github.com/gitlabhq/gitlabhq/blob/master/ROADMAP.md)
### Other documentation
* [GitLab API](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/README.md)
* [Rake tasks](https://github.com/gitlabhq/gitlabhq/tree/master/doc/raketasks)
* [GitLab recipes](https://github.com/gitlabhq/gitlab-recipes)
### Getting in touch
Checkout [wiki](https://github.com/gitlabhq/gitlabhq/wiki) pages for installation information, migration, etc. * [Contributing guide](https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md)
## [Community](http://gitlab.org/community/) * [Core team](https://github.com/gitlabhq?tab=members)
## [Contact](http://gitlab.org/contact/) * [Contributors](https://github.com/gitlabhq/gitlabhq/graphs/contributors)
## Contribute * [Leader](https://github.com/randx)
[Developer Guide](https://github.com/gitlabhq/gitlabhq/wiki/Developer-Guide) * [Contact page](http://gitlab.org/contact/)
Want to help - send a pull request.
We'll accept good pull requests.
...@@ -4,9 +4,4 @@ ...@@ -4,9 +4,4 @@
* Replace gitolite with gitlab-shell * Replace gitolite with gitlab-shell
* Usability improvements * Usability improvements
* Notification improvements * Notification improvements
\ No newline at end of file
### v4.2 February 22
* Teams
Copyright (c) 2010, Jan Gerner (post@yanone.de)
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
...@@ -132,17 +132,31 @@ ...@@ -132,17 +132,31 @@
}); });
} else if (c.space < this.commits[i].space) { } else if (c.space < this.commits[i].space) {
r.path([ if (y == psy) {
"M", x - 5, y, r.path([
"l-5-2,0,4,5,-2", "M", x - 5, y,
"L", x - 10, y, "l-5,-2,0,4,5,-2",
"L", x - 15, psy, "L", x - 10, y,
"L", cx + 5, psy, "L", x - 15, psy,
"L", cx, cy]) "L", cx + 5, psy,
.attr({ "L", cx, cy])
stroke: this.colors[this.commits[i].space], .attr({
"stroke-width": 2 stroke: this.colors[this.commits[i].space],
}); "stroke-width": 2
});
} else {
r.path([
"M", x - 3, y - 6,
"l-4,-3,4,-2,0,5",
"L", x - 5, y - 10,
"L", x - 10, psy,
"L", cx + 5, psy,
"L", cx, cy])
.attr({
stroke: this.colors[this.commits[i].space],
"stroke-width": 2
});
}
} else { } else {
r.path([ r.path([
"M", x - 3, y + 6, "M", x - 3, y + 6,
...@@ -306,15 +320,16 @@ ...@@ -306,15 +320,16 @@
}(this); }(this);
Raphael.fn.commitTooltip = function(x, y, commit){ Raphael.fn.commitTooltip = function(x, y, commit){
var nameText, idText, messageText var icon, nameText, idText, messageText
, boxWidth = 300 , boxWidth = 300
, boxHeight = 200; , boxHeight = 200;
nameText = this.text(x, y + 10, commit.author.name); icon = this.image(commit.author.icon, x, y, 20, 20);
nameText = this.text(x + 25, y + 10, commit.author.name);
idText = this.text(x, y + 35, commit.id); idText = this.text(x, y + 35, commit.id);
messageText = this.text(x, y + 50, commit.message); messageText = this.text(x, y + 50, commit.message);
textSet = this.set(nameText, idText, messageText).attr({ textSet = this.set(icon, nameText, idText, messageText).attr({
"text-anchor": "start", "text-anchor": "start",
"font": "12px Monaco, monospace" "font": "12px Monaco, monospace"
}); });
......
...@@ -54,10 +54,10 @@ $ -> ...@@ -54,10 +54,10 @@ $ ->
$(@).parents('form').submit() $(@).parents('form').submit()
# Flash # Flash
if (flash = $("#flash-container")).length > 0 if (flash = $(".flash-container")).length > 0
flash.click -> $(@).slideUp("slow") flash.click -> $(@).fadeOut()
flash.slideDown "slow" flash.show()
setTimeout (-> flash.slideUp("slow")), 3000 setTimeout (-> flash.fadeOut()), 3000
# Disable form buttons while a form is submitting # Disable form buttons while a form is submitting
$('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) -> $('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->
......
...@@ -18,3 +18,18 @@ $ -> ...@@ -18,3 +18,18 @@ $ ->
# Ref switcher # Ref switcher
$('.project-refs-select').on 'change', -> $('.project-refs-select').on 'change', ->
$(@).parents('form').submit() $(@).parents('form').submit()
$('#project_issues_enabled').change ->
if ($(this).is(':checked') == true)
$('#project_issues_tracker').removeAttr('disabled')
else
$('#project_issues_tracker').attr('disabled', 'disabled')
$('#project_issues_tracker').change()
$('#project_issues_tracker').change ->
if ($(this).val() == gon.default_issues_tracker || $(this).is(':disabled'))
$('#project_issues_tracker_id').attr('disabled', 'disabled')
else
$('#project_issues_tracker_id').removeAttr('disabled')
...@@ -67,27 +67,17 @@ table a code { ...@@ -67,27 +67,17 @@ table a code {
} }
/** FLASH message **/ /** FLASH message **/
#flash-container { .flash-container {
height: 50px;
position: fixed;
z-index: 10001;
top: 0px;
width: 100%;
margin-bottom: 15px;
overflow: hidden;
background: white;
cursor: pointer;
border-bottom: 1px solid #ccc;
text-align: center;
display: none; display: none;
.alert {
cursor: pointer;
margin: 0;
text-align: center;
border-radius: 0;
h4 { span {
color: #666; font-size: 14px;
font-size: 18px; }
line-height: 38px;
padding-top: 5px;
margin: 2px;
font-weight: normal;
} }
} }
...@@ -203,10 +193,6 @@ input[type=text] { ...@@ -203,10 +193,6 @@ input[type=text] {
} }
} }
input.git_clone_url {
width: 325px;
}
.merge-request-form-holder { .merge-request-form-holder {
select { select {
width: 300px; width: 300px;
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
border-color: #DDD; border-color: #DDD;
} }
.well { padding: 15px; }
/** HELPERS **/ /** HELPERS **/
.nothing_here_message { .nothing_here_message {
text-align: center; text-align: center;
......
@font-face{
font-family: Yanone;
src: font-url('YanoneKaffeesatz-Light.ttf');
}
/** Typo **/ /** Typo **/
$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace; $monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace;
...@@ -70,8 +70,19 @@ ...@@ -70,8 +70,19 @@
@mixin header-font { @mixin header-font {
color: $style_color; color: $style_color;
text-shadow: 0 1px 1px #FFF; text-shadow: 0 1px 1px #FFF;
font-family: 'Yanone', sans-serif; font-size: 18px;
font-size: 24px; line-height: 42px;
line-height: 36px;
font-weight: normal; font-weight: normal;
letter-spacing: -1px;
}
@mixin md-typography {
code { padding: 0 4px; }
p { font-size: 13px; }
h1 { font-size: 26px; line-height: 40px; margin: 10px 0;}
h2 { font-size: 22px; line-height: 40px; margin: 10px 0;}
h3 { font-size: 18px; line-height: 40px; margin: 10px 0;}
h4 { font-size: 16px; line-height: 20px; margin: 10px 0;}
h5 { font-size: 14px; line-height: 20px; margin: 10px 0;}
h6 { font-size: 12px; line-height: 20px; margin: 10px 0;}
} }
...@@ -87,16 +87,15 @@ a:focus { ...@@ -87,16 +87,15 @@ a:focus {
* *
*/ */
.wiki { .wiki {
@include md-typography;
font-size: 13px; font-size: 13px;
line-height: 20px;
code { padding: 0 4px; }
p { font-size: 13px; }
h1 { font-size: 32px; line-height: 40px; margin: 10px 0;}
h2 { font-size: 26px; line-height: 40px; margin: 10px 0;}
h3 { font-size: 22px; line-height: 40px; margin: 10px 0;}
h4 { font-size: 18px; line-height: 20px; margin: 10px 0;}
h5 { font-size: 14px; line-height: 20px; margin: 10px 0;}
h6 { font-size: 12px; line-height: 20px; margin: 10px 0;}
.white .highlight pre { background: #f5f5f5; } .white .highlight pre { background: #f5f5f5; }
ul { margin: 0 0 9px 25px !important; } ul { margin: 0 0 9px 25px !important; }
} }
.md {
@include md-typography;
}
.black .highlight { .black .highlight {
background-color: #333;
pre { pre {
background-color: #333;
color: #eee; color: #eee;
background: inherit;
} }
.hll { display: block; background-color: darken($hover, 65%) } .hll { display: block; background-color: darken($hover, 65%) }
......
...@@ -100,8 +100,9 @@ ...@@ -100,8 +100,9 @@
} }
} }
.line_content { .line_content {
display: block;
white-space: pre; white-space: pre;
height: 14px; height: 18px;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
border: none; border: none;
......
...@@ -48,15 +48,13 @@ ...@@ -48,15 +48,13 @@
color: #666; color: #666;
} }
.event-note { .event-note {
padding-top: 5px;
padding-left: 5px;
display: inline-block;
color: #555; color: #555;
margin-top: 5px;
margin-left: 40px;
.note-file-attach { .note-file-attach {
margin-left: -25px;
float: left;
.note-image-attach { .note-image-attach {
margin-top: 4px;
margin-left: 0px; margin-left: 0px;
max-width: 200px; max-width: 200px;
} }
...@@ -66,8 +64,8 @@ ...@@ -66,8 +64,8 @@
color: #777; color: #777;
float: left; float: left;
font-size: 16px; font-size: 16px;
line-height: 18px; line-height: 16px;
margin: 5px; margin-right: 5px;
} }
} }
.avatar { .avatar {
......
...@@ -67,7 +67,7 @@ header { ...@@ -67,7 +67,7 @@ header {
position: relative; position: relative;
float: left; float: left;
margin: 0; margin: 0;
margin-left: 15px; margin-left: 10px;
@include header-font; @include header-font;
} }
......
/* Login Page */ /* Login Page */
body.login-page{ body.login-page{
padding-top: 7%; background: #EEE;
background: #666; .container .content { padding-top: 5%; }
} }
.login-box{ .login-box{
......
...@@ -83,6 +83,7 @@ ul.notes { ...@@ -83,6 +83,7 @@ ul.notes {
margin-top: -20px; margin-top: -20px;
} }
.note-body { .note-body {
@include md-typography;
margin-left: 45px; margin-left: 45px;
} }
.note-header { .note-header {
......
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
border: 1px solid #BBB; border: 1px solid #BBB;
box-shadow: none; box-shadow: none;
margin-left: -1px; margin-left: -1px;
background: #FFF;
} }
} }
......
...@@ -7,12 +7,13 @@ class IssuesListContext < BaseContext ...@@ -7,12 +7,13 @@ class IssuesListContext < BaseContext
@issues = case params[:status] @issues = case params[:status]
when issues_filter[:all] then @project.issues when issues_filter[:all] then @project.issues
when issues_filter[:closed] then @project.issues.closed when issues_filter[:closed] then @project.issues.closed
when issues_filter[:to_me] then @project.issues.opened.assigned(current_user) when issues_filter[:to_me] then @project.issues.assigned(current_user)
when issues_filter[:by_me] then @project.issues.authored(current_user)
else @project.issues.opened else @project.issues.opened
end end
@issues = @issues.tagged_with(params[:label_name]) if params[:label_name].present? @issues = @issues.tagged_with(params[:label_name]) if params[:label_name].present?
@issues = @issues.includes(:author, :project).order("updated_at") @issues = @issues.includes(:author, :project)
# Filter by specific assignee_id (or lack thereof)? # Filter by specific assignee_id (or lack thereof)?
if params[:assignee_id].present? if params[:assignee_id].present?
......
class Admin::Teams::MembersController < Admin::Teams::ApplicationController class Admin::Teams::MembersController < Admin::Teams::ApplicationController
def new def new
@users = User.potential_team_members(user_team) @users = User.potential_team_members(user_team)
@users = UserDecorator.decorate @users @users = UserDecorator.decorate_collection @users
end end
def create def create
......
...@@ -45,7 +45,7 @@ class Admin::UsersController < Admin::ApplicationController ...@@ -45,7 +45,7 @@ class Admin::UsersController < Admin::ApplicationController
end end
def unblock def unblock
if admin_user.update_attribute(:blocked, false) if admin_user.activate
redirect_to :back, alert: "Successfully unblocked" redirect_to :back, alert: "Successfully unblocked"
else else
redirect_to :back, alert: "Error occured. User was not unblocked" redirect_to :back, alert: "Error occured. User was not unblocked"
......
...@@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base ...@@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base
before_filter :add_abilities before_filter :add_abilities
before_filter :dev_tools if Rails.env == 'development' before_filter :dev_tools if Rails.env == 'development'
before_filter :default_headers before_filter :default_headers
before_filter :add_gon_variables
protect_from_forgery protect_from_forgery
...@@ -29,7 +30,7 @@ class ApplicationController < ActionController::Base ...@@ -29,7 +30,7 @@ class ApplicationController < ActionController::Base
end end
def reject_blocked! def reject_blocked!
if current_user && current_user.blocked if current_user && current_user.blocked?
sign_out current_user sign_out current_user
flash[:alert] = "Your account is blocked. Retry when an admin unblock it." flash[:alert] = "Your account is blocked. Retry when an admin unblock it."
redirect_to new_user_session_path redirect_to new_user_session_path
...@@ -37,7 +38,7 @@ class ApplicationController < ActionController::Base ...@@ -37,7 +38,7 @@ class ApplicationController < ActionController::Base
end end
def after_sign_in_path_for resource def after_sign_in_path_for resource
if resource.is_a?(User) && resource.respond_to?(:blocked) && resource.blocked if resource.is_a?(User) && resource.respond_to?(:blocked?) && resource.blocked?
sign_out resource sign_out resource
flash[:alert] = "Your account is blocked. Retry when an admin unblock it." flash[:alert] = "Your account is blocked. Retry when an admin unblock it."
new_user_session_path new_user_session_path
...@@ -148,4 +149,8 @@ class ApplicationController < ActionController::Base ...@@ -148,4 +149,8 @@ class ApplicationController < ActionController::Base
headers['X-Frame-Options'] = 'DENY' headers['X-Frame-Options'] = 'DENY'
headers['X-XSS-Protection'] = '1; mode=block' headers['X-XSS-Protection'] = '1; mode=block'
end end
def add_gon_variables
gon.default_issues_tracker = Project.issues_tracker.default_value
end
end end
...@@ -13,7 +13,7 @@ class CommitsController < ProjectResourceController ...@@ -13,7 +13,7 @@ class CommitsController < ProjectResourceController
@limit, @offset = (params[:limit] || 40), (params[:offset] || 0) @limit, @offset = (params[:limit] || 40), (params[:offset] || 0)
@commits = @repo.commits(@ref, @path, @limit, @offset) @commits = @repo.commits(@ref, @path, @limit, @offset)
@commits = CommitDecorator.decorate(@commits) @commits = CommitDecorator.decorate_collection(@commits)
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
......
...@@ -16,7 +16,7 @@ class CompareController < ProjectResourceController ...@@ -16,7 +16,7 @@ class CompareController < ProjectResourceController
@refs_are_same = result[:same] @refs_are_same = result[:same]
@line_notes = [] @line_notes = []
@commits = CommitDecorator.decorate(@commits) @commits = CommitDecorator.decorate_collection(@commits)
end end
def create def create
......
class GraphController < ProjectResourceController class GraphController < ProjectResourceController
include ExtractsPath include ExtractsPath
include ApplicationHelper
# Authorize # Authorize
before_filter :authorize_read_project! before_filter :authorize_read_project!
...@@ -20,7 +21,10 @@ class GraphController < ProjectResourceController ...@@ -20,7 +21,10 @@ class GraphController < ProjectResourceController
respond_to do |format| respond_to do |format|
format.html format.html
format.json do format.json do
graph = Gitlab::Graph::JsonBuilder.new(project, @ref, @commit) graph = Graph::JsonBuilder.new(project, @ref, @commit)
graph.commits.each do |c|
c.icon = gravatar_icon(c.author.email)
end
render :json => graph.to_json render :json => graph.to_json
end end
end end
......
...@@ -81,7 +81,8 @@ class MergeRequestsController < ProjectResourceController ...@@ -81,7 +81,8 @@ class MergeRequestsController < ProjectResourceController
end end
def automerge def automerge
return access_denied! unless can?(current_user, :accept_mr, @project) return access_denied! unless allowed_to_merge?
if @merge_request.opened? && @merge_request.can_be_merged? if @merge_request.opened? && @merge_request.can_be_merged?
@merge_request.should_remove_source_branch = params[:should_remove_source_branch] @merge_request.should_remove_source_branch = params[:should_remove_source_branch]
@merge_request.automerge!(current_user) @merge_request.automerge!(current_user)
...@@ -142,6 +143,19 @@ class MergeRequestsController < ProjectResourceController ...@@ -142,6 +143,19 @@ class MergeRequestsController < ProjectResourceController
# Get commits from repository # Get commits from repository
# or from cache if already merged # or from cache if already merged
@commits = @merge_request.commits @commits = @merge_request.commits
@commits = CommitDecorator.decorate(@commits) @commits = CommitDecorator.decorate_collection(@commits)
@allowed_to_merge = allowed_to_merge?
@show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
end
def allowed_to_merge?
action = if project.protected_branch?(@merge_request.target_branch)
:push_code_to_protected_branches
else
:push_code
end
can?(current_user, action, @project)
end end
end end
...@@ -32,7 +32,7 @@ class MilestonesController < ProjectResourceController ...@@ -32,7 +32,7 @@ class MilestonesController < ProjectResourceController
def show def show
@issues = @milestone.issues @issues = @milestone.issues
@users = UserDecorator.decorate(@milestone.participants) @users = UserDecorator.decorate_collection(@milestone.participants)
@merge_requests = @milestone.merge_requests @merge_requests = @milestone.merge_requests
respond_to do |format| respond_to do |format|
......
require Rails.root.join('lib', 'gitlab', 'graph', 'json_builder')
class ProjectsController < ProjectResourceController class ProjectsController < ProjectResourceController
skip_before_filter :project, only: [:new, :create] skip_before_filter :project, only: [:new, :create]
skip_before_filter :repository, only: [:new, :create] skip_before_filter :repository, only: [:new, :create]
......
...@@ -8,7 +8,7 @@ class Teams::MembersController < Teams::ApplicationController ...@@ -8,7 +8,7 @@ class Teams::MembersController < Teams::ApplicationController
def new def new
@users = User.potential_team_members(user_team) @users = User.potential_team_members(user_team)
@users = UserDecorator.decorate @users @users = UserDecorator.decorate_collection @users
end end
def create def create
......
class ApplicationDecorator < Draper::Base class ApplicationDecorator < Draper::Decorator
delegate_all
# Lazy Helpers # Lazy Helpers
# PRO: Call Rails helpers without the h. proxy # PRO: Call Rails helpers without the h. proxy
# ex: number_to_currency(model.price) # ex: number_to_currency(model.price)
# CON: Add a bazillion methods into your decorator's namespace # CON: Add a bazillion methods into your decorator's namespace
# and probably sacrifice performance/memory # and probably sacrifice performance/memory
# #
# Enable them by uncommenting this line: # Enable them by uncommenting this line:
# lazy_helpers # lazy_helpers
# Shared Decorations # Shared Decorations
# Consider defining shared methods common to all your models. # Consider defining shared methods common to all your models.
# #
# Example: standardize the formatting of timestamps # Example: standardize the formatting of timestamps
# #
# def formatted_timestamp(time) # def formatted_timestamp(time)
# h.content_tag :span, time.strftime("%a %m/%d/%y"), # h.content_tag :span, time.strftime("%a %m/%d/%y"),
# class: 'timestamp' # class: 'timestamp'
# end # end
# #
# def created_at # def created_at
# formatted_timestamp(model.created_at) # formatted_timestamp(model.created_at)
# end # end
# #
# def updated_at # def updated_at
# formatted_timestamp(model.updated_at) # formatted_timestamp(model.updated_at)
# end # end
......
...@@ -164,7 +164,8 @@ module ApplicationHelper ...@@ -164,7 +164,8 @@ module ApplicationHelper
end end
def image_url(source) def image_url(source)
root_url + path_to_image(source) # prevent relative_root_path being added twice (it's part of root_url and path_to_image)
root_url.sub(/#{root_path}$/, path_to_image(source))
end end
alias_method :url_to_image, :image_url alias_method :url_to_image, :image_url
......
...@@ -27,6 +27,7 @@ module IssuesHelper ...@@ -27,6 +27,7 @@ module IssuesHelper
all: "all", all: "all",
closed: "closed", closed: "closed",
to_me: "assigned-to-me", to_me: "assigned-to-me",
by_me: "created-by-me",
open: "open" open: "open"
} }
end end
...@@ -40,4 +41,39 @@ module IssuesHelper ...@@ -40,4 +41,39 @@ module IssuesHelper
def issues_active_milestones def issues_active_milestones
@project.milestones.active.order("id desc").all @project.milestones.active.order("id desc").all
end end
def url_for_project_issues
return "" if @project.nil?
if @project.used_default_issues_tracker?
project_issues_filter_path(@project)
else
url = Settings[:issues_tracker][@project.issues_tracker]["project_url"]
url.gsub(':project_id', @project.id.to_s)
.gsub(':issues_tracker_id', @project.issues_tracker_id.to_s)
end
end
def url_for_issue(issue_id)
return "" if @project.nil?
if @project.used_default_issues_tracker?
url = project_issue_url project_id: @project, id: issue_id
else
url = Settings[:issues_tracker][@project.issues_tracker]["issues_url"]
url.gsub(':id', issue_id.to_s)
.gsub(':project_id', @project.id.to_s)
.gsub(':issues_tracker_id', @project.issues_tracker_id.to_s)
end
end
def title_for_issue(issue_id)
return "" if @project.nil?
if @project.used_default_issues_tracker? && issue = @project.issues.where(id: issue_id).first
issue.title
else
""
end
end
end end
...@@ -13,13 +13,15 @@ module TreeHelper ...@@ -13,13 +13,15 @@ module TreeHelper
tree += render partial: 'tree/tree_item', collection: folders, locals: {type: 'folder'} if folders.present? tree += render partial: 'tree/tree_item', collection: folders, locals: {type: 'folder'} if folders.present?
files.each do |f| files.each do |f|
if f.respond_to?(:url) html = if f.respond_to?(:url)
# Object is a Submodule # Object is a Submodule
tree += render partial: 'tree/submodule_item', object: f render partial: 'tree/submodule_item', object: f
else else
# Object is a Blob # Object is a Blob
tree += render partial: 'tree/tree_item', object: f, locals: {type: 'file'} render partial: 'tree/tree_item', object: f, locals: {type: 'file'}
end end
tree += html if html.present?
end end
tree.html_safe tree.html_safe
......
...@@ -91,7 +91,6 @@ class Ability ...@@ -91,7 +91,6 @@ class Ability
:admin_team_member, :admin_team_member,
:admin_merge_request, :admin_merge_request,
:admin_note, :admin_note,
:accept_mr,
:admin_wiki, :admin_wiki,
:admin_project :admin_project
] ]
......
require "grit"
module Graph
class Commit
include ActionView::Helpers::TagHelper
attr_accessor :time, :spaces, :refs, :parent_spaces, :icon
def initialize(commit)
@_commit = commit
@time = -1
@spaces = []
@parent_spaces = []
end
def method_missing(m, *args, &block)
@_commit.send(m, *args, &block)
end
def to_graph_hash
h = {}
h[:parents] = self.parents.collect do |p|
[p.id,0,0]
end
h[:author] = {
name: author.name,
email: author.email,
icon: icon
}
h[:time] = time
h[:space] = spaces.first
h[:parent_spaces] = parent_spaces
h[:refs] = refs.collect{|r|r.name}.join(" ") unless refs.nil?
h[:id] = sha
h[:date] = date
h[:message] = message
h
end
def add_refs(ref_cache, repo)
if ref_cache.empty?
repo.refs.each do |ref|
ref_cache[ref.commit.id] ||= []
ref_cache[ref.commit.id] << ref
end
end
@refs = ref_cache[@_commit.id] if ref_cache.include?(@_commit.id)
@refs ||= []
end
def space
if @spaces.size > 0
@spaces.first
else
0
end
end
end
end
require "grit"
module Graph
class JsonBuilder
attr_accessor :days, :commits, :ref_cache, :repo
def self.max_count
@max_count ||= 650
end
def initialize project, ref, commit
@project = project
@ref = ref
@commit = commit
@repo = project.repo
@ref_cache = {}
@commits = collect_commits
@days = index_commits
end
def to_json(*args)
{
days: @days.compact.map { |d| [d.day, d.strftime("%b")] },
commits: @commits.map(&:to_graph_hash)
}.to_json(*args)
end
protected
# Get commits from repository
#
def collect_commits
@commits = Grit::Commit.find_all(repo, nil, {date_order: true, max_count: self.class.max_count, skip: to_commit}).dup
# Decorate with app/models/commit.rb
@commits.map! { |commit| Commit.new(commit) }
# Decorate with lib/gitlab/graph/commit.rb
@commits.map! { |commit| Graph::Commit.new(commit) }
# add refs to each commit
@commits.each { |commit| commit.add_refs(ref_cache, repo) }
@commits
end
# Method is adding time and space on the
# list of commits. As well as returns date list
# corelated with time set on commits.
#
# @param [Array<Graph::Commit>] commits to index
#
# @return [Array<TimeDate>] list of commit dates corelated with time on commits
def index_commits
days, times = [], []
map = {}
commits.reverse.each_with_index do |c,i|
c.time = i
days[i] = c.committed_date
map[c.id] = c
times[i] = c
end
@_reserved = {}
days.each_index do |i|
@_reserved[i] = []
end
commits_sort_by_ref.each do |commit|
if map.include? commit.id then
place_chain(map[commit.id], map)
end
end
# find parent spaces for not overlap lines
times.each do |c|
c.parent_spaces.concat(find_free_parent_spaces(c, map, times))
end
days
end
# Skip count that the target commit is displayed in center.
def to_commit
commits = Grit::Commit.find_all(repo, nil, {date_order: true})
commit_index = commits.index do |c|
c.id == @commit.id
end
if commit_index && (self.class.max_count / 2 < commit_index) then
# get max index that commit is displayed in the center.
commit_index - self.class.max_count / 2
else
0
end
end
def commits_sort_by_ref
commits.sort do |a,b|
if include_ref?(a)
-1
elsif include_ref?(b)
1
else
b.committed_date <=> a.committed_date
end
end
end
def include_ref?(commit)
heads = commit.refs.select do |ref|
ref.is_a?(Grit::Head) or ref.is_a?(Grit::Remote) or ref.is_a?(Grit::Tag)
end
heads.map! do |head|
head.name
end
heads.include?(@ref)
end
def find_free_parent_spaces(commit, map, times)
spaces = []
commit.parents.each do |p|
if map.include?(p.id) then
parent = map[p.id]
range = if commit.time < parent.time then
commit.time..parent.time
else
parent.time..commit.time
end
space = if commit.space >= parent.space then
find_free_parent_space(range, parent.space, -1, commit.space, times)
else
find_free_parent_space(range, commit.space, -1, parent.space, times)
end
mark_reserved(range, space)
spaces << space
end
end
spaces
end
def find_free_parent_space(range, space_base, space_step, space_default, times)
if is_overlap?(range, times, space_default) then
find_free_space(range, space_step, space_base, space_default)
else
space_default
end
end
def is_overlap?(range, times, overlap_space)
range.each do |i|
if i != range.first &&
i != range.last &&
times[i].spaces.include?(overlap_space) then
return true;
end
end
false
end
# Add space mark on commit and its parents
#
# @param [Graph::Commit] the commit object.
# @param [Hash<String,Graph::Commit>] map of commits
def place_chain(commit, map, parent_time = nil)
leaves = take_left_leaves(commit, map)
if leaves.empty?
return
end
time_range = leaves.last.time..leaves.first.time
space_base = get_space_base(leaves, map)
space = find_free_space(time_range, 2, space_base)
leaves.each do |l|
l.spaces << space
# Also add space to parent
l.parents.each do |p|
if map.include?(p.id)
parent = map[p.id]
if parent.space > 0
parent.spaces << space
end
end
end
end
# and mark it as reserved
min_time = leaves.last.time
parents = leaves.last.parents.collect
parents.each do |p|
if map.include? p.id
parent = map[p.id]
if parent.time < min_time
min_time = parent.time
end
end
end
if parent_time.nil?
max_time = leaves.first.time
else
max_time = parent_time - 1
end
mark_reserved(min_time..max_time, space)
# Visit branching chains
leaves.each do |l|
parents = l.parents.collect.select{|p| map.include? p.id and map[p.id].space.zero?}
for p in parents
place_chain(map[p.id], map, l.time)
end
end
end
def get_space_base(leaves, map)
space_base = 1
if leaves.last.parents.size > 0
first_parent = leaves.last.parents.first
if map.include?(first_parent.id)
first_p = map[first_parent.id]
if first_p.space > 0
space_base = first_p.space
end
end
end
space_base
end
def mark_reserved(time_range, space)
for day in time_range
@_reserved[day].push(space)
end
end
def find_free_space(time_range, space_step, space_base = 1, space_default = nil)
space_default ||= space_base
reserved = []
for day in time_range
reserved += @_reserved[day]
end
reserved.uniq!
space = space_default
while reserved.include?(space) do
space += space_step
if space < space_base then
space_step *= -1
space = space_base + space_step
end
end
space
end
# Takes most left subtree branch of commits
# which don't have space mark yet.
#
# @param [Graph::Commit] the commit object.
# @param [Hash<String,Graph::Commit>] map of commits
#
# @return [Array<Graph::Commit>] list of branch commits
def take_left_leaves(commit, map)
leaves = []
leaves.push(commit) if commit.space.zero?
while true
return leaves if commit.parents.count.zero?
return leaves unless map.include? commit.parents.first.id
commit = map[commit.parents.first.id]
return leaves unless commit.space.zero?
leaves.push(commit)
end
end
end
end
...@@ -2,13 +2,14 @@ ...@@ -2,13 +2,14 @@
# #
# Table name: namespaces # Table name: namespaces
# #
# id :integer not null, primary key # id :integer not null, primary key
# name :string(255) not null # name :string(255) not null
# path :string(255) not null # description :string(255) not null
# owner_id :integer not null # path :string(255) not null
# created_at :datetime not null # owner_id :integer not null
# updated_at :datetime not null # created_at :datetime not null
# type :string(255) # updated_at :datetime not null
# type :string(255)
# #
class Group < Namespace class Group < Namespace
......
...@@ -30,6 +30,10 @@ class Issue < ActiveRecord::Base ...@@ -30,6 +30,10 @@ class Issue < ActiveRecord::Base
where('assignee_id = :user', user: user.id) where('assignee_id = :user', user: user.id)
end end
def authored(user)
where('author_id = :user', user: user.id)
end
def open_for(user) def open_for(user)
opened.assigned(user) opened.assigned(user)
end end
......
...@@ -2,17 +2,18 @@ ...@@ -2,17 +2,18 @@
# #
# Table name: namespaces # Table name: namespaces
# #
# id :integer not null, primary key # id :integer not null, primary key
# name :string(255) not null # name :string(255) not null
# path :string(255) not null # description :string(255) not null
# owner_id :integer not null # path :string(255) not null
# created_at :datetime not null # owner_id :integer not null
# updated_at :datetime not null # created_at :datetime not null
# type :string(255) # updated_at :datetime not null
# type :string(255)
# #
class Namespace < ActiveRecord::Base class Namespace < ActiveRecord::Base
attr_accessible :name, :path attr_accessible :name, :description, :path
has_many :projects, dependent: :destroy has_many :projects, dependent: :destroy
belongs_to :owner, class_name: "User" belongs_to :owner, class_name: "User"
...@@ -22,7 +23,7 @@ class Namespace < ActiveRecord::Base ...@@ -22,7 +23,7 @@ class Namespace < ActiveRecord::Base
length: { within: 0..255 }, length: { within: 0..255 },
format: { with: Gitlab::Regex.name_regex, format: { with: Gitlab::Regex.name_regex,
message: "only letters, digits, spaces & '_' '-' '.' allowed." } message: "only letters, digits, spaces & '_' '-' '.' allowed." }
validates :description, length: { within: 0..255 }
validates :path, uniqueness: true, presence: true, length: { within: 1..255 }, validates :path, uniqueness: true, presence: true, length: { within: 1..255 },
format: { with: Gitlab::Regex.path_regex, format: { with: Gitlab::Regex.path_regex,
message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" } message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
# creator_id :integer # creator_id :integer
# default_branch :string(255) # default_branch :string(255)
# issues_enabled :boolean default(TRUE), not null # issues_enabled :boolean default(TRUE), not null
# issues_tracker :string not null
# wall_enabled :boolean default(TRUE), not null # wall_enabled :boolean default(TRUE), not null
# merge_requests_enabled :boolean default(TRUE), not null # merge_requests_enabled :boolean default(TRUE), not null
# wiki_enabled :boolean default(TRUE), not null # wiki_enabled :boolean default(TRUE), not null
...@@ -22,11 +23,12 @@ require "grit" ...@@ -22,11 +23,12 @@ require "grit"
class Project < ActiveRecord::Base class Project < ActiveRecord::Base
include Gitolited include Gitolited
extend Enumerize
class TransferError < StandardError; end class TransferError < StandardError; end
attr_accessible :name, :path, :description, :default_branch, attr_accessible :name, :path, :description, :default_branch, :issues_tracker,
:issues_enabled, :wall_enabled, :merge_requests_enabled, :issues_enabled, :wall_enabled, :merge_requests_enabled, :issues_tracker_id,
:wiki_enabled, :public, :import_url, as: [:default, :admin] :wiki_enabled, :public, :import_url, as: [:default, :admin]
attr_accessible :namespace_id, :creator_id, as: :admin attr_accessible :namespace_id, :creator_id, as: :admin
...@@ -43,7 +45,7 @@ class Project < ActiveRecord::Base ...@@ -43,7 +45,7 @@ class Project < ActiveRecord::Base
has_many :events, dependent: :destroy has_many :events, dependent: :destroy
has_many :merge_requests, dependent: :destroy has_many :merge_requests, dependent: :destroy
has_many :issues, dependent: :destroy, order: "state, created_at DESC" has_many :issues, dependent: :destroy, order: "state DESC, created_at DESC"
has_many :milestones, dependent: :destroy has_many :milestones, dependent: :destroy
has_many :users_projects, dependent: :destroy has_many :users_projects, dependent: :destroy
has_many :notes, dependent: :destroy has_many :notes, dependent: :destroy
...@@ -72,6 +74,7 @@ class Project < ActiveRecord::Base ...@@ -72,6 +74,7 @@ class Project < ActiveRecord::Base
message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" } message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
validates :issues_enabled, :wall_enabled, :merge_requests_enabled, validates :issues_enabled, :wall_enabled, :merge_requests_enabled,
:wiki_enabled, inclusion: { in: [true, false] } :wiki_enabled, inclusion: { in: [true, false] }
validates :issues_tracker_id, length: { within: 0..255 }
validates_uniqueness_of :name, scope: :namespace_id validates_uniqueness_of :name, scope: :namespace_id
validates_uniqueness_of :path, scope: :namespace_id validates_uniqueness_of :path, scope: :namespace_id
...@@ -93,6 +96,8 @@ class Project < ActiveRecord::Base ...@@ -93,6 +96,8 @@ class Project < ActiveRecord::Base
scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) } scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) }
scope :public_only, -> { where(public: true) } scope :public_only, -> { where(public: true) }
enumerize :issues_tracker, :in => (Gitlab.config.issues_tracker.keys).append(:gitlab), :default => :gitlab
class << self class << self
def abandoned def abandoned
project_ids = Event.select('max(created_at) as latest_date, project_id'). project_ids = Event.select('max(created_at) as latest_date, project_id').
...@@ -201,6 +206,22 @@ class Project < ActiveRecord::Base ...@@ -201,6 +206,22 @@ class Project < ActiveRecord::Base
issues.tag_counts_on(:labels) issues.tag_counts_on(:labels)
end end
def issue_exists?(issue_id)
if used_default_issues_tracker?
self.issues.where(id: issue_id).first.present?
else
true
end
end
def used_default_issues_tracker?
self.issues_tracker == Project.issues_tracker.default_value
end
def can_have_issues_tracker_id?
self.issues_enabled && !self.used_default_issues_tracker?
end
def services def services
[gitlab_ci_service].compact [gitlab_ci_service].compact
end end
......
...@@ -137,7 +137,7 @@ class Repository ...@@ -137,7 +137,7 @@ class Repository
file_path = File.join(storage_path, self.path_with_namespace, file_name) file_path = File.join(storage_path, self.path_with_namespace, file_name)
# Put files into a directory before archiving # Put files into a directory before archiving
prefix = self.path_with_namespace + "/" prefix = File.basename(self.path_with_namespace) + "/"
# Create file if not exists # Create file if not exists
unless File.exists?(file_path) unless File.exists?(file_path)
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
# dark_scheme :boolean default(FALSE), not null # dark_scheme :boolean default(FALSE), not null
# theme_id :integer default(1), not null # theme_id :integer default(1), not null
# bio :string(255) # bio :string(255)
# blocked :boolean default(FALSE), not null # state :string(255)
# failed_attempts :integer default(0) # failed_attempts :integer default(0)
# locked_at :datetime # locked_at :datetime
# extern_uid :string(255) # extern_uid :string(255)
...@@ -46,10 +46,35 @@ class User < ActiveRecord::Base ...@@ -46,10 +46,35 @@ class User < ActiveRecord::Base
attr_accessor :force_random_password attr_accessor :force_random_password
#
# Relations
#
# Namespace for personal projects # Namespace for personal projects
has_one :namespace, dependent: :destroy, foreign_key: :owner_id, class_name: "Namespace", conditions: 'type IS NULL' has_one :namespace,
dependent: :destroy,
foreign_key: :owner_id,
class_name: "Namespace",
conditions: 'type IS NULL'
# Profile
has_many :keys, dependent: :destroy
# Groups
has_many :groups, class_name: "Group", foreign_key: :owner_id
# Teams
has_many :own_teams,
class_name: "UserTeam",
foreign_key: :owner_id,
dependent: :destroy
has_many :user_team_user_relationships, dependent: :destroy
has_many :user_teams, through: :user_team_user_relationships
has_many :user_team_project_relationships, through: :user_teams
has_many :team_projects, through: :user_team_project_relationships
has_many :keys, dependent: :destroy # Projects
has_many :users_projects, dependent: :destroy has_many :users_projects, dependent: :destroy
has_many :issues, dependent: :destroy, foreign_key: :author_id has_many :issues, dependent: :destroy, foreign_key: :author_id
has_many :notes, dependent: :destroy, foreign_key: :author_id has_many :notes, dependent: :destroy, foreign_key: :author_id
...@@ -57,18 +82,16 @@ class User < ActiveRecord::Base ...@@ -57,18 +82,16 @@ class User < ActiveRecord::Base
has_many :events, dependent: :destroy, foreign_key: :author_id, class_name: "Event" has_many :events, dependent: :destroy, foreign_key: :author_id, class_name: "Event"
has_many :assigned_issues, dependent: :destroy, foreign_key: :assignee_id, class_name: "Issue" has_many :assigned_issues, dependent: :destroy, foreign_key: :assignee_id, class_name: "Issue"
has_many :assigned_merge_requests, dependent: :destroy, foreign_key: :assignee_id, class_name: "MergeRequest" has_many :assigned_merge_requests, dependent: :destroy, foreign_key: :assignee_id, class_name: "MergeRequest"
has_many :projects, through: :users_projects
has_many :groups, class_name: "Group", foreign_key: :owner_id has_many :recent_events,
has_many :recent_events, class_name: "Event", foreign_key: :author_id, order: "id DESC" class_name: "Event",
foreign_key: :author_id,
has_many :projects, through: :users_projects order: "id DESC"
has_many :user_team_user_relationships, dependent: :destroy
has_many :user_teams, through: :user_team_user_relationships
has_many :user_team_project_relationships, through: :user_teams
has_many :team_projects, through: :user_team_project_relationships
#
# Validations
#
validates :name, presence: true validates :name, presence: true
validates :email, presence: true, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/ } validates :email, presence: true, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/ }
validates :bio, length: { within: 0..255 } validates :bio, length: { within: 0..255 }
...@@ -87,10 +110,27 @@ class User < ActiveRecord::Base ...@@ -87,10 +110,27 @@ class User < ActiveRecord::Base
delegate :path, to: :namespace, allow_nil: true, prefix: true delegate :path, to: :namespace, allow_nil: true, prefix: true
state_machine :state, initial: :active do
after_transition any => :blocked do |user, transition|
# Remove user from all projects and
user.users_projects.find_each do |membership|
return false unless membership.destroy
end
end
event :block do
transition active: :blocked
end
event :activate do
transition blocked: :active
end
end
# Scopes # Scopes
scope :admins, -> { where(admin: true) } scope :admins, -> { where(admin: true) }
scope :blocked, -> { where(blocked: true) } scope :blocked, -> { with_state(:blocked) }
scope :active, -> { where(blocked: false) } scope :active, -> { with_state(:active) }
scope :alphabetically, -> { order('name ASC') } scope :alphabetically, -> { order('name ASC') }
scope :in_team, ->(team){ where(id: team.member_ids) } scope :in_team, ->(team){ where(id: team.member_ids) }
scope :not_in_team, ->(team){ where('users.id NOT IN (:ids)', ids: team.member_ids) } scope :not_in_team, ->(team){ where('users.id NOT IN (:ids)', ids: team.member_ids) }
...@@ -260,17 +300,6 @@ class User < ActiveRecord::Base ...@@ -260,17 +300,6 @@ class User < ActiveRecord::Base
MergeRequest.cared(self) MergeRequest.cared(self)
end end
# Remove user from all projects and
# set blocked attribute to true
def block
users_projects.find_each do |membership|
return false unless membership.destroy
end
self.blocked = true
save
end
def projects_limit_percent def projects_limit_percent
return 100 if projects_limit.zero? return 100 if projects_limit.zero?
(personal_projects.count.to_f / projects_limit) * 100 (personal_projects.count.to_f / projects_limit) * 100
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# #
class UserTeam < ActiveRecord::Base class UserTeam < ActiveRecord::Base
attr_accessible :name, :owner_id, :path attr_accessible :name, :description, :owner_id, :path
belongs_to :owner, class_name: User belongs_to :owner, class_name: User
...@@ -26,6 +26,7 @@ class UserTeam < ActiveRecord::Base ...@@ -26,6 +26,7 @@ class UserTeam < ActiveRecord::Base
length: { within: 0..255 }, length: { within: 0..255 },
format: { with: Gitlab::Regex.name_regex, format: { with: Gitlab::Regex.name_regex,
message: "only letters, digits, spaces & '_' '-' '.' allowed." } message: "only letters, digits, spaces & '_' '-' '.' allowed." }
validates :description, length: { within: 0..255 }
validates :path, uniqueness: true, presence: true, length: { within: 1..255 }, validates :path, uniqueness: true, presence: true, length: { within: 1..255 },
format: { with: Gitlab::Regex.path_regex, format: { with: Gitlab::Regex.path_regex,
message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" } message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
......
...@@ -27,7 +27,7 @@ class IssueObserver < ActiveRecord::Observer ...@@ -27,7 +27,7 @@ class IssueObserver < ActiveRecord::Observer
def create_note(issue) def create_note(issue)
Note.create_status_change_note(issue, current_user, issue.state) Note.create_status_change_note(issue, current_user, issue.state)
[issue.author, issue.assignee].compact.each do |recipient| [issue.author, issue.assignee].compact.uniq.each do |recipient|
Notify.delay.issue_status_changed_email(recipient.id, issue.id, issue.state, current_user.id) Notify.delay.issue_status_changed_email(recipient.id, issue.id, issue.state, current_user.id)
end end
end end
......
...@@ -2,7 +2,8 @@ class UserObserver < ActiveRecord::Observer ...@@ -2,7 +2,8 @@ class UserObserver < ActiveRecord::Observer
def after_create(user) def after_create(user)
log_info("User \"#{user.name}\" (#{user.email}) was created") log_info("User \"#{user.name}\" (#{user.email}) was created")
Notify.delay.new_user_email(user.id, user.password) # Dont email omniauth created users
Notify.delay.new_user_email(user.id, user.password) unless user.extern_uid?
end end
def after_destroy user def after_destroy user
......
...@@ -19,6 +19,8 @@ class GitPushService ...@@ -19,6 +19,8 @@ class GitPushService
# Collect data for this git push # Collect data for this git push
@push_data = post_receive_data(oldrev, newrev, ref) @push_data = post_receive_data(oldrev, newrev, ref)
create_push_event
project.ensure_satellite_exists project.ensure_satellite_exists
project.discover_default_branch project.discover_default_branch
...@@ -27,8 +29,6 @@ class GitPushService ...@@ -27,8 +29,6 @@ class GitPushService
project.execute_hooks(@push_data.dup) project.execute_hooks(@push_data.dup)
project.execute_services(@push_data.dup) project.execute_services(@push_data.dup)
end end
create_push_event
end end
# This method provide a sample data # This method provide a sample data
......
...@@ -25,7 +25,7 @@ class ProjectTransferService ...@@ -25,7 +25,7 @@ class ProjectTransferService
Gitlab::ProjectMover.new(project, old_dir, new_dir).execute Gitlab::ProjectMover.new(project, old_dir, new_dir).execute
save! project.save!
end end
rescue Gitlab::ProjectMover::ProjectMoveError => ex rescue Gitlab::ProjectMover::ProjectMoveError => ex
raise Project::TransferError.new(ex.message) raise Project::TransferError.new(ex.message)
......
%h3.page_title Rename Group %h3.page_title Edit Group
%hr %hr
= form_for [:admin, @group] do |f| = form_for [:admin, @group] do |f|
- if @group.errors.any? - if @group.errors.any?
...@@ -10,7 +10,10 @@ ...@@ -10,7 +10,10 @@
.input .input
= f.text_field :name, placeholder: "Example Group", class: "xxlarge" = f.text_field :name, placeholder: "Example Group", class: "xxlarge"
.clearfix.group-description-holder
= f.label :description, "Details"
.input
= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
.clearfix.group_name_holder .clearfix.group_name_holder
= f.label :path do = f.label :path do
...@@ -24,5 +27,5 @@ ...@@ -24,5 +27,5 @@
%li It will change the git path to repositories under this group. %li It will change the git path to repositories under this group.
.form-actions .form-actions
= f.submit 'Rename group', class: "btn btn-remove" = f.submit 'Edit group', class: "btn btn-remove"
= link_to 'Cancel', admin_groups_path, class: "btn btn-cancel" = link_to 'Cancel', admin_groups_path, class: "btn btn-cancel"
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
Name Name
%i.icon-sort-down %i.icon-sort-down
%th Path %th Path
%th Description
%th Projects %th Projects
%th Owner %th Owner
%th.cred Danger Zone! %th.cred Danger Zone!
...@@ -25,11 +26,12 @@ ...@@ -25,11 +26,12 @@
%tr %tr
%td %td
%strong= link_to group.name, [:admin, group] %strong= link_to group.name, [:admin, group]
%td= truncate group.description
%td= group.path %td= group.path
%td= group.projects.count %td= group.projects.count
%td %td
= link_to group.owner_name, admin_user_path(group.owner) = link_to group.owner_name, admin_user_path(group.owner)
%td.bgred %td.bgred
= link_to 'Rename', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn btn-small" = link_to 'Edit', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn btn-small"
= link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove" = link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
= paginate @groups, theme: "admin" = paginate @groups, theme: "admin"
...@@ -9,8 +9,14 @@ ...@@ -9,8 +9,14 @@
Group name is Group name is
.input .input
= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
&nbsp; .clearfix.group-description-holder
= f.submit 'Create group', class: "btn btn-primary" = f.label :description, "Details"
.input
= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
.form-actions
= f.submit 'Create group', class: "btn btn-primary"
%hr %hr
.padded .padded
%ul %ul
......
...@@ -16,7 +16,13 @@ ...@@ -16,7 +16,13 @@
&nbsp; &nbsp;
= link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do = link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do
%i.icon-edit %i.icon-edit
Rename Edit
%tr
%td
%b
Description:
%td
= @group.description
%tr %tr
%td %td
%b %b
......
...@@ -31,6 +31,15 @@ ...@@ -31,6 +31,15 @@
= f.label :issues_enabled, "Issues" = f.label :issues_enabled, "Issues"
.input= f.check_box :issues_enabled .input= f.check_box :issues_enabled
- if Project.issues_tracker.values.count > 1
.clearfix
= f.label :issues_tracker, "Issues tracker", class: 'control-label'
.input= f.select(:issues_tracker, Project.issues_tracker.values, {}, { disabled: !@project.issues_enabled })
.clearfix
= f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'
.input= f.text_field :issues_tracker_id, class: "xxlarge", disabled: !@project.can_have_issues_tracker_id?
.clearfix .clearfix
= f.label :merge_requests_enabled, "Merge Requests" = f.label :merge_requests_enabled, "Merge Requests"
.input= f.check_box :merge_requests_enabled .input= f.check_box :merge_requests_enabled
......
%h3.page_title Rename Team %h3.page_title Edit Team
%hr %hr
= form_for @team, url: admin_team_path(@team), method: :put do |f| = form_for @team, url: admin_team_path(@team), method: :put do |f|
- if @team.errors.any? - if @team.errors.any?
...@@ -10,6 +10,11 @@ ...@@ -10,6 +10,11 @@
.input .input
= f.text_field :name, placeholder: "Example Team", class: "xxlarge" = f.text_field :name, placeholder: "Example Team", class: "xxlarge"
.clearfix.team-description-holder
= f.label :description, "Details"
.input
= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
.clearfix.team_name_holder .clearfix.team_name_holder
= f.label :path do = f.label :path do
%span.cred Team path is %span.cred Team path is
...@@ -19,5 +24,5 @@ ...@@ -19,5 +24,5 @@
%li It will change web url for access team and team projects. %li It will change web url for access team and team projects.
.form-actions .form-actions
= f.submit 'Rename team', class: "btn btn-remove" = f.submit 'Edit team', class: "btn btn-remove"
= link_to 'Cancel', admin_teams_path, class: "btn btn-cancel" = link_to 'Cancel', admin_teams_path, class: "btn btn-cancel"
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
%th %th
Name Name
%i.icon-sort-down %i.icon-sort-down
%th Description
%th Path %th Path
%th Projects %th Projects
%th Members %th Members
...@@ -26,13 +27,17 @@ ...@@ -26,13 +27,17 @@
%tr %tr
%td %td
%strong= link_to team.name, admin_team_path(team) %strong= link_to team.name, admin_team_path(team)
%td= truncate team.description
%td= team.path %td= team.path
%td= team.projects.count %td= team.projects.count
%td= team.members.count %td= team.members.count
%td %td
= link_to team.owner.name, admin_user_path(team.owner) - if team.owner
= link_to team.owner.name, admin_user_path(team.owner)
- else
(deleted)
%td.bgred %td.bgred
= link_to 'Rename', edit_admin_team_path(team), id: "edit_#{dom_id(team)}", class: "btn btn-small" = link_to 'Edit', edit_admin_team_path(team), id: "edit_#{dom_id(team)}", class: "btn btn-small"
= link_to 'Destroy', admin_team_path(team), confirm: "REMOVE #{team.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove" = link_to 'Destroy', admin_team_path(team), confirm: "REMOVE #{team.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
= paginate @teams, theme: "admin" = paginate @teams, theme: "admin"
...@@ -9,8 +9,15 @@ ...@@ -9,8 +9,15 @@
Team name is Team name is
.input .input
= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
&nbsp;
= f.submit 'Create team', class: "btn btn-primary" .clearfix.team-description-holder
= f.label :description, "Details"
.input
= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
.form-actions
= f.submit 'Create team', class: "btn btn-primary"
%hr %hr
.padded .padded
%ul %ul
......
...@@ -16,7 +16,13 @@ ...@@ -16,7 +16,13 @@
&nbsp; &nbsp;
= link_to edit_admin_team_path(@team), class: "btn btn-small pull-right" do = link_to edit_admin_team_path(@team), class: "btn btn-small pull-right" do
%i.icon-edit %i.icon-edit
Rename Edit
%tr
%td
%b
Description:
%td
= @team.description
%tr %tr
%td %td
%b %b
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
.span4 .span4
- unless @admin_user.new_record? - unless @admin_user.new_record?
.alert.alert-error .alert.alert-error
- if @admin_user.blocked - if @admin_user.blocked?
%p This user is blocked and is not able to login to GitLab %p This user is blocked and is not able to login to GitLab
= link_to 'Unblock User', unblock_admin_user_path(@admin_user), method: :put, class: "btn btn-small" = link_to 'Unblock User', unblock_admin_user_path(@admin_user), method: :put, class: "btn btn-small"
- else - else
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
&nbsp; &nbsp;
= link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: "btn btn-small" = link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: "btn btn-small"
- unless user == current_user - unless user == current_user
- if user.blocked - if user.blocked?
= link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn btn-small success" = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn btn-small success"
- else - else
= link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove" = link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%h3.page_title %h3.page_title
= image_tag gravatar_icon(@admin_user.email, 90), class: "avatar s90" = image_tag gravatar_icon(@admin_user.email, 90), class: "avatar s90"
= @admin_user.name = @admin_user.name
- if @admin_user.blocked - if @admin_user.blocked?
%span.cred (Blocked) %span.cred (Blocked)
- if @admin_user.admin - if @admin_user.admin
%span.cred (Admin) %span.cred (Admin)
......
- @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits| - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
%div.ui-box %div.ui-box
%h5.title %h5.title
%i.icon-calendar %i.icon-calendar
......
...@@ -21,9 +21,10 @@ ...@@ -21,9 +21,10 @@
= event.project_name = event.project_name
.event-body .event-body
%i.icon-comment-alt.event-note-icon .event-note
%span.event-note .md
= markdown truncate(event.target.note, length: 70) %i.icon-comment-alt.event-note-icon
= sanitize(markdown(truncate(event.target.note, length: 150)), tags: %w(a img b pre p))
- note = event.target - note = event.target
- if note.attachment.url - if note.attachment.url
= link_to note.attachment.secure_url, target: "_blank", class: 'note-file-attach' do = link_to note.attachment.secure_url, target: "_blank", class: 'note-file-attach' do
......
...@@ -9,8 +9,15 @@ ...@@ -9,8 +9,15 @@
Group name is Group name is
.input .input
= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
&nbsp;
= f.submit 'Save group', class: "btn btn-save" .clearfix.group-description-holder
= f.label :description, "Details"
.input
= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
.form-actions
= f.submit 'Save group', class: "btn btn-save"
%hr %hr
......
...@@ -9,9 +9,16 @@ ...@@ -9,9 +9,16 @@
Group name is Group name is
.input .input
= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
&nbsp;
= f.submit 'Create group', class: "btn btn-create" .clearfix.group-description-holder
%hr = f.label :description, "Details"
.input
= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
.form-actions
= f.submit 'Create group', class: "btn btn-create"
.padded .padded
%ul %ul
%li Group is kind of directory for several projects %li Group is kind of directory for several projects
......
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
%p.nothing_here_message Project activity will be displayed here %p.nothing_here_message Project activity will be displayed here
.loading.hide .loading.hide
.side.span4 .side.span4
- if @group.description.present?
.description.well.light
= @group.description
= render "projects", projects: @projects = render "projects", projects: @projects
%div %div
%span.rss-icon %span.rss-icon
......
...@@ -6,7 +6,10 @@ ...@@ -6,7 +6,10 @@
Open Open
%li{class: ("active" if params[:status] == 'assigned-to-me')} %li{class: ("active" if params[:status] == 'assigned-to-me')}
= link_to project_issues_path(@project, status: 'assigned-to-me') do = link_to project_issues_path(@project, status: 'assigned-to-me') do
Assigned To Me Assigned to me
%li{class: ("active" if params[:status] == 'created-by-me')}
= link_to project_issues_path(@project, status: 'created-by-me') do
Created by me
%li{class: ("active" if params[:status] == 'closed')} %li{class: ("active" if params[:status] == 'closed')}
= link_to project_issues_path(@project, status: 'closed') do = link_to project_issues_path(@project, status: 'closed') do
Closed Closed
......
- if text = alert || notice .flash-container
#flash-container - if alert
%h4= text .alert
%span= alert
- elsif notice
.alert.alert-info
%span= notice
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
= stylesheet_link_tag "application" = stylesheet_link_tag "application"
= javascript_include_tag "application" = javascript_include_tag "application"
= csrf_meta_tags = csrf_meta_tags
= include_gon
-# Atom feed -# Atom feed
- if current_user - if current_user
......
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
%span.separator %span.separator
%h1.project_name= title %h1.project_name= title
%ul.nav %ul.nav
%li
= link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
%i.icon-globe
- if current_user.is_admin? - if current_user.is_admin?
%li %li
= link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
%html{ lang: "en"} %html{ lang: "en"}
= render "layouts/head", title: "Admin area" = render "layouts/head", title: "Admin area"
%body{class: "#{app_theme} admin"} %body{class: "#{app_theme} admin"}
= render "layouts/flash"
= render "layouts/head_panel", title: "Admin area" = render "layouts/head_panel", title: "Admin area"
= render "layouts/flash"
.container .container
%ul.main_menu %ul.main_menu
= nav_link(controller: :dashboard, html_options: {class: 'home'}) do = nav_link(controller: :dashboard, html_options: {class: 'home'}) do
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
%html{ lang: "en"} %html{ lang: "en"}
= render "layouts/head", title: "Dashboard" = render "layouts/head", title: "Dashboard"
%body{class: "#{app_theme} application"} %body{class: "#{app_theme} application"}
= render "layouts/flash"
= render "layouts/head_panel", title: "Dashboard" = render "layouts/head_panel", title: "Dashboard"
= render "layouts/flash"
.container .container
%ul.main_menu %ul.main_menu
= nav_link(path: 'dashboard#show', html_options: {class: 'home'}) do = nav_link(path: 'dashboard#show', html_options: {class: 'home'}) do
......
...@@ -3,4 +3,6 @@ ...@@ -3,4 +3,6 @@
= render "layouts/head" = render "layouts/head"
%body.ui_basic.login-page %body.ui_basic.login-page
= render "layouts/flash" = render "layouts/flash"
.container= yield .container
.content
= yield
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
%html{ lang: "en"} %html{ lang: "en"}
= render "layouts/head", title: "Error" = render "layouts/head", title: "Error"
%body{class: "#{app_theme} application"} %body{class: "#{app_theme} application"}
= render "layouts/flash"
= render "layouts/head_panel", title: "" = render "layouts/head_panel", title: ""
= render "layouts/flash"
.container .container
.content .content
%center.padded.prepend-top-20 %center.padded.prepend-top-20
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
%html{ lang: "en"} %html{ lang: "en"}
= render "layouts/head", title: "#{@group.name}" = render "layouts/head", title: "#{@group.name}"
%body{class: "#{app_theme} application"} %body{class: "#{app_theme} application"}
= render "layouts/flash"
= render "layouts/head_panel", title: "group: #{@group.name}" = render "layouts/head_panel", title: "group: #{@group.name}"
= render "layouts/flash"
.container .container
%ul.main_menu %ul.main_menu
= nav_link(path: 'groups#show', html_options: {class: 'home'}) do = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
%html{ lang: "en"} %html{ lang: "en"}
= render "layouts/head", title: "Profile" = render "layouts/head", title: "Profile"
%body{class: "#{app_theme} profile"} %body{class: "#{app_theme} profile"}
= render "layouts/flash"
= render "layouts/head_panel", title: "Profile" = render "layouts/head_panel", title: "Profile"
= render "layouts/flash"
.container .container
%ul.main_menu %ul.main_menu
= nav_link(path: 'profiles#show', html_options: {class: 'home'}) do = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
%html{ lang: "en"} %html{ lang: "en"}
= render "layouts/head", title: @project.name_with_namespace = render "layouts/head", title: @project.name_with_namespace
%body{class: "#{app_theme} project"} %body{class: "#{app_theme} project"}
= render "layouts/flash"
= render "layouts/head_panel", title: project_title(@project) = render "layouts/head_panel", title: project_title(@project)
= render "layouts/flash"
- if can?(current_user, :download_code, @project) - if can?(current_user, :download_code, @project)
= render 'shared/no_ssh' = render 'shared/no_ssh'
...@@ -22,11 +22,12 @@ ...@@ -22,11 +22,12 @@
= nav_link(controller: %w(graph)) do = nav_link(controller: %w(graph)) do
= link_to "Network", project_graph_path(@project, @ref || @repository.root_ref) = link_to "Network", project_graph_path(@project, @ref || @repository.root_ref)
- if @project.issues_enabled - if @project.issues_enabled
= nav_link(controller: %w(issues milestones labels)) do = nav_link(controller: %w(issues milestones labels)) do
= link_to project_issues_filter_path(@project) do = link_to url_for_project_issues do
Issues Issues
%span.count.issue_counter= @project.issues.opened.count - if @project.used_default_issues_tracker?
%span.count.issue_counter= @project.issues.opened.count
- if @project.repo_exists? && @project.merge_requests_enabled - if @project.repo_exists? && @project.merge_requests_enabled
= nav_link(controller: :merge_requests) do = nav_link(controller: :merge_requests) do
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
%html{ lang: "en"} %html{ lang: "en"}
= render "layouts/head", title: "#{@team.name}" = render "layouts/head", title: "#{@team.name}"
%body{class: "#{app_theme} application"} %body{class: "#{app_theme} application"}
= render "layouts/flash"
= render "layouts/head_panel", title: "team: #{@team.name}" = render "layouts/head_panel", title: "team: #{@team.name}"
= render "layouts/flash"
.container .container
%ul.main_menu %ul.main_menu
= nav_link(path: 'teams#show', html_options: {class: 'home'}) do = nav_link(path: 'teams#show', html_options: {class: 'home'}) do
......
- unless can?(current_user, :accept_mr, @project) - unless @allowed_to_merge
.alert .alert
%strong Only masters can accept MR %strong You don't have enough permissions to merge this MR
- if @merge_request.opened? && @commits.any? && can?(current_user, :accept_mr, @project) - if @show_merge_controls
.automerge_widget.can_be_merged{style: "display:none"} .automerge_widget.can_be_merged{style: "display:none"}
.alert.alert-success .alert.alert-success
%span %span
......
Issue was <%= @issue_status %> by <%= @updated_by.name %>
Issue <%= @issue.id %>: <%= url_for(project_issue_url(@issue.project, @issue)) %>
New Issue was created and assigned to you.
Issue <%= @issue.id %>: <%= url_for(project_issue_url(@issue.project, @issue)) %>
New Merge Request <%= @merge_request.id %>
<%= url_for(project_merge_request_url(@merge_request.project, @merge_request)) %>
Branches: <%= @merge_request.source_branch %> to <%= @merge_request.target_branch %>
Author: <%= @merge_request.author_name %>
Asignee: <%= @merge_request.assignee_name %>
Hi <%= @user.name %>!
Administrator created account for you. Now you are a member of company GitLab application.
login.................. <%= @user.email %>
<% unless Gitlab.config.gitlab.signup_enabled %>
password............... <%= @password %>
<% end %>
Click here to login: <%= url_for(root_url) %>
New comment for Commit <%= @commit.short_id %>
<%= url_for(project_commit_url(@note.project, id: @commit.id, anchor: "note_#{@note.id}")) %>
Author: <%= @note.author_name %>
<%= @note.note %>
New comment for Issue <%= @issue.id %>
<%= url_for(project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")) %>
Author: <%= @note.author_name %>
<%= @note.note %>
New comment for Merge Request <%= @merge_request.id %>
<%= url_for(project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}")) %>
<%= @note.author_name %>
<%= @note.note %>
New message on the project wall <%= @note.project %>
<%= url_for(wall_project_url(@note.project, anchor: "note_#{@note.id}")) %>
<%= @note.author_name %>
<%= @note.note %>
You have been granted <%= @users_project.project_access_human %> access to project <%= @project.name_with_namespace %>
<%= url_for(project_url(@project)) %>
Project was moved to another location
The project is now located under
<%= url_for(link_to project_url(@project)) %>
To update the remote url in your local repository run:
git remote set-url origin <%= @project.ssh_url_to_repo %>
Reassigned Issue <%= @issue.id %>
<%= url_for(project_issue_url(@issue.project, @issue)) %>
Assignee changed from <%= @previous_assignee.name %> to <%= @issue.assignee_name %>
Reassigned Merge Request <%= @merge_request.id %>
<%= url_for(project_merge_request_url(@merge_request.project, @merge_request)) %>
Assignee changed from <%= @previous_assignee.name %> to <%= @merge_request.assignee_name %>
...@@ -24,6 +24,15 @@ ...@@ -24,6 +24,15 @@
= f.check_box :issues_enabled = f.check_box :issues_enabled
%span.descr Lightweight issue tracking system for this project %span.descr Lightweight issue tracking system for this project
- if Project.issues_tracker.values.count > 1
.control-group
= f.label :issues_tracker, "Issues tracker", class: 'control-label'
.input= f.select(:issues_tracker, Project.issues_tracker.values, {}, { disabled: !@project.issues_enabled })
.clearfix
= f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'
.input= f.text_field :issues_tracker_id, class: "xxlarge", disabled: !@project.can_have_issues_tracker_id?
.control-group .control-group
= f.label :merge_requests_enabled, "Merge Requests", class: 'control-label' = f.label :merge_requests_enabled, "Merge Requests", class: 'control-label'
.controls .controls
......
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
%fieldset %fieldset
%legend Git global setup: %legend Git global setup:
%pre.dark %pre.dark
= preserve do :preserve
git config --global user.name "#{current_user.name}" git config --global user.name "#{current_user.name}"
git config --global user.email "#{current_user.email}" git config --global user.email "#{current_user.email}"
%fieldset %fieldset
%legend Create Repository %legend Create Repository
%pre.dark %pre.dark
= preserve do :preserve
mkdir #{@project.path} mkdir #{@project.path}
cd #{@project.path} cd #{@project.path}
git init git init
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
%fieldset %fieldset
%legend Existing Git Repo? %legend Existing Git Repo?
%pre.dark %pre.dark
= preserve do :preserve
cd existing_git_repo cd existing_git_repo
git remote add origin #{@project.url_to_repo} git remote add origin #{@project.url_to_repo}
git push -u origin master git push -u origin master
......
...@@ -12,5 +12,7 @@ ...@@ -12,5 +12,7 @@
.pull-right .pull-right
%pre.dark.tiny git clone #{project.http_url_to_repo} %pre.dark.tiny git clone #{project.http_url_to_repo}
- unless @projects.present?
%h3.nothing_here_message No public projects
= paginate @projects, theme: "admin" = paginate @projects, theme: "admin"
.input-prepend.project_clone_holder .input-prepend.project_clone_holder
%button{class: "btn active", :"data-clone" => @project.ssh_url_to_repo} SSH %button{class: "btn active", :"data-clone" => @project.ssh_url_to_repo} SSH
%button{class: "btn", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase %button{class: "btn", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase
= text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select input-xxlarge", readonly: true
= text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select input-xxlarge"
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
%span.label This is you! %span.label This is you!
- if @project.namespace_owner == user - if @project.namespace_owner == user
%span.label Owner %span.label Owner
- elsif user.blocked - elsif user.blocked?
%span.label Blocked %span.label Blocked
- elsif allow_admin - elsif allow_admin
= link_to project_team_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "btn-tiny btn btn-remove" do = link_to project_team_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "btn-tiny btn btn-remove" do
......
...@@ -12,13 +12,19 @@ ...@@ -12,13 +12,19 @@
.input .input
= f.text_field :name, placeholder: "Ex. OpenSource", class: "xlarge left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "xlarge left"
.clearfix.team-description-holder
= f.label :description, "Details"
.input
= f.text_area :description, maxlength: 250, class: "xlarge js-gfm-input", rows: 4
.clearfix .clearfix
= f.label :path do = f.label :path do
Team path is Team path is
.input .input
= f.text_field :path, placeholder: "opensource", class: "xlarge left" = f.text_field :path, placeholder: "opensource", class: "xlarge left"
.form-actions .form-actions
= f.submit 'Save team changes', class: "btn btn-save" = f.submit 'Save team changes', class: "btn btn-primary"
.span5 .span5
.ui-box .ui-box
%h5.title Remove team %h5.title Remove team
...@@ -26,4 +32,3 @@ ...@@ -26,4 +32,3 @@
%p %p
Removed team can not be restored! Removed team can not be restored!
= link_to 'Remove team', team_path(@team), method: :delete, confirm: "You are sure?", class: "btn btn-remove btn-small" = link_to 'Remove team', team_path(@team), method: :delete, confirm: "You are sure?", class: "btn btn-remove btn-small"
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%span.btn.disabled This is you! %span.btn.disabled This is you!
- if @team.owner == user - if @team.owner == user
%span.btn.disabled Owner %span.btn.disabled Owner
- elsif user.blocked - elsif user.blocked?
%span.btn.disabled.blocked Blocked %span.btn.disabled.blocked Blocked
- elsif allow_admin - elsif allow_admin
= link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "btn-tiny btn btn-remove", title: "Remove from team" do = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "btn-tiny btn btn-remove", title: "Remove from team" do
......
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.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment