Skip to content

G
gitlab-ce
Commit 468d575f authored by Valery Sizov's avatar Valery Sizov
Browse files
Options

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2

parents 8f0cef0b 78f89f7a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 15609 additions and 5896 deletions
.eslintrc
View file @ 468d575f
......@@ -8,7 +8,8 @@
"globals": {
"_": false,
"gl": false,
"gon": false
"gon": false,
"localStorage": false
},
"plugins": [
"filenames"
......
.gitlab-ci.yml
View file @ 468d575f
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3-git-2.7-phantomjs-2.1"
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1"
cache:
key: "ruby-231"
key: "ruby-233"
paths:
- vendor/ruby
......@@ -30,7 +30,12 @@ stages:
- post-test
- pages
# Prepare and merge knapsack tests
# Predefined scopes
.dedicated-runner: &dedicated-runner
tags:
- gitlab-org
- 2gb
.knapsack-state: &knapsack-state
services: []
variables:
......@@ -45,47 +50,14 @@ stages:
paths:
- knapsack/
knapsack:
<<: *knapsack-state
stage: prepare
script:
- mkdir -p knapsack/
- '[[ -f knapsack/rspec_report.json ]] || echo "{}" > knapsack/rspec_report.json'
- '[[ -f knapsack/spinach_report.json ]] || echo "{}" > knapsack/spinach_report.json'
update-knapsack:
<<: *knapsack-state
stage: post-test
script:
- scripts/merge-reports knapsack/rspec_report.json knapsack/rspec_node_*.json
- scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json
- rm -f knapsack/*_node_*.json
only:
- master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
- master@gitlab/gitlabhq
- master@gitlab/gitlab-ee
.use-db: &use-db
services:
- mysql:latest
- redis:alpine
setup-test-env:
<<: *use-db
stage: prepare
script:
- bundle exec rake assets:precompile 2>/dev/null
- bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
artifacts:
expire_in: 7d
paths:
- public/assets
- tmp/tests
.rspec-knapsack: &rspec-knapsack
stage: test
<<: *dedicated-runner
<<: *use-db
script:
- JOB_NAME=( $CI_BUILD_NAME )
......@@ -103,6 +75,7 @@ setup-test-env:
.spinach-knapsack: &spinach-knapsack
stage: test
<<: *dedicated-runner
<<: *use-db
script:
- JOB_NAME=( $CI_BUILD_NAME )
......@@ -118,6 +91,44 @@ setup-test-env:
- knapsack/
- coverage/
# Prepare and merge knapsack tests
knapsack:
<<: *knapsack-state
<<: *dedicated-runner
stage: prepare
script:
- mkdir -p knapsack/
- '[[ -f knapsack/rspec_report.json ]] || echo "{}" > knapsack/rspec_report.json'
- '[[ -f knapsack/spinach_report.json ]] || echo "{}" > knapsack/spinach_report.json'
setup-test-env:
<<: *use-db
<<: *dedicated-runner
stage: prepare
script:
- bundle exec rake assets:precompile 2>/dev/null
- bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
artifacts:
expire_in: 7d
paths:
- public/assets
- tmp/tests
update-knapsack:
<<: *knapsack-state
<<: *dedicated-runner
stage: post-test
script:
- scripts/merge-reports knapsack/rspec_report.json knapsack/rspec_node_*.json
- scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json
- rm -f knapsack/*_node_*.json
only:
- master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
- master@gitlab/gitlabhq
- master@gitlab/gitlab-ee
rspec 0 20: *rspec-knapsack
rspec 1 20: *rspec-knapsack
rspec 2 20: *rspec-knapsack
......@@ -166,10 +177,12 @@ spinach 9 10: *spinach-knapsack
.rspec-knapsack-ruby21: &rspec-knapsack-ruby21
<<: *rspec-knapsack
<<: *dedicated-runner
<<: *ruby-21
.spinach-knapsack-ruby21: &spinach-knapsack-ruby21
<<: *spinach-knapsack
<<: *dedicated-runner
<<: *ruby-21
rspec 0 20 ruby21: *rspec-knapsack-ruby21
......@@ -214,6 +227,7 @@ spinach 9 10 ruby21: *spinach-knapsack-ruby21
.exec: &exec
<<: *ruby-static-analysis
<<: *dedicated-runner
stage: test
script:
- bundle exec $CI_BUILD_NAME
......@@ -229,14 +243,13 @@ rake ee_compat_check:
<<: *exec
only:
- branches@gitlab-org/gitlab-ce
- branches@gitlab/gitlabhq
except:
- master
- tags
- /^[\d-]+-stable(-ee)?$/
allow_failure: yes
cache:
key: "ruby231-ee_compat_check_repo"
key: "ruby233-ee_compat_check_repo"
paths:
- ee_compat_check/repo/
- vendor/ruby
......@@ -250,12 +263,14 @@ rake ee_compat_check:
rake db:migrate:reset:
stage: test
<<: *use-db
<<: *dedicated-runner
script:
- rake db:migrate:reset
rake db:seed_fu:
stage: test
<<: *use-db
<<: *dedicated-runner
variables:
SIZE: "1"
SETUP_DB: "false"
......@@ -277,9 +292,8 @@ teaspoon:
- node_modules/
stage: test
<<: *use-db
<<: *dedicated-runner
script:
- curl --silent --location https://deb.nodesource.com/setup_6.x | bash -
- apt-get install --assume-yes nodejs
- npm install
- npm link istanbul
- rake teaspoon
......@@ -291,20 +305,23 @@ teaspoon:
lint-doc:
stage: test
<<: *dedicated-runner
image: "phusion/baseimage:latest"
before_script: []
script:
- scripts/lint-doc.sh
bundler:check:
stage: test
<<: *ruby-static-analysis
script:
stage: test
<<: *dedicated-runner
<<: *ruby-static-analysis
script:
- bundle check
bundler:audit:
stage: test
<<: *ruby-static-analysis
<<: *dedicated-runner
only:
- master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
......@@ -316,6 +333,7 @@ bundler:audit:
migration paths:
stage: test
<<: *use-db
<<: *dedicated-runner
variables:
SETUP_DB: "false"
only:
......@@ -337,6 +355,7 @@ migration paths:
coverage:
stage: post-test
services: []
<<: *dedicated-runner
variables:
SETUP_DB: "false"
USE_BUNDLE_INSTALL: "true"
......@@ -350,6 +369,7 @@ coverage:
- coverage/assets/
lint:javascript:
<<: *dedicated-runner
cache:
paths:
- node_modules/
......@@ -361,6 +381,7 @@ lint:javascript:
- npm --silent run eslint
lint:javascript:report:
<<: *dedicated-runner
cache:
paths:
- node_modules/
......@@ -382,6 +403,7 @@ lint:javascript:report:
trigger_docs:
stage: post-test
image: "alpine"
<<: *dedicated-runner
before_script:
- apk update && apk add curl
variables:
......@@ -397,6 +419,7 @@ trigger_docs:
notify:slack:
stage: post-test
<<: *dedicated-runner
variables:
SETUP_DB: "false"
USE_BUNDLE_INSTALL: "false"
......@@ -412,6 +435,7 @@ notify:slack:
pages:
before_script: []
stage: pages
<<: *dedicated-runner
dependencies:
- coverage
- teaspoon
......@@ -426,11 +450,12 @@ pages:
paths:
- public
only:
- master
- master@gitlab-org/gitlab-ce
# Insurance in case a gem needed by one of our releases gets yanked from
# rubygems.org in the future.
cache gems:
<<: *dedicated-runner
only:
- tags
variables:
......@@ -440,3 +465,5 @@ cache gems:
artifacts:
paths:
- vendor/cache
only:
- master@gitlab-org/gitlab-ce
.gitlab/issue_templates/Bug.md
View file @ 468d575f
......@@ -21,6 +21,8 @@ logs, and code as it's very hard to read otherwise.)
### Output of checks
(If you are reporting a bug on GitLab.com, write: This bug happens on GitLab.com)
#### Results of GitLab application Check
(For installations with omnibus-gitlab package run and paste the output of:
......
.scss-lint.yml
View file @ 468d575f
......@@ -30,7 +30,7 @@ linters:
# variable declarations. They should be referred to via variables everywhere
# else.
ColorVariable:
enabled: false
enabled: true
# Which form of comments to prefer in CSS.
Comment:
......
CHANGELOG.md
View file @ 468d575f
......@@ -2,6 +2,48 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
## 8.14.4 (2016-12-08)
- Fix diff view permalink highlighting. !7090
- Fix pipeline author for Slack and use pipeline id for pipeline link. !7506
- Fix compatibility with Internet Explorer 11 for merge requests. !7525 (Steffen Rauh)
- Reenables /user API request to return private-token if user is admin and request is made with sudo. !7615
- Fix Cicking on tabs on pipeline page should set URL. !7709
- Authorize users into imported GitLab project.
- Destroy a user's session when they delete their own account.
- Don't accidentally mark unsafe diff lines as HTML safe.
- Replace MR access checks with use of MergeRequestsFinder.
- Remove visible content caching.
## 8.14.3 (2016-12-02)
- Pass commit data to ProcessCommitWorker to reduce Git overhead. !7744
- Speed up issuable dashboards.
- Don't change relative URLs to absolute URLs in the Help page.
- Fixes "ActionView::Template::Error: undefined method `text?` for nil:NilClass" on MR pages.
- Fix branch validation for GitHub PR where repo/fork was renamed/deleted.
- Validate state param when filtering issuables.
## 8.14.2 (2016-12-01)
- Remove caching of events data. !6578
- Rephrase some system notes to be compatible with new system note style. !7692
- Pass tag SHA to post-receive hook when tag is created via UI. !7700
- Prevent error when submitting a merge request and pipeline is not defined. !7707
- Fixes system note style in commit discussion. !7721
- Use a Redis lease for updating authorized projects. !7733
- Refactor JiraService by moving code out of JiraService#execute method. !7756
- Update GitLab Workhorse to v1.0.1. !7759
- Fix pipelines info being hidden in merge request widget. !7808
- Fixed commit timeago not rendering after initial page.
- Fix for error thrown in cycle analytics events if build has not started.
- Fixed issue boards issue sorting when dragging issue into list.
- Allow access to the wiki with git when repository feature disabled.
- Fixed timeago not rendering when resolving a discussion.
- Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1.
- Timeout creating and viewing merge request for binary file.
- Gracefully recover from Redis connection failures in Sidekiq initializer.
## 8.14.1 (2016-11-28)
- Fix deselecting calendar days on contribution graph. !6453 (ClemMakesApps)
......@@ -222,6 +264,16 @@ entry.
- Fix "Without projects" filter. !6611 (Ben Bodenmiller)
- Fix 404 when visit /projects page
## 8.13.9 (2016-12-08)
- Reenables /user API request to return private-token if user is admin and request is made with sudo. !7615
- Replace MR access checks with use of MergeRequestsFinder.
## 8.13.8 (2016-12-02)
- Pass tag SHA to post-receive hook when tag is created via UI. !7700
- Validate state param when filtering issuables.
## 8.13.7 (2016-11-28)
- fixes 500 error on project show when user is not logged in and project is still empty. !7376
......@@ -461,6 +513,21 @@ entry.
- Fix broken Project API docs (Takuya Noguchi)
- Migrate invalid project members (owner -> master)
## 8.12.12 (2016-12-08)
- Replace MR access checks with use of MergeRequestsFinder
- Reenables /user API request to return private-token if user is admin and request is made with sudo
## 8.12.11 (2016-12-02)
- No changes
## 8.12.10 (2016-11-28)
- Fix information disclosure in `Projects::BlobController#update`
- Fix missing access checks on issue lookup using IssuableFinder
- Replace issue access checks with use of IssuableFinder
## 8.12.9 (2016-11-07)
- Fix XSS issue in Markdown autolinker
......
Gemfile
View file @ 468d575f
......@@ -131,7 +131,7 @@ gem 'after_commit_queue', '~> 1.3.0'
gem 'acts-as-taggable-on', '~> 4.0'
# Background jobs
gem 'sidekiq', '~> 4.2'
gem 'sidekiq', '~> 4.2.7'
gem 'sidekiq-cron', '~> 0.4.4'
gem 'redis-namespace', '~> 1.5.2'
gem 'sidekiq-limit_fetch', '~> 3.4'
......@@ -263,14 +263,14 @@ group :development do
end
group :development, :test do
gem 'byebug', '~> 8.2.1', platform: :mri
gem 'pry-byebug', '~> 3.4.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
gem 'awesome_print', '~> 1.2.0', require: false
gem 'fuubar', '~> 2.0.0'
gem 'database_cleaner', '~> 1.5.0'
gem 'factory_girl_rails', '~> 4.6.0'
gem 'factory_girl_rails', '~> 4.7.0'
gem 'rspec-rails', '~> 3.5.0'
gem 'rspec-retry', '~> 0.4.5'
gem 'spinach-rails', '~> 0.2.1'
......@@ -337,7 +337,7 @@ gem 'ruby-prof', '~> 0.16.2'
gem 'oauth2', '~> 1.2.0'
# Soft deletion
gem 'paranoia', '~> 2.0'
gem 'paranoia', '~> 2.2'
# Health check
gem 'health_check', '~> 2.2.0'
......
Gemfile.lock
View file @ 468d575f
......@@ -91,7 +91,7 @@ GEM
bundler-audit (0.5.0)
bundler (~> 1.2)
thor (~> 0.18)
byebug (8.2.1)
byebug (9.0.6)
capybara (2.6.2)
addressable
mime-types (>= 1.16)
......@@ -126,7 +126,7 @@ GEM
coffee-script-source (1.10.0)
colorize (0.7.7)
concurrent-ruby (1.0.2)
connection_pool (2.2.0)
connection_pool (2.2.1)
crack (0.4.3)
safe_yaml (~> 1.0.0)
creole (0.5.0)
......@@ -177,10 +177,10 @@ GEM
excon (0.52.0)
execjs (2.6.0)
expression_parser (0.9.0)
factory_girl (4.5.0)
factory_girl (4.7.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.6.0)
factory_girl (~> 4.5.0)
factory_girl_rails (4.7.0)
factory_girl (~> 4.7.0)
railties (>= 3.0.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
......@@ -456,8 +456,8 @@ GEM
org-ruby (0.9.12)
rubypants (~> 0.2)
orm_adapter (0.5.0)
paranoia (2.1.4)
activerecord (~> 4.0)
paranoia (2.2.0)
activerecord (>= 4.0, < 5.1)
parser (2.3.1.4)
ast (~> 2.2)
pg (0.18.4)
......@@ -479,6 +479,9 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.4.1)
byebug (~> 9.0)
pry (~> 0.10)
pry-rails (0.3.4)
pry (>= 0.9.10)
pyu-ruby-sasl (0.0.3.3)
......@@ -610,8 +613,7 @@ GEM
rubyntlm (0.5.2)
rubypants (0.2.0)
rubyzip (1.2.0)
rufus-scheduler (3.3.0)
tzinfo
rufus-scheduler (3.1.10)
rugged (0.24.0)
safe_yaml (1.0.4)
sanitize (2.1.0)
......@@ -642,10 +644,10 @@ GEM
rack
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
sidekiq (4.2.1)
sidekiq (4.2.7)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (~> 1.5)
rack-protection (>= 1.5.0)
redis (~> 3.2, >= 3.2.1)
sidekiq-cron (0.4.4)
redis-namespace (>= 1.5.2)
......@@ -793,7 +795,6 @@ DEPENDENCIES
browser (~> 2.2)
bullet (~> 5.2.0)
bundler-audit (~> 0.5.0)
byebug (~> 8.2.1)
capybara (~> 2.6.2)
capybara-screenshot (~> 1.0.0)
carrierwave (~> 0.10.0)
......@@ -814,7 +815,7 @@ DEPENDENCIES
dropzonejs-rails (~> 0.7.1)
email_reply_parser (~> 0.5.8)
email_spec (~> 1.6.0)
factory_girl_rails (~> 4.6.0)
factory_girl_rails (~> 4.7.0)
ffaker (~> 2.0.0)
flay (~> 2.6.1)
fog-aws (~> 0.9)
......@@ -883,10 +884,11 @@ DEPENDENCIES
omniauth-twitter (~> 1.2.0)
omniauth_crowd (~> 2.2.0)
org-ruby (~> 0.9.12)
paranoia (~> 2.0)
paranoia (~> 2.2)
pg (~> 0.18.2)
poltergeist (~> 1.9.0)
premailer-rails (~> 1.9.0)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)
rack-cors (~> 0.4.0)
......@@ -921,7 +923,7 @@ DEPENDENCIES
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
shoulda-matchers (~> 2.8.0)
sidekiq (~> 4.2)
sidekiq (~> 4.2.7)
sidekiq-cron (~> 0.4.4)
sidekiq-limit_fetch (~> 3.4)
simplecov (= 0.12.0)
......
README.md
View file @ 468d575f
......@@ -76,7 +76,7 @@ GitLab is a Ruby on Rails application that runs on the following software:
- Ubuntu/Debian/CentOS/RHEL
- Ruby (MRI) 2.3
- Git 2.7.4+
- Git 2.8.4+
- Redis 2.8+
- MySQL or PostgreSQL
......
app/assets/fonts/OFL.txt deleted 100644 → 0
View file @ 8f0cef0b
Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
app/assets/javascripts/application.js
View file @ 468d575f
......@@ -56,33 +56,18 @@
/*= require es6-promise.auto */
(function () {
document.addEventListener('page:fetch', gl.utils.cleanupBeforeFetch);
window.addEventListener('hashchange', gl.utils.shiftWindow);
// automatically adjust scroll position for hash urls taking the height of the navbar into account
// https://github.com/twitter/bootstrap/issues/1768
window.adjustScroll = function() {
var navbar = document.querySelector('.navbar-gitlab');
var subnav = document.querySelector('.layout-nav');
var fixedTabs = document.querySelector('.js-tabs-affix');
adjustment = 0;
if (navbar) adjustment -= navbar.offsetHeight;
if (subnav) adjustment -= subnav.offsetHeight;
if (fixedTabs) adjustment -= fixedTabs.offsetHeight;
return scrollBy(0, adjustment);
};
document.addEventListener('page:fetch', function () {
// Unbind scroll events
$(document).off('scroll');
// Close any open tooltips
$('.has-tooltip, [data-toggle="tooltip"]').tooltip('destroy');
});
window.addEventListener("hashchange", adjustScroll);
window.onload = function () {
// Scroll the window to avoid the topnav bar
// https://github.com/twitter/bootstrap/issues/1768
if (location.hash) {
return setTimeout(adjustScroll, 100);
}
};
window.addEventListener('hashchange', gl.utils.handleLocationHash);
window.addEventListener('load', function onLoad() {
window.removeEventListener('load', onLoad, false);
gl.utils.handleLocationHash();
}, false);
$(function () {
var $body = $('body');
......@@ -97,7 +82,15 @@
// Set the default path for all cookies to GitLab's root directory
Cookies.defaults.path = gon.relative_url_root || '/';
gl.utils.preventDisabledButtons();
// prevent default action for disabled buttons
$('.btn').click(function(e) {
if ($(this).hasClass('disabled')) {
e.preventDefault();
e.stopImmediatePropagation();
return false;
}
});
$('.nav-sidebar').niceScroll({
cursoropacitymax: '0.4',
cursorcolor: '#FFF',
......
app/assets/javascripts/blob/template_selector.js.es6
View file @ 468d575f
......@@ -70,6 +70,8 @@
// e.g.
// Api.gitignoreText item.name, @requestFileSuccess.bind(@)
requestFileSuccess(file, { skipFocus } = {}) {
if (!file) return;
const oldValue = this.editor.getValue();
let newValue = file.content;
......
app/assets/javascripts/boards/components/board_sidebar.js.es6
View file @ 468d575f
......@@ -47,7 +47,7 @@
new gl.DueDateSelectors();
new LabelsSelect();
new Sidebar();
new Subscription('.subscription');
gl.Subscription.bindAll('.subscription');
}
});
})();
app/assets/javascripts/commit/file.js
View file @ 468d575f
......@@ -3,7 +3,7 @@
this.CommitFile = (function() {
function CommitFile(file) {
if ($('.image', file).length) {
new ImageFile(file);
new gl.ImageFile(file);
}
}
......
app/assets/javascripts/commit/image_file.js
View file @ 468d575f
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-use-before-define, prefer-arrow-callback, no-else-return, consistent-return, prefer-template, quotes, one-var, one-var-declaration-per-line, no-unused-vars, no-return-assign, comma-dangle, quote-props, no-unused-expressions, no-sequences, object-shorthand, padded-blocks, max-len */
(function() {
this.ImageFile = (function() {
gl.ImageFile = (function() {
var prepareFrames;
// Width where images must fits in, for 2-up this gets divided by 2
......
app/assets/javascripts/copy_to_clipboard.js
View file @ 468d575f
......@@ -6,7 +6,7 @@
var genericError, genericSuccess, showTooltip;
genericSuccess = function(e) {
showTooltip(e.trigger, 'Copied!');
showTooltip(e.trigger, 'Copied');
// Clear the selection and blur the trigger so it loses its border
e.clearSelection();
return $(e.trigger).blur();
......@@ -31,7 +31,7 @@
var originalTitle = $target.data('original-title');
$target
.attr('title', 'Copied!')
.attr('title', 'Copied')
.tooltip('fixTitle')
.tooltip('show')
.attr('title', originalTitle)
......
app/assets/javascripts/diff.js deleted 100644 → 0
View file @ 8f0cef0b
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, max-len, one-var, camelcase, one-var-declaration-per-line, no-unused-vars, no-unused-expressions, no-sequences, object-shorthand, comma-dangle, prefer-arrow-callback, semi, radix, padded-blocks, max-len */
(function() {
this.Diff = (function() {
var UNFOLD_COUNT;
UNFOLD_COUNT = 20;
function Diff() {
$('.files .diff-file').singleFileDiff();
this.filesCommentButton = $('.files .diff-file').filesCommentButton();
if (this.diffViewType() === 'parallel') {
$('.content-wrapper .container-fluid').removeClass('container-limited');
}
$(document).off('click', '.js-unfold');
$(document).on('click', '.js-unfold', (function(_this) {
return function(event) {
var line_number, link, file, offset, old_line, params, prev_new_line, prev_old_line, ref, ref1, since, target, to, unfold, unfoldBottom;
target = $(event.target);
unfoldBottom = target.hasClass('js-unfold-bottom');
unfold = true;
ref = _this.lineNumbers(target.parent()), old_line = ref[0], line_number = ref[1];
offset = line_number - old_line;
if (unfoldBottom) {
line_number += 1;
since = line_number;
to = line_number + UNFOLD_COUNT;
} else {
ref1 = _this.lineNumbers(target.parent().prev()), prev_old_line = ref1[0], prev_new_line = ref1[1];
line_number -= 1;
to = line_number;
if (line_number - UNFOLD_COUNT > prev_new_line + 1) {
since = line_number - UNFOLD_COUNT;
} else {
since = prev_new_line + 1;
unfold = false;
}
}
file = target.parents('.diff-file');
link = file.data('blob-diff-path');
params = {
since: since,
to: to,
bottom: unfoldBottom,
offset: offset,
unfold: unfold,
view: file.data('view')
};
return $.get(link, params, function(response) {
return target.parent().replaceWith(response);
});
};
})(this));
}
Diff.prototype.diffViewType = function() {
return $('.inline-parallel-buttons a.active').data('view-type');
}
Diff.prototype.lineNumbers = function(line) {
if (!line.children().length) {
return [0, 0];
}
return line.find('.diff-line-num').map(function() {
return parseInt($(this).data('linenumber'));
});
};
return Diff;
})();
}).call(this);
app/assets/javascripts/diff.js.es6 0 → 100644
View file @ 468d575f
/* eslint-disable class-methods-use-this */
(() => {
const UNFOLD_COUNT = 20;
class Diff {
constructor() {
const $diffFile = $('.files .diff-file');
$diffFile.singleFileDiff();
$diffFile.filesCommentButton();
$diffFile.each((index, file) => new gl.ImageFile(file));
if (this.diffViewType() === 'parallel') {
$('.content-wrapper .container-fluid').removeClass('container-limited');
}
$(document)
.off('click', '.js-unfold, .diff-line-num a')
.on('click', '.js-unfold', this.handleClickUnfold.bind(this))
.on('click', '.diff-line-num a', this.handleClickLineNum.bind(this));
this.highlighSelectedLine();
}
handleClickUnfold(e) {
const $target = $(e.target);
// current babel config relies on iterators implementation, so we cannot simply do:
// const [oldLineNumber, newLineNumber] = this.lineNumbers($target.parent());
const ref = this.lineNumbers($target.parent());
const oldLineNumber = ref[0];
const newLineNumber = ref[1];
const offset = newLineNumber - oldLineNumber;
const bottom = $target.hasClass('js-unfold-bottom');
let since;
let to;
let unfold = true;
if (bottom) {
const lineNumber = newLineNumber + 1;
since = lineNumber;
to = lineNumber + UNFOLD_COUNT;
} else {
const lineNumber = newLineNumber - 1;
since = lineNumber - UNFOLD_COUNT;
to = lineNumber;
// make sure we aren't loading more than we need
const prevNewLine = this.lineNumbers($target.parent().prev())[1];
if (since <= prevNewLine + 1) {
since = prevNewLine + 1;
unfold = false;
}
}
const file = $target.parents('.diff-file');
const link = file.data('blob-diff-path');
const view = file.data('view');
const params = { since, to, bottom, offset, unfold, view };
$.get(link, params, response => $target.parent().replaceWith(response));
}
openAnchoredDiff(anchoredDiff, cb) {
const diffTitle = $(`#file-path-${anchoredDiff}`);
const diffFile = diffTitle.closest('.diff-file');
const nothingHereBlock = $('.nothing-here-block:visible', diffFile);
if (nothingHereBlock.length) {
diffFile.singleFileDiff(true, cb);
} else {
cb();
}
}
handleClickLineNum(e) {
const hash = $(e.currentTarget).attr('href');
e.preventDefault();
if (window.history.pushState) {
window.history.pushState(null, null, hash);
} else {
window.location.hash = hash;
}
this.highlighSelectedLine();
}
diffViewType() {
return $('.inline-parallel-buttons a.active').data('view-type');
}
lineNumbers(line) {
if (!line.children().length) {
return [0, 0];
}
return line.find('.diff-line-num').map((i, elm) => parseInt($(elm).data('linenumber'), 10));
}
highlighSelectedLine() {
const $diffFiles = $('.diff-file');
$diffFiles.find('.hll').removeClass('hll');
if (window.location.hash !== '') {
const hash = window.location.hash.replace('#', '');
$diffFiles
.find(`tr#${hash}:not(.match) td, td#${hash}, td[data-line-code="${hash}"]`)
.addClass('hll');
}
}
}
window.gl = window.gl || {};
window.gl.Diff = Diff;
})();
app/assets/javascripts/dispatcher.js.es6
View file @ 468d575f
......@@ -24,6 +24,7 @@
switch (page) {
case 'sessions:new':
new UsernameValidator();
new ActiveTabMemoizer();
break;
case 'projects:boards:show':
case 'projects:boards:index':
......@@ -61,7 +62,7 @@
new ZenMode();
break;
case 'projects:compare:show':
new Diff();
new gl.Diff();
break;
case 'projects:issues:new':
case 'projects:issues:edit':
......@@ -74,7 +75,7 @@
break;
case 'projects:merge_requests:new':
case 'projects:merge_requests:edit':
new Diff();
new gl.Diff();
shortcut_handler = new ShortcutsNavigation();
new GLForm($('.merge-request-form'));
new IssuableForm($('.merge-request-form'));
......@@ -91,7 +92,7 @@
new GLForm($('.release-form'));
break;
case 'projects:merge_requests:show':
new Diff();
new gl.Diff();
shortcut_handler = new ShortcutsIssuable(true);
new ZenMode();
new MergedButtons();
......@@ -101,7 +102,7 @@
new MergedButtons();
break;
case "projects:merge_requests:diffs":
new Diff();
new gl.Diff();
new ZenMode();
new MergedButtons();
break;
......@@ -117,7 +118,7 @@
break;
case 'projects:commit:show':
new Commit();
new Diff();
new gl.Diff();
new ZenMode();
shortcut_handler = new ShortcutsNavigation();
break;
......@@ -135,8 +136,18 @@
new TreeView();
}
break;
case 'projects:pipelines:builds':
case 'projects:pipelines:show':
new gl.Pipelines();
const { controllerAction } = document.querySelector('.js-pipeline-container').dataset;
new gl.Pipelines({
initTabs: true,
tabsOptions: {
action: controllerAction,
defaultAction: 'pipelines',
parentEl: '.pipelines-tabs',
},
});
break;
case 'groups:activity':
new gl.Activities();
......@@ -262,7 +273,7 @@
new NotificationsDropdown();
break;
case 'wikis':
new Wikis();
new gl.Wikis();
shortcut_handler = new ShortcutsNavigation();
new ZenMode();
new GLForm($('.wiki-form'));
......
app/assets/javascripts/environments/components/environment.js.es6
View file @ 468d575f
......@@ -74,6 +74,8 @@
projectStoppedEnvironmentsPath: environmentsData.projectStoppedEnvironmentsPath,
newEnvironmentPath: environmentsData.newEnvironmentPath,
helpPagePath: environmentsData.helpPagePath,
commitIconSvg: environmentsData.commitIconSvg,
playIconSvg: environmentsData.playIconSvg,
};
},
......@@ -227,7 +229,9 @@
:model="model"
:toggleRow="toggleRow.bind(model)"
:can-create-deployment="canCreateDeploymentParsed"
:can-read-environment="canReadEnvironmentParsed"></tr>
:can-read-environment="canReadEnvironmentParsed"
:play-icon-svg="playIconSvg"
:commit-icon-svg="commitIconSvg"></tr>
<tr v-if="model.isOpen && model.children && model.children.length > 0"
is="environment-item"
......@@ -235,7 +239,9 @@
:model="children"
:toggleRow="toggleRow.bind(children)"
:can-create-deployment="canCreateDeploymentParsed"
:can-read-environment="canReadEnvironmentParsed">
:can-read-environment="canReadEnvironmentParsed"
:play-icon-svg="playIconSvg"
:commit-icon-svg="commitIconSvg">
</tr>
</template>
......
app/assets/javascripts/environments/components/environment_actions.js.es6
View file @ 468d575f
......@@ -12,38 +12,18 @@
required: false,
default: () => [],
},
},
/**
* Appends the svg icon that were render in the index page.
* In order to reuse the svg instead of copy and paste in this template
* we need to render it outside this component using =custom_icon partial.
*
* TODO: Remove this when webpack is merged.
*
*/
mounted() {
const playIcon = document.querySelector('.play-icon-svg.hidden svg');
const dropdownContainer = this.$el.querySelector('.dropdown-play-icon-container');
const actionContainers = this.$el.querySelectorAll('.action-play-icon-container');
// Phantomjs does not have support to iterate a nodelist.
const actionsArray = [].slice.call(actionContainers);
if (playIcon && actionsArray && dropdownContainer) {
dropdownContainer.appendChild(playIcon.cloneNode(true));
actionsArray.forEach((element) => {
element.appendChild(playIcon.cloneNode(true));
});
}
playIconSvg: {
type: String,
required: false,
},
},
template: `
<div class="inline">
<div class="dropdown">
<a class="dropdown-new btn btn-default" data-toggle="dropdown">
<span class="dropdown-play-icon-container"></span>
<span class="js-dropdown-play-icon-container" v-html="playIconSvg"></span>
<i class="fa fa-caret-down"></i>
</a>
......@@ -53,7 +33,9 @@
data-method="post"
rel="nofollow"
class="js-manual-action-link">
<span class="action-play-icon-container"></span>
<span class="js-action-play-icon-container" v-html="playIconSvg"></span>
<span>
{{action.name}}
</span>
......
app/assets/javascripts/environments/components/environment_external_url.js.es6
View file @ 468d575f
......@@ -7,14 +7,14 @@
window.gl.environmentsList.ExternalUrlComponent = Vue.component('external-url-component', {
props: {
external_url: {
externalUrl: {
type: String,
default: '',
},
},
template: `
<a class="btn external_url" :href="external_url" target="_blank">
<a class="btn external_url" :href="externalUrl" target="_blank">
<i class="fa fa-external-link"></i>
</a>
`,
......
app/assets/javascripts/environments/components/environment_item.js.es6
View file @ 468d575f
......@@ -23,6 +23,7 @@
window.gl = window.gl || {};
window.gl.environmentsList = window.gl.environmentsList || {};
window.gl.environmentsList.timeagoInstance = new timeago(); // eslint-disable-line
gl.environmentsList.EnvironmentItem = Vue.component('environment-item', {
......@@ -57,6 +58,16 @@
required: false,
default: false,
},
commitIconSvg: {
type: String,
required: false,
},
playIconSvg: {
type: String,
required: false,
},
},
data() {
......@@ -147,15 +158,26 @@
this.model.last_deployment.deployable;
},
/**
* Verifies if the date to be shown is present.
*
* @returns {Boolean|Undefined}
*/
canShowDate() {
return this.model.last_deployment &&
this.model.last_deployment.deployable &&
this.model.last_deployment.deployable !== undefined;
},
/**
* Human readable date.
*
* @returns {String}
*/
createdDate() {
const timeagoInstance = new timeago(); // eslint-disable-line
return timeagoInstance.format(this.model.created_at);
return window.gl.environmentsList.timeagoInstance.format(
this.model.last_deployment.deployable.created_at,
);
},
/**
......@@ -439,11 +461,12 @@
<div v-if="!isFolder && hasLastDeploymentKey" class="js-commit-component">
<commit-component
:tag="commitTag"
:ref="commitRef"
:commit_url="commitUrl"
:short_sha="commitShortSha"
:commit-ref="commitRef"
:commit-url="commitUrl"
:short-sha="commitShortSha"
:title="commitTitle"
:author="commitAuthor">
:author="commitAuthor"
:commit-icon-svg="commitIconSvg">
</commit-component>
</div>
<p v-if="!isFolder && !hasLastDeploymentKey" class="commit-title">
......@@ -453,7 +476,7 @@
<td>
<span
v-if="!isFolder && model.last_deployment"
v-if="!isFolder && canShowDate"
class="environment-created-date-timeago">
{{createdDate}}
</span>
......@@ -464,6 +487,7 @@
<div v-if="hasManualActions && canCreateDeployment"
class="inline js-manual-actions-container">
<actions-component
:play-icon-svg="playIconSvg"
:actions="manualActions">
</actions-component>
</div>
......@@ -471,22 +495,22 @@
<div v-if="model.external_url && canReadEnvironment"
class="inline js-external-url-container">
<external-url-component
:external_url="model.external_url">
</external_url-component>
:external-url="model.external_url">
</external-url-component>
</div>
<div v-if="isStoppable && canCreateDeployment"
class="inline js-stop-component-container">
<stop-component
:stop_url="model.stop_path">
:stop-url="model.stop_path">
</stop-component>
</div>
<div v-if="canRetry && canCreateDeployment"
class="inline js-rollback-component-container">
<rollback-component
:is_last_deployment="isLastDeployment"
:retry_url="retryUrl">
:is-last-deployment="isLastDeployment"
:retry-url="retryUrl">
</rollback-component>
</div>
</div>
......
app/assets/javascripts/environments/components/environment_rollback.js.es6
View file @ 468d575f
......@@ -7,19 +7,20 @@
window.gl.environmentsList.RollbackComponent = Vue.component('rollback-component', {
props: {
retry_url: {
retryUrl: {
type: String,
default: '',
},
is_last_deployment: {
isLastDeployment: {
type: Boolean,
default: true,
},
},
template: `
<a class="btn" :href="retry_url" data-method="post" rel="nofollow">
<span v-if="is_last_deployment">
<a class="btn" :href="retryUrl" data-method="post" rel="nofollow">
<span v-if="isLastDeployment">
Re-deploy
</span>
<span v-else>
......
app/assets/javascripts/environments/components/environment_stop.js.es6
View file @ 468d575f
......@@ -7,7 +7,7 @@
window.gl.environmentsList.StopComponent = Vue.component('stop-component', {
props: {
stop_url: {
stopUrl: {
type: String,
default: '',
},
......@@ -15,7 +15,7 @@
template: `
<a class="btn stop-env-link"
:href="stop_url"
:href="stopUrl"
data-confirm="Are you sure you want to stop this environment?"
data-method="post"
rel="nofollow">
......
app/assets/javascripts/extensions/element.js.es6
View file @ 468d575f
/* global Element */
/* eslint-disable consistent-return, max-len */
Element.prototype.matches = Element.prototype.matches || Element.prototype.msMatchesSelector;
/* eslint-disable consistent-return, max-len, no-empty, no-plusplus, func-names */
Element.prototype.closest = Element.prototype.closest || function closest(selector, selectedElement = this) {
if (!selectedElement) return;
return selectedElement.matches(selector) ? selectedElement : Element.prototype.closest(selector, selectedElement.parentElement);
};
Element.prototype.matches = Element.prototype.matches ||
Element.prototype.matchesSelector ||
Element.prototype.mozMatchesSelector ||
Element.prototype.msMatchesSelector ||
Element.prototype.oMatchesSelector ||
Element.prototype.webkitMatchesSelector ||
function (s) {
const matches = (this.document || this.ownerDocument).querySelectorAll(s);
let i = matches.length;
while (--i >= 0 && matches.item(i) !== this) {}
return i > -1;
};
app/assets/javascripts/gfm_auto_complete.js.es6
View file @ 468d575f
......@@ -5,6 +5,10 @@
window.GitLab = {};
}
function sanitize(str) {
return str.replace(/<(?:.|\n)*?>/gm, '');
}
GitLab.GfmAutoComplete = {
dataLoading: false,
dataLoaded: false,
......@@ -48,6 +52,10 @@
return $.fn.atwho["default"].callbacks.filter(query, data, searchKey);
},
beforeInsert: function(value) {
if (value && !this.setting.skipSpecialCharacterTest) {
var withoutAt = value.substring(1);
if (withoutAt && /[^\w\d]/.test(withoutAt)) value = value.charAt() + '"' + withoutAt + '"';
}
if (!GitLab.GfmAutoComplete.dataLoaded) {
return this.at;
} else {
......@@ -59,12 +67,13 @@
// Tweaked to commands to start without a space only if char before is a non-word character
// https://github.com/ichord/At.js
var _a, _y, regexp, match;
subtext = subtext.split(' ').pop();
flag = flag.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
_a = decodeURI("%C3%80");
_y = decodeURI("%C3%BF");
regexp = new RegExp("(?:\\B|\\W|\\s)" + flag + "([A-Za-z" + _a + "-" + _y + "0-9_\'\.\+\-]*)|([^\\x00-\\xff]*)$", 'gi');
regexp = new RegExp("(?:\\B|\\W|\\s)" + flag + "(?!\\W)([A-Za-z" + _a + "-" + _y + "0-9_\'\.\+\-]*)|([^\\x00-\\xff]*)$", 'gi');
match = regexp.exec(subtext);
......@@ -112,6 +121,7 @@
insertTpl: ':${name}:',
data: ['loading'],
startWithSpace: false,
skipSpecialCharacterTest: true,
callbacks: {
sorter: this.DefaultOptions.sorter,
filter: this.DefaultOptions.filter,
......@@ -136,6 +146,7 @@
data: ['loading'],
startWithSpace: false,
alwaysHighlightFirst: true,
skipSpecialCharacterTest: true,
callbacks: {
sorter: this.DefaultOptions.sorter,
filter: this.DefaultOptions.filter,
......@@ -159,8 +170,8 @@
return {
username: m.username,
avatarTag: autoCompleteAvatar.length === 1 ? txtAvatar : imgAvatar,
title: gl.utils.sanitize(title),
search: gl.utils.sanitize(m.username + " " + m.name)
title: sanitize(title),
search: sanitize(m.username + " " + m.name)
};
});
}
......@@ -194,7 +205,7 @@
}
return {
id: i.iid,
title: gl.utils.sanitize(i.title),
title: sanitize(i.title),
search: i.iid + " " + i.title
};
});
......@@ -214,12 +225,13 @@
}
};
})(this),
insertTpl: '${atwho-at}"${title}"',
insertTpl: '${atwho-at}${title}',
data: ['loading'],
startWithSpace: false,
callbacks: {
matcher: this.DefaultOptions.matcher,
sorter: this.DefaultOptions.sorter,
beforeInsert: this.DefaultOptions.beforeInsert,
beforeSave: function(milestones) {
return $.map(milestones, function(m) {
if (m.title == null) {
......@@ -227,7 +239,7 @@
}
return {
id: m.iid,
title: gl.utils.sanitize(m.title),
title: sanitize(m.title),
search: "" + m.title
};
});
......@@ -262,7 +274,7 @@
}
return {
id: m.iid,
title: gl.utils.sanitize(m.title),
title: sanitize(m.title),
search: m.iid + " " + m.title
};
});
......@@ -279,18 +291,11 @@
callbacks: {
matcher: this.DefaultOptions.matcher,
sorter: this.DefaultOptions.sorter,
beforeInsert: this.DefaultOptions.beforeInsert,
beforeSave: function(merges) {
var sanitizeLabelTitle;
sanitizeLabelTitle = function(title) {
if (/[\w\?&]+\s+[\w\?&]+/g.test(title)) {
return "\"" + (gl.utils.sanitize(title)) + "\"";
} else {
return gl.utils.sanitize(title);
}
};
return $.map(merges, function(m) {
return {
title: sanitizeLabelTitle(m.title),
title: sanitize(m.title),
color: m.color,
search: "" + m.title
};
......@@ -303,6 +308,7 @@
at: '/',
alias: 'commands',
searchKey: 'search',
skipSpecialCharacterTest: true,
displayTpl: function(value) {
var tpl = '<li>/${name}';
if (value.aliases.length > 0) {
......
app/assets/javascripts/gl_dropdown.js
View file @ 468d575f
......@@ -650,6 +650,11 @@
} else if(value) {
field = this.dropdown.parent().find("input[name='" + fieldName + "'][value='" + value.toString().replace(/'/g, '\\\'') + "']");
}
if (this.options.isSelectable && !this.options.isSelectable(selectedObject, el)) {
return;
}
if (el.hasClass(ACTIVE_CLASS)) {
el.removeClass(ACTIVE_CLASS);
if (field && field.length) {
......
app/assets/javascripts/graphs/stat_graph_contributors_util.js
View file @ 468d575f
......@@ -2,7 +2,7 @@
(function() {
window.ContributorsStatGraphUtil = {
parse_log: function(log) {
var by_author, by_email, data, entry, i, len, total;
var by_author, by_email, data, entry, i, len, total, normalized_email;
total = {};
by_author = {};
by_email = {};
......@@ -11,7 +11,8 @@
if (total[entry.date] == null) {
this.add_date(entry.date, total);
}
data = by_author[entry.author_name] || by_email[entry.author_email];
normalized_email = entry.author_email.toLowerCase();
data = by_author[entry.author_name] || by_email[normalized_email];
if (data == null) {
data = this.add_author(entry, by_author, by_email);
}
......@@ -32,12 +33,14 @@
return collection[date].date = date;
},
add_author: function(author, by_author, by_email) {
var data;
var data, normalized_email;
data = {};
data.author_name = author.author_name;
data.author_email = author.author_email;
normalized_email = author.author_email.toLowerCase();
by_author[author.author_name] = data;
return by_email[author.author_email] = data;
by_email[normalized_email] = data;
return data;
},
store_data: function(entry, total, by_author) {
this.store_commits(total, by_author);
......
app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js.es6 0 → 100644
View file @ 468d575f
/**
* Linked Tabs
*
* Handles persisting and restores the current tab selection and content.
* Reusable component for static content.
*
* ### Example Markup
*
* <ul class="nav-links tab-links">
* <li class="active">
* <a data-action="tab1" data-target="#tab1" data-toggle="tab" href="/path/tab1">
* Tab 1
* </a>
* </li>
* <li class="groups-tab">
* <a data-action="tab2" data-target="#tab2" data-toggle="tab" href="/path/tab2">
* Tab 2
* </a>
* </li>
*
*
* <div class="tab-content">
* <div class="tab-pane" id="tab1">
* Tab 1 Content
* </div>
* <div class="tab-pane" id="tab2">
* Tab 2 Content
* </div>
* </div>
*
*
* ### How to use
*
* new window.gl.LinkedTabs({
* action: "#{controller.action_name}",
* defaultAction: 'tab1',
* parentEl: '.tab-links'
* });
*/
(() => {
window.gl = window.gl || {};
window.gl.LinkedTabs = class LinkedTabs {
/**
* Binds the events and activates de default tab.
*
* @param {Object} options
*/
constructor(options) {
this.options = options || {};
this.defaultAction = this.options.defaultAction;
this.action = this.options.action || this.defaultAction;
if (this.action === 'show') {
this.action = this.defaultAction;
}
this.currentLocation = window.location;
const tabSelector = `${this.options.parentEl} a[data-toggle="tab"]`;
// since this is a custom event we need jQuery :(
$(document)
.off('shown.bs.tab', tabSelector)
.on('shown.bs.tab', tabSelector, e => this.tabShown(e));
this.activateTab(this.action);
}
/**
* Handles the `shown.bs.tab` event to set the currect url action.
*
* @param {type} evt
* @return {Function}
*/
tabShown(evt) {
const source = evt.target.getAttribute('href');
return this.setCurrentAction(source);
}
/**
* Updates the URL with the path that matched the given action.
*
* @param {String} source
* @return {String}
*/
setCurrentAction(source) {
const copySource = source;
copySource.replace(/\/+$/, '');
const newState = `${copySource}${this.currentLocation.search}${this.currentLocation.hash}`;
history.replaceState({
turbolinks: true,
url: newState,
}, document.title, newState);
return newState;
}
/**
* Given the current action activates the correct tab.
* http://getbootstrap.com/javascript/#tab-show
* Note: Will trigger `shown.bs.tab`
*/
activateTab() {
return $(`${this.options.parentEl} a[data-action='${this.action}']`).tab('show');
}
};
})();
app/assets/javascripts/lib/utils/common_utils.js
View file @ 468d575f
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-unused-expressions, no-param-reassign, no-else-return, quotes, object-shorthand, comma-dangle, camelcase, one-var, vars-on-top, one-var-declaration-per-line, no-return-assign, consistent-return, padded-blocks, max-len */
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-unused-expressions, no-param-reassign, no-else-return, quotes, object-shorthand, comma-dangle, camelcase, one-var, vars-on-top, one-var-declaration-per-line, no-return-assign, consistent-return, padded-blocks, max-len, prefer-template */
(function() {
(function(w) {
var base;
......@@ -33,10 +33,6 @@
});
};
w.gl.utils.split = function(val) {
return val.split(/,\s*/);
};
w.gl.utils.extractLast = function(term) {
return this.split(term).pop();
};
......@@ -67,63 +63,51 @@
});
};
w.gl.utils.disableButtonIfAnyEmptyField = function(form, form_selector, button_selector) {
var closest_submit, updateButtons;
closest_submit = form.find(button_selector);
updateButtons = function() {
var filled;
filled = true;
form.find('input').filter(form_selector).each(function() {
return filled = this.rstrip($(this).val()) !== "" || !$(this).attr('required');
});
if (filled) {
return closest_submit.enable();
} else {
return closest_submit.disable();
}
};
updateButtons();
return form.keyup(updateButtons);
};
w.gl.utils.sanitize = function(str) {
return str.replace(/<(?:.|\n)*?>/gm, '');
};
w.gl.utils.unbindEvents = function() {
return $(document).off('scroll');
};
// automatically adjust scroll position for hash urls taking the height of the navbar into account
// https://github.com/twitter/bootstrap/issues/1768
w.gl.utils.handleLocationHash = function() {
var hash = w.gl.utils.getLocationHash();
if (!hash) return;
w.gl.utils.shiftWindow = function() {
return w.scrollBy(0, -100);
};
var navbar = document.querySelector('.navbar-gitlab');
var subnav = document.querySelector('.layout-nav');
var fixedTabs = document.querySelector('.js-tabs-affix');
var adjustment = 0;
if (navbar) adjustment -= navbar.offsetHeight;
if (subnav) adjustment -= subnav.offsetHeight;
gl.utils.updateTooltipTitle = function($tooltipEl, newTitle) {
return $tooltipEl.tooltip('destroy').attr('title', newTitle).tooltip('fixTitle');
};
gl.utils.preventDisabledButtons = function() {
return $('.btn').click(function(e) {
if ($(this).hasClass('disabled')) {
e.preventDefault();
e.stopImmediatePropagation();
return false;
// scroll to user-generated markdown anchor if we cannot find a match
if (document.getElementById(hash) === null) {
var target = document.getElementById('user-content-' + hash);
if (target && target.scrollIntoView) {
target.scrollIntoView(true);
window.scrollBy(0, adjustment);
}
});
} else {
// only adjust for fixedTabs when not targeting user-generated content
if (fixedTabs) {
adjustment -= fixedTabs.offsetHeight;
}
window.scrollBy(0, adjustment);
}
};
gl.utils.getPagePath = function() {
return $('body').data('page').split(':')[0];
};
gl.utils.parseUrl = function (url) {
var parser = document.createElement('a');
parser.href = url;
return parser;
};
gl.utils.cleanupBeforeFetch = function() {
// Unbind scroll events
$(document).off('scroll');
// Close any open tooltips
$('.has-tooltip, [data-toggle="tooltip"]').tooltip('destroy');
gl.utils.parseUrlPathname = function (url) {
var parsedUrl = gl.utils.parseUrl(url);
// parsedUrl.pathname will return an absolute path for Firefox and a relative path for IE11
// We have to make sure we always have an absolute path.
return parsedUrl.pathname.charAt(0) === '/' ? parsedUrl.pathname : '/' + parsedUrl.pathname;
};
gl.utils.isMetaKey = function(e) {
......
app/assets/javascripts/lib/utils/datetime_utility.js
View file @ 468d575f
......@@ -29,7 +29,7 @@
setTimeago = true;
}
$timeagoEls.each(function() {
$timeagoEls.filter(':not([data-timeago-rendered])').each(function() {
var $el = $(this);
$el.attr('title', gl.utils.formatDate($el.attr('datetime')));
......@@ -39,6 +39,8 @@
template: '<div class="tooltip local-timeago" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
});
}
$el.attr('data-timeago-rendered', true);
gl.utils.renderTimeago($el);
});
};
......
app/assets/javascripts/members.js.es6
View file @ 468d575f
/* eslint-disable */
((w) => {
w.gl = w.gl || {};
/* eslint-disable class-methods-use-this */
(() => {
window.gl = window.gl || {};
class Members {
constructor() {
this.addListeners();
this.initGLDropdown();
}
addListeners() {
$('.project_member, .group_member').off('ajax:success').on('ajax:success', this.removeRow);
$('.js-member-update-control').off('change').on('change', this.formSubmit);
$('.js-edit-member-form').off('ajax:success').on('ajax:success', this.formSuccess);
$('.js-member-update-control').off('change').on('change', this.formSubmit.bind(this));
$('.js-edit-member-form').off('ajax:success').on('ajax:success', this.formSuccess.bind(this));
gl.utils.disableButtonIfEmptyField('#user_ids', 'input[name=commit]', 'change');
}
initGLDropdown() {
$('.js-member-permissions-dropdown').each((i, btn) => {
const $btn = $(btn);
$btn.glDropdown({
selectable: true,
isSelectable(selected, $el) {
return !$el.hasClass('is-active');
},
fieldName: $btn.data('field-name'),
id(selected, $el) {
return $el.data('id');
},
toggleLabel(selected, $el) {
return $el.text();
},
clicked: (selected, $link) => {
this.formSubmit(null, $link);
},
});
});
}
removeRow(e) {
const $target = $(e.target);
if ($target.hasClass('btn-remove')) {
$target.closest('.member')
.fadeOut(function () {
.fadeOut(function fadeOutMemberRow() {
$(this).remove();
});
}
}
formSubmit() {
$(this).closest('form').trigger("submit.rails").end().disable();
formSubmit(e, $el = null) {
const $this = e ? $(e.currentTarget) : $el;
const { $toggle, $dateInput } = this.getMemberListItems($this);
$this.closest('form').trigger('submit.rails');
$toggle.disable();
$dateInput.disable();
}
formSuccess() {
$(this).find('.js-member-update-control').enable();
formSuccess(e) {
const { $toggle, $dateInput } = this.getMemberListItems($(e.currentTarget).closest('.member'));
$toggle.enable();
$dateInput.enable();
}
getMemberListItems($el) {
const $memberListItem = $el.is('.member') ? $el : $(`#${$el.data('el-id')}`);
return {
$memberListItem,
$toggle: $memberListItem.find('.dropdown-menu-toggle'),
$dateInput: $memberListItem.find('.js-access-expiration-date'),
};
}
}
gl.Members = Members;
})(window);
})();
app/assets/javascripts/merge_request.js
View file @ 468d575f
......@@ -40,7 +40,7 @@
if (window.mrTabs) {
window.mrTabs.unbindEvents();
}
window.mrTabs = new MergeRequestTabs(this.opts);
window.mrTabs = new gl.MergeRequestTabs(this.opts);
};
MergeRequest.prototype.showAllCommits = function() {
......
app/assets/javascripts/merge_request_widget.js.es6
View file @ 468d575f
......@@ -40,19 +40,26 @@
$('#modal_merge_info').modal({
show: false
});
this.firstCICheck = true;
this.readyForCICheck = false;
this.readyForCIEnvironmentCheck = false;
this.cancel = false;
clearInterval(this.fetchBuildStatusInterval);
clearInterval(this.fetchBuildEnvironmentStatusInterval);
this.clearEventListeners();
this.addEventListeners();
this.getCIStatus(false);
this.getCIEnvironmentsStatus();
this.retrieveSuccessIcon();
this.pollCIStatus();
this.pollCIEnvironmentsStatus();
this.ciStatusInterval = new global.SmartInterval({
callback: this.getCIStatus.bind(this, true),
startingInterval: 10000,
maxInterval: 30000,
hiddenInterval: 120000,
incrementByFactorOf: 5000,
});
this.ciEnvironmentStatusInterval = new global.SmartInterval({
callback: this.getCIEnvironmentsStatus.bind(this),
startingInterval: 30000,
maxInterval: 120000,
hiddenInterval: 240000,
incrementByFactorOf: 15000,
immediateExecution: true,
});
notifyPermissions();
}
......@@ -60,10 +67,6 @@
return $(document).off('page:change.merge_request');
};
MergeRequestWidget.prototype.cancelPolling = function() {
return this.cancel = true;
};
MergeRequestWidget.prototype.addEventListeners = function() {
var allowedPages;
allowedPages = ['show', 'commits', 'builds', 'pipelines', 'changes'];
......@@ -72,9 +75,6 @@
var page;
page = $('body').data('page').split(':').last();
if (allowedPages.indexOf(page) < 0) {
clearInterval(_this.fetchBuildStatusInterval);
clearInterval(_this.fetchBuildEnvironmentStatusInterval);
_this.cancelPolling();
return _this.clearEventListeners();
}
};
......@@ -101,7 +101,7 @@
urlSuffix = deleteSourceBranch ? '?deleted_source_branch=true' : '';
return window.location.href = window.location.pathname + urlSuffix;
} else if (data.merge_error) {
return this.$widgetBody.html("<h4>" + data.merge_error + "</h4>");
return _this.$widgetBody.html("<h4>" + data.merge_error + "</h4>");
} else {
callback = function() {
return merge_request_widget.mergeInProgress(deleteSourceBranch);
......@@ -114,6 +114,11 @@
});
};
MergeRequestWidget.prototype.cancelPolling = function () {
this.ciStatusInterval.cancel();
this.ciEnvironmentStatusInterval.cancel();
};
MergeRequestWidget.prototype.getMergeStatus = function() {
return $.get(this.opts.merge_check_url, function(data) {
return $('.mr-state-widget').replaceWith(data);
......@@ -131,18 +136,6 @@
}
};
MergeRequestWidget.prototype.pollCIStatus = function() {
return this.fetchBuildStatusInterval = setInterval(((function(_this) {
return function() {
if (!_this.readyForCICheck) {
return;
}
_this.getCIStatus(true);
return _this.readyForCICheck = false;
};
})(this)), 10000);
};
MergeRequestWidget.prototype.getCIStatus = function(showNotification) {
var _this;
_this = this;
......@@ -150,23 +143,17 @@
return $.getJSON(this.opts.ci_status_url, (function(_this) {
return function(data) {
var message, status, title;
if (_this.cancel) {
return;
}
_this.readyForCICheck = true;
if (data.status === '') {
return;
}
if (data.environments && data.environments.length) _this.renderEnvironments(data.environments);
if (_this.firstCICheck || data.status !== _this.opts.ci_status && (data.status != null)) {
if (data.status !== _this.opts.ci_status && (data.status != null)) {
_this.opts.ci_status = data.status;
_this.showCIStatus(data.status);
if (data.coverage) {
_this.showCICoverage(data.coverage);
}
// The first check should only update the UI, a notification
// should only be displayed on status changes
if (showNotification && !_this.firstCICheck) {
if (showNotification) {
status = _this.ciLabelForStatus(data.status);
if (status === "preparing") {
title = _this.opts.ci_title.preparing;
......@@ -184,24 +171,13 @@
return Turbolinks.visit(_this.opts.builds_path);
});
}
return _this.firstCICheck = false;
}
};
})(this));
};
MergeRequestWidget.prototype.pollCIEnvironmentsStatus = function() {
this.fetchBuildEnvironmentStatusInterval = setInterval(() => {
if (!this.readyForCIEnvironmentCheck) return;
this.getCIEnvironmentsStatus();
this.readyForCIEnvironmentCheck = false;
}, 300000);
};
MergeRequestWidget.prototype.getCIEnvironmentsStatus = function() {
$.getJSON(this.opts.ci_environments_status_url, (environments) => {
if (this.cancel) return;
this.readyForCIEnvironmentCheck = true;
if (environments && environments.length) this.renderEnvironments(environments);
});
};
......@@ -212,11 +188,11 @@
if ($(`.mr-state-widget #${ environment.id }`).length) return;
const $template = $(DEPLOYMENT_TEMPLATE);
if (!environment.external_url || !environment.external_url_formatted) $('.js-environment-link', $template).remove();
if (!environment.stop_url) {
$('.js-stop-env-link', $template).remove();
}
if (environment.deployed_at && environment.deployed_at_formatted) {
environment.deployed_at = gl.utils.getTimeago().format(environment.deployed_at, 'gl_en') + '.';
} else {
......
app/assets/javascripts/pipelines.js.es6
View file @ 468d575f
//= require lib/utils/bootstrap_linked_tabs
/* eslint-disable */
((global) => {
class Pipelines {
constructor() {
constructor(options = {}) {
if (options.initTabs && options.tabsOptions) {
new global.LinkedTabs(options.tabsOptions);
}
this.addMarginToBuildColumns();
}
addMarginToBuildColumns() {
this.pipelineGraph = document.querySelector('.pipeline-graph');
const secondChildBuildNodes = document.querySelector('.pipeline-graph').querySelectorAll('.build:nth-child(2)');
for (buildNodeIndex in secondChildBuildNodes) {
this.pipelineGraph = document.querySelector('.js-pipeline-graph');
const secondChildBuildNodes = this.pipelineGraph.querySelectorAll('.build:nth-child(2)');
for (const buildNodeIndex in secondChildBuildNodes) {
const buildNode = secondChildBuildNodes[buildNodeIndex];
const firstChildBuildNode = buildNode.previousElementSibling;
if (!firstChildBuildNode || !firstChildBuildNode.matches('.build')) continue;
......@@ -21,6 +30,7 @@
const columnBuilds = previousColumn.querySelectorAll('.build');
if (columnBuilds.length === 1) previousColumn.classList.add('no-margin');
}
this.pipelineGraph.classList.remove('hidden');
}
}
......
app/assets/javascripts/signin_tabs_memoizer.js.es6 0 → 100644
View file @ 468d575f
/* eslint no-param-reassign: ["error", { "props": false }]*/
/* eslint no-new: "off" */
((global) => {
/**
* Memorize the last selected tab after reloading a page.
* Does that setting the current selected tab in the localStorage
*/
class ActiveTabMemoizer {
constructor({ currentTabKey = 'current_signin_tab', tabSelector = 'ul.nav-tabs' } = {}) {
this.currentTabKey = currentTabKey;
this.tabSelector = tabSelector;
this.bootstrap();
}
bootstrap() {
const tabs = document.querySelectorAll(this.tabSelector);
if (tabs.length > 0) {
tabs[0].addEventListener('click', (e) => {
if (e.target && e.target.nodeName === 'A') {
const anchorName = e.target.getAttribute('href');
this.saveData(anchorName);
}
});
}
this.showTab();
}
showTab() {
const anchorName = this.readData();
if (anchorName) {
const tab = document.querySelector(`${this.tabSelector} a[href="${anchorName}"]`);
if (tab) {
tab.click();
}
}
}
saveData(val) {
localStorage.setItem(this.currentTabKey, val);
}
readData() {
return localStorage.getItem(this.currentTabKey);
}
}
global.ActiveTabMemoizer = ActiveTabMemoizer;
})(window);
app/assets/javascripts/single_file_diff.js
View file @ 468d575f
......@@ -14,6 +14,7 @@
COLLAPSED_HTML = '<div class="nothing-here-block diff-collapsed">This diff is collapsed. <a class="click-to-expand">Click to expand it.</a></div>';
function SingleFileDiff(file, forceLoad, cb) {
var clickTarget;
this.file = file;
this.toggleDiff = bind(this.toggleDiff, this);
this.content = $('.diff-content', this.file);
......@@ -31,9 +32,9 @@
this.content.after(this.collapsedContent);
this.$toggleIcon.addClass('fa-caret-down');
}
$('.file-title, .click-to-expand', this.file).on('click', this.toggleDiff);
clickTarget = $('.file-title, .click-to-expand', this.file).on('click', this.toggleDiff);
if (forceLoad) {
this.toggleDiff(null, cb);
this.toggleDiff({ target: clickTarget }, cb);
}
}
......
app/assets/javascripts/smart_interval.js.es6
View file @ 468d575f
......@@ -7,24 +7,31 @@
(() => {
class SmartInterval {
/**
* @param { function } callback Function to be called on each iteration (required)
* @param { milliseconds } startingInterval `currentInterval` is set to this initially
* @param { milliseconds } maxInterval `currentInterval` will be incremented to this
* @param { integer } incrementByFactorOf `currentInterval` is incremented by this factor
* @param { boolean } lazyStart Configure if timer is initialized on instantiation or lazily
* @param { function } opts.callback Function to be called on each iteration (required)
* @param { milliseconds } opts.startingInterval `currentInterval` is set to this initially
* @param { milliseconds } opts.maxInterval `currentInterval` will be incremented to this
* @param { milliseconds } opts.hiddenInterval `currentInterval` is set to this
* when the page is hidden
* @param { integer } opts.incrementByFactorOf `currentInterval` is incremented by this factor
* @param { boolean } opts.lazyStart Configure if timer is initialized on
* instantiation or lazily
* @param { boolean } opts.immediateExecution Configure if callback should
* be executed before the first interval.
*/
constructor({ callback, startingInterval, maxInterval, incrementByFactorOf, lazyStart }) {
constructor(opts = {}) {
this.cfg = {
callback,
startingInterval,
maxInterval,
incrementByFactorOf,
lazyStart,
callback: opts.callback,
startingInterval: opts.startingInterval,
maxInterval: opts.maxInterval,
hiddenInterval: opts.hiddenInterval,
incrementByFactorOf: opts.incrementByFactorOf,
lazyStart: opts.lazyStart,
immediateExecution: opts.immediateExecution,
};
this.state = {
intervalId: null,
currentInterval: startingInterval,
currentInterval: this.cfg.startingInterval,
pageVisibility: 'visible',
};
......@@ -36,6 +43,11 @@
const cfg = this.cfg;
const state = this.state;
if (cfg.immediateExecution) {
cfg.immediateExecution = false;
cfg.callback();
}
state.intervalId = window.setInterval(() => {
cfg.callback();
......@@ -54,14 +66,29 @@
this.stopTimer();
}
onVisibilityHidden() {
if (this.cfg.hiddenInterval) {
this.setCurrentInterval(this.cfg.hiddenInterval);
this.resume();
} else {
this.cancel();
}
}
// start a timer, using the existing interval
resume() {
this.stopTimer(); // stop exsiting timer, in case timer was not previously stopped
this.start();
}
onVisibilityVisible() {
this.cancel();
this.start();
}
destroy() {
this.cancel();
document.removeEventListener('visibilitychange', this.handleVisibilityChange);
$(document).off('visibilitychange').off('page:before-unload');
}
......@@ -80,11 +107,7 @@
initVisibilityChangeHandling() {
// cancel interval when tab no longer shown (prevents cached pages from polling)
$(document)
.off('visibilitychange').on('visibilitychange', (e) => {
this.state.pageVisibility = e.target.visibilityState;
this.handleVisibilityChange();
});
document.addEventListener('visibilitychange', this.handleVisibilityChange.bind(this));
}
initPageUnloadHandling() {
......@@ -92,10 +115,11 @@
$(document).on('page:before-unload', () => this.cancel());
}
handleVisibilityChange() {
const state = this.state;
const intervalAction = state.pageVisibility === 'hidden' ? this.cancel : this.resume;
handleVisibilityChange(e) {
this.state.pageVisibility = e.target.visibilityState;
const intervalAction = this.isPageVisible() ?
this.onVisibilityVisible :
this.onVisibilityHidden;
intervalAction.apply(this);
}
......@@ -111,6 +135,7 @@
incrementInterval() {
const cfg = this.cfg;
const currentInterval = this.getCurrentInterval();
if (cfg.hiddenInterval && !this.isPageVisible()) return;
let nextInterval = currentInterval * cfg.incrementByFactorOf;
if (nextInterval > cfg.maxInterval) {
......@@ -120,6 +145,8 @@
this.setCurrentInterval(nextInterval);
}
isPageVisible() { return this.state.pageVisibility === 'visible'; }
stopTimer() {
const state = this.state;
......
app/assets/javascripts/subscription.js deleted 100644 → 0
View file @ 8f0cef0b
/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, vars-on-top, no-unused-vars, one-var, one-var-declaration-per-line, camelcase, consistent-return, no-undef, padded-blocks, max-len */
(function() {
var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
this.Subscription = (function() {
function Subscription(container) {
this.toggleSubscription = bind(this.toggleSubscription, this);
var $container;
this.$container = $(container);
this.url = this.$container.attr('data-url');
this.subscribe_button = this.$container.find('.js-subscribe-button');
this.subscription_status = this.$container.find('.subscription-status');
this.subscribe_button.unbind('click').click(this.toggleSubscription);
}
Subscription.prototype.toggleSubscription = function(event) {
var action, btn, current_status;
btn = $(event.currentTarget);
action = btn.find('span').text();
current_status = this.subscription_status.attr('data-status');
btn.addClass('disabled');
if ($('html').hasClass('issue-boards-page')) {
this.url = this.$container.attr('data-url');
}
return $.post(this.url, (function(_this) {
return function() {
var status;
btn.removeClass('disabled');
if ($('html').hasClass('issue-boards-page')) {
Vue.set(gl.issueBoards.BoardsStore.detail.issue, 'subscribed', !gl.issueBoards.BoardsStore.detail.issue.subscribed);
} else {
status = current_status === 'subscribed' ? 'unsubscribed' : 'subscribed';
_this.subscription_status.attr('data-status', status);
action = status === 'subscribed' ? 'Unsubscribe' : 'Subscribe';
btn.find('span').text(action);
_this.subscription_status.find('>div').toggleClass('hidden');
if (btn.attr('data-original-title')) {
return btn.tooltip('hide').attr('data-original-title', action).tooltip('fixTitle');
}
}
};
})(this));
};
return Subscription;
})();
}).call(this);
app/assets/javascripts/subscription.js.es6 0 → 100644
View file @ 468d575f
/* global Vue */
(() => {
class Subscription {
constructor(containerElm) {
this.containerElm = containerElm;
const subscribeButton = containerElm.querySelector('.js-subscribe-button');
if (subscribeButton) {
// remove class so we don't bind twice
subscribeButton.classList.remove('js-subscribe-button');
subscribeButton.addEventListener('click', this.toggleSubscription.bind(this));
}
}
toggleSubscription(event) {
const button = event.currentTarget;
const buttonSpan = button.querySelector('span');
if (!buttonSpan || button.classList.contains('disabled')) {
return;
}
button.classList.add('disabled');
const isSubscribed = buttonSpan.innerHTML.trim().toLowerCase() !== 'subscribe';
const toggleActionUrl = this.containerElm.dataset.url;
$.post(toggleActionUrl, () => {
button.classList.remove('disabled');
// hack to allow this to work with the issue boards Vue object
if (document.querySelector('html').classList.contains('issue-boards-page')) {
Vue.set(
gl.issueBoards.BoardsStore.detail.issue,
'subscribed',
!gl.issueBoards.BoardsStore.detail.issue.subscribed,
);
} else {
buttonSpan.innerHTML = isSubscribed ? 'Subscribe' : 'Unsubscribe';
}
});
}
static bindAll(selector) {
[].forEach.call(document.querySelectorAll(selector), elm => new Subscription(elm));
}
}
window.gl = window.gl || {};
window.gl.Subscription = Subscription;
})();
app/assets/javascripts/vue_common_component/commit.js.es6
View file @ 468d575f
......@@ -23,7 +23,7 @@
* name
* ref_url
*/
ref: {
commitRef: {
type: Object,
required: false,
default: () => ({}),
......@@ -32,16 +32,16 @@
/**
* Used to link to the commit sha.
*/
commit_url: {
commitUrl: {
type: String,
required: false,
default: '',
},
/**
* Used to show the commit short_sha that links to the commit url.
* Used to show the commit short sha that links to the commit url.
*/
short_sha: {
shortSha: {
type: String,
required: false,
default: '',
......@@ -68,6 +68,11 @@
required: false,
default: () => ({}),
},
commitIconSvg: {
type: String,
required: false,
},
},
computed: {
......@@ -79,8 +84,8 @@
*
* @returns {Boolean}
*/
hasRef() {
return this.ref && this.ref.name && this.ref.ref_url;
hasCommitRef() {
return this.commitRef && this.commitRef.name && this.commitRef.ref_url;
},
/**
......@@ -110,43 +115,25 @@
},
},
/**
* In order to reuse the svg instead of copy and paste in this template
* we need to render it outside this component using =custom_icon partial.
* Make sure it has this structure:
* .commit-icon-svg.hidden
* svg
*
* TODO: Find a better way to include SVG
*/
mounted() {
const commitIconContainer = this.$el.querySelector('.commit-icon-container');
const commitIcon = document.querySelector('.commit-icon-svg.hidden svg');
if (commitIconContainer && commitIcon) {
commitIconContainer.appendChild(commitIcon.cloneNode(true));
}
},
template: `
<div class="branch-commit">
<div v-if="hasRef" class="icon-container">
<div v-if="hasCommitRef" class="icon-container">
<i v-if="tag" class="fa fa-tag"></i>
<i v-if="!tag" class="fa fa-code-fork"></i>
</div>
<a v-if="hasRef"
<a v-if="hasCommitRef"
class="monospace branch-name"
:href="ref.ref_url">
{{ref.name}}
:href="commitRef.ref_url">
{{commitRef.name}}
</a>
<div class="icon-container commit-icon commit-icon-container"></div>
<div v-html="commitIconSvg" class="commit-icon js-commit-icon"></div>
<a class="commit-id monospace"
:href="commit_url">
{{short_sha}}
:href="commitUrl">
{{shortSha}}
</a>
<p class="commit-title">
......@@ -162,7 +149,7 @@
</a>
<a class="commit-row-message"
:href="commit_url">
:href="commitUrl">
{{title}}
</a>
</span>
......
app/assets/javascripts/wikis.js deleted 100644 → 0
View file @ 8f0cef0b
/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, consistent-return, one-var, one-var-declaration-per-line, no-undef, prefer-template, padded-blocks, max-len */
/*= require latinise */
(function() {
var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
this.Wikis = (function() {
function Wikis() {
this.slugify = bind(this.slugify, this);
$('.new-wiki-page').on('submit', (function(_this) {
return function(e) {
var field, path, slug;
$('[data-error~=slug]').addClass('hidden');
field = $('#new_wiki_path');
slug = _this.slugify(field.val());
if (slug.length > 0) {
path = field.attr('data-wikis-path');
location.href = path + '/' + slug;
return e.preventDefault();
}
};
})(this));
}
Wikis.prototype.dasherize = function(value) {
return value.replace(/[_\s]+/g, '-');
};
Wikis.prototype.slugify = function(value) {
return this.dasherize(value.trim().toLowerCase().latinise());
};
return Wikis;
})();
}).call(this);
app/assets/javascripts/wikis.js.es6 0 → 100644
View file @ 468d575f
/* eslint-disable no-param-reassign */
/* global Breakpoints */
/*= require latinise */
/*= require breakpoints */
/*= require jquery.nicescroll */
((global) => {
const dasherize = str => str.replace(/[_\s]+/g, '-');
const slugify = str => dasherize(str.trim().toLowerCase().latinise());
class Wikis {
constructor() {
this.bp = Breakpoints.get();
this.sidebarEl = document.querySelector('.js-wiki-sidebar');
this.sidebarExpanded = false;
$(this.sidebarEl).niceScroll();
const sidebarToggles = document.querySelectorAll('.js-sidebar-wiki-toggle');
for (let i = 0; i < sidebarToggles.length; i += 1) {
sidebarToggles[i].addEventListener('click', e => this.handleToggleSidebar(e));
}
this.newWikiForm = document.querySelector('form.new-wiki-page');
if (this.newWikiForm) {
this.newWikiForm.addEventListener('submit', e => this.handleNewWikiSubmit(e));
}
window.addEventListener('resize', () => this.renderSidebar());
this.renderSidebar();
}
handleNewWikiSubmit(e) {
if (!this.newWikiForm) return;
const slugInput = this.newWikiForm.querySelector('#new_wiki_path');
const slug = slugify(slugInput.value);
if (slug.length > 0) {
const wikisPath = slugInput.getAttribute('data-wikis-path');
window.location.href = `${wikisPath}/${slug}`;
e.preventDefault();
}
}
handleToggleSidebar(e) {
e.preventDefault();
this.sidebarExpanded = !this.sidebarExpanded;
this.renderSidebar();
}
sidebarCanCollapse() {
const bootstrapBreakpoint = this.bp.getBreakpointSize();
return bootstrapBreakpoint === 'xs' || bootstrapBreakpoint === 'sm';
}
renderSidebar() {
if (!this.sidebarEl) return;
const { classList } = this.sidebarEl;
if (this.sidebarExpanded || !this.sidebarCanCollapse()) {
if (!classList.contains('right-sidebar-expanded')) {
classList.remove('right-sidebar-collapsed');
classList.add('right-sidebar-expanded');
}
} else if (classList.contains('right-sidebar-expanded')) {
classList.add('right-sidebar-collapsed');
classList.remove('right-sidebar-expanded');
}
}
}
global.Wikis = Wikis;
})(window.gl || (window.gl = {}));
app/assets/stylesheets/framework.scss
View file @ 468d575f
@import "framework/fonts";
@import "framework/variables";
@import "framework/mixins";
@import 'framework/tw_bootstrap_variables';
......@@ -7,6 +6,7 @@
@import "framework/animations.scss";
@import "framework/avatar.scss";
@import "framework/asciidoctor.scss";
@import "framework/blocks.scss";
@import "framework/buttons.scss";
@import "framework/calendar.scss";
......@@ -41,3 +41,6 @@
@import "framework/blank";
@import "framework/wells.scss";
@import "framework/page-header.scss";
@import "framework/awards.scss";
@import "framework/images.scss";
@import "framework/broadcast-messages";
app/assets/stylesheets/framework/asciidoctor.scss 0 → 100644
View file @ 468d575f
.admonitionblock td.icon {
width: 1%;
[class^="fa icon-"] {
@extend .fa-2x;
}
.icon-note {
@extend .fa-thumb-tack;
}
.icon-tip {
@extend .fa-lightbulb-o;
}
.icon-warning {
@extend .fa-exclamation-triangle;
}
.icon-caution {
@extend .fa-fire;
}
.icon-important {
@extend .fa-exclamation-circle;
}
}
app/assets/stylesheets/framework/avatar.scss
View file @ 468d575f
......@@ -8,7 +8,7 @@
float: left;
margin-right: 15px;
border-radius: $avatar_radius;
border: 1px solid rgba(0, 0, 0, .1);
border: 1px solid $avatar-border;
&.s16 { @include avatar-size(16px, 6px); }
&.s20 { @include avatar-size(20px, 7px); }
&.s24 { @include avatar-size(24px, 8px); }
......
app/assets/stylesheets/pages/awards.scss → app/assets/stylesheets/framework/awards.scss
View file @ 468d575f
.awards {
.emoji-icon {
width: 19px;
height: 19px;
width: 20px;
height: 20px;
}
}
......@@ -15,7 +15,7 @@
background-color: $award-emoji-menu-bg;
border: 1px solid $award-emoji-menu-border;
border-radius: $border-radius-base;
box-shadow: 0 6px 12px rgba(0,0,0,.175);
box-shadow: 0 6px 12px $award-emoji-menu-shadow;
pointer-events: none;
opacity: 0;
transform: scale(.2);
......@@ -127,7 +127,7 @@
.award-control-icon {
float: left;
margin-right: 5px;
font-size: 19px;
font-size: 18px;
}
.award-control-icon-loading {
......@@ -136,5 +136,6 @@
.award-control-icon {
color: $award-emoji-new-btn-icon-color;
margin-top: 1px;
}
}
app/assets/stylesheets/framework/blank.scss
View file @ 468d575f
......@@ -32,14 +32,14 @@
.blank-state-title {
margin-top: 0;
margin-bottom: 5px;
font-size: 19px;
font-size: 18px;
font-weight: normal;
}
.blank-state-text {
margin-top: 0;
margin-bottom: $gl-padding;
font-size: 15px;
font-size: 14px;
> strong {
font-weight: 600;
......
app/assets/stylesheets/framework/blocks.scss
View file @ 468d575f
.light-well {
background-color: $background-color;
padding: 15px;
}
.centered-light-block {
text-align: center;
color: $gl-gray;
......@@ -41,7 +36,7 @@
}
&.white {
background-color: white;
background-color: $white-light;
}
&.top-block {
......@@ -158,7 +153,7 @@
p {
padding: 0 $gl-padding;
color: #5c5d5e;
color: $gl-text-color-dark;
}
}
......@@ -274,6 +269,10 @@
}
}
.emoji-icon {
display: inline-block;
}
@media(max-width: $screen-xs-max) {
margin-top: 50px;
text-align: center;
......
app/assets/stylesheets/framework/broadcast-messages.scss 0 → 100644
View file @ 468d575f
.broadcast-message {
@extend .alert-warning;
padding: 10px;
text-align: center;
div,
p {
display: inline;
margin: 0;
a {
color: inherit;
text-decoration: underline;
}
}
}
.broadcast-message-preview {
@extend .broadcast-message;
margin-bottom: 20px;
}
app/assets/stylesheets/framework/buttons.scss
View file @ 468d575f
@mixin btn-default {
border-radius: 3px;
font-size: $gl-font-size;
font-weight: 500;
font-weight: 400;
padding: $gl-vert-padding $gl-btn-padding;
&:focus,
......@@ -68,23 +68,23 @@
}
@mixin btn-green {
@include btn-color($green-light, $border-green-light, $green-normal, $border-green-normal, $green-dark, $border-green-dark, #fff);
@include btn-color($green-light, $border-green-light, $green-normal, $border-green-normal, $green-dark, $border-green-dark, $white-light);
}
@mixin btn-blue {
@include btn-color($blue-light, $border-blue-light, $blue-normal, $border-blue-normal, $blue-dark, $border-blue-dark, #fff);
@include btn-color($blue-light, $border-blue-light, $blue-normal, $border-blue-normal, $blue-dark, $border-blue-dark, $white-light);
}
@mixin btn-blue-medium {
@include btn-color($blue-medium-light, $border-blue-light, $blue-medium, $border-blue-normal, $blue-medium-dark, $border-blue-dark, #fff);
@include btn-color($blue-medium-light, $border-blue-light, $blue-medium, $border-blue-normal, $blue-medium-dark, $border-blue-dark, $white-light);
}
@mixin btn-orange {
@include btn-color($orange-light, $border-orange-light, $orange-normal, $border-orange-normal, $orange-dark, $border-orange-dark, #fff);
@include btn-color($orange-light, $border-orange-light, $orange-normal, $border-orange-normal, $orange-dark, $border-orange-dark, $white-light);
}
@mixin btn-red {
@include btn-color($red-light, $border-red-light, $red-normal, $border-red-normal, $red-dark, $border-red-dark, #fff);
@include btn-color($red-light, $border-red-light, $red-normal, $border-red-normal, $red-dark, $border-red-dark, $white-light);
}
@mixin btn-gray {
......@@ -289,8 +289,8 @@
.active {
box-shadow: $gl-btn-active-background;
border: 1px solid #c6cacf !important;
background-color: #e4e7ed !important;
border: 1px solid $border-white-dark !important;
background-color: $btn-active-gray-light !important;
}
}
......@@ -345,13 +345,13 @@
.btn-static {
background-color: $background-color !important;
border: 1px solid lightgrey;
border: 1px solid $border-gray-light;
cursor: default;
&:active {
-moz-box-shadow: inset 0 0 0 white;
-webkit-box-shadow: inset 0 0 0 white;
box-shadow: inset 0 0 0 white;
-moz-box-shadow: inset 0 0 0 $white-light;
-webkit-box-shadow: inset 0 0 0 $white-light;
box-shadow: inset 0 0 0 $white-light;
}
}
......
app/assets/stylesheets/framework/calendar.scss
View file @ 468d575f
......@@ -2,7 +2,7 @@
padding-left: 0;
padding-right: 0;
@media (min-width: $screen-sm-min) and (max-width: $screen-lg-min) {
@media (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
overflow-x: scroll;
}
}
......@@ -28,13 +28,13 @@
.user-contrib-cell {
&:hover {
cursor: pointer;
stroke: #000;
stroke: $black;
}
}
.user-contrib-text {
font-size: 12px;
fill: #959494;
fill: $calendar-user-contrib-text;
}
.calendar-hint {
......
app/assets/stylesheets/framework/callout.scss
View file @ 468d575f
......@@ -25,25 +25,25 @@
/* Variations */
.bs-callout-danger {
background-color: #fdf7f7;
border-color: #eed3d7;
color: #b94a48;
background-color: $callout-danger-bg;
border-color: $callout-danger-border;
color: $callout-danger-color;
}
.bs-callout-warning {
background-color: #faf8f0;
border-color: #faebcc;
color: #8a6d3b;
background-color: $callout-warning-bg;
border-color: $callout-warning-border;
color: $callout-warning-color;
}
.bs-callout-info {
background-color: #f4f8fa;
border-color: #bce8f1;
color: #34789a;
background-color: $callout-info-bg;
border-color: $callout-info-border;
color: $callout-info-color;
}
.bs-callout-success {
background-color: #dff0d8;
border-color: #5ca64d;
color: #3c763d;
background-color: $callout-success-bg;
border-color: $callout-success-border;
color: $callout-success-color;
}
app/assets/stylesheets/framework/common.scss
View file @ 468d575f
/** COLORS **/
.cgray { color: $gl-gray; }
.clgray { color: #bbb; }
.cred { color: $gl-text-red; }
.cgreen { color: $gl-text-green; }
.cdark { color: #444; }
.cgray { color: $common-gray; }
.clgray { color: $common-gray-light; }
.cred { color: $common-red; }
.cgreen { color: $common-green; }
.cdark { color: $common-gray-dark; }
/** COMMON CLASSES **/
.prepend-top-0 { margin-top: 0; }
......@@ -28,12 +28,12 @@
.center { text-align: center; }
.underlined-link { text-decoration: underline; }
.hint { font-style: italic; color: #999; }
.light { color: $gl-gray; }
.hint { font-style: italic; color: $hint-color; }
.light { color: $common-gray; }
.slead {
color: $gl-gray;
font-size: 15px;
color: $common-gray;
font-size: 14px;
margin-bottom: 12px;
font-weight: normal;
line-height: 24px;
......@@ -52,10 +52,10 @@ pre {
}
&.well-pre {
border: 1px solid #eee;
border: 1px solid $well-pre-bg;
background: $gray-light;
border-radius: 0;
color: #555;
color: $well-pre-color;
}
}
......@@ -87,14 +87,14 @@ table a code {
.loading {
margin: 20px auto;
height: 40px;
color: #555;
color: $loading-color;
font-size: 32px;
text-align: center;
}
span.update-author {
display: block;
color: #999;
color: $update-author-color;
font-weight: normal;
font-style: italic;
......@@ -105,7 +105,7 @@ span.update-author {
}
.user-mention {
color: #2fa0bb;
color: $user-mention-color;
font-weight: bold;
}
......@@ -114,7 +114,7 @@ span.update-author {
}
p.time {
color: #999;
color: $time-color;
font-size: 90%;
margin: 30px 3px 3px 2px;
}
......@@ -150,7 +150,7 @@ li.note {
.project_member_show {
td:first-child {
color: #aaa;
color: $project-member-show-color;
}
}
......@@ -176,7 +176,7 @@ li.note {
margin-top: 40px;
pre {
background: white;
background: $white-light;
border: none;
font-size: 12px;
}
......@@ -184,12 +184,12 @@ li.note {
.error-message {
padding: 10px;
background: #c67;
background: $error-bg;
margin: 0;
color: #fff;
color: $white-light;
a {
color: #fff;
color: $white-light;
text-decoration: underline;
}
}
......@@ -197,22 +197,22 @@ li.note {
.browser-alert {
padding: 10px;
text-align: center;
background: #c67;
color: #fff;
background: $error-bg;
color: $white-light;
font-weight: bold;
a {
color: #fff;
color: $white-light;
text-decoration: underline;
}
}
.warning_message {
border-left: 4px solid #ed9;
color: #b90;
border-left: 4px solid $warning-message-border;
color: $warning-message-color;
padding: 10px;
margin-bottom: 10px;
background: #ffffe6;
background: $warning-message-bg;
padding-left: 20px;
&.centered {
......@@ -222,7 +222,7 @@ li.note {
.gitlab-promo {
a {
color: #aaa;
color: $gl-promo-color;
margin-right: 30px;
}
}
......@@ -245,7 +245,7 @@ li.note {
position: relative;
top: 2px;
left: 5px;
color: #666;
color: $control-group-descr-color;
}
}
}
......@@ -255,6 +255,7 @@ img.emoji {
height: 20px;
vertical-align: top;
width: 20px;
margin-top: 1px;
}
.chart {
......@@ -270,7 +271,7 @@ img.emoji {
table {
td.permission-x {
background: #d9edf7 !important;
background: $table-permission-x-bg !important;
text-align: center;
}
}
......@@ -323,13 +324,13 @@ table {
.username {
font-size: 18px;
color: #666;
color: $username-color;
margin-top: 8px;
}
.description {
font-size: $gl-font-size;
color: #666;
color: $description-color;
margin-top: 8px;
}
}
......@@ -339,7 +340,7 @@ table {
.profiler-button,
.profiler-controls {
border-color: #eee !important;
border-color: $profiler-border !important;
}
}
......@@ -379,7 +380,9 @@ table {
border-top: 1px solid $border-color;
}
.hide-bottom-border { border-bottom: none !important; }
.hide-bottom-border {
border-bottom: none !important;
}
.gl-accessibility {
&:focus {
......@@ -396,3 +399,13 @@ table {
z-index: 1;
}
}
.str-truncated {
&-60 {
@include str-truncated(60%);
}
&-100 {
@include str-truncated(100%);
}
}
app/assets/stylesheets/framework/dropdowns.scss
View file @ 468d575f
......@@ -36,12 +36,17 @@
padding: 6px 8px 6px 10px;
background-color: $dropdown-toggle-bg;
color: $dropdown-toggle-color;
font-size: 15px;
font-size: 14px;
text-align: left;
border: 1px solid $border-color;
border-radius: $border-radius-base;
white-space: nowrap;
&[disabled] {
background-color: $input-bg-disabled;
cursor: not-allowed;
}
&.no-outline {
outline: 0;
}
......@@ -123,7 +128,7 @@
width: 240px;
margin-top: 2px;
margin-bottom: 0;
font-size: 15px;
font-size: 14px;
font-weight: normal;
padding: 8px 0;
background-color: $dropdown-bg;
......@@ -376,7 +381,7 @@
position: absolute;
top: 10px;
right: 20px;
color: #c7c7c7;
color: $dropdown-input-fa-color;
font-size: 12px;
pointer-events: none;
}
......@@ -529,7 +534,7 @@
.ui-datepicker-calendar {
.ui-state-hover,
.ui-state-active {
color: #fff;
color: $white-light;
border: 0;
}
}
......@@ -589,7 +594,7 @@
.ui-datepicker-title {
color: $gl-gray;
font-size: 15px;
font-size: 14px;
line-height: 1;
font-weight: normal;
}
......
app/assets/stylesheets/framework/files.scss
View file @ 468d575f
......@@ -59,10 +59,10 @@
}
.file-content {
background: #fff;
background: $white-light;
&.image_file {
background: #eee;
background: $file-image-bg;
text-align: center;
img {
......@@ -84,8 +84,8 @@
}
&.blob-no-preview {
background: #eee;
text-shadow: 0 1px 2px #fff;
background: $blob-bg;
text-shadow: 0 1px 2px $white-light;
padding: 100px 0;
}
......@@ -99,7 +99,7 @@
}
tr {
border-bottom: 1px solid #eee;
border-bottom: 1px solid $blame-border;
}
td {
......@@ -120,7 +120,7 @@
td.line-numbers {
float: none;
border-left: 1px solid #ddd;
border-left: 1px solid $blame-line-numbers-border;
i {
float: none;
......@@ -134,7 +134,7 @@
}
&.logs {
background: #eee;
background: $logs-bg;
max-height: 700px;
overflow-y: auto;
......@@ -143,14 +143,14 @@
padding: 10px 0;
border-left: 1px solid $border-color;
margin-bottom: 0;
background: white;
background: $white-light;
li {
color: #888;
color: $logs-li-color;
p {
margin: 0;
color: #333;
color: $logs-p-color;
line-height: 24px;
padding-left: 10px;
}
......
app/assets/stylesheets/framework/flash.scss
View file @ 468d575f
......@@ -38,7 +38,7 @@
}
}
@media (max-width: $screen-md-min) {
@media (max-width: $screen-sm-max) {
ul.notes {
.flash-container.timeline-content {
margin-left: 0;
......
app/assets/stylesheets/framework/fonts.scss deleted 100644 → 0
View file @ 8f0cef0b
// Disabling "SpaceAfterPropertyColon" linter because the linter doesn't like
// the way the `src` property is formatted in this file.
// scss-lint:disable SpaceAfterPropertyColon
/* latin-ext */
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 300;
src:
local('Source Sans Pro Light'),
local('SourceSansPro-Light'),
font-url('SourceSansPro-Light.ttf.woff2') format('woff2'),
font-url('SourceSansPro-Light.ttf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 400;
src:
local('Source Sans Pro'),
local('SourceSansPro-Regular'),
font-url('SourceSansPro-Regular.ttf.woff2') format('woff2'),
font-url('SourceSansPro-Regular.ttf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 600;
src:
local('Source Sans Pro Semibold'),
local('SourceSansPro-Semibold'),
font-url('SourceSansPro-Semibold.ttf.woff2') format('woff2'),
font-url('SourceSansPro-Semibold.ttf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 700;
src:
local('Source Sans Pro Bold'),
local('SourceSansPro-Bold'),
font-url('SourceSansPro-Bold.ttf.woff2') format('woff2'),
font-url('SourceSansPro-Bold.ttf.woff') format('woff');
}
app/assets/stylesheets/framework/forms.scss
View file @ 468d575f
......@@ -7,9 +7,9 @@ input {
}
input[type='text'].danger {
background: #f2dede!important;
border-color: #d66;
text-shadow: 0 1px 1px #fff;
background: $input-danger-bg !important;
border-color: $input-danger-border;
text-shadow: 0 1px 1px $white-light;
}
.datetime-controls {
......@@ -98,7 +98,7 @@ label {
}
}
@media(max-width: $screen-sm-min) {
@media(max-width: $screen-xs-max) {
padding: 0 $gl-padding;
.control-label,
......@@ -159,7 +159,7 @@ label {
}
.input-group-addon {
background-color: #f7f8fa;
background-color: $input-group-addon-bg;
}
.input-group-addon:not(:first-child):not(:last-child) {
......@@ -181,7 +181,7 @@ label {
border: 1px solid $green-normal;
&:focus {
box-shadow: 0 0 0 1px $green-normal inset, 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 4px 0 $green-normal;
box-shadow: 0 0 0 1px $green-normal inset, 0 1px 1px $gl-field-focus-shadow inset, 0 0 4px 0 $green-normal;
border: 0 none;
}
}
......@@ -190,7 +190,7 @@ label {
border: 1px solid $red-normal;
&:focus {
box-shadow: 0 0 0 1px $red-normal inset, 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 4px 0 rgba(210, 40, 82, 0.6);
box-shadow: 0 0 0 1px $red-normal inset, 0 1px 1px $gl-field-focus-shadow inset, 0 0 4px 0 $gl-field-focus-shadow-error;
border: 0 none;
}
}
......
app/assets/stylesheets/framework/gitlab-theme.scss
View file @ 468d575f
......@@ -21,7 +21,6 @@
background: $color-darker;
}
.sidebar-header,
.sidebar-action-buttons {
color: $color-light;
background-color: lighten($color-darker, 5%);
......@@ -86,37 +85,57 @@
}
$theme-charcoal: #3d454d;
$theme-charcoal-light: #485157;
$theme-charcoal-dark: #383f45;
$theme-charcoal-text: #b9bbbe;
$theme-blue-light: #becde9;
$theme-blue: #2980b9;
$theme-blue-dark: #1970a9;
$theme-blue-darker: #096099;
$theme-graphite-lighter: #ccc;
$theme-graphite-light: #777;
$theme-graphite: #666;
$theme-graphite-dark: #555;
$theme-gray-light: #979797;
$theme-gray: #373737;
$theme-gray-dark: #272727;
$theme-gray-darker: #222;
$theme-green-light: #adc;
$theme-green: #019875;
$theme-green-dark: #018865;
$theme-green-darker: #017855;
$theme-violet-light: #98c;
$theme-violet: #548;
$theme-violet-dark: #436;
$theme-violet-darker: #325;
body {
&.ui_blue {
@include gitlab-theme(#becde9, $theme-blue, #1970a9, #096099);
@include gitlab-theme($theme-blue-light, $theme-blue, $theme-blue-dark, $theme-blue-darker);
}
&.ui_charcoal {
@include gitlab-theme($theme-charcoal-text, #485157, $theme-charcoal, $theme-charcoal-dark);
@include gitlab-theme($theme-charcoal-text, $theme-charcoal-light, $theme-charcoal, $theme-charcoal-dark);
}
&.ui_graphite {
@include gitlab-theme(#ccc, #777, $theme-graphite, #555);
@include gitlab-theme($theme-graphite-lighter, $theme-graphite-light, $theme-graphite, $theme-graphite-dark);
}
&.ui_gray {
@include gitlab-theme(#979797, $theme-gray, #272727, #222);
@include gitlab-theme($theme-gray-light, $theme-gray, $theme-gray-dark, $theme-gray-darker);
}
&.ui_green {
@include gitlab-theme(#adc, $theme-green, #018865, #017855);
@include gitlab-theme($theme-green-light, $theme-green, $theme-green-dark, $theme-green-darker);
}
&.ui_violet {
@include gitlab-theme(#98c, $theme-violet, #436, #325);
@include gitlab-theme($theme-violet-light, $theme-violet, $theme-violet-dark, $theme-violet-darker);
}
}
app/assets/stylesheets/framework/header.scss
View file @ 468d575f
......@@ -8,7 +8,7 @@ header {
&.navbar-empty {
height: $header-height;
background: #fff;
background: $white-light;
border-bottom: 1px solid $btn-gray-hover;
.center-logo {
......@@ -71,12 +71,12 @@ header {
}
.fa-caret-down {
font-size: 15px;
font-size: 14px;
}
}
.navbar-toggle {
color: #666;
color: $nav-toggle-gray;
margin: 6px 0;
border-radius: 0;
position: absolute;
......@@ -156,7 +156,7 @@ header {
position: relative;
padding-right: 20px;
margin: 0;
font-size: 19px;
font-size: 18px;
max-width: 385px;
display: inline-block;
line-height: $header-height;
......@@ -228,7 +228,7 @@ header {
}
.page-sidebar-pinned.right-sidebar-expanded {
@media (max-width: $screen-lg-min) {
@media (max-width: $screen-md-max) {
.header-content .title {
width: 300px;
}
......
app/assets/stylesheets/framework/issue_box.scss
View file @ 468d575f
......@@ -20,7 +20,7 @@
display: block;
float: left;
margin-right: 10px;
color: #fff;
color: $white-light;
font-size: $gl-font-size;
line-height: 25px;
......@@ -37,10 +37,10 @@
}
&.status-box-expired {
background: #cea61b;
background-color: $issue-status-expired;
}
&.status-box-upcoming {
background: #8f8f8f;
background: $issue-box-upcoming-bg;
}
}
app/assets/stylesheets/framework/jquery.scss
View file @ 468d575f
......@@ -4,13 +4,13 @@
&.ui-datepicker,
&.ui-datepicker-inline {
border: 1px solid #ddd;
border: 1px solid $jq-ui-border;
padding: 10px;
width: 270px;
.ui-datepicker-header {
background: #fff;
border-color: #ddd;
background: $white-light;
border-color: $jq-ui-border;
.ui-datepicker-prev,
.ui-datepicker-next {
......@@ -39,7 +39,7 @@
}
&.ui-autocomplete {
border-color: #ddd;
border-color: $jq-ui-border;
padding: 0;
margin-top: 2px;
z-index: 1001;
......@@ -50,9 +50,9 @@
}
.ui-state-default {
border: 1px solid #fff;
background: #fff;
color: #777;
border: 1px solid $white-light;
background: $white-light;
color: $jq-ui-default-color;
}
.ui-state-highlight {
......@@ -66,7 +66,7 @@
.ui-state-focus {
border: 1px solid $gl-primary;
background: $gl-primary;
color: #fff;
color: $white-light;
}
}
}
......
app/assets/stylesheets/framework/layout.scss
View file @ 468d575f
......@@ -6,7 +6,7 @@ html {
body {
&.navless {
background-color: white !important;
background-color: $white-light !important;
}
}
......
app/assets/stylesheets/framework/lists.scss
View file @ 468d575f
......@@ -11,8 +11,8 @@
> li {
padding: 10px 15px;
min-height: 20px;
border-bottom: 1px solid #eee;
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
border-bottom: 1px solid $list-border-light;
border-bottom: 1px solid $list-border;
&::after {
content: " ";
......@@ -21,7 +21,7 @@
}
&.disabled {
color: #888;
color: $list-text-disabled-color;
}
&.unstyled {
......@@ -31,9 +31,9 @@
}
&.warning-row {
background-color: #fcf8e3;
border-color: #faebcc;
color: #8a6d3b;
background-color: $list-warning-row-bg;
border-color: $list-warning-row-border;
color: $list-warning-row-color;
}
&.smoke { background-color: $background-color; }
......@@ -106,13 +106,13 @@ ul.task-list {
}
}
// Generic content list
ul.content-list {
@include basic-list;
margin: 0;
padding: 0;
> li {
li {
border-color: $table-border-color;
font-size: $list-font-size;
color: $list-text-color;
......@@ -193,6 +193,41 @@ ul.content-list {
}
}
// Content list using flexbox
.flex-list {
.flex-row {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
white-space: nowrap;
}
.row-main-content {
flex: 1 1 auto;
overflow: hidden;
padding-right: 8px;
}
.row-title {
font-weight: 600;
}
.row-second-line {
display: block;
}
.dropdown {
.btn-block {
margin-bottom: 0;
line-height: inherit;
}
}
.label-default {
color: $btn-transparent-color;
}
}
.panel > .content-list > li {
padding: $gl-padding-top $gl-padding;
......
app/assets/stylesheets/framework/markdown_area.scss
View file @ 468d575f
......@@ -56,16 +56,9 @@
.md-header {
.nav-links {
.active {
a {
border-bottom-color: #000;
}
}
a {
padding-top: 0;
line-height: 19px;
border-bottom: 1px solid $border-color;
&.btn.btn-xs {
padding: 2px 5px;
......@@ -80,7 +73,7 @@
}
.referenced-users {
color: #4c4e54;
color: $gl-header-color;
padding-top: 10px;
}
......@@ -92,8 +85,8 @@
.markdown-area {
border-radius: 0;
background: #fff;
border: 1px solid #ddd;
background: $white-light;
border: 1px solid $md-area-border;
min-height: 140px;
max-height: 500px;
padding: 5px;
......@@ -115,7 +108,7 @@
hr {
// Darken 'whitesmoke' a bit to make it more visible in note bodies
border-color: darken(#f5f5f5, 8%);
border-color: darken($gray-normal, 8%);
margin: 10px 0;
}
......@@ -142,7 +135,7 @@
.toolbar-btn {
float: left;
padding: 0 5px;
color: #959494;
color: $note-toolbar-color;
background: transparent;
border: 0;
outline: 0;
......
app/assets/stylesheets/framework/mixins.scss
View file @ 468d575f
......@@ -24,7 +24,7 @@
@include clearfix;
padding: 10px 0;
border-bottom: 1px solid #eee;
border-bottom: 1px solid $list-border-light;
display: block;
margin: 0;
......@@ -67,8 +67,8 @@
}
@mixin dark-diff-match-line {
color: rgba(255, 255, 255, 0.3);
background: rgba(255, 255, 255, 0.1);
color: $dark-diff-match-bg;
background: $dark-diff-match-color;
}
@mixin webkit-prefix($property, $value) {
......
app/assets/stylesheets/framework/mobile.scss
View file @ 468d575f
......@@ -133,9 +133,9 @@
right: 0;
top: 30%;
padding: 5px 15px;
background: #eee;
background: $show-aside-bg;
font-size: 20px;
color: #777;
color: $show-aside-color;
z-index: 100;
box-shadow: 0 1px 2px #ddd;
box-shadow: 0 1px 2px $show-aside-shadow;
}
app/assets/stylesheets/framework/nav.scss
View file @ 468d575f
......@@ -49,7 +49,7 @@
padding: $gl-btn-padding;
padding-bottom: 11px;
margin-bottom: -1px;
font-size: 15px;
font-size: 14px;
line-height: 28px;
color: $note-toolbar-color;
border-bottom: 2px solid transparent;
......@@ -71,11 +71,15 @@
border-bottom: 2px solid $link-underline-blue;
color: $black;
font-weight: 600;
.badge {
color: $black;
}
}
.badge {
font-weight: normal;
background-color: #eee;
background-color: $nav-badge-bg;
color: $btn-transparent-color;
vertical-align: baseline;
}
......@@ -123,7 +127,7 @@
line-height: 28px;
/* Small devices (phones, tablets, 768px and lower) */
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-xs-max) {
width: 100%;
}
}
......@@ -268,6 +272,16 @@
width: auto;
}
}
&.multi-line {
.nav-text {
line-height: 20px;
}
.nav-controls {
padding: 17px 0;
}
}
}
.layout-nav {
......
app/assets/stylesheets/framework/pagination.scss
View file @ 468d575f
......@@ -43,7 +43,7 @@
/**
* Small screen pagination
*/
@media (max-width: $screen-xs) {
@media (max-width: $screen-xs-min) {
.gl-pagination {
.pagination li a {
padding: 6px 10px;
......@@ -62,7 +62,7 @@
/**
* Medium screen pagination
*/
@media (min-width: $screen-xs) and (max-width: $screen-md-max) {
@media (min-width: $screen-xs-min) and (max-width: $screen-md-max) {
.gl-pagination {
.page {
display: none;
......
app/assets/stylesheets/framework/selects.scss
View file @ 468d575f
......@@ -6,7 +6,7 @@
.select2-container,
.select2-container.select2-drop-above {
.select2-choice {
background: #fff;
background: $white-light;
border-color: $input-border;
height: 35px;
padding: $gl-vert-padding $gl-input-padding;
......@@ -47,7 +47,7 @@
}
.select2-drop {
box-shadow: rgba(76, 86, 103, 0.247059) 0 0 1px 0, rgba(31, 37, 50, 0.317647) 0 2px 18px 0;
box-shadow: $select2-drop-shadow1 0 0 1px 0, $select2-drop-shadow2 0 2px 18px 0;
border-radius: $border-radius-default;
border: none;
min-width: 175px;
......@@ -59,7 +59,7 @@
}
.select2-drop {
color: #7f8fa4;
color: $gl-grayish-blue;
}
.select2-highlighted {
......@@ -156,7 +156,7 @@
.select2-search input {
padding: 2px 25px 2px 5px;
background: #fff image-url('select2.png');
background: $white-light image-url('select2.png');
background-repeat: no-repeat;
background-position: right 0 bottom 6px;
border: 1px solid $input-border;
......@@ -169,7 +169,7 @@
}
.select2-search input.select2-active {
background-color: #fff;
background-color: $white-light;
background-image: image-url('select2-spinner.gif') !important;
background-repeat: no-repeat;
background-position: right 5px center !important;
......@@ -206,7 +206,7 @@
.select2-highlighted {
.group-result {
.group-path {
color: #fff;
color: $white-light;
}
}
}
......@@ -221,7 +221,7 @@
}
.group-path {
color: #999;
color: $group-path-color;
}
}
......@@ -241,7 +241,7 @@
.namespace-result {
.namespace-kind {
color: #aaa;
color: $namespace-kind-color;
font-weight: normal;
}
......
app/assets/stylesheets/framework/wells.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/framework/zen.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/highlight/dark.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/highlight/white.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/mailers/devise.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/notify.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/admin.scss deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
app/assets/stylesheets/pages/boards.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/builds.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/commit.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/commits.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/confirmation.scss deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
app/assets/stylesheets/pages/dashboard.scss deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
app/assets/stylesheets/pages/diff.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/editor.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/errors.scss deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
app/assets/stylesheets/pages/events.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/graph.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/groups.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/help.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/issuable.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/issues.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/labels.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/lint.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/login.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/members.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/milestone.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/note_form.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/notes.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/pipelines.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/profile.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/projects.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/runners.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/snippets.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/status.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/tags.scss deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
app/assets/stylesheets/pages/todos.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/tree.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/votes.scss deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
app/assets/stylesheets/pages/wiki.scss
View file @ 468d575f
This diff is collapsed.
app/assets/stylesheets/pages/xterm.scss
View file @ 468d575f
This diff is collapsed.
app/controllers/admin/groups_controller.rb
View file @ 468d575f
This diff is collapsed.
app/controllers/concerns/creates_commit.rb
View file @ 468d575f
This diff is collapsed.
app/controllers/help_controller.rb
View file @ 468d575f
This diff is collapsed.
app/controllers/registrations_controller.rb
View file @ 468d575f
This diff is collapsed.
app/controllers/sessions_controller.rb
View file @ 468d575f
This diff is collapsed.
app/finders/issuable_finder.rb
View file @ 468d575f
This diff is collapsed.
app/finders/merge_requests_finder.rb
View file @ 468d575f
This diff is collapsed.
app/finders/notes_finder.rb
View file @ 468d575f
This diff is collapsed.
app/finders/snippets_finder.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/button_helper.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/ci_status_helper.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/commits_helper.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/diff_helper.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/environment_helper.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/events_helper.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/gitlab_markdown_helper.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/gitlab_routing_helper.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/groups_helper.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/issuables_helper.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/labels_helper.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/nav_helper.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/projects_helper.rb
View file @ 468d575f
This diff is collapsed.
app/helpers/snippets_helper.rb
View file @ 468d575f
This diff is collapsed.
app/models/ci/build.rb
View file @ 468d575f
This diff is collapsed.
app/models/ci/pipeline.rb
View file @ 468d575f
This diff is collapsed.
app/models/ci/stage.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
app/models/ci/variable.rb
View file @ 468d575f
This diff is collapsed.
app/models/commit.rb
View file @ 468d575f
This diff is collapsed.
app/models/commit_range.rb
View file @ 468d575f
This diff is collapsed.
app/models/commit_status.rb
View file @ 468d575f
This diff is collapsed.
app/models/concerns/has_status.rb
View file @ 468d575f
This diff is collapsed.
app/models/concerns/issuable.rb
View file @ 468d575f
This diff is collapsed.
app/models/concerns/milestoneish.rb
View file @ 468d575f
This diff is collapsed.
app/models/concerns/referable.rb
View file @ 468d575f
This diff is collapsed.
app/models/concerns/routable.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
app/models/discussion.rb
View file @ 468d575f
This diff is collapsed.
app/models/environment.rb
View file @ 468d575f
This diff is collapsed.
app/models/issue.rb
View file @ 468d575f
This diff is collapsed.
app/models/key.rb
View file @ 468d575f
This diff is collapsed.
app/models/label.rb
View file @ 468d575f
This diff is collapsed.
app/models/member.rb
View file @ 468d575f
This diff is collapsed.
app/models/merge_request.rb
View file @ 468d575f
This diff is collapsed.
app/models/merge_request_diff.rb
View file @ 468d575f
This diff is collapsed.
app/models/milestone.rb
View file @ 468d575f
This diff is collapsed.
app/models/namespace.rb
View file @ 468d575f
This diff is collapsed.
app/models/note.rb
View file @ 468d575f
This diff is collapsed.
app/models/project.rb
View file @ 468d575f
This diff is collapsed.
app/models/project_services/jira_service.rb
View file @ 468d575f
This diff is collapsed.
app/models/repository.rb
View file @ 468d575f
This diff is collapsed.
app/models/route.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
app/models/snippet.rb
View file @ 468d575f
This diff is collapsed.
app/models/user.rb
View file @ 468d575f
This diff is collapsed.
app/policies/ci/build_policy.rb
View file @ 468d575f
This diff is collapsed.
app/policies/group_member_policy.rb
View file @ 468d575f
This diff is collapsed.
app/policies/group_policy.rb
View file @ 468d575f
This diff is collapsed.
app/policies/personal_snippet_policy.rb
View file @ 468d575f
This diff is collapsed.
app/policies/project_policy.rb
View file @ 468d575f
This diff is collapsed.
app/services/ci/process_pipeline_service.rb
View file @ 468d575f
This diff is collapsed.
app/services/commits/change_service.rb
View file @ 468d575f
This diff is collapsed.
app/services/destroy_group_service.rb
View file @ 468d575f
This diff is collapsed.
app/services/discussions/base_service.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
app/services/discussions/resolve_service.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
app/services/git_push_service.rb
View file @ 468d575f
This diff is collapsed.
app/services/issuable_base_service.rb
View file @ 468d575f
This diff is collapsed.
app/services/issues/base_service.rb
View file @ 468d575f
This diff is collapsed.
app/services/issues/build_service.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
app/services/issues/close_service.rb
View file @ 468d575f
This diff is collapsed.
app/services/issues/create_service.rb
View file @ 468d575f
This diff is collapsed.
app/services/system_note_service.rb
View file @ 468d575f
This diff is collapsed.
app/uploaders/uploader_helper.rb
View file @ 468d575f
This diff is collapsed.
app/views/admin/dashboard/index.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/admin/users/_user.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/admin/users/index.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/admin/users/projects.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/devise/sessions/new.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/errors/access_denied.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/errors/encoding.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/errors/git_not_found.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/errors/not_found.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/errors/omniauth_error.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/explore/snippets/index.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/groups/issues.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/groups/merge_requests.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/help/show.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/layouts/errors.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/layouts/nav/_dashboard.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/layouts/nav/_group.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/layouts/nav/_project.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/_merge_request_merge_settings.html.haml 0 → 100644
View file @ 468d575f
This diff is collapsed.
app/views/projects/_readme.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/blame/show.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/builds/show.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/commit/_change.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/commit/_ci_stage.html.haml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
app/views/projects/commit/_pipeline_stage.html.haml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
app/views/projects/edit.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/empty.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/forks/error.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/notes/_note.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/pipelines/_graph.html.haml 0 → 100644
View file @ 468d575f
This diff is collapsed.
app/views/projects/pipelines/show.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/snippets/index.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/stage/_graph.html.haml 0 → 100644
View file @ 468d575f
This diff is collapsed.
app/views/projects/stage/_stage.html.haml 0 → 100644
View file @ 468d575f
This diff is collapsed.
app/views/projects/tags/show.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/wikis/_form.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/wikis/_nav.html.haml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
app/views/projects/wikis/_sidebar.html.haml 0 → 100644
View file @ 468d575f
This diff is collapsed.
app/views/projects/wikis/edit.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/wikis/history.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/wikis/pages.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/projects/wikis/show.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/shared/_event_filter.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/shared/_issues.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/shared/_merge_requests.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/shared/issuable/_form.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/shared/issuable/_nav.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/shared/issuable/form/_branch_chooser.html.haml 0 → 100644
View file @ 468d575f
This diff is collapsed.
app/views/shared/members/_group.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/shared/members/_member.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/shared/snippets/_header.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/snippets/_actions.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/snippets/_snippets.html.haml
View file @ 468d575f
This diff is collapsed.
app/views/snippets/_snippets_scope_menu.html.haml 0 → 100644
View file @ 468d575f
This diff is collapsed.
app/workers/pipeline_success_worker.rb
View file @ 468d575f
This diff is collapsed.
app/workers/process_commit_worker.rb
View file @ 468d575f
This diff is collapsed.
bin/changelog
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/15081-wrong-login-tab-ldap-frontend.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/18546-update-wiki-page-design.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/20052-actions-table-vscroll.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/22781-user-generated-permalinks.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/23500-enable-colorvariable.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/23589-open-issue-for-mr.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/24807-stop-ddosing-ourselves.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/24844-environments-date.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/25136-last-deployment-link.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/25202-fix-mr-widget-content-wrapping.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/25264-ref-commit.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/25272_fix_comments_tab_disappearing.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/25294-remove-signed-out-msg.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/25374-svg-as-prop.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/25482-fix-api-sudo.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/25483-broken-tabs.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/4269-public-api.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/allow-more-filenames.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/api-branch-status.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/api-cherry-pick.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/api-expose-commiter-details.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/api-remove-source-branch.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/api-simple-group-project.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/awards_handler.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/boards-issue-sorting.yml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
changelogs/unreleased/chomp-git-status-message.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/cleanup-common_utils-js.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/comments-fixture.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/destroy-session.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/enable-asciidoctor-admonition-icons.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/events-cache-invalidation.yml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
changelogs/unreleased/feature-admin-user-groups-link.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/features-api-snippets.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/fix-ca-no-date.yml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
changelogs/unreleased/fix-slack-pipeline-event.yml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
changelogs/unreleased/glm-shorthand-reference.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/html-safe-diff-line-content.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/issue-events-filter.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/issue_13270.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/issue_24020.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/issue_24363.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/issue_25030.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/issues-1608-text.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/members-dropdowns.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/mr-origin-7855.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/public-tags-api.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/refactor-create-service-spec.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/render-svg-in-diffs-and-notes.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/rephrase-system-notes.yml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
changelogs/unreleased/right-sidebar-fixture.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/sh-update-sidekiq-cron.yml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
changelogs/unreleased/shortcuts-issuable-fixture.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/small-emoji-adjustments.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/timeago-perf-fix.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/unescape-relative-path.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/update-api-spec-files.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/update-button-font-weight.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/update-git-version-in-doc.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/use-st-commits-where-possible.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/workhorse-v1-0-1.yml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
changelogs/unreleased/zj-guest-reads-public-builds.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/zj-issue-new-over-issue-create.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
changelogs/unreleased/zj-use-ruby-2-3-3.yml 0 → 100644
View file @ 468d575f
This diff is collapsed.
config/application.rb
View file @ 468d575f
This diff is collapsed.
config/initializers/1_settings.rb
View file @ 468d575f
This diff is collapsed.
config/initializers/ar_monkey_patch.rb
View file @ 468d575f
This diff is collapsed.
config/initializers/sentry.rb
View file @ 468d575f
This diff is collapsed.
config/initializers/sidekiq.rb
View file @ 468d575f
This diff is collapsed.
config/routes.rb
View file @ 468d575f
This diff is collapsed.
config/routes/group.rb
View file @ 468d575f
This diff is collapsed.
config/routes/project.rb
View file @ 468d575f
This diff is collapsed.
db/migrate/20140209025651_create_emails.rb
View file @ 468d575f
This diff is collapsed.
db/migrate/20140729134820_create_labels.rb
View file @ 468d575f
This diff is collapsed.
db/migrate/20160212123307_create_tasks.rb
View file @ 468d575f
This diff is collapsed.
db/migrate/20161124111390_add_parent_id_to_namespace.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
db/migrate/20161124111395_add_index_to_parent_id.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
db/migrate/20161124111402_add_routes_table.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
db/migrate/20161130095245_fill_routes_table.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
db/migrate/20161130101252_fill_projects_routes_table.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
db/migrate/20161202152031_remove_duplicates_from_routes.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
db/migrate/20161202152035_add_index_to_routes.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
db/migrate/20161212142807_add_lower_path_index_to_routes.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
db/schema.rb
View file @ 468d575f
This diff is collapsed.
doc/README.md
View file @ 468d575f
This diff is collapsed.
doc/administration/build_artifacts.md
View file @ 468d575f
This diff is collapsed.
doc/administration/custom_hooks.md
View file @ 468d575f
This diff is collapsed.
doc/api/branches.md
View file @ 468d575f
This diff is collapsed.
doc/api/build_triggers.md
View file @ 468d575f
This diff is collapsed.
doc/api/build_variables.md
View file @ 468d575f
This diff is collapsed.
doc/api/commits.md
View file @ 468d575f
This diff is collapsed.
doc/api/groups.md
View file @ 468d575f
This diff is collapsed.
doc/api/issues.md
View file @ 468d575f
This diff is collapsed.
doc/api/merge_requests.md
View file @ 468d575f
This diff is collapsed.
doc/api/projects.md
View file @ 468d575f
This diff is collapsed.
doc/api/repository_files.md
View file @ 468d575f
This diff is collapsed.
doc/api/services.md
View file @ 468d575f
This diff is collapsed.
doc/api/snippets.md 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/api/tags.md
View file @ 468d575f
This diff is collapsed.
doc/api/users.md
View file @ 468d575f
This diff is collapsed.
doc/ci/README.md
View file @ 468d575f
This diff is collapsed.
doc/ci/docker/using_docker_build.md
View file @ 468d575f
This diff is collapsed.
doc/ci/examples/php.md
View file @ 468d575f
This diff is collapsed.
doc/ci/git_submodules.md 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/ci/review_apps/index.md
View file @ 468d575f
This diff is collapsed.
doc/ci/triggers/README.md
View file @ 468d575f
This diff is collapsed.
doc/ci/variables/README.md
View file @ 468d575f
This diff is collapsed.
doc/ci/yaml/README.md
View file @ 468d575f
This diff is collapsed.
doc/development/code_review.md
View file @ 468d575f
This diff is collapsed.
doc/development/gotchas.md
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/animation.md 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/basics.md
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/components.md
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/copy.md
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/animation-dropdown.gif 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/animation-hover.gif 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/animation-quickupdate.gif 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-close--active.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-close--hover.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-close--resting.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-danger--active.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-danger--hover.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-danger--resting.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-info--active.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-info--hover.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-info--resting.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-spam--active.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-spam--hover.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-spam--resting.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-success--active.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-success--hover.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-success--resting.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-success-secondary--active.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-success-secondary--hover.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-warning--active.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-warning--hover.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/button-warning--resting.png 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/color-blue.png
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/color-green.png
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/color-grey.png
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/color-orange.png
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/color-red.png
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/icon-add.png
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/icon-close.png
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/icon-edit.png
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/icon-rss.png
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/img/icon-trash.png
View file @ 468d575f
This diff is collapsed.
doc/development/ux_guide/index.md
View file @ 468d575f
This diff is collapsed.
doc/install/installation.md
View file @ 468d575f
This diff is collapsed.
doc/integration/shibboleth.md
View file @ 468d575f
This diff is collapsed.
doc/intro/README.md
View file @ 468d575f
This diff is collapsed.
doc/project_services/jira.md
View file @ 468d575f
This diff is collapsed.
doc/raketasks/backup_restore.md
View file @ 468d575f
This diff is collapsed.
doc/ssh/README.md
View file @ 468d575f
This diff is collapsed.
doc/university/README.md
View file @ 468d575f
This diff is collapsed.
doc/update/8.12-to-8.13.md
View file @ 468d575f
This diff is collapsed.
doc/update/8.14-to-8.15.md 0 → 100644
View file @ 468d575f
This diff is collapsed.
doc/update/patch_versions.md
View file @ 468d575f
This diff is collapsed.
doc/user/markdown.md
View file @ 468d575f
This diff is collapsed.
doc/user/permissions.md
View file @ 468d575f
This diff is collapsed.
doc/user/project/container_registry.md
View file @ 468d575f
This diff is collapsed.
doc/user/project/merge_requests.md
View file @ 468d575f
This diff is collapsed.
doc/web_hooks/ssl.png
View file @ 468d575f
This diff is collapsed.
doc/web_hooks/web_hooks.md
View file @ 468d575f
This diff is collapsed.
doc/workflow/README.md
View file @ 468d575f
This diff is collapsed.
doc/workflow/merge_when_build_succeeds.md
View file @ 468d575f
This diff is collapsed.
features/admin/hooks.feature deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
features/admin/logs.feature deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
features/admin/settings.feature deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
features/project/wiki.feature
View file @ 468d575f
This diff is collapsed.
features/steps/admin/hooks.rb deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
features/steps/group/members.rb
View file @ 468d575f
This diff is collapsed.
features/steps/project/snippets.rb
View file @ 468d575f
This diff is collapsed.
features/steps/project/team_management.rb
View file @ 468d575f
This diff is collapsed.
features/steps/project/wiki.rb
View file @ 468d575f
This diff is collapsed.
features/steps/shared/markdown.rb
View file @ 468d575f
This diff is collapsed.
features/steps/shared/paths.rb
View file @ 468d575f
This diff is collapsed.
features/steps/shared/project.rb
View file @ 468d575f
This diff is collapsed.
lib/api/access_requests.rb
View file @ 468d575f
This diff is collapsed.
lib/api/api.rb
View file @ 468d575f
This diff is collapsed.
lib/api/award_emoji.rb
View file @ 468d575f
This diff is collapsed.
lib/api/branches.rb
View file @ 468d575f
This diff is collapsed.
lib/api/builds.rb
View file @ 468d575f
This diff is collapsed.
lib/api/commit_statuses.rb
View file @ 468d575f
This diff is collapsed.
lib/api/commits.rb
View file @ 468d575f
This diff is collapsed.
lib/api/entities.rb
View file @ 468d575f
This diff is collapsed.
lib/api/files.rb
View file @ 468d575f
This diff is collapsed.
lib/api/groups.rb
View file @ 468d575f
This diff is collapsed.
lib/api/helpers.rb
View file @ 468d575f
This diff is collapsed.
lib/api/issues.rb
View file @ 468d575f
This diff is collapsed.
lib/api/members.rb
View file @ 468d575f
This diff is collapsed.
lib/api/merge_requests.rb
View file @ 468d575f
This diff is collapsed.
lib/api/milestones.rb
View file @ 468d575f
This diff is collapsed.
lib/api/namespaces.rb
View file @ 468d575f
This diff is collapsed.
lib/api/notes.rb
View file @ 468d575f
This diff is collapsed.
lib/api/project_hooks.rb
View file @ 468d575f
This diff is collapsed.
lib/api/project_snippets.rb
View file @ 468d575f
This diff is collapsed.
lib/api/projects.rb
View file @ 468d575f
This diff is collapsed.
lib/api/runners.rb
View file @ 468d575f
This diff is collapsed.
lib/api/services.rb
View file @ 468d575f
This diff is collapsed.
lib/api/session.rb
View file @ 468d575f
This diff is collapsed.
lib/api/snippets.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/api/tags.rb
View file @ 468d575f
This diff is collapsed.
lib/api/todos.rb
View file @ 468d575f
This diff is collapsed.
lib/api/triggers.rb
View file @ 468d575f
This diff is collapsed.
lib/api/users.rb
View file @ 468d575f
This diff is collapsed.
lib/backup/manager.rb
View file @ 468d575f
This diff is collapsed.
lib/banzai/filter/label_reference_filter.rb
View file @ 468d575f
This diff is collapsed.
lib/banzai/filter/relative_link_filter.rb
View file @ 468d575f
This diff is collapsed.
lib/constraints/group_url_constrainer.rb
View file @ 468d575f
This diff is collapsed.
lib/event_filter.rb
View file @ 468d575f
This diff is collapsed.
lib/gitlab/asciidoc.rb
View file @ 468d575f
This diff is collapsed.
lib/gitlab/chat_commands/issue_create.rb
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/canceled.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/core.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/created.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/extended.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/factory.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/failed.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/pending.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/pipeline/common.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/pipeline/factory.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/pipeline/success_with_warnings.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/running.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/skipped.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/stage/common.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/stage/factory.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/ci/status/success.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/gitlab/data_builder/pipeline.rb
View file @ 468d575f
This diff is collapsed.
lib/gitlab/git_access.rb
View file @ 468d575f
This diff is collapsed.
lib/gitlab/git_access_wiki.rb
View file @ 468d575f
This diff is collapsed.
lib/gitlab/o_auth/user.rb
View file @ 468d575f
This diff is collapsed.
lib/gitlab/regex.rb
View file @ 468d575f
This diff is collapsed.
lib/gitlab/search_results.rb
View file @ 468d575f
This diff is collapsed.
lib/gitlab/url_builder.rb
View file @ 468d575f
This diff is collapsed.
lib/tasks/gitlab/helpers.rake 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/tasks/gitlab/shell.rake
View file @ 468d575f
This diff is collapsed.
lib/tasks/gitlab/task_helpers.rake deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
lib/tasks/gitlab/task_helpers.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/tasks/gitlab/workhorse.rake 0 → 100644
View file @ 468d575f
This diff is collapsed.
lib/tasks/migrate/setup_postgresql.rake
View file @ 468d575f
This diff is collapsed.
package.json
View file @ 468d575f
This diff is collapsed.
public/404.html
View file @ 468d575f
This diff is collapsed.
public/422.html
View file @ 468d575f
This diff is collapsed.
public/500.html
View file @ 468d575f
This diff is collapsed.
public/502.html
View file @ 468d575f
This diff is collapsed.
public/503.html
View file @ 468d575f
This diff is collapsed.
scripts/lint-doc.sh
View file @ 468d575f
This diff is collapsed.
spec/controllers/help_controller_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/controllers/projects/releases_controller_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/factories/ci/stages.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/factories/groups.rb
View file @ 468d575f
This diff is collapsed.
spec/features/admin/admin_hooks_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/features/admin/admin_users_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/features/boards/sidebar_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/features/commits_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/features/environments_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/features/groups/labels/edit_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/features/groups/merge_requests_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/features/help_pages_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/features/issues/move_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/features/merge_requests/target_branch_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/features/projects/builds_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/features/projects/files/creating_a_file_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/features/projects/members/group_members_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/features/projects/pipelines/pipeline_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/features/u2f_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/finders/issues_finder_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/finders/labels_finder_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/finders/merge_requests_finder_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/finders/snippets_finder_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/fixtures/api/schemas/user/login.json 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/fixtures/api/schemas/user/public.json 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/helpers/diff_helper_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/helpers/labels_helper_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/javascripts/application_spec.js deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
spec/javascripts/awards_handler_spec.js
View file @ 468d575f
This diff is collapsed.
spec/javascripts/bootstrap_linked_tabs_spec.js.es6 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/javascripts/extensions/element_spec.js.es6 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/javascripts/fixtures/application.html.haml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
spec/javascripts/fixtures/awards_handler.html.haml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
spec/javascripts/fixtures/comments.html.haml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
spec/javascripts/fixtures/issuable.html.haml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
spec/javascripts/fixtures/issue_note.html.haml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
spec/javascripts/fixtures/issues.rb
View file @ 468d575f
This diff is collapsed.
spec/javascripts/fixtures/linked_tabs.html.haml 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/javascripts/fixtures/pipeline_graph.html.haml 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/javascripts/fixtures/right_sidebar.html.haml deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
spec/javascripts/fixtures/signin_tabs.html.haml 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/javascripts/lib/utils/common_utils_spec.js.es6 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/javascripts/merge_request_tabs_spec.js
View file @ 468d575f
This diff is collapsed.
spec/javascripts/notes_spec.js
View file @ 468d575f
This diff is collapsed.
spec/javascripts/pipelines_spec.js.es6 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/javascripts/project_title_spec.js
View file @ 468d575f
This diff is collapsed.
spec/javascripts/right_sidebar_spec.js
View file @ 468d575f
This diff is collapsed.
spec/javascripts/shortcuts_issuable_spec.js
View file @ 468d575f
This diff is collapsed.
spec/javascripts/signin_tabs_memoizer_spec.js.es6 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/javascripts/smart_interval_spec.js.es6
View file @ 468d575f
This diff is collapsed.
spec/lib/event_filter_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/backup/manager_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/ci/status/canceled_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/ci/status/created_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/ci/status/extended_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/ci/status/factory_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/ci/status/failed_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/ci/status/pending_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/ci/status/pipeline/common_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/ci/status/pipeline/factory_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/ci/status/running_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/ci/status/skipped_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/ci/status/stage/common_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/ci/status/stage/factory_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/ci/status/success_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/git_access_wiki_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/lib/gitlab/search_results_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/migrations/migrate_process_commit_worker_jobs_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/models/build_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/ci/pipeline_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/ci/stage_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/models/ci/variable_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/commit_range_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/commit_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/commit_status_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/concerns/has_status_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/concerns/issuable_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/concerns/routable_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/models/discussion_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/environment_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/group_label_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/group_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/issue_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/key_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/merge_request_diff_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/milestone_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/namespace_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/project_label_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/project_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/repository_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/route_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/models/snippet_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/models/user_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/policies/project_policy_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/rake_helper.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/award_emoji_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/boards_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/branches_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/builds_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/commits_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/deploy_keys_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/deployments_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/environments_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/files_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/groups_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/internal_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/issues_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/keys_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/labels_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/merge_requests_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/milestones_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/namespaces_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/notes_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/pipelines_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/project_hooks_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/project_snippets_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/projects_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/repositories_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/services_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/session_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/settings_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/snippets_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/requests/api/system_hooks_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/tags_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/triggers_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/users_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/variables_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/api/version_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/ci/api/builds_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/ci/api/runners_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/requests/ci/api/triggers_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/services/discussions/resolve_service_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/services/git_push_service_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/services/issues/build_service_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/services/issues/create_service_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/services/issues/move_service_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/services/issues/update_service_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/services/notification_service_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/services/system_note_service_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/spec_helper.rb
View file @ 468d575f
This diff is collapsed.
spec/support/login_helpers.rb
View file @ 468d575f
This diff is collapsed.
spec/support/matchers/is_within.rb deleted 100644 → 0
View file @ 8f0cef0b
This diff is collapsed.
spec/support/matchers/markdown_matchers.rb
View file @ 468d575f
This diff is collapsed.
spec/support/rake_helpers.rb
View file @ 468d575f
This diff is collapsed.
spec/support/services_shared_context.rb
View file @ 468d575f
This diff is collapsed.
spec/tasks/gitlab/backup_rake_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/tasks/gitlab/task_helpers_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/tasks/gitlab/users_rake_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/tasks/gitlab/workhorse_rake_spec.rb 0 → 100644
View file @ 468d575f
This diff is collapsed.
spec/workers/build_email_worker_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/workers/emails_on_push_worker_spec.rb
View file @ 468d575f
This diff is collapsed.
spec/workers/process_commit_worker_spec.rb
View file @ 468d575f
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