Skip to content

G
gitlab-ce
Commit 161a8b10 authored by Valery Sizov's avatar Valery Sizov
Browse files
Options

Merge branch 'ce_upstream' into 'master' 

CE upstream

Could you guys please resolve next conflicts (the conflicts just committed to the branch):

@dzaporozhets - `app/views/layouts/nav/_project_settings.html.haml`

@iamphill `app/views/projects/_builds_settings.html.haml` and `app/views/projects/edit.html.haml`

@annabeldunstone `app/views/projects/_home_panel.html.haml`

@jschatz1 - `app/views/shared/issuable/_form.html.haml`

- [x] `app/views/layouts/nav/_project_settings.html.haml`
- [x] `app/views/projects/_builds_settings.html.haml` 
- [x] `app/views/projects/edit.html.haml`
- [x] `app/views/projects/_home_panel.html.haml`
- [x] `app/views/shared/issuable/_form.html.haml`
- [x]  `app/views/layouts/nav/_project.html.haml`
- [x]	`app/views/projects/hooks/index.html.haml`

See merge request !425
parents 9bdd60c5 949d43eb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11712 additions and 3414 deletions
.gitignore
View file @ 161a8b10
......@@ -4,46 +4,46 @@
.bundle
.chef
.directory
.envrc
.gitlab_shell_secret
/.envrc
/.gitlab_shell_secret
.idea
.rbenv-version
/.rbenv-version
.rbx/
.ruby-gemset
.ruby-version
.rvmrc
/.ruby-gemset
/.ruby-version
/.rvmrc
.sass-cache/
.secret
.vagrant
.byebug_history
Vagrantfile
backups/*
config/aws.yml
config/database.yml
config/gitlab.yml
config/gitlab_ci.yml
config/initializers/rack_attack.rb
config/initializers/smtp_settings.rb
config/initializers/relative_url.rb
config/resque.yml
config/unicorn.rb
config/secrets.yml
config/sidekiq.yml
coverage/*
db/*.sqlite3
db/*.sqlite3-journal
db/data.yml
doc/code/*
dump.rdb
log/*.log*
nohup.out
public/assets/
public/uploads.*
public/uploads/
shared/artifacts/
rails_best_practices_output.html
/.secret
/.vagrant
/.byebug_history
/Vagrantfile
/backups/*
/config/aws.yml
/config/database.yml
/config/gitlab.yml
/config/gitlab_ci.yml
/config/initializers/rack_attack.rb
/config/initializers/smtp_settings.rb
/config/initializers/relative_url.rb
/config/resque.yml
/config/unicorn.rb
/config/secrets.yml
/config/sidekiq.yml
/coverage/*
/db/*.sqlite3
/db/*.sqlite3-journal
/db/data.yml
/doc/code/*
/dump.rdb
/log/*.log*
/nohup.out
/public/assets/
/public/uploads.*
/public/uploads/
/shared/artifacts/
/rails_best_practices_output.html
/tags
tmp/
vendor/bundle/*
builds/*
shared/*
/tmp/*
/vendor/bundle/*
/builds/*
/shared/*
.rubocop.yml
View file @ 161a8b10
This diff is collapsed.
CHANGELOG
View file @ 161a8b10
......@@ -3,6 +3,60 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.8.1
- Add documentation for the "Health Check" feature
- Allow anonymous users to access a public project's pipelines
v 8.9.0 (unreleased)
- Allow enabling wiki page events from Webhook management UI
- Make EmailsOnPushWorker use Sidekiq mailers queue
- Fix wiki page events' webhook to point to the wiki repository
- Fix issue todo not remove when leave project !4150 (Long Nguyen)
- Allow forking projects with restricted visibility level
- Improve note validation to prevent errors when creating invalid note via API
- Reduce number of fog gem dependencies
- Remove project notification settings associated with deleted projects
- Fix 404 page when viewing TODOs that contain milestones or labels in different projects
- Redesign navigation for project pages
- Fix groups API to list only user's accessible projects
- Redesign account and email confirmation emails
- Use gitlab-shell v3.0.0
- Add DB index on users.state
- Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
- Changed the Slack build message to use the singular duration if necessary (Aran Koning)
- Fix issues filter when ordering by milestone
- Todos will display target state if issuable target is 'Closed' or 'Merged'
- Fix bug when sorting issues by milestone due date and filtering by two or more labels
- Link to blank group icon doesn't throw a 404 anymore
- Remove 'main language' feature
- Pipelines can be canceled only when there are running builds
- Use downcased path to container repository as this is expected path by Docker
- Projects pending deletion will render a 404 page
- Measure queue duration between gitlab-workhorse and Rails
- Make authentication service for Container Registry to be compatible with < Docker 1.11
- Add Application Setting to configure Container Registry token expire delay (default 5min)
- Cache assigned issue and merge request counts in sidebar nav
- Cache project build count in sidebar nav
v 8.8.3
- Fix incorrect links on pipeline page when merge request created from fork
- Fix gitlab importer failing to import new projects due to missing credentials
- Fix serious performance bug with rendering Markdown with InlineDiffFilter
- Fix import URL migration not rescuing with the correct Error
- In search results, only show notes on confidential issues that the user has access to
- Fix health check access token changing due to old application settings being used
- Fix wiki project clone address error (chujinjin)
v 8.8.2
- Added remove due date button. !4209
- Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources. !4242
- Fix Error 500 in CI charts by gracefully handling commits with no durations. !4245
- Fix table UI on CI builds page. !4249
- Fix backups if registry is disabled. !4263
- Fixed issue with merge button color. !4211
- Fixed issue with enter key selecting wrong option in dropdown. !4210
- When creating a .gitignore file a dropdown with templates will be provided. !4075
- Fix concurrent request when updating build log in browser. !4183
v 8.8.1
- Add documentation for the "Health Check" feature
- Allow anonymous users to access a public project's pipelines !4233
- Fix MySQL compatibility in zero downtime migrations helpers
- Fix the CI login to Container Registry (the gitlab-ci-token user)
......@@ -19,6 +73,7 @@ v 8.8.0
- Added inline diff styling for `change_title` system notes. (Adam Butler)
- Project#open_branches has been cleaned up and no longer loads entire records into memory.
- Escape HTML in commit titles in system note messages
- Improve design of Pipeline View
- Fix scope used when accessing container registry
- Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios
- Improve multiple branch push performance by memoizing permission checking
......@@ -78,11 +133,16 @@ v 8.8.0
- Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
- Fixed advice on invalid permissions on upload path !2948 (Ludovic Perrine)
- Allows MR authors to have the source branch removed when merging the MR. !2801 (Jeroen Jacobs)
- When creating a .gitignore file a dropdown with templates will be provided
v 8.7.7
- Fix import by `Any Git URL` broken if the URL contains a space
v 8.7.6
- Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
- Fix import from GitLab.com to a private instance failure. !4181
- Fix external imports not finding the import data. !4106
- Fix notification delay when changing status of an issue
v 8.7.5
- Fix relative links in wiki pages. !4050
......
CONTRIBUTING.md
View file @ 161a8b10
......@@ -311,13 +311,11 @@ request is as follows:
1. Create a feature branch
1. Write [tests](https://gitlab.com/gitlab-org/gitlab-development-kit#running-the-tests) and code
1. Add your changes to the [CHANGELOG](CHANGELOG)
1. If you are changing the README, some documentation or other things which
have no effect on the tests, add `[ci skip]` somewhere in the commit message
and make sure to read the [documentation styleguide][doc-styleguide]
1. If you are writing documentation, make sure to read the [documentation styleguide][doc-styleguide]
1. If you have multiple commits please combine them into one commit by
[squashing them][git-squash]
1. Push the commit(s) to your fork
1. Submit a merge request (MR) to the master branch
1. Submit a merge request (MR) to the `master` branch
1. The MR title should describe the change you want to make
1. The MR description should give a motive for your change and the method you
used to achieve it, see the [merge request description format]
......
Gemfile
View file @ 161a8b10
......@@ -18,9 +18,8 @@ gem "mysql2", '~> 0.3.16', group: :mysql
gem "pg", '~> 0.18.2', group: :postgres
# Authentication libraries
gem 'devise', '~> 3.5.4'
gem 'devise', '~> 4.0'
gem 'doorkeeper', '~> 3.1'
gem 'devise-async', '~> 0.9.0'
gem 'omniauth', '~> 1.3.1'
gem 'omniauth-auth0', '~> 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6'
......@@ -44,9 +43,9 @@ gem 'recaptcha', require: 'recaptcha/rails'
gem 'akismet', '~> 2.0'
# Two-factor authentication
gem 'devise-two-factor', '~> 2.0.0'
gem 'devise-two-factor', '~> 3.0.0'
gem 'rqrcode-rails3', '~> 0.1.7'
gem 'attr_encrypted', '~> 1.3.4'
gem 'attr_encrypted', '~> 3.0.0'
# GitLab Pages
gem 'validates_hostname', '~> 1.0.0'
......@@ -78,7 +77,7 @@ gem 'grape-entity', '~> 0.4.2'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
# Pagination
gem "kaminari", "~> 0.16.3"
gem "kaminari", "~> 0.17.0"
# HAML
gem "haml-rails", '~> 0.9.0'
......@@ -89,8 +88,14 @@ gem "carrierwave", '~> 0.10.0'
# Drag and Drop UI
gem 'dropzonejs-rails', '~> 0.7.1'
# for backups
gem 'fog-aws', '~> 0.9'
gem 'fog-core', '~> 1.40'
gem 'fog-local', '~> 0.3'
gem 'fog-google', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
# for aws storage
gem "fog", "~> 1.36.0"
gem "unf", '~> 0.1.4'
# Authorization
......@@ -131,7 +136,7 @@ group :unicorn do
end
# State machine
gem "state_machines-activerecord", '~> 0.3.0'
gem "state_machines-activerecord", '~> 0.4.0'
# Run events after state machine commits
gem 'after_commit_queue'
......@@ -188,9 +193,6 @@ gem 'ruby-fogbugz', '~> 0.2.1'
# d3
gem 'd3_rails', '~> 3.5.0'
#cal-heatmap
gem 'cal-heatmap-rails', '~> 3.6.0'
# underscore-rails
gem "underscore-rails", "~> 1.8.0"
......@@ -304,9 +306,10 @@ group :development, :test do
gem 'spring-commands-spinach', '~> 1.1.0'
gem 'spring-commands-teaspoon', '~> 0.0.2'
gem 'rubocop', '~> 0.38.0', require: false
gem 'rubocop', '~> 0.40.0', require: false
gem 'rubocop-rspec', '~> 1.5.0', require: false
gem 'scss_lint', '~> 0.47.0', require: false
gem 'coveralls', '~> 0.8.2', require: false
gem 'coveralls', '~> 0.8.2', require: false
gem 'simplecov', '~> 0.11.0', require: false
gem 'flog', require: false
gem 'flay', require: false
......@@ -336,7 +339,7 @@ gem "mail_room", "~> 0.7"
gem 'email_reply_parser', '~> 0.5.8'
## CI
gem 'activerecord-session_store', '~> 0.1.0'
gem 'activerecord-session_store', '~> 1.0.0'
gem "nested_form", '~> 0.3.2'
# OAuth
......
Gemfile.lock
View file @ 161a8b10
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.2)
RedCloth (4.2.9)
ace-rails-ap (4.0.2)
actionmailer (4.2.6)
......@@ -33,10 +32,12 @@ GEM
activemodel (= 4.2.6)
activesupport (= 4.2.6)
arel (~> 6.0)
activerecord-session_store (0.1.2)
actionpack (>= 4.0.0, < 5)
activerecord (>= 4.0.0, < 5)
railties (>= 4.0.0, < 5)
activerecord-session_store (1.0.0)
actionpack (>= 4.0, < 5.1)
activerecord (>= 4.0, < 5.1)
multi_json (~> 1.11, >= 1.11.2)
rack (>= 1.5.2, < 3)
railties (>= 4.0, < 5.1)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
......@@ -58,8 +59,8 @@ GEM
oauth2 (~> 1.0)
asciidoctor (1.5.3)
ast (2.2.0)
attr_encrypted (1.3.4)
encryptor (>= 1.3.0)
attr_encrypted (3.0.1)
encryptor (~> 3.0.0)
attr_required (1.0.0)
autoprefixer-rails (6.2.3)
execjs
......@@ -71,7 +72,7 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
babosa (1.0.2)
base32 (0.3.2)
bcrypt (3.1.10)
bcrypt (3.1.11)
benchmark-ips (2.3.0)
better_errors (1.0.1)
coderay (>= 1.0.0)
......@@ -100,7 +101,6 @@ GEM
bundler (~> 1.2)
thor (~> 0.18)
byebug (8.2.1)
cal-heatmap-rails (3.6.0)
capybara (2.6.2)
addressable
mime-types (>= 1.16)
......@@ -154,21 +154,18 @@ GEM
activerecord (>= 3.2.0, < 5.0)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (3.5.4)
devise (4.1.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
railties (>= 4.1.0, < 5.1)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise-async (0.9.0)
devise (~> 3.2)
devise-two-factor (2.0.1)
devise-two-factor (3.0.0)
activesupport
attr_encrypted (~> 1.3.2)
devise (~> 3.5.0)
attr_encrypted (>= 1.3, < 4, != 2)
devise (~> 4.0)
railties
rotp (~> 2)
rotp (~> 2.0)
diff-lcs (1.2.5)
diffy (3.0.7)
docile (1.1.5)
......@@ -193,12 +190,12 @@ GEM
email_spec (1.6.0)
launchy (~> 2.1)
mail (~> 2.2)
encryptor (1.3.0)
encryptor (3.0.0)
equalizer (0.0.11)
erubis (2.7.0)
escape_utils (1.1.1)
eventmachine (1.0.8)
excon (0.45.4)
excon (0.49.0)
execjs (2.6.0)
expression_parser (0.9.0)
factory_girl (4.5.0)
......@@ -215,8 +212,6 @@ GEM
multi_json
ffaker (2.0.0)
ffi (1.9.10)
fission (0.5.0)
CFPropertyList (~> 2.2)
flay (2.6.1)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
......@@ -226,109 +221,28 @@ GEM
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
fog (1.36.0)
fog-aliyun (>= 0.1.0)
fog-atmos
fog-aws (>= 0.6.0)
fog-brightbox (~> 0.4)
fog-core (~> 1.32)
fog-dynect (~> 0.0.2)
fog-ecloud (~> 0.1)
fog-google (<= 0.1.0)
fog-json
fog-local
fog-powerdns (>= 0.1.1)
fog-profitbricks
fog-radosgw (>= 0.0.2)
fog-riakcs
fog-sakuracloud (>= 0.0.4)
fog-serverlove
fog-softlayer
fog-storm_on_demand
fog-terremark
fog-vmfusion
fog-voxel
fog-xenserver
fog-xml (~> 0.1.1)
ipaddress (~> 0.5)
nokogiri (~> 1.5, >= 1.5.11)
fog-aliyun (0.1.0)
fog-core (~> 1.27)
fog-json (~> 1.0)
ipaddress (~> 0.8)
xml-simple (~> 1.1)
fog-atmos (0.1.0)
fog-core
fog-xml
fog-aws (0.8.1)
fog-aws (0.9.2)
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-brightbox (0.10.1)
fog-core (~> 1.22)
fog-json
inflecto (~> 0.0.2)
fog-core (1.35.0)
fog-core (1.40.0)
builder
excon (~> 0.45)
excon (~> 0.49)
formatador (~> 0.2)
fog-dynect (0.0.2)
fog-core
fog-json
fog-xml
fog-ecloud (0.3.0)
fog-core
fog-xml
fog-google (0.1.0)
fog-google (0.3.2)
fog-core
fog-json
fog-xml
fog-json (1.0.2)
fog-core (~> 1.0)
multi_json (~> 1.10)
fog-local (0.2.1)
fog-core (~> 1.27)
fog-powerdns (0.1.1)
fog-local (0.3.0)
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-xml (~> 0.1)
fog-profitbricks (0.0.5)
fog-core
fog-xml
nokogiri
fog-radosgw (0.0.5)
fog-core (>= 1.21.0)
fog-json
fog-xml (>= 0.0.1)
fog-riakcs (0.1.0)
fog-core
fog-json
fog-xml
fog-sakuracloud (1.7.5)
fog-core
fog-json
fog-serverlove (0.1.2)
fog-core
fog-json
fog-softlayer (1.0.3)
fog-core
fog-json
fog-storm_on_demand (0.1.1)
fog-core
fog-json
fog-terremark (0.1.0)
fog-core
fog-xml
fog-vmfusion (0.1.0)
fission
fog-core
fog-voxel (0.1.0)
fog-core
fog-xml
fog-xenserver (0.2.2)
fog-core
fog-xml
fog-openstack (0.1.6)
fog-core (>= 1.39)
fog-json (>= 1.0)
ipaddress (>= 0.8)
fog-xml (0.1.2)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
......@@ -448,11 +362,10 @@ GEM
httpclient (2.7.0.1)
i18n (0.7.0)
ice_nine (0.11.1)
inflecto (0.0.2)
influxdb (0.2.3)
cause
json
ipaddress (0.8.2)
ipaddress (0.8.3)
jquery-atwho-rails (1.3.2)
jquery-rails (4.1.1)
rails-dom-testing (>= 1, < 3)
......@@ -465,7 +378,7 @@ GEM
railties (>= 3.2.16)
json (1.8.3)
jwt (1.5.2)
kaminari (0.16.3)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.10.0)
......@@ -573,7 +486,7 @@ GEM
orm_adapter (0.5.0)
paranoia (2.1.4)
activerecord (~> 4.0)
parser (2.3.0.6)
parser (2.3.1.0)
ast (~> 2.2)
pg (0.18.4)
poltergeist (1.9.0)
......@@ -679,7 +592,7 @@ GEM
responders (2.1.1)
railties (>= 4.2.0, < 5.1)
rinku (1.7.3)
rotp (2.1.1)
rotp (2.1.2)
rouge (1.10.1)
rqrcode (0.7.0)
chunky_png
......@@ -708,15 +621,17 @@ GEM
rspec-retry (0.4.5)
rspec-core
rspec-support (3.4.1)
rubocop (0.38.0)
parser (>= 2.3.0.6, < 3.0)
rubocop (0.40.0)
parser (>= 2.3.1.0, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-rspec (1.5.0)
rubocop (>= 0.40.0)
ruby-fogbugz (0.2.1)
crack (~> 0.4)
ruby-progressbar (1.7.5)
ruby-progressbar (1.8.1)
ruby-saml (1.1.2)
nokogiri (>= 1.5.10)
uuid (~> 2.3)
......@@ -810,11 +725,11 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
state_machines (0.4.0)
state_machines-activemodel (0.3.0)
activemodel (~> 4.1)
state_machines-activemodel (0.4.0)
activemodel (>= 4.1, < 5.1)
state_machines (>= 0.4.0)
state_machines-activerecord (0.3.0)
activerecord (~> 4.1)
state_machines-activerecord (0.4.0)
activerecord (>= 4.1, < 5.1)
state_machines-activemodel (>= 0.3.0)
stringex (2.5.2)
systemu (2.6.5)
......@@ -863,7 +778,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
unicode-display_width (1.0.2)
unicode-display_width (1.0.5)
unicorn (4.9.0)
kgio (~> 2.6)
rack
......@@ -883,7 +798,7 @@ GEM
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
warden (1.2.4)
warden (1.2.6)
rack (>= 1.0)
web-console (2.3.0)
activemodel (>= 4.0)
......@@ -900,7 +815,6 @@ GEM
builder
expression_parser
rinku
xml-simple (1.1.5)
xpath (2.0.0)
nokogiri (~> 1.3)
......@@ -910,7 +824,7 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.2.9)
ace-rails-ap (~> 4.0.2)
activerecord-session_store (~> 0.1.0)
activerecord-session_store (~> 1.0.0)
acts-as-taggable-on (~> 3.4)
addressable (~> 2.3.8)
after_commit_queue
......@@ -918,7 +832,7 @@ DEPENDENCIES
allocations (~> 1.0)
asana (~> 0.4.0)
asciidoctor (~> 1.5.2)
attr_encrypted (~> 1.3.4)
attr_encrypted (~> 3.0.0)
awesome_print (~> 1.2.0)
babosa (~> 1.0.2)
base32 (~> 0.3.0)
......@@ -931,7 +845,6 @@ DEPENDENCIES
bullet
bundler-audit
byebug
cal-heatmap-rails (~> 3.6.0)
capybara (~> 2.6.2)
capybara-screenshot (~> 1.0.0)
carrierwave (~> 0.10.0)
......@@ -944,9 +857,8 @@ DEPENDENCIES
d3_rails (~> 3.5.0)
database_cleaner (~> 1.4.0)
default_value_for (~> 3.0.0)
devise (~> 3.5.4)
devise-async (~> 0.9.0)
devise-two-factor (~> 2.0.0)
devise (~> 4.0)
devise-two-factor (~> 3.0.0)
diffy (~> 3.0.3)
doorkeeper (~> 3.1)
dropzonejs-rails (~> 0.7.1)
......@@ -958,7 +870,11 @@ DEPENDENCIES
ffaker (~> 2.0.0)
flay
flog
fog (~> 1.36.0)
fog-aws (~> 0.9)
fog-core (~> 1.40)
fog-google (~> 0.3)
fog-local (~> 0.3)
fog-openstack (~> 0.1)
font-awesome-rails (~> 4.2)
foreman
fuubar (~> 2.0.0)
......@@ -989,7 +905,7 @@ DEPENDENCIES
jquery-turbolinks (~> 2.1.0)
jquery-ui-rails (~> 5.0.0)
jwt
kaminari (~> 0.16.3)
kaminari (~> 0.17.0)
letter_opener_web (~> 1.3.0)
licensee (~> 8.0.0)
loofah (~> 2.0.3)
......@@ -1046,7 +962,8 @@ DEPENDENCIES
rqrcode-rails3 (~> 0.1.7)
rspec-rails (~> 3.4.0)
rspec-retry
rubocop (~> 0.38.0)
rubocop (~> 0.40.0)
rubocop-rspec (~> 1.5.0)
ruby-fogbugz (~> 0.2.1)
sanitize (~> 2.0)
sass-rails (~> 5.0.0)
......@@ -1071,7 +988,7 @@ DEPENDENCIES
spring-commands-spinach (~> 1.1.0)
spring-commands-teaspoon (~> 0.0.2)
sprockets (~> 3.6.0)
state_machines-activerecord (~> 0.3.0)
state_machines-activerecord (~> 0.4.0)
task_list (~> 1.0.2)
teaspoon (~> 1.1.0)
teaspoon-jasmine (~> 2.2.0)
......@@ -1092,4 +1009,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
1.12.3
1.12.4
README.md
View file @ 161a8b10
# GitLab
[![build status](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/build.svg)](https://gitlab.com/gitlab-org/gitlab-ce/commits/master)
[![Build Status](https://semaphoreci.com/api/v1/projects/2f1a5809-418b-4cc2-a1f4-819607579fe7/400484/shields_badge.svg)](https://semaphoreci.com/gitlabhq/gitlabhq)
[![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
[![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.svg?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq?branch=master)
## Canonical source
......
app/assets/javascripts/api.js.coffee
View file @ 161a8b10
@Api =
groups_path: "/api/:version/groups.json"
group_path: "/api/:version/groups/:id.json"
projects_path: "/api/:version/projects.json"
ldap_groups_path: "/api/:version/ldap/:provider/groups.json"
namespaces_path: "/api/:version/namespaces.json"
group_projects_path: "/api/:version/groups/:id/projects.json"
projects_path: "/api/:version/projects.json"
labels_path: "/api/:version/projects/:id/labels"
license_path: "/api/:version/licenses/:key"
groupsPath: "/api/:version/groups.json"
groupPath: "/api/:version/groups/:id.json"
namespacesPath: "/api/:version/namespaces.json"
groupProjectsPath: "/api/:version/groups/:id/projects.json"
projectsPath: "/api/:version/projects.json"
labelsPath: "/api/:version/projects/:id/labels"
licensePath: "/api/:version/licenses/:key"
gitignorePath: "/api/:version/gitignores/:key"
ldapGroupsPath: "/api/:version/ldap/:provider/groups.json"
group: (group_id, callback) ->
url = Api.buildUrl(Api.group_path)
url = Api.buildUrl(Api.groupPath)
url = url.replace(':id', group_id)
$.ajax(
......@@ -24,7 +24,7 @@
# Return groups list. Filtered by query
# Only active groups retrieved
groups: (query, skip_ldap, callback) ->
url = Api.buildUrl(Api.groups_path)
url = Api.buildUrl(Api.groupsPath)
$.ajax(
url: url
......@@ -38,7 +38,7 @@
# Return namespaces list. Filtered by query
namespaces: (query, callback) ->
url = Api.buildUrl(Api.namespaces_path)
url = Api.buildUrl(Api.namespacesPath)
$.ajax(
url: url
......@@ -52,7 +52,7 @@
# Return projects list. Filtered by query
projects: (query, order, callback) ->
url = Api.buildUrl(Api.projects_path)
url = Api.buildUrl(Api.projectsPath)
$.ajax(
url: url
......@@ -66,7 +66,7 @@
callback(projects)
newLabel: (project_id, data, callback) ->
url = Api.buildUrl(Api.labels_path)
url = Api.buildUrl(Api.labelsPath)
url = url.replace(':id', project_id)
data.private_token = gon.api_token
......@@ -82,7 +82,7 @@
# Return group projects list. Filtered by query
groupProjects: (group_id, query, callback) ->
url = Api.buildUrl(Api.group_projects_path)
url = Api.buildUrl(Api.groupProjectsPath)
url = url.replace(':id', group_id)
$.ajax(
......@@ -97,7 +97,7 @@
# Return text for a specific license
licenseText: (key, data, callback) ->
url = Api.buildUrl(Api.license_path).replace(':key', key)
url = Api.buildUrl(Api.licensePath).replace(':key', key)
$.ajax(
url: url
......@@ -105,13 +105,19 @@
).done (license) ->
callback(license)
gitignoreText: (key, callback) ->
url = Api.buildUrl(Api.gitignorePath).replace(':key', key)
$.get url, (gitignore) ->
callback(gitignore)
buildUrl: (url) ->
url = gon.relative_url_root + url if gon.relative_url_root?
return url.replace(':version', gon.api_version)
# Return LDAP groups list. Filtered by query
ldap_groups: (query, provider, callback) ->
url = Api.buildUrl(Api.ldap_groups_path)
url = Api.buildUrl(Api.ldapGroupsPath)
url = url.replace(':provider', provider);
$.ajax(
......
app/assets/javascripts/application.js.coffee
View file @ 161a8b10
......@@ -19,8 +19,6 @@
#= require jquery.scrollTo
#= require jquery.turbolinks
#= require jquery.tablesorter
#= require d3
#= require cal-heatmap
#= require turbolinks
#= require autosave
#= require bootstrap/affix
......@@ -53,7 +51,13 @@
#= require shortcuts_network
#= require jquery.nicescroll
#= require date.format
#= require_tree .
#= require_directory ./behaviors
#= require_directory ./blob
#= require_directory ./ci
#= require_directory ./commit
#= require_directory ./extensions
#= require_directory ./lib
#= require_directory .
#= require fuzzaldrin-plus
#= require cropper
......@@ -250,38 +254,6 @@ $ ->
if $navIcon.hasClass('fa-angle-left')
$navIconToggle.trigger('click')
$(document)
.off 'click', '.js-sidebar-toggle'
.on 'click', '.js-sidebar-toggle', (e, triggered) ->
e.preventDefault()
$this = $(this)
$thisIcon = $this.find 'i'
$allGutterToggleIcons = $('.js-sidebar-toggle i')
if $thisIcon.hasClass('fa-angle-double-right')
$allGutterToggleIcons
.removeClass('fa-angle-double-right')
.addClass('fa-angle-double-left')
$('aside.right-sidebar')
.removeClass('right-sidebar-expanded')
.addClass('right-sidebar-collapsed')
$('.page-with-sidebar')
.removeClass('right-sidebar-expanded')
.addClass('right-sidebar-collapsed')
else
$allGutterToggleIcons
.removeClass('fa-angle-double-left')
.addClass('fa-angle-double-right')
$('aside.right-sidebar')
.removeClass('right-sidebar-collapsed')
.addClass('right-sidebar-expanded')
$('.page-with-sidebar')
.removeClass('right-sidebar-collapsed')
.addClass('right-sidebar-expanded')
if not triggered
$.cookie("collapsed_gutter",
$('.right-sidebar')
.hasClass('right-sidebar-collapsed'), { path: '/' })
fitSidebarForSize = ->
oldBootstrapBreakpoint = bootstrapBreakpoint
bootstrapBreakpoint = bp.getBreakpointSize()
......
app/assets/javascripts/blob/blob_gitignore_selector.js.coffee 0 → 100644
View file @ 161a8b10
class @BlobGitignoreSelector
constructor: (opts) ->
{
@dropdown
@editor
@$wrapper = @dropdown.closest('.gitignore-selector')
@$filenameInput = $('#file_name')
@data = @dropdown.data('filenames')
} = opts
@dropdown.glDropdown(
data: @data,
filterable: true,
selectable: true,
search:
fields: ['name']
clicked: @onClick
text: (gitignore) ->
gitignore.name
)
@toggleGitignoreSelector()
@bindEvents()
bindEvents: ->
@$filenameInput
.on 'keyup blur', (e) =>
@toggleGitignoreSelector()
toggleGitignoreSelector: ->
filename = @$filenameInput.val() or $('.editor-file-name').text().trim()
@$wrapper.toggleClass 'hidden', filename isnt '.gitignore'
onClick: (item, el, e) =>
e.preventDefault()
@requestIgnoreFile(item.name)
requestIgnoreFile: (name) ->
Api.gitignoreText name, @requestIgnoreFileSuccess.bind(@)
requestIgnoreFileSuccess: (gitignore) ->
@editor.setValue(gitignore.content, 1)
@editor.focus()
class @BlobGitignoreSelectors
constructor: (opts) ->
{
@$dropdowns = $('.js-gitignore-selector')
@editor
} = opts
@$dropdowns.each (i, dropdown) =>
$dropdown = $(dropdown)
new BlobGitignoreSelector(
dropdown: $dropdown,
editor: @editor
)
app/assets/javascripts/blob/edit_blob.js.coffee
View file @ 161a8b10
......@@ -13,6 +13,7 @@ class @EditBlob
@initModePanesAndLinks()
new BlobLicenseSelector(@editor)
new BlobGitignoreSelectors(editor: @editor)
initModePanesAndLinks: ->
@$editModePanes = $(".js-edit-mode-pane")
......
app/assets/javascripts/calendar.js.coffee deleted 100644 → 0
View file @ 9bdd60c5
class @Calendar
constructor: (timestamps, starting_year, starting_month, calendar_activities_path) ->
cal = new CalHeatMap()
cal.init
itemName: ["contribution"]
data: timestamps
start: new Date(starting_year, starting_month)
domainLabelFormat: "%b"
id: "cal-heatmap"
domain: "month"
subDomain: "day"
range: 12
tooltip: true
label:
position: "top"
legend: [
0
10
20
30
]
legendCellPadding: 3
cellSize: $('.user-calendar').width() / 73
onClick: (date, count) ->
formated_date = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + date.getDate()
$.ajax
url: calendar_activities_path
data:
date: formated_date
cache: false
dataType: "html"
success: (data) ->
$(".user-calendar-activities").html data
app/assets/javascripts/ci/build.coffee
View file @ 161a8b10
......@@ -28,12 +28,15 @@ class CiBuild
#
CiBuild.interval = setInterval =>
if window.location.href.split("#").first() is build_url
last_state = @state
$.ajax
url: build_url + "/trace.json?state=" + encodeURIComponent(@state)
dataType: "json"
success: (log) =>
@state = log.state
if log.status is "running"
return unless last_state is @state
if log.state and log.status is "running"
@state = log.state
if log.append
$('.fa-refresh').before log.html
else
......
app/assets/javascripts/dispatcher.js.coffee
View file @ 161a8b10
......@@ -16,7 +16,6 @@ class Dispatcher
shortcut_handler = null
switch page
when 'projects:issues:index'
Issues.init()
Issuable.init()
shortcut_handler = new ShortcutsNavigation()
when 'projects:issues:show'
......@@ -123,7 +122,7 @@ class Dispatcher
new UsersSelect()
when 'projects'
new NamespaceSelect()
when 'dashboard'
when 'dashboard', 'root'
shortcut_handler = new ShortcutsDashboardNavigation()
when 'profiles'
new Profile()
......
app/assets/javascripts/due_date_select.js.coffee
View file @ 161a8b10
......@@ -11,6 +11,7 @@ class @DueDateSelect
$block = $dropdown.closest('.block')
$selectbox = $dropdown.closest('.selectbox')
$value = $block.find('.value')
$valueContent = $block.find('.value-content')
$sidebarValue = $('.js-due-date-sidebar-value', $block)
fieldName = $dropdown.data('field-name')
......@@ -23,11 +24,15 @@ class @DueDateSelect
$value.removeAttr('style')
)
addDueDate = ->
addDueDate = (isDropdown) ->
# Create the post date
value = $("input[name='#{fieldName}']").val()
date = new Date value.replace(new RegExp('-', 'g'), ',')
mediumDate = $.datepicker.formatDate 'M d, yy', date
if value isnt ''
date = new Date value.replace(new RegExp('-', 'g'), ',')
mediumDate = $.datepicker.formatDate 'M d, yy', date
else
mediumDate = 'None'
data = {}
data[abilityName] = {}
......@@ -39,23 +44,35 @@ class @DueDateSelect
data: data
beforeSend: ->
$loading.fadeIn()
$dropdown.trigger('loading.gl.dropdown')
$selectbox.hide()
if isDropdown
$dropdown.trigger('loading.gl.dropdown')
$selectbox.hide()
$value.removeAttr('style')
$value.html(mediumDate)
$valueContent.html(mediumDate)
$sidebarValue.html(mediumDate)
if value isnt ''
$('.js-remove-due-date-holder').removeClass 'hidden'
else
$('.js-remove-due-date-holder').addClass 'hidden'
).done (data) ->
$dropdown.trigger('loaded.gl.dropdown')
$dropdown.dropdown('toggle')
if isDropdown
$dropdown.trigger('loaded.gl.dropdown')
$dropdown.dropdown('toggle')
$loading.fadeOut()
$block.on 'click', '.js-remove-due-date', (e) ->
e.preventDefault()
$("input[name='#{fieldName}']").val ''
addDueDate(false)
$datePicker.datepicker(
dateFormat: 'yy-mm-dd',
defaultDate: $("input[name='#{fieldName}']").val()
altField: "input[name='#{fieldName}']"
onSelect: ->
addDueDate()
addDueDate(true)
)
$(document)
......
app/assets/javascripts/gl_dropdown.js.coffee
View file @ 161a8b10
......@@ -60,9 +60,36 @@ class GitLabDropdownFilter
results = data
if search_text isnt ''
results = fuzzaldrinPlus.filter(data, search_text,
key: @options.keys
)
# When data is an array of objects therefore [object Array] e.g.
# [
# { prop: 'foo' },
# { prop: 'baz' }
# ]
if _.isArray(data)
results = fuzzaldrinPlus.filter(data, search_text,
key: @options.keys
)
else
# If data is grouped therefore an [object Object]. e.g.
# {
# groupName1: [
# { prop: 'foo' },
# { prop: 'baz' }
# ],
# groupName2: [
# { prop: 'abc' },
# { prop: 'def' }
# ]
# }
if gl.utils.isObject data
results = {}
for key, group of data
tmp = fuzzaldrinPlus.filter(group, search_text,
key: @options.keys
)
if tmp.length
results[key] = tmp.map (item) -> item
@options.callback results
else
......@@ -141,8 +168,9 @@ class GitLabDropdown
searchFields = if @options.search then @options.search.fields else [];
if @options.data
# If data is an array
if _.isArray @options.data
# If we provided data
# data could be an array of objects or a group of arrays
if _.isObject(@options.data) and not _.isFunction(@options.data)
@fullData = @options.data
@parseData @options.data
else
......@@ -230,19 +258,33 @@ class GitLabDropdown
parseData: (data) ->
@renderedData = data
# Render each row
html = $.map data, (obj) =>
return @renderItem(obj)
if @options.filterable and data.length is 0
# render no matching results
html = [@noResults()]
else
# Handle array groups
if gl.utils.isObject data
html = []
for name, groupData of data
# Add header for each group
html.push(@renderItem(header: name, name))
@renderData(groupData, name)
.map (item) ->
html.push item
else
# Render each row
html = @renderData(data)
# Render the full menu
full_html = @renderMenu(html.join(""))
@appendMenu(full_html)
renderData: (data, group = false) ->
data.map (obj, index) =>
return @renderItem(obj, group, index)
shouldPropagate: (e) =>
if @options.multiSelect
$target = $(e.target)
......@@ -299,11 +341,10 @@ class GitLabDropdown
selector = '.dropdown-content'
if @dropdown.find(".dropdown-toggle-page").length
selector = ".dropdown-page-one .dropdown-content"
$(selector, @dropdown).html html
# Render the row
renderItem: (data) ->
renderItem: (data, group = false, index = false) ->
html = ""
# Divider
......@@ -346,8 +387,13 @@ class GitLabDropdown
if @highlight
text = @highlightTextMatches(text, @filterInput.val())
if group
groupAttrs = "data-group='#{group}' data-index='#{index}'"
else
groupAttrs = ''
html = "<li>
<a href='#{url}' class='#{cssClass}'>
<a href='#{url}' #{groupAttrs} class='#{cssClass}'>
#{text}
</a>
</li>"
......@@ -377,9 +423,15 @@ class GitLabDropdown
rowClicked: (el) ->
fieldName = @options.fieldName
selectedIndex = el.parent().index()
if @renderedData
selectedObject = @renderedData[selectedIndex]
groupName = el.data('group')
if groupName
selectedIndex = el.data('index')
selectedObject = @renderedData[groupName][selectedIndex]
else
selectedIndex = el.closest('li').index()
selectedObject = @renderedData[selectedIndex]
value = if @options.id then @options.id(selectedObject, el) else selectedObject.id
field = @dropdown.parent().find("input[name='#{fieldName}'][value='#{value}']")
if el.hasClass(ACTIVE_CLASS)
......@@ -460,7 +512,7 @@ class GitLabDropdown
return false
if currentKeyCode is 13
@selectRowAtIndex currentIndex
@selectRowAtIndex if currentIndex < 0 then 0 else currentIndex
removeArrayKeyEvent: ->
$('body').off 'keydown'
......
app/assets/javascripts/graphs/application.js.coffee 0 → 100644
View file @ 161a8b10
# This is a manifest file that'll be compiled into including all the files listed below.
# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
# be included in the compiled file accessible from http://example.com/assets/application.js
# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
# the compiled file.
#
#= require_tree .
app/assets/javascripts/stat_graph_contributors.js.coffee → app/assets/javascripts/graphs/stat_graph_contributors.js.coffee
View file @ 161a8b10
#= require d3
#= require stat_graph_contributors_util
class @ContributorsStatGraph
init: (log) ->
......
app/assets/javascripts/issuable.js.coffee
View file @ 161a8b10
issuable_created = false
@Issuable =
init: ->
Issuable.initTemplates()
Issuable.initSearch()
unless issuable_created
issuable_created = true
Issuable.initTemplates()
Issuable.initSearch()
Issuable.initChecks()
initTemplates: ->
Issuable.labelRow = _.template(
......@@ -19,7 +23,16 @@
.on 'keyup', ->
clearTimeout(@timer)
@timer = setTimeout( ->
Issuable.filterResults $('#issue_search_form')
$search = $('#issue_search')
$form = $('.js-filter-form')
$input = $("input[name='#{$search.attr('name')}']", $form)
if $input.length is 0
$form.append "<input type='hidden' name='#{$search.attr('name')}' value='#{_.escape($search.val())}'/>"
else
$input.val $search.val()
Issuable.filterResults $form
, 500)
toggleLabelFilters: ->
......@@ -59,15 +72,22 @@
dataType: "json"
reload: ->
if Issues.created
Issues.initChecks()
if Issuable.created
Issuable.initChecks()
$('#filter_issue_search').val($('#issue_search').val())
initChecks: ->
$('.check_all_issues').on 'click', ->
$('.selected_issue').prop('checked', @checked)
Issuable.checkChanged()
$('.selected_issue').on 'change', Issuable.checkChanged
updateStateFilters: ->
stateFilters = $('.issues-state-filters')
stateFilters = $('.issues-state-filters, .dropdown-menu-sort')
newParams = {}
paramKeys = ['author_id', 'milestone_title', 'assignee_id', 'issue_search']
paramKeys = ['author_id', 'milestone_title', 'assignee_id', 'issue_search', 'issue_search']
for paramKey in paramKeys
newParams[paramKey] = gl.utils.getParameterValues(paramKey)[0] or ''
......@@ -82,3 +102,17 @@
else
newUrl = gl.utils.mergeUrlParams(newParams, initialUrl)
$(this).attr 'href', newUrl
checkChanged: ->
checked_issues = $('.selected_issue:checked')
if checked_issues.length > 0
ids = $.map checked_issues, (value) ->
$(value).data('id')
$('#update_issues_ids').val ids
$('.issues-other-filters').hide()
$('.issues_bulk_update').show()
else
$('#update_issues_ids').val []
$('.issues_bulk_update').hide()
$('.issues-other-filters').show()
app/assets/javascripts/issuable_form.js.coffee
View file @ 161a8b10
......@@ -19,6 +19,16 @@ class @IssuableForm
@form.on "click", ".btn-cancel", @resetAutosave
@initWip()
@initMoveDropdown()
$issuableDueDate = $('#issuable-due-date')
if $issuableDueDate.length
$('.datepicker').datepicker(
dateFormat: 'yy-mm-dd',
onSelect: (dateText, inst) ->
$issuableDueDate.val dateText
).datepicker 'setDate', $.datepicker.parseDate('yy-mm-dd', $issuableDueDate.val())
initAutosave: ->
new Autosave @titleField, [
......@@ -80,3 +90,19 @@ class @IssuableForm
addWip: ->
@titleField.val "WIP: #{@titleField.val()}"
initMoveDropdown: ->
$moveDropdown = $('.js-move-dropdown')
if $moveDropdown.length
$('.js-move-dropdown').select2
ajax:
url: $moveDropdown.data('projects-url')
results: (data) ->
return {
results: data
}
formatResult: (project) ->
project.name_with_namespace
formatSelection: (project) ->
project.name_with_namespace
app/assets/javascripts/issues.js.coffee deleted 100644 → 0
View file @ 9bdd60c5
@Issues =
init: ->
Issues.created = true
Issues.initChecks()
$("body").on "ajax:success", ".close_issue, .reopen_issue", ->
t = $(this)
totalIssues = undefined
reopen = t.hasClass("reopen_issue")
$(".issue_counter").each ->
issue = $(this)
totalIssues = parseInt($(this).html(), 10)
if reopen and issue.closest(".main_menu").length
$(this).html totalIssues + 1
else
$(this).html totalIssues - 1
initChecks: ->
$(".check_all_issues").click ->
$(".selected_issue").prop("checked", @checked)
Issues.checkChanged()
$(".selected_issue").bind "change", Issues.checkChanged
checkChanged: ->
checked_issues = $(".selected_issue:checked")
if checked_issues.length > 0
ids = []
$.each checked_issues, (index, value) ->
ids.push $(value).attr("data-id")
$("#update_issues_ids").val ids
$(".issues-other-filters").hide()
$(".issues_bulk_update").show()
else
$("#update_issues_ids").val []
$(".issues_bulk_update").hide()
$(".issues-other-filters").show()
app/assets/javascripts/layout_nav.js.coffee 0 → 100644
View file @ 161a8b10
class @LayoutNav
$ ->
$('.fade-left').addClass('end-scroll')
$('.scrolling-tabs').on 'scroll', (event) ->
$this = $(this)
$el = $(event.target)
currentPosition = $this.scrollLeft()
size = bp.getBreakpointSize()
controlBtnWidth = $('.controls').width()
maxPosition = $this.get(0).scrollWidth - $this.parent().width()
maxPosition += controlBtnWidth if size isnt 'xs' and $('.nav-control').length
$el.find('.fade-left').toggleClass('end-scroll', currentPosition is 0)
$el.find('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)
app/assets/javascripts/lib/type_utility.js.coffee 0 → 100644
View file @ 161a8b10
((w) ->
w.gl ?= {}
w.gl.utils ?= {}
w.gl.utils.isObject = (obj) ->
obj? and (obj.constructor is Object)
) window
app/assets/javascripts/lib/url_utility.js.coffee
View file @ 161a8b10
......@@ -26,10 +26,19 @@
newUrl = decodeURIComponent(url)
for paramName, paramValue of params
pattern = new RegExp "\\b(#{paramName}=).*?(&|$)"
if url.search(pattern) >= 0
if not paramValue?
newUrl = newUrl.replace pattern, ''
else if url.search(pattern) isnt -1
newUrl = newUrl.replace pattern, "$1#{paramValue}$2"
else
newUrl = "#{newUrl}#{(if newUrl.indexOf('?') > 0 then '&' else '?')}#{paramName}=#{paramValue}"
# Remove a trailing ampersand
lastChar = newUrl[newUrl.length - 1]
if lastChar is '&'
newUrl = newUrl.slice 0, -1
newUrl
# removes parameter query string from url. returns the modified url
......
app/assets/javascripts/merge_request_tabs.js.coffee
View file @ 161a8b10
......@@ -75,6 +75,9 @@ class @MergeRequestTabs
@loadDiff($target.attr('href'))
if bp? and bp.getBreakpointSize() isnt 'lg'
@shrinkView()
navBarHeight = $('.navbar-gitlab').outerHeight()
$.scrollTo(".merge-request-details .merge-request-tabs", offset: -navBarHeight)
else if action == 'builds'
@loadBuilds($target.attr('href'))
@expandView()
......
app/assets/javascripts/merge_request_widget.js.coffee
View file @ 161a8b10
......@@ -10,6 +10,7 @@ class @MergeRequestWidget
$('#modal_merge_info').modal(show: false)
@firstCICheck = true
@readyForCICheck = false
@cancel = false
clearInterval @fetchBuildStatusInterval
@clearEventListeners()
......@@ -21,10 +22,16 @@ class @MergeRequestWidget
clearEventListeners: ->
$(document).off 'page:change.merge_request'
cancelPolling: ->
@cancel = true
addEventListeners: ->
allowedPages = ['show', 'commits', 'builds', 'changes']
$(document).on 'page:change.merge_request', =>
if $('body').data('page') isnt 'projects:merge_requests:show'
page = $('body').data('page').split(':').last()
if allowedPages.indexOf(page) < 0
clearInterval @fetchBuildStatusInterval
@cancelPolling()
@clearEventListeners()
mergeInProgress: (deleteSourceBranch = false)->
......@@ -78,6 +85,7 @@ class @MergeRequestWidget
$('.ci-widget-fetching').show()
$.getJSON @opts.ci_status_url, (data) =>
return if @cancel
@readyForCICheck = true
if data.status is ''
......@@ -117,6 +125,7 @@ class @MergeRequestWidget
@firstCICheck = false
showCIStatus: (state) ->
return if not state?
$('.ci_widget').hide()
allowed_states = ["failed", "canceled", "running", "pending", "success", "skipped", "not_found"]
if state in allowed_states
......@@ -124,7 +133,7 @@ class @MergeRequestWidget
switch state
when "failed", "canceled", "not_found"
@setMergeButtonClass('btn-danger')
when "running", "pending"
when "running"
@setMergeButtonClass('btn-warning')
when "success"
@setMergeButtonClass('btn-create')
......@@ -137,6 +146,6 @@ class @MergeRequestWidget
$('.ci_widget:visible .ci-coverage').text(text)
setMergeButtonClass: (css_class) ->
$('.accept_merge_request')
$('.js-merge-button,.accept-action .dropdown-toggle')
.removeClass('btn-danger btn-warning btn-create')
.addClass(css_class)
app/assets/javascripts/notes.js.coffee
View file @ 161a8b10
......@@ -114,9 +114,9 @@ class @Notes
@refresh()
, @pollingInterval
refresh: ->
refresh: =>
return if @refreshing is true
refreshing = true
@refreshing = true
if not document.hidden and document.URL.indexOf(@noteable_url) is 0
@getContent()
......@@ -134,8 +134,8 @@ class @Notes
@renderDiscussionNote(note)
else
@renderNote(note)
always: =>
@refreshing = false
.always () =>
@refreshing = false
###
Increase @pollingInterval up to 120 seconds on every function call,
......@@ -329,7 +329,7 @@ class @Notes
@renderDiscussionNote(note)
# cleanup after successfully creating a diff/discussion note
@removeDiscussionNoteForm($("#new-discussion-note-form-#{note.discussion_id}"))
@removeDiscussionNoteForm($(xhr.target))
###
Called in response to the edit note form being submitted
......
app/assets/javascripts/right_sidebar.js.coffee
View file @ 161a8b10
......@@ -10,6 +10,40 @@ class @Sidebar
$('.dropdown').on('loading.gl.dropdown', @sidebarDropdownLoading)
$('.dropdown').on('loaded.gl.dropdown', @sidebarDropdownLoaded)
$(document)
.off 'click', '.js-sidebar-toggle'
.on 'click', '.js-sidebar-toggle', (e, triggered) ->
e.preventDefault()
$this = $(this)
$thisIcon = $this.find 'i'
$allGutterToggleIcons = $('.js-sidebar-toggle i')
if $thisIcon.hasClass('fa-angle-double-right')
$allGutterToggleIcons
.removeClass('fa-angle-double-right')
.addClass('fa-angle-double-left')
$('aside.right-sidebar')
.removeClass('right-sidebar-expanded')
.addClass('right-sidebar-collapsed')
$('.page-with-sidebar')
.removeClass('right-sidebar-expanded')
.addClass('right-sidebar-collapsed')
else
$allGutterToggleIcons
.removeClass('fa-angle-double-left')
.addClass('fa-angle-double-right')
$('aside.right-sidebar')
.removeClass('right-sidebar-collapsed')
.addClass('right-sidebar-expanded')
$('.page-with-sidebar')
.removeClass('right-sidebar-collapsed')
.addClass('right-sidebar-expanded')
if not triggered
$.cookie("collapsed_gutter",
$('.right-sidebar')
.hasClass('right-sidebar-collapsed'), { path: '/' })
sidebarDropdownLoading: (e) ->
$sidebarCollapsedIcon = $(@).closest('.block').find('.sidebar-collapsed-icon')
img = $sidebarCollapsedIcon.find('img')
......@@ -76,7 +110,7 @@ class @Sidebar
@triggerOpenSidebar() if not @isOpen()
if action is 'hide'
@triggerOpenSidebar() is @isOpen()
@triggerOpenSidebar() if @isOpen()
isOpen: ->
@sidebar.is('.right-sidebar-expanded')
......
app/assets/javascripts/search_autocomplete.js.coffee
View file @ 161a8b10
......@@ -20,8 +20,7 @@ class @SearchAutocomplete
@dropdown = @wrap.find('.dropdown')
@dropdownContent = @dropdown.find('.dropdown-content')
@locationBadgeEl = @getElement('.search-location-badge')
@locationText = @getElement('.location-text')
@locationBadgeEl = @getElement('.location-badge')
@scopeInputEl = @getElement('#scope')
@searchInput = @getElement('.search-input')
@projectInputEl = @getElement('#search_project_id')
......@@ -133,7 +132,7 @@ class @SearchAutocomplete
scope: @scopeInputEl.val()
# Location badge
_location: @locationText.text()
_location: @locationBadgeEl.text()
}
bindEvents: ->
......@@ -143,12 +142,14 @@ class @SearchAutocomplete
@searchInput.on 'click', @onSearchInputClick
@searchInput.on 'focus', @onSearchInputFocus
@clearInput.on 'click', @onClearInputClick
@locationBadgeEl.on 'click', =>
@searchInput.focus()
onDocumentClick: (e) =>
# If clicking outside the search box
# And search input is not focused
# And we are not clicking inside a suggestion
if not $.contains(@dropdown[0], e.target) and @isFocused and not $(e.target).parents('ul').length
if not $.contains(@dropdown[0], e.target) and @isFocused and not $(e.target).closest('.search-form').length
@onSearchInputBlur()
enableAutocomplete: ->
......@@ -221,10 +222,8 @@ class @SearchAutocomplete
category = if item.category? then "#{item.category}: " else ''
value = if item.value? then item.value else ''
html = "<span class='location-badge'>
<i class='location-text'>#{category}#{value}</i>
</span>"
@locationBadgeEl.html(html)
badgeText = "#{category}#{value}"
@locationBadgeEl.text(badgeText).show()
@wrap.addClass('has-location-badge')
restoreOriginalState: ->
......@@ -233,9 +232,8 @@ class @SearchAutocomplete
for input in inputs
@getElement("##{input}").val(@originalState[input])
if @originalState._location is ''
@locationBadgeEl.empty()
@locationBadgeEl.hide()
else
@addLocationBadge(
value: @originalState._location
......@@ -244,7 +242,7 @@ class @SearchAutocomplete
@dropdown.removeClass 'open'
badgePresent: ->
@locationBadgeEl.children().length
@locationBadgeEl.length
resetSearchState: ->
inputs = Object.keys @originalState
......@@ -257,7 +255,7 @@ class @SearchAutocomplete
@getElement("##{input}").val('')
removeLocationBadge: ->
@locationBadgeEl.empty()
@locationBadgeEl.hide()
# Reset state
@resetSearchState()
......
app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee
View file @ 161a8b10
......@@ -3,10 +3,10 @@
class @ShortcutsDashboardNavigation extends Shortcuts
constructor: ->
super()
Mousetrap.bind('g a', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-activity'))
Mousetrap.bind('g i', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-issues'))
Mousetrap.bind('g m', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-merge_requests'))
Mousetrap.bind('g p', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-projects'))
Mousetrap.bind('g a', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-activity'))
Mousetrap.bind('g i', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-issues'))
Mousetrap.bind('g m', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-merge_requests'))
Mousetrap.bind('g p', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-projects'))
@findAndFollowLink: (selector) ->
link = $(selector).attr('href')
......
app/assets/javascripts/users/application.js.coffee 0 → 100644
View file @ 161a8b10
# This is a manifest file that'll be compiled into including all the files listed below.
# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
# be included in the compiled file accessible from http://example.com/assets/application.js
# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
# the compiled file.
#
#= require d3
#= require_tree .
app/assets/javascripts/users/calendar.js.coffee 0 → 100644
View file @ 161a8b10
class @Calendar
constructor: (timestamps, @calendar_activities_path) ->
@currentSelectedDate = ''
@daySpace = 1
@daySize = 15
@daySizeWithSpace = @daySize + (@daySpace * 2)
@monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
@months = []
@highestValue = 0
# Get the highest value from the timestampes
_.each timestamps, (count) =>
if count > @highestValue
@highestValue = count
# Loop through the timestamps to create a group of objects
# The group of objects will be grouped based on the day of the week they are
@timestampsTmp = []
i = 0
group = 0
_.each timestamps, (count, date) =>
newDate = new Date parseInt(date) * 1000
day = newDate.getDay()
# Create a new group array if this is the first day of the week
# or if is first object
if (day is 0 and i isnt 0) or i is 0
@timestampsTmp.push []
group++
innerArray = @timestampsTmp[group-1]
# Push to the inner array the values that will be used to render map
innerArray.push
count: count
date: newDate
day: day
i++
# Init color functions
@color = @initColor()
@colorKey = @initColorKey()
# Init the svg element
@renderSvg(group)
@renderDays()
@renderMonths()
@renderDayTitles()
@renderKey()
@initTooltips()
renderSvg: (group) ->
@svg = d3.select '.js-contrib-calendar'
.append 'svg'
.attr 'width', (group + 1) * @daySizeWithSpace
.attr 'height', 167
.attr 'class', 'contrib-calendar'
renderDays: ->
@svg.selectAll 'g'
.data @timestampsTmp
.enter()
.append 'g'
.attr 'transform', (group, i) =>
_.each group, (stamp, a) =>
if a is 0 and stamp.day is 0
month = stamp.date.getMonth()
x = (@daySizeWithSpace * i + 1) + @daySizeWithSpace
lastMonth = _.last(@months)
if lastMonth?
lastMonthX = lastMonth.x
if !lastMonth?
@months.push
month: month
x: x
else if month isnt lastMonth.month and x - @daySizeWithSpace isnt lastMonthX
@months.push
month: month
x: x
"translate(#{(@daySizeWithSpace * i + 1) + @daySizeWithSpace}, 18)"
.selectAll 'rect'
.data (stamp) ->
stamp
.enter()
.append 'rect'
.attr 'x', '0'
.attr 'y', (stamp, i) =>
(@daySizeWithSpace * stamp.day)
.attr 'width', @daySize
.attr 'height', @daySize
.attr 'title', (stamp) =>
contribText = 'No contributions'
if stamp.count > 0
contribText = "#{stamp.count} contribution#{if stamp.count > 1 then 's' else ''}"
date = dateFormat(stamp.date, 'mmm d, yyyy')
"#{contribText}<br />#{date}"
.attr 'class', 'user-contrib-cell js-tooltip'
.attr 'fill', (stamp) =>
if stamp.count isnt 0
@color(stamp.count)
else
'#ededed'
.attr 'data-container', 'body'
.on 'click', @clickDay
renderDayTitles: ->
days = [{
text: 'M'
y: 29 + (@daySizeWithSpace * 1)
}, {
text: 'W'
y: 29 + (@daySizeWithSpace * 3)
}, {
text: 'F'
y: 29 + (@daySizeWithSpace * 5)
}]
@svg.append 'g'
.selectAll 'text'
.data days
.enter()
.append 'text'
.attr 'text-anchor', 'middle'
.attr 'x', 8
.attr 'y', (day) ->
day.y
.text (day) ->
day.text
.attr 'class', 'user-contrib-text'
renderMonths: ->
@svg.append 'g'
.selectAll 'text'
.data @months
.enter()
.append 'text'
.attr 'x', (date) ->
date.x
.attr 'y', 10
.attr 'class', 'user-contrib-text'
.text (date) =>
@monthNames[date.month]
renderKey: ->
keyColors = ['#ededed', @colorKey(0), @colorKey(1), @colorKey(2), @colorKey(3)]
@svg.append 'g'
.attr 'transform', "translate(18, #{@daySizeWithSpace * 8 + 16})"
.selectAll 'rect'
.data keyColors
.enter()
.append 'rect'
.attr 'width', @daySize
.attr 'height', @daySize
.attr 'x', (color, i) =>
@daySizeWithSpace * i
.attr 'y', 0
.attr 'fill', (color) ->
color
initColor: ->
d3.scale
.linear()
.range(['#acd5f2', '#254e77'])
.domain([0, @highestValue])
initColorKey: ->
d3.scale
.linear()
.range(['#acd5f2', '#254e77'])
.domain([0, 3])
clickDay: (stamp) =>
if @currentSelectedDate isnt stamp.date
@currentSelectedDate = stamp.date
formatted_date = @currentSelectedDate.getFullYear() + "-" + (@currentSelectedDate.getMonth()+1) + "-" + @currentSelectedDate.getDate()
$.ajax
url: @calendar_activities_path
data:
date: formatted_date
cache: false
dataType: 'html'
beforeSend: ->
$('.user-calendar-activities').html '<div class="text-center"><i class="fa fa-spinner fa-spin user-calendar-activities-loading"></i></div>'
success: (data) ->
$('.user-calendar-activities').html data
else
$('.user-calendar-activities').html ''
initTooltips: ->
$('.js-contrib-calendar .js-tooltip').tooltip
html: true
app/assets/javascripts/users_select.js.coffee
View file @ 161a8b10
......@@ -93,7 +93,9 @@ class @UsersSelect
$dropdown.glDropdown(
data: (term, callback) =>
@users term, (users) =>
isAuthorFilter = $('.js-author-search')
@users term, term is '' and isAuthorFilter, (users) =>
if term.length is 0
showDivider = 0
......@@ -138,7 +140,7 @@ class @UsersSelect
toggleLabel: (selected) ->
if selected && 'id' of selected
selected.name
if selected.text then selected.text else selected.name
else
defaultLabel
......@@ -221,7 +223,7 @@ class @UsersSelect
multiple: $(select).hasClass('multiselect')
minimumInputLength: 0
query: (query) =>
@users query.term, (users) =>
@users query.term, @projectId?, (users) =>
data = { results: users }
if query.term.length == 0
......@@ -304,7 +306,7 @@ class @UsersSelect
# Return users list. Filtered by query
# Only active users retrieved
users: (query, callback) =>
users: (query, fromProject, callback) =>
url = @buildUrl(@usersPath)
$.ajax(
......@@ -313,7 +315,7 @@ class @UsersSelect
search: query
per_page: 20
active: true
project_id: @projectId
project_id: @projectId if fromProject
group_id: @groupId
skip_ldap: @skipLdap
current_user: @showCurrentUser
......
app/assets/stylesheets/application.scss
View file @ 161a8b10
......@@ -8,7 +8,6 @@
*= require select2
*= require_self
*= require dropzone/basic
*= require cal-heatmap
*= require cropper.css
*/
......
app/assets/stylesheets/framework/avatar.scss
View file @ 161a8b10
......@@ -45,6 +45,7 @@
&.s32 { font-size: 20px; line-height: 32px; }
&.s40 { font-size: 16px; line-height: 40px; }
&.s60 { font-size: 32px; line-height: 60px; }
&.s70 { font-size: 34px; line-height: 70px; }
&.s90 { font-size: 36px; line-height: 90px; }
&.s110 { font-size: 40px; line-height: 112px; font-weight: 300; }
&.s140 { font-size: 72px; line-height: 140px; }
......
app/assets/stylesheets/framework/blocks.scss
View file @ 161a8b10
......@@ -24,8 +24,8 @@
background-color: $background-color;
padding: $gl-padding;
margin-bottom: 0;
border-top: 1px solid $border-color;
border-bottom: 1px solid $border-color;
border-top: 1px solid $white-dark;
border-bottom: 1px solid $white-dark;
color: $gl-gray;
&.oneline-block {
......@@ -110,9 +110,9 @@
.cover-title {
color: $gl-header-color;
margin: 0;
font-size: 23px;
font-size: 24px;
font-weight: normal;
margin: 16px 0 5px;
margin-bottom: 5px;
color: #4c4e54;
font-size: 23px;
line-height: 1.1;
......@@ -137,7 +137,6 @@
}
.cover-desc {
padding: 0 $gl-padding 3px;
color: $gl-text-color;
&.username:last-child {
......@@ -205,7 +204,7 @@
.content-block {
padding: $gl-padding 0;
border-bottom: 1px solid $border-color;
border-bottom: 1px solid $white-dark;
&.oneline-block {
line-height: 36px;
......
app/assets/stylesheets/framework/buttons.scss
View file @ 161a8b10
......@@ -16,6 +16,19 @@
@include btn-default;
}
@mixin btn-outline($background, $text, $border, $hover-background, $hover-text, $hover-border) {
background-color: $background;
color: $text;
border-color: $border;
&:hover,
&:focus {
background-color: $hover-background;
color: $hover-text;
border-color: $hover-border;;
}
}
@mixin btn-color($light, $border-light, $normal, $border-normal, $dark, $border-dark, $color) {
background-color: $light;
border-color: $border-light;
......@@ -106,11 +119,14 @@
@include btn-blue;
}
&.btn-close,
&.btn-warning {
@include btn-orange;
}
&.btn-close {
@include btn-outline($white-light, $orange-normal, $orange-normal, $orange-light, $white-light, $orange-light);
}
&.btn-danger,
&.btn-remove,
&.btn-red {
......
app/assets/stylesheets/framework/calendar.scss
View file @ 161a8b10
.calender-block {
padding-left: 0;
padding-right: 0;
@media (min-width: $screen-sm-min) and (max-width: $screen-lg-min) {
overflow-x: scroll;
}
}
.user-calendar-activities {
.calendar_onclick_hr {
padding: 0;
margin: 10px 0;
}
.str-truncated {
max-width: 70%;
}
.text-expander {
background: #eee;
color: #555;
padding: 0 5px;
cursor: pointer;
margin-left: 4px;
&:hover {
background-color: #ddd;
}
.user-calendar-activities-loading {
font-size: 24px;
}
}
/**
* This overwrites the default values of the cal-heatmap gem
*/
.calendar {
.qi {
fill: #fff;
}
.q1 {
fill: #ededed !important;
}
.user-calendar {
text-align: center;
.q2 {
fill: #acd5f2 !important;
}
.q3 {
fill: #7fa8d1 !important;
}
.q4 {
fill: #49729b !important;
}
.q5 {
fill: #254e77 !important;
.calendar {
display: inline-block;
}
}
.future {
visibility: hidden;
.user-contrib-cell {
&:hover {
cursor: pointer;
stroke: #000;
}
}
.domain-background {
fill: none;
shape-rendering: crispedges;
}
.user-contrib-text {
font-size: 12px;
fill: #959494;
}
.ch-tooltip {
padding: 3px;
font-weight: 550;
}
.calendar-hint {
margin-top: -23px;
float: right;
font-size: 12px;
}
app/assets/stylesheets/framework/dropdowns.scss
View file @ 161a8b10
......@@ -154,7 +154,7 @@
color: $dropdown-header-color;
font-size: 13px;
line-height: 22px;
padding: 0 10px 10px;
padding: 0 10px;
}
.separator + .dropdown-header {
......@@ -162,6 +162,10 @@
}
}
.dropdown-menu-full-width {
width: 100%;
}
.dropdown-menu-paging {
.dropdown-page-two,
.dropdown-menu-back {
......
app/assets/stylesheets/framework/files.scss
View file @ 161a8b10
......@@ -5,6 +5,10 @@
.file-holder {
border: 1px solid $border-color;
&.file-holder-no-border {
border: 0;
}
&.readme-holder {
margin: $gl-padding-top 0;
}
......@@ -23,8 +27,17 @@
word-wrap: break-word;
border-radius: 3px 3px 0 0;
&.file-title-clear {
padding-left: 0;
padding-right: 0;
background-color: transparent;
.file-actions {
right: 0;
}
}
.file-actions {
float: right;
position: absolute;
top: 5px;
right: 15px;
......
app/assets/stylesheets/framework/forms.scss
View file @ 161a8b10
......@@ -28,10 +28,6 @@ input[type='text'].danger {
}
label {
&.control-label {
@extend .col-sm-2;
}
&.inline-label {
margin: 0;
}
......@@ -41,6 +37,10 @@ label {
}
}
.control-label {
@extend .col-sm-2;
}
.inline-input-group {
width: 250px;
}
......
app/assets/stylesheets/framework/mobile.scss
View file @ 161a8b10
......@@ -48,10 +48,6 @@
display: block;
}
.project-home-desc {
font-size: 21px;
}
.project-repo-buttons,
.git-clone-holder {
display: none;
......
app/assets/stylesheets/framework/nav.scss
View file @ 161a8b10
@mixin fade($gradient-direction, $rgba, $gradient-color) {
visibility: visible;
opacity: 1;
position: absolute;
bottom: 12px;
width: 43px;
height: 30px;
transition-duration: .3s;
-webkit-transform: translateZ(0);
background: -webkit-linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
background: -o-linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
background: -moz-linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
background: linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
&.end-scroll {
visibility: hidden;
opacity: 0;
transition-duration: .3s;
}
}
@mixin scrolling-links() {
white-space: nowrap;
overflow-x: auto;
overflow-y: hidden;
-webkit-overflow-scrolling: touch;
&::-webkit-scrollbar {
display: none;
}
}
.nav-links {
padding: 0;
margin: 0;
......@@ -119,7 +150,7 @@
}
input {
height: 34px;
height: 35px;
display: inline-block;
position: relative;
top: 2px;
......@@ -196,7 +227,7 @@
position: fixed;
top: $header-height;
width: 100%;
z-index: 1;
z-index: 11;
background: $background-color;
border-bottom: 1px solid $border-color;
transition-duration: .3s;
......@@ -209,13 +240,8 @@
float: right;
padding: 7px 0 0;
@media (max-width: $screen-xs-min) {
float: none;
padding: 0 9px;
.dropdown-new {
width: 100%;
}
@media (max-width: $screen-xs-max) {
display: none;
}
i {
......@@ -238,14 +264,27 @@
@media (max-width: $screen-xs-min) {
margin-left: 0;
}
li.active {
font-weight: bold;
}
}
}
.nav-links {
@include scrolling-links();
border-bottom: none;
height: 51px;
white-space: nowrap;
overflow-x: auto;
.fade-right {
@include fade(left, rgba(250, 250, 250, 0.4), $background-color);
right: 0;
}
.fade-left {
@include fade(right, rgba(250, 250, 250, 0.4), $background-color);
left: 0;
}
li {
......@@ -269,14 +308,62 @@
}
}
.nav-control {
.fade-right {
@media (min-width: $screen-xs-max) {
right: 67px;
}
@media (max-width: $screen-xs-min) {
right: 0;
}
}
}
}
.nav-block {
position: relative;
.nav-links {
@include scrolling-links();
.fade-right {
@include fade(left, rgba(255, 255, 255, 0.4), $white-light);
right: 0;
}
.fade-left {
@include fade(right, rgba(255, 255, 255, 0.4), $white-light);
left: 0;
}
&.event-filter {
.fade-right {
visibility: hidden;
@media (max-width: $screen-xs-max) {
visibility: visible;
}
}
}
}
}
.page-with-layout-nav {
margin-top: 50px;
margin-top: $header-height + 2;
.right-sidebar {
top: ($header-height * 2) + 2;
}
}
.activities {
.nav-block {
border-bottom: 1px solid $border-color;
&.controls-dropdown-visible {
@media (max-width: $screen-xs-min) {
margin-top: 96px;
.nav-links {
border-bottom: none;
}
}
}
app/assets/stylesheets/framework/sidebar.scss
View file @ 161a8b10
......@@ -324,7 +324,7 @@
.layout-nav {
@media (max-width: $screen-xs-min) {
padding-right: 0;;
padding-right: 0;
}
@media (min-width: $screen-xs-min) and (max-width: $screen-md-min) {
......
app/assets/stylesheets/framework/variables.scss
View file @ 161a8b10
......@@ -63,7 +63,8 @@ $gl-padding-top: 10px;
/*
* Misc
*/
$row-hover: #f4f8fe;
$row-hover: #f7faff;
$row-hover-border: #b2d7ff;
$progress-color: #c0392b;
$avatar_radius: 50%;
$header-height: 50px;
......@@ -104,7 +105,7 @@ $blue-medium-light: #3498cb;
$blue-medium: #2f8ebf;
$blue-medium-dark: #2d86b4;
$orange-light: rgba(252, 109, 38, 0.80);
$orange-light: #fc8a51;
$orange-normal: #e75e40;
$orange-dark: #ce5237;
......@@ -119,8 +120,8 @@ $border-white-light: #f1f2f4;
$border-white-normal: #d6dae2;
$border-white-dark: #c6cacf;
$border-gray-light: rgba(0, 0, 0, 0.06);
$border-gray-normal: rgba(0, 0, 0, 0.10);;
$border-gray-light: #dcdcdc;
$border-gray-normal: rgba(0, 0, 0, 0.10);
$border-gray-dark: #c6cacf;
$border-green-light: #2faa60;
......
app/assets/stylesheets/mailers/devise.scss 0 → 100644
View file @ 161a8b10
// NOTE: This stylesheet is for the exclusive use of the `devise_mailer` layout
// used for Devise email templates, and _should not_ be included in any
// application stylesheets.
//
// Styles defined here are embedded directly into the resulting email HTML via
// the `premailer` gem.
$body-background-color: #363636;
$message-background-color: #fafafa;
$header-color: #6b4fbb;
$body-color: #444;
$cta-color: #e14329;
$footer-link-color: #7e7e7e;
$font-family: Helvetica, Arial, sans-serif;
body {
background-color: $body-background-color;
font-family: $font-family;
margin: 0;
padding: 0;
}
table {
-premailer-cellpadding: 0;
-premailer-cellspacing: 0;
border: 0;
border-collapse: separate;
&#wrapper {
background-color: $body-background-color;
width: 100%;
}
&#header {
margin: 0 auto;
text-align: left;
width: 600px;
}
&#body {
background-color: $message-background-color;
border: 1px solid #000;
border-radius: 4px;
margin: 0 auto;
width: 600px;
}
&#footer {
color: $footer-link-color;
font-size: 14px;
text-align: center;
width: 100%;
}
td {
&#body-container {
padding: 20px 40px;
}
}
}
.center {
text-align: center;
}
#logo {
border: none;
outline: none;
min-height: 88px;
width: 134px;
}
#content {
h2 {
color: $header-color;
font-size: 30px;
font-weight: 400;
line-height: 34px;
margin-top: 0;
}
p {
color: $body-color;
font-size: 17px;
line-height: 24px;
margin-bottom: 0;
}
}
#cta {
border: 1px solid $cta-color;
border-radius: 3px;
display: inline-block;
margin: 20px 0;
padding: 12px 24px;
a {
background-color: $message-background-color;
color: $cta-color;
display: inline-block;
text-decoration: none;
}
}
#tanuki {
padding: 40px 0 0;
img {
border: none;
outline: none;
width: 37px;
min-height: 36px;
}
}
#tagline {
font-size: 22px;
font-weight: 100;
padding: 4px 0 40px;
}
#social {
padding: 0 10px 20px;
width: 600px;
word-spacing: 20px;
a {
color: $footer-link-color;
text-decoration: none;
}
}
app/assets/stylesheets/pages/commit.scss
View file @ 161a8b10
......@@ -26,8 +26,28 @@
.commit-info-row {
margin-bottom: 10px;
&.commit-info-row-header {
line-height: 34px;
@media (min-width: $screen-sm-min) {
margin-bottom: 0;
}
.commit-options-dropdown-caret {
@media (max-width: $screen-sm) {
margin-left: 0;
}
}
}
.avatar {
@extend .avatar-inline;
margin-left: 0;
@media (min-width: $screen-sm-min) {
margin-left: 4px;
}
}
.commit-committer-link,
.commit-author-link {
......@@ -35,10 +55,6 @@
font-weight: bold;
}
.time_ago {
margin-left: 8px;
}
.fa-clipboard {
color: $dropdown-title-btn-color;
}
......
app/assets/stylesheets/pages/editor.scss
View file @ 161a8b10
......@@ -23,7 +23,7 @@
.file-title {
@extend .monospace;
line-height: 42px;
line-height: 35px;
padding-top: 7px;
padding-bottom: 7px;
......@@ -43,7 +43,7 @@
.editor-file-name {
@extend .monospace;
float: left;
margin-right: 10px;
}
......@@ -59,7 +59,22 @@
}
.encoding-selector,
.license-selector {
.license-selector,
.gitignore-selector {
display: inline-block;
vertical-align: top;
font-family: $regular_font;
}
.gitignore-selector {
.dropdown {
line-height: 21px;
}
.dropdown-menu-toggle {
vertical-align: top;
width: 220px;
}
}
}
app/assets/stylesheets/pages/issuable.scss
View file @ 161a8b10
......@@ -150,6 +150,10 @@
font-weight: 600;
}
.light {
font-weight: normal;
}
.sidebar-collapsed-icon {
display: none;
}
......
app/assets/stylesheets/pages/issues.scss
View file @ 161a8b10
......@@ -40,11 +40,6 @@
}
}
.issue-search-form {
margin: 0;
height: 24px;
}
form.edit-issue {
margin: 0;
}
......@@ -96,8 +91,3 @@ form.edit-issue {
.issue-form .select2-container {
width: 250px !important;
}
.issue-closed-by-widget {
color: $gl-text-color;
margin-left: 52px;
}
app/assets/stylesheets/pages/merge_requests.scss
View file @ 161a8b10
......@@ -41,7 +41,7 @@
margin: 0;
margin-left: 20px;
padding: 5px;
padding-top: 12px;
padding-top: 8px;
line-height: 20px;
&.right {
......@@ -110,6 +110,29 @@
p:last-child {
margin-bottom: 0;
}
@media (max-width: $screen-sm-max) {
h4 {
font-size: 15px;
}
p {
font-size: 13px;
}
.btn,
.btn-group,
.accept-action {
width: 100%;
margin-bottom: 4px;
}
.accept-control {
width: 100%;
text-align: center;
margin: 0;
}
}
}
.mr-widget-footer {
......@@ -280,11 +303,5 @@
background-color: $white-light;
color: $gl-placeholder-color;
}
th,
td {
padding: 16px;
}
}
}
app/assets/stylesheets/pages/pipelines.scss
View file @ 161a8b10
.pipeline-stage {
overflow: hidden;
text-overflow: ellipsis;
.pipelines {
.stage {
max-width: 100px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.duration, .finished_at {
margin: 4px 0;
}
.commit-title {
margin: 0;
}
.controls {
white-space: nowrap;
}
.btn {
margin: 4px;
}
}
app/assets/stylesheets/pages/profile.scss
View file @ 161a8b10
......@@ -66,12 +66,6 @@
}
}
.calendar-hint {
margin-top: -12px;
float: right;
font-size: 12px;
}
.profile-link-holder {
display: inline;
......@@ -134,14 +128,6 @@
}
}
.change-username-title {
color: $gl-warning;
}
.remove-account-title {
color: $gl-danger;
}
.provider-btn-group {
display: inline-block;
margin-right: 10px;
......
app/assets/stylesheets/pages/projects.scss
View file @ 161a8b10
......@@ -10,7 +10,7 @@
margin-bottom: 0;
}
.new_project,
.edit_project {
.edit-project {
fieldset.features {
.control-label {
font-weight: normal;
......@@ -26,8 +26,13 @@
}
.project-home-panel {
padding-bottom: 40px;
border-bottom: 1px solid $border-color;
background: $white-light;
text-align: left;
padding: 24px 0;
.container-fluid {
position: relative;
}
.cover-controls {
.project-settings-dropdown {
......@@ -43,21 +48,55 @@
}
}
.project-identicon-holder {
margin-bottom: 16px;
.cover-title {
margin-bottom: 0;
}
.project-image-container {
@include make-sm-column(1);
max-width: 86px;
min-width: 86px;
padding-right: 0;
margin: 11px 0;
.avatar, .identicon {
margin: 0 auto;
float: none;
@media (max-width: $screen-md-max) {
padding-left: 0;
margin: 0 0 10px;
max-width: none;
min-width: none;
.avatar.s70 {
margin: auto;
}
}
}
.identicon {
@include border-radius(50%);
.project-info {
@include make-sm-column(10);
h1 {
font-size: 24px;
font-weight: normal;
margin: 0;
}
.project-home-desc {
p {
margin: 0;
}
}
}
.identicon {
float: left;
@include border-radius(50%);
}
.avatar {
float: none;
}
.notifications-btn {
margin-top: -28px;
.fa-bell {
margin-right: 6px;
......@@ -69,28 +108,45 @@
}
.project-repo-buttons {
margin-top: 20px;
margin-bottom: 0;
font-size: 0;
.count-buttons {
display: block;
margin-bottom: 20px;
}
.btn {
@include btn-gray;
padding: 3px 10px;
text-transform: none;
background-color: $background-color;
.clone-row {
.split-repo-buttons,
.project-clone-holder {
display: inline-block;
.fa {
color: $layout-link-gray;
}
.split-repo-buttons {
margin: 0 12px;
.fa-caret-down {
margin-left: 3px;
}
}
.btn {
@include btn-gray;
text-transform: none;
.btn-group:not(:first-child):not(:last-child) > .btn {
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}
form {
margin-left: 10px;
}
.count-buttons {
display: inline-block;
vertical-align: top;
margin-top: 16px;
}
.project-clone-holder {
display: inline-block;
margin-top: 16px;
input {
height: 29px;
}
}
.count-with-arrow {
......@@ -140,14 +196,18 @@
line-height: 13px;
padding: $gl-vert-padding $gl-padding;
letter-spacing: .4px;
padding: 10px 14px;
padding: 7px 14px;
text-align: center;
vertical-align: middle;
touch-action: manipulation;
cursor: pointer;
background-image: none;
white-space: nowrap;
margin: 0 11px 0 4px;
margin: 0 10px 0 4px;
a {
color: inherit;
}
&:hover {
background: #fff;
......@@ -155,13 +215,37 @@
}
}
}
.project-right-buttons {
position: absolute;
right: 16px;
bottom: 0;
.btn {
padding: 3px 10px;
background-color: $background-color;
}
@media (max-width: 1304px) {
top: 0;
}
}
@media (max-width: $screen-md-max) {
text-align: center;
.project-info,
.project-image-container {
width: 100%;
}
}
}
.split-one {
display: inline-table;
margin-right: 12px;
a {
> a {
margin: -1px;
}
}
......@@ -285,11 +369,11 @@ a.deploy-project-label {
}
.project-stats {
text-align: center;
margin-top: $gl-padding;
margin-bottom: 0;
padding-top: 10px;
padding-bottom: 4px;
padding: 16px 0;
background-color: $white-light;
font-size: 0;
ul.nav {
display: inline-block;
......@@ -300,12 +384,11 @@ a.deploy-project-label {
}
.nav > li > a {
@include btn-default;
@include btn-gray;
background-color: transparent;
border: 1px solid #f7f8fa;
margin-left: 12px;
margin-right: 12px;
padding: 0 10px;
font-size: 15px;
color: $notes-light-color;
}
li {
......@@ -325,6 +408,10 @@ a.deploy-project-label {
background-color: #f0f2f5;
}
}
&.row-content-block.second-block {
margin-top: 0;
}
}
pre.light-well {
......@@ -442,9 +529,14 @@ pre.light-well {
border-top: 0;
.edit-project-readme {
z-index: 100;
z-index: 2;
position: relative;
}
.wiki h1 {
border-bottom: none;
padding: 0;
}
}
.git-clone-holder {
......
app/assets/stylesheets/pages/search.scss
View file @ 161a8b10
......@@ -28,6 +28,7 @@
}
.search-input {
padding-right: 20px;
border: none;
font-size: 14px;
outline: none;
......@@ -47,6 +48,7 @@
display: inline-block;
background-color: $location-badge-bg;
vertical-align: top;
cursor: default;
}
.search-input-container {
......@@ -55,7 +57,7 @@
position: relative;
}
.search-location-badge, .search-input-wrap {
.search-input-wrap {
// Fallback if flexbox is not supported
display: inline-block;
}
......
app/assets/stylesheets/pages/settings.scss
View file @ 161a8b10
......@@ -12,3 +12,11 @@
border: 1px solid $warning-message-border;
border-radius: $border-radius-base;
}
.warning-title {
color: $gl-warning;
}
.danger-title {
color: $gl-danger;
}
app/assets/stylesheets/pages/snippets.scss
View file @ 161a8b10
......@@ -16,19 +16,6 @@
}
}
.snippet-box {
@include border-radius(2px);
display: block;
float: left;
padding: 0 $gl-padding;
font-weight: normal;
margin-right: 10px;
font-size: $gl-font-size;
border: 1px solid;
line-height: 32px;
}
.markdown-snippet-copy {
position: fixed;
top: -10px;
......@@ -36,3 +23,34 @@
max-height: 0;
max-width: 0;
}
.file-holder.snippet-file-content {
padding-bottom: $gl-padding;
border-bottom: 1px solid $border-color;
.file-title {
padding-top: $gl-padding;
padding-bottom: $gl-padding;
}
.file-actions {
top: 12px;
}
.file-content {
border-left: 1px solid $border-color;
border-right: 1px solid $border-color;
border-bottom: 1px solid $border-color;
}
}
.snippet-title {
font-size: 24px;
font-weight: normal;
}
.snippet-actions {
@media (min-width: $screen-sm-min) {
float: right;
}
}
app/assets/stylesheets/pages/todos.scss
View file @ 161a8b10
......@@ -29,6 +29,17 @@
.todo-item {
.todo-title {
@include str-truncated(calc(100% - 174px));
overflow: visible;
}
.status-box {
margin: 0;
float: none;
display: inline-block;
font-weight: normal;
padding: 0 5px;
line-height: inherit;
font-size: 14px;
}
.todo-body {
......@@ -76,12 +87,11 @@
@media (max-width: $screen-xs-max) {
.todo-item {
padding-left: $gl-padding;
.todo-title {
white-space: normal;
overflow: visible;
max-width: 100%;
margin-bottom: 10px;
}
.avatar {
......
app/assets/stylesheets/pages/tree.scss
View file @ 161a8b10
......@@ -15,16 +15,23 @@
margin-bottom: 0;
tr {
> td, > th {
border-bottom: 1px solid $table-border-gray;
border-top: 1px solid $table-border-gray;
td, th {
line-height: 23px;
}
&:hover {
cursor: pointer;
td {
background: $row-hover;
background-color: $row-hover;
border-top: 1px solid $row-hover-border;
border-bottom: 1px solid $row-hover-border;
}
cursor: pointer;
}
&.selected {
td {
background: $gray-dark;
......
app/controllers/admin/application_settings_controller.rb
View file @ 161a8b10
......@@ -109,6 +109,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:repository_checks_enabled,
:metrics_packet_size,
:send_user_confirmation_email,
:container_registry_token_expire_delay,
restricted_visibility_levels: [],
import_sources: [],
disabled_oauth_sign_in_sources: []
......
app/controllers/application_controller.rb
View file @ 161a8b10
......@@ -236,7 +236,7 @@ class ApplicationController < ActionController::Base
end
def configure_permitted_parameters
devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:username, :email, :password, :login, :remember_me, :otp_attempt) }
devise_parameter_sanitizer.permit(:sign_in, keys: [:username, :email, :password, :login, :remember_me, :otp_attempt])
end
def hexdigest(string)
......@@ -273,7 +273,7 @@ class ApplicationController < ActionController::Base
# internal repos where you are not a member. Enable this filter
# or improve current implementation to filter only issues you
# created or assigned or mentioned
#@filter_params[:authorized_only] = true
# @filter_params[:authorized_only] = true
end
@filter_params
......
app/controllers/autocomplete_controller.rb
View file @ 161a8b10
......@@ -39,6 +39,24 @@ class AutocompleteController < ApplicationController
render json: @user, only: [:name, :username, :id], methods: [:avatar_url]
end
def projects
project = Project.find_by_id(params[:project_id])
projects = current_user.authorized_projects
projects = projects.select do |project|
current_user.can?(:admin_issue, project)
end
no_project = {
id: 0,
name_with_namespace: 'No project',
}
projects.unshift(no_project)
projects.delete(project)
render json: projects.to_json(only: [:id, :name_with_namespace], methods: :name_with_namespace)
end
private
def find_users
......
app/controllers/jwt_controller.rb
View file @ 161a8b10
......@@ -32,7 +32,7 @@ class JwtController < ApplicationController
end
def auth_params
params.permit(:service, :scope, :offline_token, :account, :client_id)
params.permit(:service, :scope, :account, :client_id)
end
def authenticate_project(login, password)
......
app/controllers/omniauth_callbacks_controller.rb
View file @ 161a8b10
......@@ -97,7 +97,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
handle_signup_error
end
def handle_service_ticket provider, ticket
def handle_service_ticket(provider, ticket)
Gitlab::OAuth::Session.create provider, ticket
session[:service_tickets] ||= {}
session[:service_tickets][provider] = ticket
......
app/controllers/projects/application_controller.rb
View file @ 161a8b10
......@@ -26,7 +26,7 @@ class Projects::ApplicationController < ApplicationController
project_path = "#{namespace}/#{id}"
@project = Project.find_with_namespace(project_path)
if @project && can?(current_user, :read_project, @project)
if can?(current_user, :read_project, @project) && !@project.pending_delete?
if @project.path_with_namespace != project_path
redirect_to request.original_url.gsub(project_path, @project.path_with_namespace)
end
......
app/controllers/projects/find_file_controller.rb
View file @ 161a8b10
# Controller for viewing a repository's file structure
class Projects::FindFileController < Projects::ApplicationController
include ExtractsPath
include ActionView::Helpers::SanitizeHelper
include TreeHelper
before_action :require_non_empty_project
before_action :assign_ref_vars
before_action :authorize_download_code!
def show
return render_404 unless @repository.commit(@ref)
respond_to do |format|
format.html
end
end
def list
file_paths = @repo.ls_files(@ref)
respond_to do |format|
format.json { render json: file_paths }
end
end
end
# Controller for viewing a repository's file structure
class Projects::FindFileController < Projects::ApplicationController
include ExtractsPath
include ActionView::Helpers::SanitizeHelper
include TreeHelper
before_action :require_non_empty_project
before_action :assign_ref_vars
before_action :authorize_download_code!
def show
return render_404 unless @repository.commit(@ref)
respond_to do |format|
format.html
end
end
def list
file_paths = @repo.ls_files(@ref)
respond_to do |format|
format.json { render json: file_paths }
end
end
end
app/controllers/projects/hooks_controller.rb
View file @ 161a8b10
......@@ -63,7 +63,8 @@ class Projects::HooksController < Projects::ApplicationController
:push_events,
:tag_push_events,
:token,
:url
:url,
:wiki_page_events
)
end
end
app/controllers/projects/merge_requests_controller.rb
View file @ 161a8b10
......@@ -226,7 +226,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def branch_from
#This is always source
# This is always source
@source_project = @merge_request.nil? ? @project : @merge_request.source_project
@commit = @repository.commit(params[:ref]) if params[:ref].present?
render layout: false
......@@ -250,6 +250,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
if ci_commit
status = ci_commit.status
coverage = ci_commit.try(:coverage)
status ||= "preparing"
else
ci_service = @merge_request.source_project.ci_service
status = ci_service.commit_status(merge_request.last_commit.sha, merge_request.source_branch) if ci_service
......@@ -259,8 +261,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
status = "preparing" if status.nil?
response = {
title: merge_request.title,
sha: merge_request.last_commit_short_sha,
......@@ -376,6 +376,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
params.require(:merge_request).permit(
:title, :assignee_id, :source_project_id, :source_branch,
:target_project_id, :target_branch, :milestone_id, :approver_ids,
:target_project_id, :target_branch, :milestone_id,
:state_event, :description, :task_num, :force_remove_source_branch,
label_ids: []
)
......
app/controllers/projects/wikis_controller.rb
View file @ 161a8b10
......@@ -100,8 +100,8 @@ class Projects::WikisController < Projects::ApplicationController
def markdown_preview
text = params[:text]
ext = Gitlab::ReferenceExtractor.new(@project, current_user, current_user)
ext.analyze(text)
ext = Gitlab::ReferenceExtractor.new(@project, current_user)
ext.analyze(text, author: current_user)
render json: {
body: view_context.markdown(text, pipeline: :wiki, project_wiki: @project_wiki),
......
app/controllers/projects_controller.rb
View file @ 161a8b10
......@@ -198,8 +198,8 @@ class ProjectsController < Projects::ApplicationController
def markdown_preview
text = params[:text]
ext = Gitlab::ReferenceExtractor.new(@project, current_user, current_user)
ext.analyze(text)
ext = Gitlab::ReferenceExtractor.new(@project, current_user)
ext.analyze(text, author: current_user)
render json: {
body: view_context.markdown(text),
......
app/controllers/sessions_controller.rb
View file @ 161a8b10
class SessionsController < Devise::SessionsController
include AuthenticatesWithTwoFactor
include Devise::Controllers::Rememberable
include Recaptcha::ClientHelper
skip_before_action :check_2fa_requirement, only: [:destroy]
......@@ -99,6 +100,7 @@ class SessionsController < Devise::SessionsController
# Remove any lingering user data from login
session.delete(:otp_user_id)
remember_me(user) if user_params[:remember_me] == '1'
sign_in(user) and return
else
flash.now[:alert] = 'Invalid two-factor code.'
......
app/controllers/users_controller.rb
View file @ 161a8b10
......@@ -74,8 +74,6 @@ class UsersController < ApplicationController
def calendar
calendar = contributions_calendar
@timestamps = calendar.timestamps
@starting_year = calendar.starting_year
@starting_month = calendar.starting_month
render 'calendar', layout: false
end
......
app/finders/group_projects_finder.rb
View file @ 161a8b10
......@@ -18,7 +18,7 @@ class GroupProjectsFinder < UnionFinder
projects = []
if current_user
if @group.users.include?(current_user)
if @group.users.include?(current_user) || current_user.admin?
projects << @group.projects unless only_shared
projects << @group.shared_projects unless only_owned
else
......
app/finders/issuable_finder.rb
View file @ 161a8b10
......@@ -251,12 +251,12 @@ class IssuableFinder
def by_milestone(items)
if milestones?
if filter_by_no_milestone?
items = items.where(milestone_id: [-1, nil])
items = items.left_joins_milestones.where(milestone_id: [-1, nil])
elsif filter_by_upcoming_milestone?
upcoming_ids = Milestone.upcoming_ids_by_projects(projects)
items = items.joins(:milestone).where(milestone_id: upcoming_ids)
items = items.left_joins_milestones.where(milestone_id: upcoming_ids)
else
items = items.joins(:milestone).where(milestones: { title: params[:milestone_title] })
items = items.with_milestone(params[:milestone_title])
if projects
items = items.where(milestones: { project_id: projects })
......@@ -272,7 +272,7 @@ class IssuableFinder
if filter_by_no_label?
items = items.without_label
else
items = items.with_label(label_names)
items = items.with_label(label_names, params[:sort])
if projects
items = items.where(labels: { project_id: projects })
end
......
app/helpers/application_helper.rb
View file @ 161a8b10
......@@ -110,8 +110,7 @@ module ApplicationHelper
]
# If reference is commit id - we should add it to branch/tag selectbox
if(@ref && !options.flatten.include?(@ref) &&
@ref =~ /\A[0-9a-zA-Z]{6,52}\z/)
if @ref && !options.flatten.include?(@ref) && @ref =~ /\A[0-9a-zA-Z]{6,52}\z/
options << ['Commit', [@ref]]
end
......@@ -266,6 +265,8 @@ module ApplicationHelper
assignee_id: params[:assignee_id],
author_id: params[:author_id],
sort: params[:sort],
issue_search: params[:issue_search],
label_name: params[:label_name]
}
options = exist_opts.merge(options)
......@@ -276,16 +277,11 @@ module ApplicationHelper
end
end
path = request.path
path << "?#{options.to_param}"
if add_label
if params[:label_name].present? and params[:label_name].respond_to?('any?')
params[:label_name].each do |label|
path << "&label_name[]=#{label}"
end
end
end
path
params = options.compact
params.delete(:label_name) unless add_label
"#{request.path}?#{params.to_param}"
end
def outdated_browser?
......
app/helpers/blob_helper.rb
View file @ 161a8b10
......@@ -184,4 +184,14 @@ module BlobHelper
Other: licenses.reject(&:featured).map { |license| [license.name, license.key] }
}
end
def gitignore_names
return @gitignore_names if defined?(@gitignore_names)
@gitignore_names = {
Global: Gitlab::Gitignore.global.map { |gitignore| { name: gitignore.name } },
# Note that the key here doesn't cover it really
Languages: Gitlab::Gitignore.languages_frameworks.map{ |gitignore| { name: gitignore.name } }
}
end
end
app/helpers/button_helper.rb
View file @ 161a8b10
......@@ -30,7 +30,7 @@ module ButtonHelper
content_tag :a, protocol,
class: klass,
href: @project.http_url_to_repo,
href: project.http_url_to_repo,
data: {
html: true,
placement: 'right',
......
app/helpers/commits_helper.rb
View file @ 161a8b10
......@@ -123,13 +123,14 @@ module CommitsHelper
)
end
def revert_commit_link(commit, continue_to_path, btn_class: nil)
def revert_commit_link(commit, continue_to_path, btn_class: nil, has_tooltip: true)
return unless current_user
tooltip = "Revert this #{commit.change_type_title} in a new merge request"
tooltip = "Revert this #{commit.change_type_title} in a new merge request" if has_tooltip
if can_collaborate_with_project?
link_to 'Revert', '#modal-revert-commit', 'data-toggle' => 'modal', 'data-container' => 'body', title: tooltip, class: "btn btn-default btn-grouped btn-#{btn_class} has-tooltip"
btn_class = "btn btn-grouped btn-close btn-#{btn_class}" unless btn_class.nil?
link_to 'Revert', '#modal-revert-commit', 'data-toggle' => 'modal', 'data-container' => 'body', title: (tooltip if has_tooltip), class: "#{btn_class} #{'has-tooltip' if has_tooltip}"
elsif can?(current_user, :fork_project, @project)
continue_params = {
to: continue_to_path,
......@@ -140,17 +141,20 @@ module CommitsHelper
namespace_key: current_user.namespace.id,
continue: continue_params)
link_to 'Revert', fork_path, class: 'btn btn-grouped btn-close', method: :post, 'data-toggle' => 'tooltip', 'data-container' => 'body', title: tooltip
btn_class = "btn btn-grouped btn-close" unless btn_class.nil?
link_to 'Revert', fork_path, class: btn_class, method: :post, 'data-toggle' => 'tooltip', 'data-container' => 'body', title: (tooltip if has_tooltip)
end
end
def cherry_pick_commit_link(commit, continue_to_path, btn_class: nil)
def cherry_pick_commit_link(commit, continue_to_path, btn_class: nil, has_tooltip: true)
return unless current_user
tooltip = "Cherry-pick this #{commit.change_type_title} in a new merge request"
if can_collaborate_with_project?
link_to 'Cherry-pick', '#modal-cherry-pick-commit', 'data-toggle' => 'modal', 'data-container' => 'body', title: tooltip, class: "btn btn-default btn-grouped btn-#{btn_class} has-tooltip"
btn_class = "btn btn-default btn-grouped btn-#{btn_class}" unless btn_class.nil?
link_to 'Cherry-pick', '#modal-cherry-pick-commit', 'data-toggle' => 'modal', 'data-container' => 'body', title: (tooltip if has_tooltip), class: "#{btn_class} #{'has-tooltip' if has_tooltip}"
elsif can?(current_user, :fork_project, @project)
continue_params = {
to: continue_to_path,
......@@ -161,7 +165,8 @@ module CommitsHelper
namespace_key: current_user.namespace.id,
continue: continue_params)
link_to 'Cherry-pick', fork_path, class: 'btn btn-grouped btn-close', method: :post, 'data-toggle' => 'tooltip', 'data-container' => 'body', title: tooltip
btn_class = "btn btn-grouped btn-close" unless btn_class.nil?
link_to 'Cherry-pick', fork_path, class: "#{btn_class}", method: :post, 'data-toggle' => 'tooltip', 'data-container' => 'body', title: (tooltip if has_tooltip)
end
end
......
app/helpers/diff_helper.rb
View file @ 161a8b10
......@@ -39,11 +39,11 @@ module DiffHelper
end
def unfold_bottom_class(bottom)
(bottom) ? 'js-unfold-bottom' : ''
bottom ? 'js-unfold-bottom' : ''
end
def unfold_class(unfold)
(unfold) ? 'unfold js-unfold' : ''
unfold ? 'unfold js-unfold' : ''
end
def diff_line_content(line, line_type = nil)
......
app/helpers/events_helper.rb
View file @ 161a8b10
......@@ -159,28 +159,6 @@ module EventsHelper
"--broken encoding"
end
def event_to_atom(xml, event)
if event.visible_to_user?(current_user)
xml.entry do
event_link = event_feed_url(event)
event_title = event_feed_title(event)
event_summary = event_feed_summary(event)
xml.id "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
xml.link href: event_link
xml.title truncate(event_title, length: 80)
xml.updated event.created_at.xmlschema
xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(event.author_email))
xml.author do |author|
xml.name event.author_name
xml.email event.author_email
end
xml.summary(type: "xhtml") { |x| x << event_summary unless event_summary.nil? }
end
end
end
def event_row_class(event)
if event.body?
"event-block"
......
app/helpers/gitlab_markdown_helper.rb
View file @ 161a8b10
......@@ -13,7 +13,7 @@ module GitlabMarkdownHelper
def link_to_gfm(body, url, html_options = {})
return "" if body.blank?
escaped_body = if body =~ /\A\<img/
escaped_body = if body.start_with?('<img')
body
else
escape_once(body)
......
app/helpers/groups_helper.rb
View file @ 161a8b10
......@@ -31,7 +31,7 @@ module GroupsHelper
if group && group.avatar.present?
group.avatar.url
else
'no_group_avatar.png'
image_path('no_group_avatar.png')
end
end
......
app/helpers/issuables_helper.rb
View file @ 161a8b10
......@@ -50,14 +50,10 @@ module IssuablesHelper
end
def user_dropdown_label(user_id, default_label)
return default_label if user_id.nil?
return "Unassigned" if user_id == "0"
if @project
member = @project.team.find_member(user_id)
user = member.user if member
else
user = User.find_by(id: user_id)
end
user = User.find_by(id: user_id)
if user
user.name
......@@ -76,7 +72,7 @@ module IssuablesHelper
def issuable_meta(issuable, project, text)
output = content_tag :strong, "#{text} #{issuable.to_reference}", class: "identifier"
output << " opened #{time_ago_with_tooltip(issuable.created_at)} by".html_safe
output << " opened #{time_ago_with_tooltip(issuable.created_at)} by ".html_safe
output << content_tag(:strong) do
author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "hidden-xs")
author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "hidden-sm hidden-md hidden-lg")
......
app/helpers/issues_helper.rb
View file @ 161a8b10
......@@ -105,23 +105,6 @@ module IssuesHelper
return 'hidden' if issue.closed? == closed
end
def issue_to_atom(xml, issue)
xml.entry do
xml.id namespace_project_issue_url(issue.project.namespace,
issue.project, issue)
xml.link href: namespace_project_issue_url(issue.project.namespace,
issue.project, issue)
xml.title truncate(issue.title, length: 80)
xml.updated issue.created_at.xmlschema
xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(issue.author_email))
xml.author do |author|
xml.name issue.author_name
xml.email issue.author_email
end
xml.summary issue.title
end
end
def merge_requests_sentence(merge_requests)
# Sorting based on the `!123` or `group/project!123` reference will sort
# local merge requests first.
......@@ -164,8 +147,8 @@ module IssuesHelper
def emoji_author_list(notes, current_user)
list = notes.map do |note|
note.author == current_user ? "me" : note.author.name
end
note.author == current_user ? "me" : note.author.name
end
list.join(", ")
end
......
app/helpers/javascript_helper.rb 0 → 100644
View file @ 161a8b10
module JavascriptHelper
def page_specific_javascripts(js = nil)
@page_specific_javascripts = js unless js.nil?
@page_specific_javascripts
end
end
app/helpers/merge_requests_helper.rb
View file @ 161a8b10
......@@ -93,10 +93,9 @@ module MergeRequestsHelper
more_approvals = merge_request.approvals_left - merge_request.approvers_left.count
approvers_names = merge_request.approvers_left.map(&:name)
case true
when more_approvals > 0
if more_approvals > 0
str << " (from #{render_items_list(approvers_names + ["#{more_approvals} more"])})"
when more_approvals < 0
elsif more_approvals < 0
str << " (from #{render_items_list(approvers_names, "or")})"
else
str << " (from #{render_items_list(approvers_names)})"
......
app/helpers/nav_helper.rb
View file @ 161a8b10
......@@ -48,7 +48,7 @@ module NavHelper
"page-with-layout-nav" if defined?(nav) && nav
end
def layout_dropdown_class
"controls-dropdown-visible" if current_user
def nav_control_class
"nav-control" if current_user
end
end
app/helpers/tab_helper.rb
View file @ 161a8b10
......@@ -95,7 +95,9 @@ module TabHelper
end
def project_tab_class
return "active" if current_page?(controller: "/projects", action: :edit, id: @project)
if controller.controller_path.start_with?('projects')
return 'active'
end
if ['services', 'hooks', 'deploy_keys', 'protected_branches', 'git_hooks'].include? controller.controller_name
"active"
......@@ -112,7 +114,7 @@ module TabHelper
end
def profile_tab_class
if controller.controller_path =~ /\Aprofiles/
if controller.controller_path.start_with?('profiles')
return 'active'
end
......
app/helpers/todos_helper.rb
View file @ 161a8b10
......@@ -37,6 +37,16 @@ module TodosHelper
end
end
def todo_target_state_pill(todo)
return unless show_todo_state?(todo)
content_tag(:span, nil, class: 'target-status') do
content_tag(:span, nil, class: "status-box status-box-#{todo.target.state.dasherize}") do
todo.target.state.capitalize
end
end
end
def todos_filter_params
{
state: params[:state],
......@@ -95,4 +105,10 @@ module TodosHelper
options_from_collection_for_select(types, 'name', 'title', params[:type])
end
private
def show_todo_state?(todo)
(todo.target.is_a?(MergeRequest) || todo.target.is_a?(Issue)) && ['closed', 'merged'].include?(todo.target.state)
end
end
app/mailers/devise_mailer.rb
View file @ 161a8b10
class DeviseMailer < Devise::Mailer
default from: "#{Gitlab.config.gitlab.email_display_name} <#{Gitlab.config.gitlab.email_from}>"
default reply_to: Gitlab.config.gitlab.email_reply_to
layout 'devise_mailer'
end
app/models/ability.rb
View file @ 161a8b10
......@@ -37,20 +37,41 @@ class Ability
]
end
# Given a list of users and a project this method returns the users that can
# read the given project.
def users_that_can_read_project(users, project)
if project.public?
users
else
users.select do |user|
if user.admin?
true
elsif project.internal? && !user.external?
true
elsif project.owner == user
true
elsif project.team.members.include?(user)
true
else
false
end
end
end
end
# List of possible abilities for anonymous user
def anonymous_abilities(user, subject)
case true
when subject.is_a?(PersonalSnippet)
if subject.is_a?(PersonalSnippet)
anonymous_personal_snippet_abilities(subject)
when subject.is_a?(ProjectSnippet)
elsif subject.is_a?(ProjectSnippet)
anonymous_project_snippet_abilities(subject)
when subject.is_a?(CommitStatus)
elsif subject.is_a?(CommitStatus)
anonymous_commit_status_abilities(subject)
when subject.is_a?(Project) || subject.respond_to?(:project)
elsif subject.is_a?(Project) || subject.respond_to?(:project)
anonymous_project_abilities(subject)
when subject.is_a?(Group) || subject.respond_to?(:group)
elsif subject.is_a?(Group) || subject.respond_to?(:group)
anonymous_group_abilities(subject)
when subject.is_a?(User)
elsif subject.is_a?(User)
anonymous_user_abilities
else
[]
......
app/models/application_setting.rb
View file @ 161a8b10
......@@ -7,7 +7,7 @@ class ApplicationSetting < ActiveRecord::Base
serialize :restricted_visibility_levels
serialize :import_sources
serialize :disabled_oauth_sign_in_sources
serialize :disabled_oauth_sign_in_sources, Array
serialize :restricted_signup_domains, Array
attr_accessor :restricted_signup_domains_raw
......@@ -51,6 +51,10 @@ class ApplicationSetting < ActiveRecord::Base
presence: true,
numericality: { only_integer: true, greater_than: 0 }
validates :container_registry_token_expire_delay,
presence: true,
numericality: { only_integer: true, greater_than: 0 }
validates_each :restricted_visibility_levels do |record, attr, value|
unless value.nil?
value.each do |level|
......@@ -98,6 +102,10 @@ class ApplicationSetting < ActiveRecord::Base
Rails.cache.delete(CACHE_KEY)
end
def self.cached
Rails.cache.fetch(CACHE_KEY)
end
def self.create_from_defaults
create(
default_projects_limit: Settings.gitlab['default_projects_limit'],
......@@ -121,7 +129,8 @@ class ApplicationSetting < ActiveRecord::Base
akismet_enabled: false,
repository_checks_enabled: true,
disabled_oauth_sign_in_sources: [],
send_user_confirmation_email: false
send_user_confirmation_email: false,
container_registry_token_expire_delay: 5,
)
end
......
app/models/ci/build.rb
View file @ 161a8b10
This diff is collapsed.
app/models/ci/commit.rb
View file @ 161a8b10
This diff is collapsed.
app/models/ci/runner.rb
View file @ 161a8b10
This diff is collapsed.
app/models/ci/variable.rb
View file @ 161a8b10
This diff is collapsed.
app/models/commit.rb
View file @ 161a8b10
This diff is collapsed.
app/models/commit_range.rb
View file @ 161a8b10
This diff is collapsed.
app/models/concerns/issuable.rb
View file @ 161a8b10
This diff is collapsed.
app/models/concerns/mentionable.rb
View file @ 161a8b10
This diff is collapsed.
app/models/concerns/participable.rb
View file @ 161a8b10
This diff is collapsed.
app/models/issue.rb
View file @ 161a8b10
This diff is collapsed.
app/models/key.rb
View file @ 161a8b10
This diff is collapsed.
app/models/members/project_member.rb
View file @ 161a8b10
This diff is collapsed.
app/models/network/graph.rb
View file @ 161a8b10
This diff is collapsed.
app/models/note.rb
View file @ 161a8b10
This diff is collapsed.
app/models/project.rb
View file @ 161a8b10
This diff is collapsed.
app/models/project_import_data.rb
View file @ 161a8b10
This diff is collapsed.
app/models/project_snippet.rb
View file @ 161a8b10
This diff is collapsed.
app/models/project_wiki.rb
View file @ 161a8b10
This diff is collapsed.
app/models/remote_mirror.rb
View file @ 161a8b10
This diff is collapsed.
app/models/repository.rb
View file @ 161a8b10
This diff is collapsed.
app/models/snippet.rb
View file @ 161a8b10
This diff is collapsed.
app/models/user.rb
View file @ 161a8b10
This diff is collapsed.
app/services/git_push_service.rb
View file @ 161a8b10
This diff is collapsed.
app/services/git_tag_push_service.rb
View file @ 161a8b10
This diff is collapsed.
app/services/notes/create_service.rb
View file @ 161a8b10
This diff is collapsed.
app/services/projects/fork_service.rb
View file @ 161a8b10
This diff is collapsed.
app/services/wiki_pages/base_service.rb
View file @ 161a8b10
This diff is collapsed.
app/views/admin/builds/index.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/dashboard/issues.atom.builder
View file @ 161a8b10
This diff is collapsed.
app/views/dashboard/todos/_todo.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/devise/mailer/confirmation_instructions.html.haml 0 → 100644
View file @ 161a8b10
This diff is collapsed.
app/views/devise/mailer/confirmation_instructions.text.erb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
app/views/events/_commit.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/events/_event.atom.builder 0 → 100644
View file @ 161a8b10
This diff is collapsed.
app/views/events/_event_issue.atom.haml
View file @ 161a8b10
This diff is collapsed.
app/views/events/_event_note.atom.haml
View file @ 161a8b10
This diff is collapsed.
app/views/events/_event_push.atom.haml
View file @ 161a8b10
This diff is collapsed.
app/views/events/event/_common.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/events/event/_push.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/groups/issues.atom.builder
View file @ 161a8b10
This diff is collapsed.
app/views/groups/show.atom.builder
View file @ 161a8b10
This diff is collapsed.
app/views/import/gitlab/status.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/issues/_issue.atom.builder 0 → 100644
View file @ 161a8b10
This diff is collapsed.
app/views/kaminari/gitlab/_gap.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/kaminari/gitlab/_page.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/layouts/_head.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/layouts/_page.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/layouts/_search.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/layouts/devise_mailer.html.haml 0 → 100644
View file @ 161a8b10
This diff is collapsed.
app/views/layouts/nav/_dashboard.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/layouts/nav/_group.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/layouts/nav/_profile.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/layouts/nav/_project.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/layouts/project.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/notify/_note_message.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/notify/new_issue_email.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/profiles/accounts/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/_home_panel.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/activity.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/badges/index.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/blame/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/blob/_editor.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/blob/_header_title.html.haml deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
app/views/projects/blob/edit.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/blob/new.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/blob/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/branches/index.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/branches/new.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/builds/_header_title.html.haml deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
app/views/projects/builds/index.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/builds/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/buttons/_fork.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/commit/builds.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/commit/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/commits/_commit.atom.builder 0 → 100644
View file @ 161a8b10
This diff is collapsed.
app/views/projects/commits/_header_title.html.haml deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
app/views/projects/commits/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/compare/index.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/compare/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/edit.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/empty.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/find_file/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/graphs/_head.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/graphs/_header_title.html.haml deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
app/views/projects/graphs/ci.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/graphs/commits.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/graphs/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/issues/_header_title.html.haml deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
app/views/projects/issues/_issue.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/issues/edit.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/issues/index.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/issues/new.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/issues/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/labels/_header_title.html.haml deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
app/views/projects/labels/edit.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/labels/index.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/labels/new.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/milestones/_header_title.html.haml deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
app/views/projects/milestones/new.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/network/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/new.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/notes/_note.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/pipelines/_head.html.haml 0 → 100644
View file @ 161a8b10
This diff is collapsed.
app/views/projects/pipelines/_header_title.html.haml deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
app/views/projects/pipelines/new.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/pipelines/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/releases/edit.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/services/_form.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/services/index.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/show.atom.builder
View file @ 161a8b10
This diff is collapsed.
app/views/projects/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/snippets/_header_title.html.haml deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
app/views/projects/snippets/edit.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/snippets/index.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/snippets/new.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/snippets/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/tags/index.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/tags/new.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/tags/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/tree/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/triggers/index.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/wikis/_header_title.html.haml deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
app/views/projects/wikis/edit.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/wikis/empty.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/wikis/history.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/wikis/pages.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/projects/wikis/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/search/results/_issue.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/search/results/_note.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/shared/_clone_panel.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/shared/_event_filter.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/shared/_sort_dropdown.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/shared/groups/_list.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/shared/issuable/_filter.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/shared/issuable/_form.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/shared/snippets/_header.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/shared/web_hooks/_form.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/snippets/_actions.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/snippets/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/users/calendar.html.haml
View file @ 161a8b10
This diff is collapsed.
app/views/users/show.atom.builder
View file @ 161a8b10
This diff is collapsed.
app/views/users/show.html.haml
View file @ 161a8b10
This diff is collapsed.
app/workers/emails_on_push_worker.rb
View file @ 161a8b10
This diff is collapsed.
app/workers/geo_key_refresh_worker.rb
View file @ 161a8b10
This diff is collapsed.
config/application.rb
View file @ 161a8b10
This diff is collapsed.
config/environments/development.rb
View file @ 161a8b10
This diff is collapsed.
config/gitlab.yml.example
View file @ 161a8b10
This diff is collapsed.
config/initializers/1_settings.rb
View file @ 161a8b10
This diff is collapsed.
config/initializers/devise_async.rb deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
config/initializers/doorkeeper.rb
View file @ 161a8b10
This diff is collapsed.
config/initializers/metrics.rb
View file @ 161a8b10
This diff is collapsed.
config/initializers/omniauth.rb
View file @ 161a8b10
This diff is collapsed.
config/initializers/premailer.rb
View file @ 161a8b10
This diff is collapsed.
config/initializers/session_store.rb
View file @ 161a8b10
This diff is collapsed.
config/routes.rb
View file @ 161a8b10
This diff is collapsed.
db/migrate/20160528043124_add_users_state_index.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
db/schema.rb
View file @ 161a8b10
This diff is collapsed.
doc/README.md
View file @ 161a8b10
This diff is collapsed.
doc/administration/container_registry.md 0 → 100644
View file @ 161a8b10
This diff is collapsed.
doc/administration/high_availability/nfs.md
View file @ 161a8b10
This diff is collapsed.
doc/administration/repository_checks.md
View file @ 161a8b10
This diff is collapsed.
doc/api/groups.md
View file @ 161a8b10
This diff is collapsed.
doc/api/labels.md
View file @ 161a8b10
This diff is collapsed.
doc/api/services.md
View file @ 161a8b10
This diff is collapsed.
doc/api/settings.md
View file @ 161a8b10
This diff is collapsed.
doc/ci/yaml/README.md
View file @ 161a8b10
This diff is collapsed.
doc/container_registry/README.md 0 → 100644
View file @ 161a8b10
This diff is collapsed.
doc/container_registry/img/container_registry.png 0 → 100644
View file @ 161a8b10
This diff is collapsed.
doc/container_registry/img/project_feature.png 0 → 100644
View file @ 161a8b10
This diff is collapsed.
doc/development/migration_style_guide.md
View file @ 161a8b10
This diff is collapsed.
doc/development/testing.md
View file @ 161a8b10
This diff is collapsed.
doc/development/ui_guide.md
View file @ 161a8b10
This diff is collapsed.
doc/install/installation.md
View file @ 161a8b10
This diff is collapsed.
doc/install/requirements.md
View file @ 161a8b10
This diff is collapsed.
doc/integration/google.md
View file @ 161a8b10
This diff is collapsed.
doc/logs/logs.md
View file @ 161a8b10
This diff is collapsed.
doc/migrate_ci_to_ce/README.md
View file @ 161a8b10
This diff is collapsed.
doc/monitoring/health_check.md
View file @ 161a8b10
This diff is collapsed.
doc/operations/moving_repositories.md
View file @ 161a8b10
This diff is collapsed.
doc/update/8.6-to-8.7.md
View file @ 161a8b10
This diff is collapsed.
doc/update/8.7-to-8.8.md
View file @ 161a8b10
This diff is collapsed.
doc/web_hooks/web_hooks.md
View file @ 161a8b10
This diff is collapsed.
features/project/active_tab.feature
View file @ 161a8b10
This diff is collapsed.
features/project/builds/summary.feature
View file @ 161a8b10
This diff is collapsed.
features/project/project.feature
View file @ 161a8b10
This diff is collapsed.
features/steps/admin/active_tab.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/dashboard/active_tab.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/dashboard/shortcuts.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/dashboard/todos.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/groups_management.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/profile/active_tab.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/project/active_tab.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/project/builds/summary.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/project/commits/commits.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/project/fork.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/project/issues/issues.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/project/issues/labels.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/project/merge_requests.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/project/project.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/project/project_milestone.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/project/project_shortcuts.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/project/snippets.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/project/wiki.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/shared/active_tab.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/shared/issuable.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/shared/note.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/shared/project.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/shared/project_tab.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/shared/shortcuts.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/shared/sidebar_active_tab.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
features/steps/snippets/snippets.rb
View file @ 161a8b10
This diff is collapsed.
features/steps/user.rb
View file @ 161a8b10
This diff is collapsed.
lib/api/api.rb
View file @ 161a8b10
This diff is collapsed.
lib/api/entities.rb
View file @ 161a8b10
This diff is collapsed.
lib/api/gitignores.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/api/groups.rb
View file @ 161a8b10
This diff is collapsed.
lib/api/helpers.rb
View file @ 161a8b10
This diff is collapsed.
lib/api/license_templates.rb
View file @ 161a8b10
This diff is collapsed.
lib/api/users.rb
View file @ 161a8b10
This diff is collapsed.
lib/backup/manager.rb
View file @ 161a8b10
This diff is collapsed.
lib/banzai/filter/inline_diff_filter.rb
View file @ 161a8b10
This diff is collapsed.
lib/banzai/filter/issue_reference_filter.rb
View file @ 161a8b10
This diff is collapsed.
lib/banzai/filter/label_reference_filter.rb
View file @ 161a8b10
This diff is collapsed.
lib/banzai/filter/redactor_filter.rb
View file @ 161a8b10
This diff is collapsed.
lib/banzai/filter/reference_filter.rb
View file @ 161a8b10
This diff is collapsed.
lib/banzai/filter/reference_gatherer_filter.rb deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
lib/banzai/filter/user_reference_filter.rb
View file @ 161a8b10
This diff is collapsed.
lib/banzai/lazy_reference.rb deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
lib/banzai/pipeline/reference_extraction_pipeline.rb deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
lib/banzai/reference_extractor.rb
View file @ 161a8b10
This diff is collapsed.
lib/banzai/reference_parser.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/banzai/reference_parser/base_parser.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/banzai/reference_parser/commit_parser.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/banzai/reference_parser/commit_range_parser.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/banzai/reference_parser/external_issue_parser.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/banzai/reference_parser/issue_parser.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/banzai/reference_parser/label_parser.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/banzai/reference_parser/merge_request_parser.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/banzai/reference_parser/milestone_parser.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/banzai/reference_parser/snippet_parser.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/banzai/reference_parser/user_parser.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/ci/ansi2html.rb
View file @ 161a8b10
This diff is collapsed.
lib/ci/charts.rb
View file @ 161a8b10
This diff is collapsed.
lib/ci/gitlab_ci_yaml_processor.rb
View file @ 161a8b10
This diff is collapsed.
lib/event_filter.rb
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/bitbucket_import/client.rb
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/ci/build/artifacts/metadata.rb
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/contributions_calendar.rb
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/current_settings.rb
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/diff/parser.rb
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/gitignore.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/gitlab_import/importer.rb
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/lazy.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/middleware/go.rb
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/middleware/rails_queue_duration.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/project_search_results.rb
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/reference_extractor.rb
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/url_sanitizer.rb
View file @ 161a8b10
This diff is collapsed.
lib/gitlab/visibility_level.rb
View file @ 161a8b10
This diff is collapsed.
lib/support/nginx/registry-ssl 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/tasks/gitlab/backup.rake
View file @ 161a8b10
This diff is collapsed.
lib/tasks/gitlab/db.rake
View file @ 161a8b10
This diff is collapsed.
lib/tasks/gitlab/update_gitignore.rake 0 → 100644
View file @ 161a8b10
This diff is collapsed.
lib/tasks/rubocop.rake
View file @ 161a8b10
This diff is collapsed.
spec/factories/notes.rb
View file @ 161a8b10
This diff is collapsed.
spec/factories_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/admin/admin_runners_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/admin/admin_users_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/builds_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/commits_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/issues/filter_issues_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/issues/move_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/issues/note_polling_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/issues/update_issues_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/issues_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/login_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/merge_requests/created_from_fork_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/features/pipelines_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/projects/badges/list_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/projects/files/gitignore_dropdown_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/features/runners_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/task_lists_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/todos/target_state_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/features/todos/todos_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/features/variables_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/helpers/auth_helper_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/helpers/merge_requests_helper_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/javascripts/fixtures/right_sidebar.html.haml 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/javascripts/right_sidebar_spec.js.coffee 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/award_emoji_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/lib/banzai/reference_parser/base_parser_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/banzai/reference_parser/commit_parser_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/banzai/reference_parser/commit_range_parser_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/banzai/reference_parser/external_issue_parser_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/banzai/reference_parser/issue_parser_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/banzai/reference_parser/label_parser_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/banzai/reference_parser/merge_request_parser_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/banzai/reference_parser/milestone_parser_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/banzai/reference_parser/snippet_parser_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/banzai/reference_parser/user_parser_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/ci/ansi2html_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/lib/ci/charts_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/lib/container_registry/tag_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/lib/gitlab/akismet_helper_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/lib/gitlab/git_access_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/lib/gitlab/gitignore_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/gitlab/lazy_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/gitlab/lfs/lfs_router_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/lib/gitlab/metrics/sampler_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/lib/gitlab/middleware/rails_queue_duration_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/lib/gitlab/note_data_builder_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/lib/gitlab/sherlock/collection_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/lib/gitlab/sherlock/query_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/lib/json_web_token/rsa_token_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/mailers/notify_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/mailers/previews/devise_mailer_preview.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/mailers/shared/notify.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/ability_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/models/build_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/ci/commit_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/ci/runner_project_spec.rb deleted 100644 → 0
View file @ 9bdd60c5
This diff is collapsed.
spec/models/ci/runner_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/ci/variable_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/commit_range_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/commit_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/concerns/elastic/note_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/concerns/issuable_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/concerns/participable_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/models/generic_commit_status_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/issue_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/legacy_diff_note_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/members/project_member_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/note_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/pages_domain_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/project_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/project_wiki_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/repository_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/snippet_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/models/user_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/requests/api/gitignores_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/requests/api/groups_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/requests/api/ldap_group_links_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/requests/api/license_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/requests/api/license_templates_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/requests/api/notes_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/requests/api/project_members_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/requests/api/users_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/requests/ci/api/builds_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/services/git_push_service_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/services/groups/create_service_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/services/issues/create_service_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/services/issues/move_service_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/services/pages_service_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/services/projects/fork_service_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/services/system_note_service_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/support/filter_spec_helper.rb
View file @ 161a8b10
This diff is collapsed.
spec/support/login_helpers.rb
View file @ 161a8b10
This diff is collapsed.
spec/support/reference_parser_helpers.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/tasks/gitlab/backup_rake_spec.rb
View file @ 161a8b10
This diff is collapsed.
spec/tasks/gitlab/db_rake_spec.rb 0 → 100644
View file @ 161a8b10
This diff is collapsed.
spec/teaspoon_env.rb
View file @ 161a8b10
This diff is collapsed.
spec/workers/post_receive_spec.rb
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Actionscript.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Ada.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Agda.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Android.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/AppEngine.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/AppceleratorTitanium.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/ArchLinuxPackages.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Autotools.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/C++.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/C.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/CFWheels.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/CMake.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/CUDA.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/CakePHP.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/ChefCookbook.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Clojure.gitignore 0 → 120000
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/CodeIgniter.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/CommonLisp.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Composer.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Concrete5.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Coq.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/CraftCMS.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/D.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/DM.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Dart.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Delphi.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Drupal.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/EPiServer.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Eagle.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Elisp.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Elixir.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Elm.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Erlang.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/ExpressionEngine.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/ExtJs.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Fancy.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Finale.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/ForceDotCom.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Fortran.gitignore 0 → 120000
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/FuelPHP.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/GWT.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Gcov.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/GitBook.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Anjuta.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Archives.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/BricxCC.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/CVS.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Calabash.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Cloud9.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/CodeKit.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/DartEditor.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Dreamweaver.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Dropbox.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Eclipse.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/EiffelStudio.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Emacs.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Ensime.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Espresso.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/FlexBuilder.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/GPG.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/IPythonNotebook.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/JDeveloper.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/JetBrains.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/KDevelop4.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Kate.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Lazarus.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/LibreOffice.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Linux.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/LyX.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Matlab.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Mercurial.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/MicrosoftOffice.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/ModelSim.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Momentics.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/MonoDevelop.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/NetBeans.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Ninja.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/NotepadPP.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/OSX.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Otto.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Redcar.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Redis.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/SBT.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/SVN.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/SlickEdit.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/SublimeText.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/SynopsysVCS.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Tags.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/TextMate.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/TortoiseGit.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Vagrant.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Vim.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/VirtualEnv.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/VisualStudioCode.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/WebMethods.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Windows.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/Xcode.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Global/XilinxISE.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Go.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Gradle.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Grails.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Haskell.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/IGORPro.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Idris.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Java.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Jboss.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Jekyll.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Joomla.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/KiCad.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Kohana.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/LabVIEW.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Laravel.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Leiningen.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/LemonStand.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Lilypond.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Lithium.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Lua.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Magento.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Maven.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Mercury.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/MetaProgrammingSystem.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Nanoc.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Nim.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Node.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/OCaml.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Objective-C.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Opa.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/OpenCart.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/OracleForms.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Packer.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Perl.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Phalcon.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/PlayFramework.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Plone.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Prestashop.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Processing.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Python.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Qooxdoo.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Qt.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/R.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/README.md 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/ROS.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Rails.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/RhodesRhomobile.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Ruby.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Rust.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/SCons.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Sass.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Scala.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Scheme.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Scrivener.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Sdcc.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/SeamGen.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/SketchUp.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Smalltalk.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Stella.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/SugarCRM.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Swift.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Symfony.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/SymphonyCMS.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/TeX.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Terraform.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Textpattern.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/TurboGears2.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Typo3.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Umbraco.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Unity.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/UnrealEngine.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/VVVV.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/VisualStudio.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Waf.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/WordPress.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Xojo.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Yeoman.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Yii.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/ZendFramework.gitignore 0 → 100644
View file @ 161a8b10
This diff is collapsed.
vendor/gitignore/Zephir.gitignore 0 → 100644
View file @ 161a8b10
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7