Skip to content

G
gitlab-ce
Commit 0b540a0f authored by Douwe Maan's avatar Douwe Maan
Browse files
Options

Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit

parents 3d50b99d df0110ba
Expand all Show whitespace changes
Inline Side-by-side
Showing with 13068 additions and 4701 deletions
.gitignore
View file @ 0b540a0f
......@@ -37,8 +37,10 @@ nohup.out
public/assets/
public/uploads.*
public/uploads/
shared/artifacts/
rails_best_practices_output.html
/tags
tmp/
vendor/bundle/*
builds/*
shared/*
.gitlab-ci.yml
View file @ 0b540a0f
......@@ -73,3 +73,18 @@ brakeman:
tags:
- ruby
- mysql
flog:
script:
- bundle exec rake flog
tags:
- ruby
- mysql
flay:
script:
- bundle exec rake flay
tags:
- ruby
- mysql
allow_failure: true
CHANGELOG
View file @ 0b540a0f
Please view this file on the master branch, on stable branches it's out of date.
v 8.1.0 (unreleased)
v 8.2.0 (unreleased)
- Remove CSS property preventing hard tabs from rendering in Chromium 45 (Stan Hu)
- Fix Drone CI service template not saving properly (Stan Hu)
- Fix avatars not showing in Atom feeds and project issues when Gravatar disabled (Stan Hu)
- Added a GitLab specific profiling tool called "Sherlock" (see GitLab CE merge request #1749)
- Upgrade gitlab_git to 7.2.20 and rugged to 0.23.3 (Stan Hu)
- Improved performance of finding users by one of their Email addresses
- Add allow_failure field to commit status API (Stan Hu)
- Improved performance of replacing references in comments
- Show last project commit to default branch on project home page
- Highlight comment based on anchor in URL
- Adds ability to remove the forked relationship from project settings screen. (Han Loong Liauw)
- Improved performance of sorting milestone issues
- Allow users to select the Files view as default project view (Cristian Bica)
- Show "Empty Repository Page" for repository without branches (Artem V. Navrotskiy)
- Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork
- Use git follow flag for commits page when retrieve history for file or directory
- Show merge request CI status on merge requests index page
- Send build name and stage in CI notification e-mail
- Extend yml syntax for only and except to support specifying repository path
- Enable shared runners to all new projects
- Bump GitLab-Workhorse to 0.4.1
- Allow to define cache in `.gitlab-ci.yml`
- Fix: 500 error returned if destroy request without HTTP referer (Kazuki Shimizu)
- Remove deprecated CI events from project settings page
- [API] Add ability to fetch the commit ID of the last commit that actually touched a file
- Fix omniauth documentation setting for omnibus configuration (Jon Cairns)
- Add "New file" link to dropdown on project page
- Include commit logs in project search
- Add "added", "modified" and "removed" properties to commit object in webhook
- Rename "Back to" links to "Go to" because its not always a case it point to place user come from
- Allow groups to appear in the search results if the group owner allows it
- New design for project graphs page
- Remove deprecated dumped yaml file generated from previous job definitions
- Fix incoming email config defaults
- Show specific runners from projects where user is master or owner
- MR target branch is now visible on a list view when it is different from project's default one
- Improve Continuous Integration graphs page
- Make color of "Accept Merge Request" button consistent with current build status
- Add ignore white space option in merge request diff and commit and compare view
- Ability to add release notes (markdown text and attachments) to git tags (aka Releases)
- Relative links from a repositories README.md now link to the default branch
- Fix trailing whitespace issue in merge request/issue title
- Fix bug when milestone/label filter was empty for dashboard issues page
- Add ability to create milestone in group projects from single form
v 8.1.4
- Fix bug where manually merged branches in a MR would end up with an empty diff (Stan Hu)
- Prevent redirect loop when home_page_url is set to the root URL
- Fix incoming email config defaults
- Remove CSS property preventing hard tabs from rendering in Chromium 45 (Stan Hu)
v 8.1.3
- Force update refs/merge-requests/X/head upon a push to the source branch of a merge request (Stan Hu)
- Spread out runner contacted_at updates
- Use issue editor as cross reference comment author when issue is edited with a new mention
- Add Facebook authentication
v 8.1.2
- Fix cloning Wiki repositories via HTTP (Stan Hu)
- Add migration to remove satellites directory
- Fix specific runners visibility
- Fix 500 when editing CI service
- Require CI jobs to be named
- Fix CSS for runner status
- Fix CI badge
- Allow developer to manage builds
v 8.1.1
- Removed, see 8.1.2
v 8.1.0
- Ensure MySQL CI limits DB migrations occur after the fields have been created (Stan Hu)
- Fix duplicate repositories in GitHub import page (Stan Hu)
- Redirect to a default path if HTTP_REFERER is not set (Stan Hu)
- Adds ability to create directories using the web editor (Ben Ford)
- Cleanup stuck CI builds
- Send an email to admin email when a user is reported for spam (Jonathan Rochkind)
- Show notifications button when user is member of group rather than project (Grzegorz Bizon)
- Fix bug preventing mentioned issued from being closed when MR is merged using fast-forward merge.
- Fix nonatomic database update potentially causing project star counts to go negative (Stan Hu)
- Don't show "Add README" link in an empty repository if user doesn't have access to push (Stan Hu)
- Fix error preventing displaying of commit data for a directory with a leading dot (Stan Hu)
- Speed up load times of issue detail pages by roughly 1.5x
- Fix CI rendering regressions
- If a merge request is to close an issue, show this on the issue page (Zeger-Jan van de Weg)
- Add a system note and update relevant merge requests when a branch is deleted or re-added (Stan Hu)
- Make diff file view easier to use on mobile screens (Stan Hu)
- Improved performance of finding users by username or Email address
- Fix bug where merge request comments created by API would not trigger notifications (Stan Hu)
......@@ -10,8 +94,10 @@ v 8.1.0 (unreleased)
- Allow removing of project without confirmation when JavaScript is disabled (Stan Hu)
- Support filtering by "Any" milestone or issue and fix "No Milestone" and "No Label" filters (Stan Hu)
- Improved performance of the trending projects page
- Remove CI migration task
- Improved performance of finding projects by their namespace
- Fix bug where transferring a project would result in stale commit links (Stan Hu)
- Fix build trace updating
- Include full path of source and target branch names in New Merge Request page (Stan Hu)
- Add user preference to view activities as default dashboard (Stan Hu)
- Add option to admin area to sign in as a specific user (Pavel Forkert)
......@@ -22,11 +108,13 @@ v 8.1.0 (unreleased)
- Add first and last to pagination (Zeger-Jan van de Weg)
- Added Commit Status API
- Added Builds View
- Added when to .gitlab-ci.yml
- Show CI status on commit page
- Added CI_BUILD_TAG, _STAGE, _NAME and _TRIGGERED to CI builds
- Show CI status on Your projects page and Starred projects page
- Remove "Continuous Integration" page from dashboard
- Add notes and SSL verification entries to hook APIs (Ben Boeckel)
- Added build artifacts
- Fix grammar in admin area "labels" .nothing-here-block when no labels exist.
- Move CI runners page to project settings area
- Move CI variables page to project settings area
......@@ -45,7 +133,7 @@ v 8.1.0 (unreleased)
- Move CI web hooks page to project settings area
- Fix User Identities API. It now allows you to properly create or update user's identities.
- Add user preference to change layout width (Peter Göbel)
- Use commit status in merge request widget as preffered source of CI status
- Use commit status in merge request widget as preferred source of CI status
- Integrate CI commit and build pages into project pages
- Move CI services page to project settings area
- Add "Quick Submit" behavior to input fields throughout the application. Use
......@@ -53,6 +141,8 @@ v 8.1.0 (unreleased)
- Fix position of hamburger in header for smaller screens (Han Loong Liauw)
- Fix bug where Emojis in Markdown would truncate remaining text (Sakata Sinji)
- Persist filters when sorting on admin user page (Jerry Lukins)
- Update style of snippets pages (Han Loong Liauw)
- Allow dashboard and group issues/MRs to be filtered by label
- Add spellcheck=false to certain input fields
- Invalidate stored service password if the endpoint URL is changed
- Project names are not fully shown if group name is too big, even on group page view
......@@ -61,6 +151,14 @@ v 8.1.0 (unreleased)
- Only render 404 page from /public
- Hide passwords from services API (Alex Lossent)
- Fix: Images cannot show when projects' path was changed
- Let gitlab-git-http-server generate and serve 'git archive' downloads
- Optimize query when filtering on issuables (Zeger-Jan van de Weg)
- Fix padding of outdated discussion item.
- Animate the logo on hover
v 8.0.5
- Correct lookup-by-email for LDAP logins
- Fix loading spinner sometimes not being hidden on Merge Request tab switches
v 8.0.4
- Fix Message-ID header to be RFC 2111-compliant to prevent e-mails being dropped (Stan Hu)
......
CONTRIBUTING.md
View file @ 0b540a0f
......@@ -10,7 +10,7 @@ By submitting code as an individual you agree to the [individual contributor lic
## Security vulnerability disclosure
Please report suspected security vulnerabilities in private to support@gitlab.com, also see the [disclosure section on the GitLab.com website](http://about.gitlab.com/disclosure/). Please do NOT create publicly viewable issues for suspected security vulnerabilities.
Please report suspected security vulnerabilities in private to support@gitlab.com, also see the [disclosure section on the GitLab.com website](https://about.gitlab.com/disclosure/). Please do NOT create publicly viewable issues for suspected security vulnerabilities.
## Closing policy for issues and merge requests
......@@ -35,7 +35,7 @@ The [GitLab CE issue tracker on GitLab.com](https://gitlab.com/gitlab-org/gitlab
Do not use the issue tracker for feature requests. We have a specific [feature request forum](http://feedback.gitlab.com) for this purpose. Please keep feature requests as small and simple as possible, complex ones might be edited to make them small and simple.
Please send a merge request with a tested solution or a merge request with a failing test instead of opening an issue if you can. If you're unsure where to post, post to the [mailing list](https://groups.google.com/forum/#!forum/gitlabhq) or [Stack Overflow](http://stackoverflow.com/questions/tagged/gitlab) first. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there.
Please send a merge request with a tested solution or a merge request with a failing test instead of opening an issue if you can. If you're unsure where to post, post to the [mailing list](https://groups.google.com/forum/#!forum/gitlabhq) or [Stack Overflow](https://stackoverflow.com/questions/tagged/gitlab) first. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there.
### Issue tracker guidelines
......@@ -72,7 +72,7 @@ If you can, please submit a merge request with the fix or improvements including
1. Write [tests](https://gitlab.com/gitlab-org/gitlab-development-kit#running-the-tests) and code
1. Add your changes to the [CHANGELOG](CHANGELOG)
1. If you are changing the README, some documentation or other things which have no effect on the tests, add `[ci skip]` somewhere in the commit message
1. If you have multiple commits please combine them into one commit by [squashing them](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
1. If you have multiple commits please combine them into one commit by [squashing them](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
1. Push the commit to your fork
1. Submit a merge request (MR) to the master branch
1. The MR title should describe the change you want to make
......@@ -83,6 +83,7 @@ If you can, please submit a merge request with the fix or improvements including
1. Be prepared to answer questions and incorporate feedback even if requests for this arrive weeks or months after your MR submission
1. If your MR touches code that executes shell commands, make sure it adheres to the [shell command guidelines]( doc/development/shell_commands.md).
1. Also have a look at the [shell command guidelines](doc/development/shell_commands.md) if your code reads or opens files, or handles paths to files on disk.
1. If your code creates new files on disk please read the [shared files guidelines](doc/development/shared_files.md).
The **official merge window** is in the beginning of the month from the 1st to the 7th day of the month. The best time to submit a MR and get feedback fast.
Before this time the GitLab B.V. team is still dealing with work that is created by the monthly release such as regressions requiring patch releases.
......@@ -180,4 +181,4 @@ This code of conduct applies both within project spaces and in public spaces whe
Instances of abusive, harassing, or otherwise unacceptable behavior can be reported by emailing contact@gitlab.com
This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.1.0, available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/)
This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.1.0, available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/)
Gemfile
View file @ 0b540a0f
......@@ -19,6 +19,7 @@ gem 'devise-async', '~> 0.9.0'
gem 'doorkeeper', '~> 2.1.3'
gem 'omniauth', '~> 1.2.2'
gem 'omniauth-bitbucket', '~> 0.0.2'
gem 'omniauth-facebook', '~> 3.0.0'
gem 'omniauth-github', '~> 1.1.1'
gem 'omniauth-gitlab', '~> 1.0.0'
gem 'omniauth-google-oauth2', '~> 0.2.0'
......@@ -39,7 +40,7 @@ gem "browser", '~> 1.0.0'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
gem "gitlab_git", '~> 7.2.19'
gem "gitlab_git", '~> 7.2.20'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
......@@ -50,20 +51,16 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"
gem 'gollum-lib', '~> 4.0.2'
# Language detection
# GitLab fork of linguist does not require pygments/python dependency.
# New version of original gem also dropped pygments support but it has strict
# dependency to unstable rugged version. We have internal issue for replacing
# fork with original gem when we meet on same rugged version - https://dev.gitlab.org/gitlab/gitlabhq/issues/2052.
gem "gitlab-linguist", "~> 3.0.1", require: "linguist"
gem "github-linguist", "~> 4.7.0", require: "linguist"
# API
gem 'grape', '~> 0.6.1'
gem 'grape', '~> 0.13.0'
gem 'grape-entity', '~> 0.4.2'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
# Format dates and times
# based on human-friendly examples
gem "stamp", '~> 0.5.0'
gem "stamp", '~> 0.6.0'
# Enumeration fields
gem 'enumerize', '~> 0.7.0'
......@@ -94,7 +91,7 @@ gem "seed-fu", '~> 2.3.5'
gem 'html-pipeline', '~> 1.11.0'
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
gem 'github-markup', '~> 1.3.1'
gem 'redcarpet', '~> 3.3.2'
gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.2.9'
gem 'rdoc', '~>3.6'
gem 'org-ruby', '~> 0.9.12'
......@@ -112,7 +109,7 @@ group :unicorn do
end
# State machine
gem "state_machine", '~> 1.2.0'
gem "state_machines-activerecord", '~> 0.3.0'
# Run events after state machine commits
gem 'after_commit_queue'
......@@ -184,7 +181,7 @@ gem 'ace-rails-ap', '~> 2.0.1'
gem 'mousetrap-rails', '~> 1.4.6'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.6.9.4'
gem 'charlock_holmes', '~> 0.7.3'
gem "sass-rails", '~> 4.0.5'
gem "coffee-rails", '~> 4.1.0'
......@@ -197,11 +194,11 @@ gem 'bootstrap-sass', '~> 3.0'
gem 'font-awesome-rails', '~> 4.2'
gem 'gitlab_emoji', '~> 0.1'
gem 'gon', '~> 5.0.0'
gem 'jquery-atwho-rails', '~> 1.0.0'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 3.1.3'
gem 'jquery-scrollto-rails', '~> 1.4.3'
gem 'jquery-ui-rails', '~> 4.2.1'
gem 'nprogress-rails', '~> 0.1.2.3'
gem 'nprogress-rails', '~> 0.1.6.7'
gem 'raphael-rails', '~> 2.1.2'
gem 'request_store', '~> 1.2.0'
gem 'select2-rails', '~> 3.5.9'
......@@ -214,11 +211,9 @@ group :development do
gem "annotate", "~> 2.6.0"
gem "letter_opener", '~> 1.1.2'
gem 'quiet_assets', '~> 1.0.2'
gem 'rack-mini-profiler', '~> 0.9.0', require: false
gem 'rerun', '~> 0.10.0'
gem 'bullet', require: false
gem 'active_record_query_trace', require: false
gem 'rack-lineprof', platform: :mri
gem 'rblineprof', platform: :mri, require: false
# Better errors handler
gem 'better_errors', '~> 1.0.1'
......@@ -264,6 +259,8 @@ group :development, :test do
gem 'rubocop', '~> 0.28.0', require: false
gem 'coveralls', '~> 0.8.2', require: false
gem 'simplecov', '~> 0.10.0', require: false
gem 'flog', require: false
gem 'flay', require: false
gem 'benchmark-ips', require: false
end
......
Gemfile.lock
View file @ 0b540a0f
......@@ -17,7 +17,6 @@ GEM
activesupport (= 4.1.12)
builder (~> 3.1)
erubis (~> 2.7.0)
active_record_query_trace (1.5)
activemodel (4.1.12)
activesupport (= 4.1.12)
builder (~> 3.1)
......@@ -108,7 +107,7 @@ GEM
json (>= 1.7)
celluloid (0.16.0)
timers (~> 4.0.0)
charlock_holmes (0.6.9.4)
charlock_holmes (0.7.3)
chunky_png (1.3.4)
cliver (0.3.2)
coderay (1.1.0)
......@@ -176,7 +175,7 @@ GEM
activesupport (>= 3.2)
equalizer (0.0.11)
erubis (2.7.0)
escape_utils (0.2.4)
escape_utils (1.1.0)
eventmachine (1.0.8)
excon (0.45.4)
execjs (2.6.0)
......@@ -195,6 +194,12 @@ GEM
ffi (1.9.10)
fission (0.5.0)
CFPropertyList (~> 2.2)
flay (2.6.1)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
flog (4.3.2)
ruby_parser (~> 3.1, > 3.1.0)
sexp_processor (~> 4.4)
flowdock (0.7.0)
httparty (~> 0.7)
multi_json
......@@ -267,6 +272,11 @@ GEM
json
get_process_mem (0.2.0)
gherkin-ruby (0.3.2)
github-linguist (4.7.0)
charlock_holmes (~> 0.7.3)
escape_utils (~> 1.1.0)
mime-types (>= 1.19)
rugged (>= 0.23.0b)
github-markup (1.3.3)
gitlab-flowdock-git-hook (1.0.1)
flowdock (~> 0.7)
......@@ -277,17 +287,13 @@ GEM
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3)
gitlab-linguist (3.0.1)
charlock_holmes (~> 0.6.6)
escape_utils (~> 0.2.4)
mime-types (~> 1.19)
gitlab_emoji (0.1.1)
gemojione (~> 2.0)
gitlab_git (7.2.19)
gitlab_git (7.2.20)
activesupport (~> 4.0)
charlock_holmes (~> 0.6)
gitlab-linguist (~> 3.0)
rugged (~> 0.22.2)
charlock_holmes (~> 0.7.3)
github-linguist (~> 4.7.0)
rugged (~> 0.23.3)
gitlab_meta (7.0)
gitlab_omniauth-ldap (1.2.1)
net-ldap (~> 0.9)
......@@ -306,10 +312,10 @@ GEM
gon (5.0.4)
actionpack (>= 2.3.0)
json
grape (0.6.1)
grape (0.13.0)
activesupport
builder
hashie (>= 1.2.0)
hashie (>= 2.1.0)
multi_json (>= 1.3.2)
multi_xml (>= 0.5.2)
rack (>= 1.3.0)
......@@ -354,7 +360,7 @@ GEM
ice_nine (0.11.1)
inflecto (0.0.2)
ipaddress (0.8.0)
jquery-atwho-rails (1.0.1)
jquery-atwho-rails (1.3.2)
jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
......@@ -406,7 +412,7 @@ GEM
newrelic_rpm (3.9.4.245)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
nprogress-rails (0.1.2.3)
nprogress-rails (0.1.6.7)
oauth (0.4.7)
oauth2 (1.0.0)
faraday (>= 0.8, < 0.10)
......@@ -423,6 +429,8 @@ GEM
multi_json (~> 1.7)
omniauth (~> 1.1)
omniauth-oauth (~> 1.0)
omniauth-facebook (3.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-github (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
......@@ -489,12 +497,6 @@ GEM
rack-attack (4.3.0)
rack
rack-cors (0.4.0)
rack-lineprof (0.0.3)
rack (~> 1.5)
rblineprof (~> 0.3.6)
term-ansicolor (~> 1.3)
rack-mini-profiler (0.9.7)
rack (>= 1.1.3)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-oauth2 (1.0.10)
......@@ -539,7 +541,7 @@ GEM
trollop
rdoc (3.12.2)
json (~> 1.4)
redcarpet (3.3.2)
redcarpet (3.3.3)
redis (3.2.1)
redis-actionpack (4.0.0)
actionpack (~> 4)
......@@ -615,7 +617,7 @@ GEM
sexp_processor (~> 4.1)
rubyntlm (0.5.2)
rubypants (0.2.0)
rugged (0.22.2)
rugged (0.23.3)
safe_yaml (1.0.4)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
......@@ -689,8 +691,14 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
stamp (0.5.0)
state_machine (1.2.0)
stamp (0.6.0)
state_machines (0.4.0)
state_machines-activemodel (0.3.0)
activemodel (~> 4.1)
state_machines (>= 0.4.0)
state_machines-activerecord (0.3.0)
activerecord (~> 4.1)
state_machines-activemodel (>= 0.3.0)
stringex (2.5.2)
systemu (2.6.5)
task_list (1.0.2)
......@@ -777,7 +785,6 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.2.9)
ace-rails-ap (~> 2.0.1)
active_record_query_trace
activerecord-deprecated_finders (~> 1.0.3)
activerecord-session_store (~> 0.1.0)
acts-as-taggable-on (~> 3.4)
......@@ -800,7 +807,7 @@ DEPENDENCIES
capybara (~> 2.4.0)
capybara-screenshot (~> 1.0.0)
carrierwave (~> 0.9.0)
charlock_holmes (~> 0.6.9.4)
charlock_holmes (~> 0.7.3)
coffee-rails (~> 4.1.0)
colored (~> 1.2)
colorize (~> 0.5.8)
......@@ -820,27 +827,29 @@ DEPENDENCIES
enumerize (~> 0.7.0)
factory_girl_rails (~> 4.3.0)
ffaker (~> 2.0.0)
flay
flog
fog (~> 1.25.0)
font-awesome-rails (~> 4.2)
foreman
fuubar (~> 2.0.0)
gemnasium-gitlab-service (~> 0.2)
github-linguist (~> 4.7.0)
github-markup (~> 1.3.1)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-linguist (~> 3.0.1)
gitlab_emoji (~> 0.1)
gitlab_git (~> 7.2.19)
gitlab_git (~> 7.2.20)
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.0.2)
gon (~> 5.0.0)
grape (~> 0.6.1)
grape (~> 0.13.0)
grape-entity (~> 0.4.2)
haml-rails (~> 0.9.0)
hipchat (~> 1.5.0)
html-pipeline (~> 1.11.0)
httparty (~> 0.13.3)
jquery-atwho-rails (~> 1.0.0)
jquery-atwho-rails (~> 1.3.2)
jquery-rails (~> 3.1.3)
jquery-scrollto-rails (~> 1.4.3)
jquery-turbolinks (~> 2.0.1)
......@@ -854,11 +863,12 @@ DEPENDENCIES
nested_form (~> 0.3.2)
newrelic-grape
newrelic_rpm (~> 3.9.4.245)
nprogress-rails (~> 0.1.2.3)
nprogress-rails (~> 0.1.6.7)
oauth2 (~> 1.0.0)
octokit (~> 3.7.0)
omniauth (~> 1.2.2)
omniauth-bitbucket (~> 0.0.2)
omniauth-facebook (~> 3.0.0)
omniauth-github (~> 1.1.1)
omniauth-gitlab (~> 1.0.0)
omniauth-google-oauth2 (~> 0.2.0)
......@@ -875,13 +885,12 @@ DEPENDENCIES
quiet_assets (~> 1.0.2)
rack-attack (~> 4.3.0)
rack-cors (~> 0.4.0)
rack-lineprof
rack-mini-profiler (~> 0.9.0)
rack-oauth2 (~> 1.0.5)
rails (= 4.1.12)
raphael-rails (~> 2.1.2)
rblineprof
rdoc (~> 3.6)
redcarpet (~> 3.3.2)
redcarpet (~> 3.3.3)
redis-rails (~> 4.0.0)
request_store (~> 1.2.0)
rerun (~> 0.10.0)
......@@ -909,8 +918,8 @@ DEPENDENCIES
spring-commands-spinach (~> 1.0.0)
spring-commands-teaspoon (~> 0.0.2)
sprockets (~> 2.12.3)
stamp (~> 0.5.0)
state_machine (~> 1.2.0)
stamp (~> 0.6.0)
state_machines-activerecord (~> 0.3.0)
task_list (~> 1.0.2)
teaspoon (~> 1.0.0)
teaspoon-jasmine (~> 2.2.0)
......
PROCESS.md
View file @ 0b540a0f
......@@ -115,3 +115,10 @@ We can only accept a merge request if all the tests are green. I've just
restarted the build. When the tests are still not passing after this restart and
you're sure that is does not have anything to do with your code changes, please
rebase with master to see if that solves the issue.
### Closing down the issue tracker on GitHub
We are currently in the process of closing down the issue tracker on GitHub, to
prevent duplication with the GitLab.com issue tracker.
Since this is an older issue I'll be closing this for now. If you think this is
still an issue I encourage you to open it on the \[GitLab.com issue tracker\](https://gitlab.com/gitlab-org/gitlab-ce/issues).
app/assets/fonts/SourceSansPro-Black.ttf 100755 → 100644
View file @ 0b540a0f
No preview for this file type
app/assets/fonts/SourceSansPro-Bold.ttf 100755 → 100644
View file @ 0b540a0f
File mode changed from 100755 to 100644
app/assets/fonts/SourceSansPro-ExtraLight.ttf 100755 → 100644
View file @ 0b540a0f
No preview for this file type
app/assets/fonts/SourceSansPro-Light.ttf 100755 → 100644
View file @ 0b540a0f
File mode changed from 100755 to 100644
app/assets/fonts/SourceSansPro-Regular.ttf 100755 → 100644
View file @ 0b540a0f
File mode changed from 100755 to 100644
app/assets/fonts/SourceSansPro-Semibold.ttf 100755 → 100644
View file @ 0b540a0f
File mode changed from 100755 to 100644
app/assets/images/logo.svg
View file @ 0b540a0f
......@@ -10,13 +10,13 @@
<g id="Fill-1-+-Group-24">
<g id="Group-24">
<g id="Group">
<path d="M105.0614,193.655 L105.0614,193.655 L143.7014,74.734 L66.4214,74.734 L105.0614,193.655 L105.0614,193.655 Z" id="Fill-4" fill="#E24329"></path>
<path d="M105.0614,193.6548 L66.4214,74.7338 L12.2684,74.7338 L105.0614,193.6548 L105.0614,193.6548 Z" id="Fill-8" fill="#FC6D26"></path>
<path d="M12.2685,74.7341 L12.2685,74.7341 L0.5265,110.8731 C-0.5445,114.1691 0.6285,117.7801 3.4325,119.8171 L105.0615,193.6551 L12.2685,74.7341 L12.2685,74.7341 Z" id="Fill-12" fill="#FCA326"></path>
<path d="M12.2685,74.7342 L66.4215,74.7342 L43.1485,3.1092 C41.9515,-0.5768 36.7375,-0.5758 35.5405,3.1092 L12.2685,74.7342 L12.2685,74.7342 Z" id="Fill-16" fill="#E24329"></path>
<path d="M105.0614,193.6548 L143.7014,74.7338 L197.8544,74.7338 L105.0614,193.6548 L105.0614,193.6548 Z" id="Fill-18" fill="#FC6D26"></path>
<path d="M197.8544,74.7341 L197.8544,74.7341 L209.5964,110.8731 C210.6674,114.1691 209.4944,117.7801 206.6904,119.8171 L105.0614,193.6551 L197.8544,74.7341 L197.8544,74.7341 Z" id="Fill-20" fill="#FCA326"></path>
<path d="M197.8544,74.7342 L143.7014,74.7342 L166.9744,3.1092 C168.1714,-0.5768 173.3854,-0.5758 174.5824,3.1092 L197.8544,74.7342 L197.8544,74.7342 Z" id="Fill-22" fill="#E24329"></path>
<path d="M105.0614,193.655 L105.0614,193.655 L143.7014,74.734 L66.4214,74.734 L105.0614,193.655 L105.0614,193.655 Z" id="Fill-4" fill="#E24329" class="tanuki-shape"></path>
<path d="M105.0614,193.6548 L66.4214,74.7338 L12.2684,74.7338 L105.0614,193.6548 L105.0614,193.6548 Z" id="Fill-8" fill="#FC6D26" class="tanuki-shape"></path>
<path d="M12.2685,74.7341 L12.2685,74.7341 L0.5265,110.8731 C-0.5445,114.1691 0.6285,117.7801 3.4325,119.8171 L105.0615,193.6551 L12.2685,74.7341 L12.2685,74.7341 Z" id="Fill-12" fill="#FCA326" class="tanuki-shape"></path>
<path d="M12.2685,74.7342 L66.4215,74.7342 L43.1485,3.1092 C41.9515,-0.5768 36.7375,-0.5758 35.5405,3.1092 L12.2685,74.7342 L12.2685,74.7342 Z" id="Fill-16" fill="#E24329" class="tanuki-shape"></path>
<path d="M105.0614,193.6548 L143.7014,74.7338 L197.8544,74.7338 L105.0614,193.6548 L105.0614,193.6548 Z" id="Fill-18" fill="#FC6D26" class="tanuki-shape"></path>
<path d="M197.8544,74.7341 L197.8544,74.7341 L209.5964,110.8731 C210.6674,114.1691 209.4944,117.7801 206.6904,119.8171 L105.0614,193.6551 L197.8544,74.7341 L197.8544,74.7341 Z" id="Fill-20" fill="#FCA326" class="tanuki-shape"></path>
<path d="M197.8544,74.7342 L143.7014,74.7342 L166.9744,3.1092 C168.1714,-0.5768 173.3854,-0.5758 174.5824,3.1092 L197.8544,74.7342 L197.8544,74.7342 Z" id="Fill-22" fill="#E24329" class="tanuki-shape"></path>
</g>
</g>
</g>
......
app/assets/javascripts/blob/edit_blob.js.coffee
View file @ 0b540a0f
......@@ -18,10 +18,10 @@ class @EditBlob
$('.form-group.destination').hide()
$('#create_merge_request').prop('checked', false)
$(".js-commit-button").click ->
$("#file-content").val editor.getValue()
$(".file-editor form").submit()
return false
# Before a form submission, move the content from the Ace editor into the
# submitted textarea
$('form').submit ->
$("#file-content").val(editor.getValue())
editModePanes = $(".js-edit-mode-pane")
editModeLinks = $(".js-edit-mode a")
......
app/assets/javascripts/blob/new_blob.js.coffee
View file @ 0b540a0f
......@@ -18,10 +18,10 @@ class @NewBlob
$('.form-group.destination').hide()
$('#create_merge_request').prop('checked', false)
$(".js-commit-button").click ->
$("#file-content").val editor.getValue()
$(".file-editor form").submit()
return false
# Before a form submission, move the content from the Ace editor into the
# submitted textarea
$('form').submit ->
$("#file-content").val(editor.getValue())
editor: ->
return @editor
app/assets/javascripts/calendar.js.coffee
View file @ 0b540a0f
......@@ -25,7 +25,7 @@ class @Calendar
30
]
legendCellPadding: 3
cellSize: $('.user-calendar').width() / 80
cellSize: $('.user-calendar').width() / 73
onClick: (date, count) ->
formated_date = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + date.getDate()
$.ajax
......
app/assets/javascripts/ci/build.coffee
View file @ 0b540a0f
......@@ -22,7 +22,7 @@ class CiBuild
# Only valid for runnig build when output changes during time
#
CiBuild.interval = setInterval =>
if window.location.href is build_url
if window.location.href.split("#").first() is build_url
$.ajax
url: build_url
dataType: "json"
......@@ -31,7 +31,7 @@ class CiBuild
$('#build-trace code').html build.trace_html
$('#build-trace code').append '<i class="fa fa-refresh fa-spin"/>'
@checkAutoscroll()
else
else if build.status != build_status
Turbolinks.visit build_url
, 4000
......
app/assets/javascripts/copy_to_clipboard.js.coffee 0 → 100644
View file @ 0b540a0f
#= require clipboard
$ ->
clipboard = new Clipboard '.js-clipboard-trigger',
text: (trigger) ->
$target = $(trigger.nextElementSibling || trigger.previousElementSibling)
$target.data('clipboard-text') || $target.text().trim()
clipboard.on 'success', (e) ->
$(e.trigger).
tooltip(trigger: 'manual', placement: 'auto bottom', title: 'Copied!').
tooltip('show')
# Clear the selection and blur the trigger so it loses its border
e.clearSelection()
$(e.trigger).blur()
# Manually hide the tooltip after 1 second
setTimeout(->
$(e.trigger).tooltip('hide')
, 1000)
app/assets/javascripts/dispatcher.js.coffee
View file @ 0b540a0f
......@@ -28,6 +28,8 @@ class Dispatcher
when 'projects:milestones:new', 'projects:milestones:edit'
new ZenMode()
new DropzoneInput($('.milestone-form'))
when 'groups:milestones:new'
new ZenMode()
when 'projects:compare:show'
new Diff()
when 'projects:issues:new','projects:issues:edit'
......@@ -39,6 +41,12 @@ class Dispatcher
shortcut_handler = new ShortcutsNavigation()
new DropzoneInput($('.merge-request-form'))
new IssuableForm($('.merge-request-form'))
when 'projects:tags:new'
new ZenMode()
new DropzoneInput($('.tag-form'))
when 'projects:releases:edit'
new ZenMode()
new DropzoneInput($('.release-form'))
when 'projects:merge_requests:show'
new Diff()
shortcut_handler = new ShortcutsIssuable()
......
app/assets/stylesheets/framework/blocks.scss
View file @ 0b540a0f
......@@ -18,6 +18,7 @@
line-height: 36px;
}
.content-block,
.gray-content-block {
margin: -$gl-padding;
background-color: $background-color;
......@@ -27,6 +28,14 @@
border-bottom: 1px solid $border-color;
color: $gl-gray;
&.oneline-block {
line-height: 42px;
}
&.white {
background-color: white;
}
&.top-block {
border-top: none;
}
......@@ -60,3 +69,48 @@
line-height: 42px;
}
}
.cover-block {
text-align: center;
background: #f7f8fa;
margin: -$gl-padding;
margin-bottom: 0;
padding: 44px $gl-padding;
border-bottom: 1px solid $border-color;
position: relative;
.avatar-holder {
margin-bottom: 16px;
.avatar, .identicon {
margin: 0 auto;
float: none;
}
.identicon {
@include border-radius(50%);
}
}
.cover-title {
color: $gl-header-color;
margin: 0;
font-size: 23px;
font-weight: normal;
margin: 16px 0 5px 0;
color: #4c4e54;
font-size: 23px;
line-height: 1.1;
}
.cover-desc {
padding: 0 $gl-padding 3px;
color: $gl-text-color;
}
.cover-controls {
position: absolute;
top: 10px;
right: 10px;
}
}
app/assets/stylesheets/framework/buttons.scss
View file @ 0b540a0f
......@@ -162,10 +162,25 @@
border-color: #e7e9ed;
width: 140px;
.badge {
font-weight: normal;
background-color: #eee;
color: #78a;
}
&.active {
border-color: $gl-info;
background: $gl-info;
color: #fff;
.badge {
color: $gl-info;
background-color: white;
}
}
}
}
.btn-clipboard {
border: none;
}
app/assets/stylesheets/framework/callout.scss
View file @ 0b540a0f
......@@ -9,9 +9,9 @@
.bs-callout {
margin: 20px 0;
padding: 20px;
border-left: 3px solid #eee;
color: #666;
background: #f9f9f9;
border-left: 3px solid $border-color;
color: $text-color;
background: $background-color;
}
.bs-callout h4 {
margin-top: 0;
......
app/assets/stylesheets/framework/common.scss
View file @ 0b540a0f
......@@ -16,6 +16,7 @@
.append-bottom-10 { margin-bottom:10px }
.append-bottom-15 { margin-bottom:15px }
.append-bottom-20 { margin-bottom:20px }
.append-bottom-default { margin-bottom: $gl-padding; }
.inline { display: inline-block }
.center { text-align: center }
......@@ -387,6 +388,36 @@ table {
}
}
.center-middle-menu {
@include nav-menu;
padding: 0;
text-align: center;
margin: -$gl-padding;
margin-top: 0;
margin-bottom: 0;
height: 58px;
border-bottom: 1px solid $border-color;
li {
&:after {
content: "|";
color: $border-gray-light;
}
&:last-child {
&:after {
content: none;
}
}
> a {
display: inline-block;
text-transform: uppercase;
font-size: 13px;
}
}
}
.dropzone .dz-preview .dz-progress {
border-color: $border-color !important;
}
......
app/assets/stylesheets/framework/files.scss
View file @ 0b540a0f
......@@ -10,6 +10,10 @@
border-bottom: 1px solid #E7E9EE;
margin-bottom: 1em;
&.readme-holder {
border-bottom: 0;
}
table {
@extend .table;
}
......@@ -94,7 +98,6 @@
border-right: none;
}
background: #fff;
padding: 10px $gl-padding;
}
.lines {
pre {
......
app/assets/stylesheets/framework/header.scss
View file @ 0b540a0f
......@@ -118,6 +118,10 @@ header {
}
}
}
.impersonation i {
color: $red-normal;
}
}
@mixin collapsed-header {
......
app/assets/stylesheets/framework/layout.scss
View file @ 0b540a0f
......@@ -5,7 +5,6 @@ html {
body {
padding-top: $header-height;
text-rendering: geometricPrecision;
}
}
......
app/assets/stylesheets/framework/lists.scss
View file @ 0b540a0f
......@@ -107,7 +107,7 @@ ul.content-list {
> li {
padding: $gl-padding;
border-color: #f1f2f4;
border-color: $table-border-color;
margin-left: -$gl-padding;
margin-right: -$gl-padding;
color: $gl-gray;
......@@ -117,7 +117,7 @@ ul.content-list {
}
.controls {
padding-top: 4px;
padding-top: 1px;
float: right;
.btn {
......
app/assets/stylesheets/framework/markdown_area.scss
View file @ 0b540a0f
......@@ -106,6 +106,7 @@
}
.markdown-area {
@include border-radius(0);
background: #FFF;
border: 1px solid #ddd;
min-height: 140px;
......
app/assets/stylesheets/framework/mixins.scss
View file @ 0b540a0f
......@@ -72,9 +72,10 @@
list-style: none;
> li {
@include clearfix;
padding: 10px 0;
border-bottom: 1px solid #EEE;
overflow: hidden;
display: block;
margin: 0px;
......@@ -137,6 +138,7 @@
&:hover, &:active, &:focus {
text-decoration: none;
outline: none;
}
}
......@@ -147,14 +149,8 @@
.badge {
font-weight: normal;
background-color: #fff;
background-color: #eee;
color: #78a;
}
}
}
.fa-align {
top: 20px;
position: relative;
}
app/assets/stylesheets/framework/selects.scss
View file @ 0b540a0f
......@@ -32,7 +32,7 @@
}
.select2-results .select2-result-label {
padding: 16px;
padding: 9px;
}
.select2-drop{
......
app/assets/stylesheets/framework/sidebar.scss
View file @ 0b540a0f
......@@ -64,6 +64,7 @@
text-decoration: none;
padding-left: 22px;
font-weight: normal;
outline: none;
&:hover {
text-decoration: none;
......@@ -176,6 +177,7 @@
text-align: center;
line-height: 40px;
transition-duration: .3s;
outline: none;
}
.collapse-nav a:hover {
......@@ -238,10 +240,14 @@
width: 100%;
padding: 10px 22px;
overflow: hidden;
outline: none;
img {
width: 36px;
height: 36px;
}
#tanuki-logo, img {
float: left;
}
......@@ -265,3 +271,13 @@
}
}
}
.tanuki-shape {
transition: all 0.8s;
&:hover {
fill: rgb(255, 255, 255);
transition: all 0.1s;
}
}
app/assets/stylesheets/framework/tables.scss
View file @ 0b540a0f
.table-holder {
margin: -$gl-padding;
margin-top: 0;
margin-bottom: 0;
}
table {
&.table {
.dropdown-menu a {
......@@ -18,15 +24,17 @@ table {
tr {
td, th {
padding: 8px 10px;
padding: 10px $gl-padding;
line-height: 20px;
vertical-align: middle;
}
th {
font-weight: normal;
font-size: 15px;
border-bottom: 1px solid $border-color !important;
}
td {
border-color: $table-border-color !important;
border-bottom: 1px solid;
......
app/assets/stylesheets/framework/timeline.scss
View file @ 0b540a0f
......@@ -6,13 +6,17 @@
.timeline-entry {
padding: $gl-padding;
border-color: #f1f2f4;
border-color: $table-border-color;
margin-left: -$gl-padding;
margin-right: -$gl-padding;
color: $gl-gray;
border-bottom: 1px solid #ECEEF1;
border-right: 1px solid #ECEEF1;
&:target {
background: $hover;
}
&:last-child {
border-bottom: none;
}
......
app/assets/stylesheets/framework/typography.scss
View file @ 0b540a0f
@mixin md-typography {
color: $md-text-color;
word-wrap: break-word;
a {
color: $md-link-color;
......@@ -17,7 +18,6 @@
font-family: $monospace_font;
white-space: pre;
word-wrap: normal;
padding: 1px 2px;
}
kbd {
......@@ -73,6 +73,8 @@
}
blockquote {
color: #7f8fa4;
font-size: inherit;
padding: 8px 21px;
margin: 12px 0 12px;
border-left: 3px solid #e7e9ed;
......@@ -80,7 +82,7 @@
blockquote p {
color: #7f8fa4 !important;
font-size: 15px;
font-size: inherit;
line-height: 1.5;
}
......@@ -112,9 +114,9 @@
font-weight: inherit;
}
ul {
color: #5c5d5e;
ul, ol {
padding: 0;
margin: 6px 0 6px 18px !important;
}
li {
......@@ -136,6 +138,33 @@
text-decoration: none;
}
}
/* Link to current header. */
h1, h2, h3, h4, h5, h6 {
position: relative;
a.anchor {
// Setting `display: none` would prevent the anchor being scrolled to, so
// instead we set the height to 0 and it gets updated on hover.
height: 0;
}
&:hover > a.anchor {
$size: 16px;
position: absolute;
right: 100%;
top: 50%;
margin-top: -$size/2;
margin-right: 0px;
padding-right: 20px;
display: inline-block;
width: $size;
height: $size;
background-image: image-url("icon-link.png");
background-size: contain;
background-repeat: no-repeat;
}
}
}
......@@ -144,7 +173,6 @@
*
*/
body {
text-rendering:optimizeLegibility;
-webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px;
}
......@@ -202,53 +230,11 @@ a > code {
}
/**
* Wiki typography
* Apply Markdown typography
*
*/
.wiki {
@include md-typography;
word-wrap: break-word;
padding: 7px;
/* Link to current header. */
h1, h2, h3, h4, h5, h6 {
position: relative;
a.anchor {
// Setting `display: none` would prevent the anchor being scrolled to, so
// instead we set the height to 0 and it gets updated on hover.
height: 0;
}
&:hover > a.anchor {
$size: 16px;
position: absolute;
right: 100%;
top: 50%;
margin-top: -$size/2;
margin-right: 0px;
padding-right: 20px;
display: inline-block;
width: $size;
height: $size;
background-image: image-url("icon-link.png");
background-size: contain;
background-repeat: no-repeat;
}
}
ul,ol {
padding: 0;
margin: 6px 0 6px 18px !important;
}
ol {
color: #5c5d5e;
}
}
.md-area {
@include md-typography;
}
.md {
......@@ -261,6 +247,7 @@ a > code {
*/
textarea.js-gfm-input {
font-family: $monospace_font;
color: $gl-text-color;
}
.md-preview {
......
app/assets/stylesheets/pages/ci_projects.scss
View file @ 0b540a0f
......@@ -6,11 +6,6 @@
line-height: 1.5;
}
.wide-table-holder {
margin-left: -$gl-padding;
margin-right: -$gl-padding;
}
.builds,
.projects-table {
.light {
......
app/assets/stylesheets/pages/commits.scss
View file @ 0b540a0f
......@@ -33,6 +33,8 @@
}
li.commit {
list-style: none;
.commit-row-title {
font-size: $list-font-size;
line-height: 20px;
......@@ -113,3 +115,10 @@ li.commit {
}
}
}
.branch-commit {
color: $gl-gray;
.commit-id, .commit-row-message {
color: $gl-gray;
}
}
app/assets/stylesheets/pages/diff.scss
View file @ 0b540a0f
......@@ -367,7 +367,6 @@
.inline-parallel-buttons {
float: right;
margin-top: -5px;
}
// Mobile
......
app/assets/stylesheets/pages/editor.scss
View file @ 0b540a0f
......@@ -50,7 +50,7 @@
.editor-file-name {
.new-file-name {
display: inline-block;
width: 200px;
width: 450px;
}
.form-control {
......
app/assets/stylesheets/pages/events.scss
View file @ 0b540a0f
......@@ -4,10 +4,10 @@
*/
.event-item {
font-size: $gl-font-size;
padding: $gl-padding;
padding: $gl-padding $gl-padding $gl-padding ($gl-padding + $gl-avatar-size + 15px);
margin-left: -$gl-padding;
margin-right: -$gl-padding;
border-bottom: 1px solid #f1f2f4;
border-bottom: 1px solid $table-border-color;
color: #7f8fa4;
&.event-inline {
......@@ -16,10 +16,7 @@
top: -2px;
}
.event-title {
line-height: 44px;
}
.event-title,
.event-item-timestamp {
line-height: 44px;
}
......@@ -30,7 +27,7 @@
}
.avatar {
margin-right: 15px;
margin-left: -($gl-avatar-size + 15px);
}
.event-title {
......@@ -43,8 +40,7 @@
}
.event-body {
margin-left: 63px;
margin-right: 80px;
margin-right: 174px;
.event-note {
margin-top: 5px;
......@@ -155,6 +151,8 @@
@media (max-width: $screen-xs-max) {
.event-item {
padding-left: $gl-padding;
.event-title {
white-space: normal;
overflow: visible;
......
app/assets/stylesheets/pages/help.scss
View file @ 0b540a0f
......@@ -68,3 +68,7 @@ body.modal-open {
.modal .modal-dialog {
width: 860px;
}
.documentation {
padding: 7px;
}
app/assets/stylesheets/pages/issuable.scss
View file @ 0b540a0f
......@@ -80,3 +80,24 @@
}
}
}
.issuable-filter-count {
span {
display: block;
margin-bottom: -16px;
padding: 13px 0;
}
}
.cross-project-reference {
text-align: center;
width: 100%;
.slead {
padding: 5px;
}
span, button {
background-color: $background-color;
}
}
app/assets/stylesheets/pages/issues.scss
View file @ 0b540a0f
......@@ -132,6 +132,11 @@ form.edit-issue {
}
}
.issue-closed-by-widget {
padding: 16px 0;
margin: 0px;
}
.issue-form .select2-container {
width: 250px !important;
}
app/assets/stylesheets/pages/merge_requests.scss
View file @ 0b540a0f
......@@ -19,6 +19,20 @@
.accept-merge-holder {
.accept-action {
display: inline-block;
.accept_merge_request {
&.ci-pending,
&.ci-running {
@include btn-orange;
}
&.ci-skipped,
&.ci-failed,
&.ci-canceled,
&.ci-error {
@include btn-red;
}
}
}
.accept-control {
......@@ -205,6 +219,15 @@
#modal_merge_info .modal-dialog {
width: 600px;
.btn-clipboard {
@extend .pull-right;
margin-right: 18px;
margin-top: 5px;
position: absolute;
right: 0;
}
}
.mr-source-target {
......
app/assets/stylesheets/pages/note_form.scss
View file @ 0b540a0f
......@@ -56,6 +56,10 @@
.note_text {
width: 100%;
}
.comment-hints {
margin-top: -12px;
}
}
/* loading indicator */
......@@ -168,7 +172,7 @@
color: #999;
background: #FFF;
padding: 7px;
margin-top: -11px;
margin-top: -7px;
border: 1px solid $border-color;
font-size: 13px;
}
app/assets/stylesheets/pages/notes.scss
View file @ 0b540a0f
......@@ -30,7 +30,6 @@ ul.notes {
.discussion-header,
.note-header {
@extend .cgray;
padding-bottom: 15px;
a:hover {
text-decoration: none;
......@@ -75,6 +74,10 @@ ul.notes {
}
}
.discussion-body {
padding-top: 15px;
}
.discussion {
overflow: hidden;
display: block;
......
app/assets/stylesheets/pages/profile.scss
View file @ 0b540a0f
......@@ -47,3 +47,31 @@
}
}
}
.calendar-hint {
margin-top: -12px;
float: right;
font-size: 12px;
}
.profile-link-holder {
display: inline;
&:after {
content: "\00B7";
padding: 0px 6px;
font-weight: bold;
}
&:last-child {
&:after {
content: "";
padding: 0;
}
}
a {
color: $blue-dark;
text-decoration: none;
}
}
app/assets/stylesheets/pages/projects.scss
View file @ 0b540a0f
......@@ -50,7 +50,17 @@
}
.project-home-dropdown {
margin: 11px 3px 0;
margin: 13px 0px 0;
}
.notifications-btn {
.fa-bell {
margin-right: 6px;
}
.fa-angle-down {
margin-left: 6px;
}
}
.project-home-desc {
......@@ -85,6 +95,7 @@
color: inherit;
}
}
.input-group {
display: inline-table;
position: relative;
......@@ -233,23 +244,11 @@
}
}
.fa-fw {
i {
margin-right: 8px;
}
}
.fa-bell {
margin-right: 6px;
}
.fa-angle-down {
margin-left: 6px;
}
.project-home-panel .project-home-dropdown {
margin: 13px 0px 0;
}
.project-visibility-level-holder {
.radio {
margin-bottom: 10px;
......@@ -457,7 +456,7 @@ pre.light-well {
.project-row {
padding: $gl-padding;
border-color: #f1f2f4;
border-color: $table-border-color;
margin-left: -$gl-padding;
margin-right: -$gl-padding;
......@@ -511,3 +510,46 @@ pre.light-well {
margin-top: -1px;
}
}
.project-last-commit {
margin: 0 7px;
.ci-status {
margin-right: 16px;
}
.commit-row-message {
color: $gl-gray;
}
.commit_short_id {
margin-right: 5px;
color: $gl-link-color;
font-weight: 600;
}
.commit-author-link {
margin-left: 7px;
text-decoration: none;
.avatar {
float: none;
margin-right: 4px;
}
.commit-author-name {
font-weight: 600;
}
}
}
.project-show-readme .readme-holder {
margin-left: -$gl-padding;
margin-right: -$gl-padding;
padding: ($gl-padding + 7px);
border-top: 0;
.edit-project-readme {
z-index: 100;
position: relative;
}
}
\ No newline at end of file
app/assets/stylesheets/pages/runners.scss
View file @ 0b540a0f
.ci-body {
.runner-state {
.runner-state {
padding: 6px 12px;
margin-right: 10px;
color: #FFF;
......@@ -10,21 +9,21 @@
&.runner-state-specific {
background: #3498db;
}
}
}
.runner-status-online {
.runner-status-online {
color: green;
}
}
.runner-status-offline {
.runner-status-offline {
color: gray;
}
}
.runner-status-paused {
.runner-status-paused {
color: red;
}
}
.runner {
.runner {
.btn {
padding: 1px 6px;
}
......@@ -32,5 +31,4 @@
h4 {
font-weight: normal;
}
}
}
app/assets/stylesheets/pages/sherlock.scss 0 → 100644
View file @ 0b540a0f
table .sherlock-code {
max-width: 700px;
}
.sherlock-code {
pre {
word-wrap: normal;
}
pre code {
white-space: pre;
}
}
.sherlock-line-samples-table {
margin-bottom: 0px !important;
thead tr th,
tbody tr td {
font-size: 13px !important;
text-align: right;
padding: 0px 10px !important;
}
}
.sherlock-file-sample pre {
padding-top: 28px !important;
}
.sherlock-line-samples-table .slow {
color: $red-light;
font-weight: bold;
}
app/assets/stylesheets/pages/snippets.scss
View file @ 0b540a0f
.my-snippets li:first-child {
h4 { margin-top: 0; }
padding-top: 0;
}
.snippet-form-holder .file-holder .file-title {
padding: 2px;
}
......@@ -30,3 +25,58 @@
}
}
}
.snippet-holder {
.snippet-details {
.page-title {
margin-top: -15px;
padding: 10px 0;
margin-bottom: 0;
color: #5c5d5e;
font-size: 16px;
.author {
color: #5c5d5e;
}
.snippet-id {
color: #5c5d5e;
}
}
.snippet-title {
margin: 0;
font-size: 23px;
color: #313236;
}
@media (max-width: $screen-md-max) {
.new-snippet-link {
display: none;
}
}
@media (max-width: $screen-sm-max) {
.creator,
.page-title .btn-close {
display: none;
}
}
}
.file-holder {
border-top: 0;
}
}
.snippet-box {
@include border-radius(2px);
display: inline-block;
padding: 10px $gl-padding;
font-weight: normal;
margin-right: 10px;
font-size: $gl-font-size;
border: 1px solid;
}
app/assets/stylesheets/pages/tree.scss
View file @ 0b540a0f
.tree-holder {
.tree-table-holder {
margin-left: -$gl-padding;
margin-right: -$gl-padding;
}
.tree_progress {
display: none;
margin: 20px;
&.loading {
display: block;
}
}
.tree-table {
margin-bottom: 0;
tr {
> td, > th {
padding: 10px $gl-padding;
line-height: 32px;
border-color: $table-border-color !important;
line-height: 28px;
}
&:hover {
......
app/controllers/abuse_reports_controller.rb
View file @ 0b540a0f
......@@ -9,6 +9,10 @@ class AbuseReportsController < ApplicationController
@abuse_report.reporter = current_user
if @abuse_report.save
if current_application_settings.admin_notification_email.present?
AbuseReportMailer.delay.notify(@abuse_report.id)
end
message = "Thank you for your report. A GitLab administrator will look into it shortly."
redirect_to root_path, notice: message
else
......
app/controllers/admin/application_controller.rb
View file @ 0b540a0f
......@@ -8,4 +8,10 @@ class Admin::ApplicationController < ApplicationController
def authenticate_admin!
return render_404 unless current_user.is_admin?
end
def authorize_impersonator!
if session[:impersonator_id]
User.find_by!(username: session[:impersonator_id]).admin?
end
end
end
app/controllers/admin/application_settings_controller.rb
View file @ 0b540a0f
......@@ -55,7 +55,10 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:default_snippet_visibility,
:restricted_signup_domains_raw,
:version_check_enabled,
:admin_notification_email,
:user_oauth_applications,
:shared_runners_enabled,
:max_artifacts_size,
restricted_visibility_levels: [],
import_sources: []
)
......
app/controllers/admin/broadcast_messages_controller.rb
View file @ 0b540a0f
......@@ -19,7 +19,7 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController
BroadcastMessage.find(params[:id]).destroy
respond_to do |format|
format.html { redirect_to :back }
format.html { redirect_back_or_default(default: { action: 'index' }) }
format.js { render nothing: true }
end
end
......
app/controllers/admin/hooks_controller.rb
View file @ 0b540a0f
......@@ -35,7 +35,7 @@ class Admin::HooksController < Admin::ApplicationController
}
@hook.execute(data, 'system_hooks')
redirect_to :back
redirect_back_or_default
end
def hook_params
......
app/controllers/admin/impersonation_controller.rb 0 → 100644
View file @ 0b540a0f
class Admin::ImpersonationController < Admin::ApplicationController
skip_before_action :authenticate_admin!, only: :destroy
before_action :user
before_action :authorize_impersonator!
def create
session[:impersonator_id] = current_user.username
session[:impersonator_return_to] = request.env['HTTP_REFERER']
warden.set_user(user, scope: 'user')
flash[:alert] = "You are impersonating #{user.username}."
redirect_to root_path
end
def destroy
redirect = session[:impersonator_return_to]
warden.set_user(user, scope: 'user')
session[:impersonator_return_to] = nil
session[:impersonator_id] = nil
redirect_to redirect || root_path
end
def user
@user ||= User.find_by!(username: params[:id] || session[:impersonator_id])
end
end
app/controllers/admin/users_controller.rb
View file @ 0b540a0f
......@@ -33,42 +33,36 @@ class Admin::UsersController < Admin::ApplicationController
def block
if user.block
redirect_to :back, notice: "Successfully blocked"
redirect_back_or_admin_user(notice: "Successfully blocked")
else
redirect_to :back, alert: "Error occurred. User was not blocked"
redirect_back_or_admin_user(alert: "Error occurred. User was not blocked")
end
end
def unblock
if user.activate
redirect_to :back, notice: "Successfully unblocked"
redirect_back_or_admin_user(notice: "Successfully unblocked")
else
redirect_to :back, alert: "Error occurred. User was not unblocked"
redirect_back_or_admin_user(alert: "Error occurred. User was not unblocked")
end
end
def unlock
if user.unlock_access!
redirect_to :back, alert: "Successfully unlocked"
redirect_back_or_admin_user(alert: "Successfully unlocked")
else
redirect_to :back, alert: "Error occurred. User was not unlocked"
redirect_back_or_admin_user(alert: "Error occurred. User was not unlocked")
end
end
def confirm
if user.confirm
redirect_to :back, notice: "Successfully confirmed"
redirect_back_or_admin_user(notice: "Successfully confirmed")
else
redirect_to :back, alert: "Error occurred. User was not confirmed"
redirect_back_or_admin_user(alert: "Error occurred. User was not confirmed")
end
end
def login_as
sign_in(user)
flash[:alert] = "Logged in as #{user.username}"
redirect_to root_path
end
def disable_two_factor
user.disable_two_factor!
redirect_to admin_user_path(user),
......@@ -138,7 +132,7 @@ class Admin::UsersController < Admin::ApplicationController
user.update_secondary_emails!
respond_to do |format|
format.html { redirect_to :back, notice: "Successfully removed email." }
format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") }
format.js { render nothing: true }
end
end
......@@ -157,4 +151,12 @@ class Admin::UsersController < Admin::ApplicationController
:projects_limit, :can_create_group, :admin, :key_id
)
end
def redirect_back_or_admin_user(options = {})
redirect_back_or_default(default: default_route, options: options)
end
def default_route
[:admin, @user]
end
end
app/controllers/application_controller.rb
View file @ 0b540a0f
......@@ -34,6 +34,10 @@ class ApplicationController < ActionController::Base
render_404
end
def redirect_back_or_default(default: root_path, options: {})
redirect_to request.referer.present? ? :back : default, options
end
protected
# From https://github.com/plataformatec/devise/wiki/How-To:-Simple-Token-Authentication-Example
......@@ -56,14 +60,9 @@ class ApplicationController < ActionController::Base
end
def authenticate_user!(*args)
# If user is not signed-in and tries to access root_path - redirect him to landing page
# Don't redirect to the default URL to prevent endless redirections
if current_application_settings.home_page_url.present? &&
current_application_settings.home_page_url.chomp('/') != Gitlab.config.gitlab['url'].chomp('/')
if current_user.nil? && root_path == request.path
if redirect_to_home_page_url?
redirect_to current_application_settings.home_page_url and return
end
end
super(*args)
end
......@@ -121,7 +120,6 @@ class ApplicationController < ActionController::Base
project_path = "#{namespace}/#{id}"
@project = Project.find_with_namespace(project_path)
if @project and can?(current_user, :read_project, @project)
if @project.path_with_namespace != project_path
redirect_to request.original_url.gsub(project_path, @project.path_with_namespace) and return
......@@ -373,4 +371,17 @@ class ApplicationController < ActionController::Base
}
}
end
def redirect_to_home_page_url?
# If user is not signed-in and tries to access root_path - redirect him to landing page
# Don't redirect to the default URL to prevent endless redirections
return false unless current_application_settings.home_page_url.present?
home_page_url = current_application_settings.home_page_url.chomp('/')
root_urls = [Gitlab.config.gitlab['url'].chomp('/'), root_url.chomp('/')]
return false if root_urls.include?(home_page_url)
current_user.nil? && root_path == request.path
end
end
app/controllers/ci/admin/runners_controller.rb
View file @ 0b540a0f
......@@ -17,6 +17,7 @@ module Ci
@projects = @projects.where(gitlab_id: @gl_projects.select(:id))
end
@projects = @projects.where("ci_projects.id NOT IN (?)", @runner.projects.pluck(:id)) if @runner.projects.any?
@projects = @projects.joins(:gl_project)
@projects = @projects.page(params[:page]).per(30)
end
......
app/controllers/ci/application_controller.rb
View file @ 0b540a0f
......@@ -8,14 +8,6 @@ module Ci
private
def authenticate_public_page!
unless project.public
authenticate_user!
return access_denied! unless can?(current_user, :read_project, gl_project)
end
end
def authenticate_token!
unless project.valid_token?(params[:token])
return head(403)
......
app/controllers/ci/events_controller.rb deleted 100644 → 0
View file @ 3d50b99d
module Ci
class EventsController < Ci::ApplicationController
EVENTS_PER_PAGE = 50
before_action :authenticate_user!
before_action :project
before_action :authorize_manage_project!
layout 'ci/project'
def index
@events = project.events.order("created_at DESC").page(params[:page]).per(EVENTS_PER_PAGE)
end
private
def project
@project ||= Ci::Project.find(params[:project_id])
end
end
end
app/controllers/ci/projects_controller.rb
View file @ 0b540a0f
module Ci
class ProjectsController < Ci::ApplicationController
before_action :project
before_action :authenticate_user!, except: [:build, :badge]
before_action :authorize_access_project!, except: [:badge]
before_action :project, except: [:index]
before_action :authenticate_user!, except: [:index, :build, :badge]
before_action :authorize_access_project!, except: [:index, :badge]
before_action :authorize_manage_project!, only: [:toggle_shared_runners, :dumped_yaml]
before_action :no_cache, only: [:badge]
protect_from_forgery
def show
# Temporary compatibility with CI badges pointing to CI project page
redirect_to namespace_project_path(project.gl_project.namespace, project.gl_project)
end
# Project status badge
# Image with build status for sha or ref
def badge
......@@ -21,10 +26,6 @@ module Ci
redirect_to namespace_project_runners_path(project.gl_project.namespace, project.gl_project)
end
def dumped_yaml
send_data @project.generated_yaml_config, filename: '.gitlab-ci.yml'
end
protected
def project
......
app/controllers/ci/runner_projects_controller.rb
View file @ 0b540a0f
......@@ -4,8 +4,6 @@ module Ci
before_action :project
before_action :authorize_manage_project!
layout 'ci/project'
def create
@runner = Ci::Runner.find(params[:runner_project][:runner_id])
......
app/controllers/concerns/global_milestones.rb 0 → 100644
View file @ 0b540a0f
module GlobalMilestones
extend ActiveSupport::Concern
def milestones
@milestones = MilestonesFinder.new.execute(@projects, params)
@milestones = GlobalMilestone.build_collection(@milestones)
@milestones = Kaminari.paginate_array(@milestones).page(params[:page]).per(ApplicationController::PER_PAGE)
end
def milestone
milestones = Milestone.of_projects(@projects).where(title: params[:title])
if milestones.present?
@milestone = GlobalMilestone.new(params[:title], milestones)
else
render_404
end
end
end
app/controllers/dashboard/milestones_controller.rb
View file @ 0b540a0f
class Dashboard::MilestonesController < Dashboard::ApplicationController
before_action :load_projects
include GlobalMilestones
before_action :projects
before_action :milestones, only: [:index]
before_action :milestone, only: [:show]
def index
project_milestones = case params[:state]
when 'all'; state
when 'closed'; state('closed')
else state('active')
end
@dashboard_milestones = Milestones::GroupService.new(project_milestones).execute
@dashboard_milestones = Kaminari.paginate_array(@dashboard_milestones).page(params[:page]).per(PER_PAGE)
end
def show
project_milestones = Milestone.where(project_id: @projects).order("due_date ASC")
@dashboard_milestone = Milestones::GroupService.new(project_milestones).milestone(title)
end
private
def load_projects
@projects = current_user.authorized_projects.sorted_by_activity.non_archived
end
def title
params[:title]
end
def state(state = nil)
conditions = { project_id: @projects }
conditions.reverse_merge!(state: state) if state
Milestone.where(conditions).order("title ASC")
def projects
@projects ||= current_user.authorized_projects.sorted_by_activity.non_archived
end
end
app/controllers/dashboard_controller.rb
View file @ 0b540a0f
class DashboardController < Dashboard::ApplicationController
before_action :event_filter, only: :activity
before_action :projects, only: [:issues, :merge_requests]
respond_to :html
......@@ -47,4 +48,8 @@ class DashboardController < Dashboard::ApplicationController
@events = @event_filter.apply_filter(@events).with_associations
@events = @events.limit(20).offset(params[:offset] || 0)
end
def projects
@projects ||= current_user.authorized_projects.sorted_by_activity.non_archived
end
end
app/controllers/groups/application_controller.rb
View file @ 0b540a0f
class Groups::ApplicationController < ApplicationController
layout 'group'
before_action :group
private
def group
@group ||= Group.find_by(path: params[:group_id])
end
def authorize_read_group!
unless @group and can?(current_user, :read_group, @group)
if current_user.nil?
......
app/controllers/groups/avatars_controller.rb
View file @ 0b540a0f
class Groups::AvatarsController < ApplicationController
class Groups::AvatarsController < Groups::ApplicationController
def destroy
@group = Group.find_by(path: params[:group_id])
@group.remove_avatar!
@group.save
redirect_to edit_group_path(@group)
......
app/controllers/groups/group_members_controller.rb
View file @ 0b540a0f
class Groups::GroupMembersController < Groups::ApplicationController
skip_before_action :authenticate_user!, only: [:index]
before_action :group
# Authorize
before_action :authorize_read_group!
......@@ -80,10 +79,6 @@ class Groups::GroupMembersController < Groups::ApplicationController
protected
def group
@group ||= Group.find_by(path: params[:group_id])
end
def member_params
params.require(:group_member).permit(:access_level, :user_id)
end
......
app/controllers/groups/milestones_controller.rb
View file @ 0b540a0f
class Groups::MilestonesController < Groups::ApplicationController
before_action :authorize_group_milestone!, only: :update
include GlobalMilestones
before_action :projects
before_action :milestones, only: [:index]
before_action :milestone, only: [:show, :update]
before_action :authorize_group_milestone!, only: [:create, :update]
def index
project_milestones = case params[:state]
when 'all'; state
when 'closed'; state('closed')
else state('active')
end
@group_milestones = Milestones::GroupService.new(project_milestones).execute
@group_milestones = Kaminari.paginate_array(@group_milestones).page(params[:page]).per(PER_PAGE)
end
def show
project_milestones = Milestone.where(project_id: group.projects).order("due_date ASC")
@group_milestone = Milestones::GroupService.new(project_milestones).milestone(title)
def new
@milestone = Milestone.new
end
def update
project_milestones = Milestone.where(project_id: group.projects).order("due_date ASC")
@group_milestones = Milestones::GroupService.new(project_milestones).milestone(title)
def create
project_ids = params[:milestone][:project_ids]
title = milestone_params[:title]
@group.projects.where(id: project_ids).each do |project|
Milestones::CreateService.new(project, current_user, milestone_params).execute
end
@group_milestones.milestones.each do |milestone|
Milestones::UpdateService.new(milestone.project, current_user, params[:milestone]).execute(milestone)
redirect_to milestone_path(title)
end
respond_to do |format|
format.js
format.html do
redirect_to group_milestones_path(group)
def show
end
def update
@milestone.milestones.each do |milestone|
Milestones::UpdateService.new(milestone.project, current_user, milestone_params).execute(milestone)
end
redirect_back_or_default(default: milestone_path(@milestone.title))
end
private
def group
@group ||= Group.find_by(path: params[:group_id])
def authorize_group_milestone!
return render_404 unless can?(current_user, :admin_milestones, group)
end
def title
params[:title]
def milestone_params
params.require(:milestone).permit(:title, :description, :due_date, :state_event)
end
def state(state = nil)
conditions = { project_id: group.projects }
conditions.reverse_merge!(state: state) if state
Milestone.where(conditions).order("title ASC")
def milestone_path(title)
group_milestone_path(@group, title.parameterize, title: title)
end
def authorize_group_milestone!
return render_404 unless can?(current_user, :admin_group, group)
def projects
@projects ||= @group.projects
end
end
app/controllers/groups_controller.rb
View file @ 0b540a0f
......@@ -4,12 +4,12 @@ class GroupsController < Groups::ApplicationController
before_action :group, except: [:new, :create]
# Authorize
before_action :authorize_read_group!, except: [:show, :new, :create]
before_action :authorize_read_group!, except: [:show, :new, :create, :autocomplete]
before_action :authorize_admin_group!, only: [:edit, :update, :destroy, :projects]
before_action :authorize_create_group!, only: [:new, :create]
# Load group projects
before_action :load_projects, except: [:new, :create, :projects, :edit, :update]
before_action :load_projects, except: [:new, :create, :projects, :edit, :update, :autocomplete]
before_action :event_filter, only: :show
layout :determine_layout
......@@ -133,7 +133,7 @@ class GroupsController < Groups::ApplicationController
end
def group_params
params.require(:group).permit(:name, :description, :path, :avatar)
params.require(:group).permit(:name, :description, :path, :avatar, :public)
end
def load_events
......
app/controllers/import/github_controller.rb
View file @ 0b540a0f
......@@ -11,10 +11,6 @@ class Import::GithubController < Import::BaseController
def status
@repos = client.repos
client.orgs.each do |org|
@repos += client.org_repos(org.login)
end
@already_added_projects = current_user.created_projects.where(import_type: "github")
already_added_projects_names = @already_added_projects.pluck(:import_source)
......
app/controllers/import/google_code_controller.rb
View file @ 0b540a0f
......@@ -10,18 +10,18 @@ class Import::GoogleCodeController < Import::BaseController
dump_file = params[:dump_file]
unless dump_file.respond_to?(:read)
return redirect_to :back, alert: "You need to upload a Google Takeout archive."
return redirect_back_or_default(options: { alert: "You need to upload a Google Takeout archive." })
end
begin
dump = JSON.parse(dump_file.read)
rescue
return redirect_to :back, alert: "The uploaded file is not a valid Google Takeout archive."
return redirect_back_or_default(options: { alert: "The uploaded file is not a valid Google Takeout archive." })
end
client = Gitlab::GoogleCodeImport::Client.new(dump)
unless client.valid?
return redirect_to :back, alert: "The uploaded file is not a valid Google Takeout archive."
return redirect_back_or_default(options: { alert: "The uploaded file is not a valid Google Takeout archive." })
end
session[:google_code_dump] = dump
......
app/controllers/invites_controller.rb
View file @ 0b540a0f
......@@ -14,7 +14,7 @@ class InvitesController < ApplicationController
redirect_to path, notice: "You have been granted #{member.human_access} access to #{label}."
else
redirect_to :back, alert: "The invitation could not be accepted."
redirect_back_or_default(options: { alert: "The invitation could not be accepted." })
end
end
......@@ -31,7 +31,7 @@ class InvitesController < ApplicationController
redirect_to path, notice: "You have declined the invitation to join #{label}."
else
redirect_to :back, alert: "The invitation could not be declined."
redirect_back_or_default(options: { alert: "The invitation could not be declined." })
end
end
......
app/controllers/profiles/notifications_controller.rb
View file @ 0b540a0f
......@@ -29,7 +29,7 @@ class Profiles::NotificationsController < Profiles::ApplicationController
flash[:alert] = "Failed to save new settings"
end
redirect_to :back
redirect_back_or_default(default: profile_notifications_path)
end
format.js
......
app/controllers/profiles_controller.rb
View file @ 0b540a0f
......@@ -26,7 +26,7 @@ class ProfilesController < Profiles::ApplicationController
end
respond_to do |format|
format.html { redirect_to :back }
format.html { redirect_back_or_default(default: { action: 'show' }) }
end
end
......
app/controllers/projects/application_controller.rb
View file @ 0b540a0f
......@@ -29,7 +29,7 @@ class Projects::ApplicationController < ApplicationController
private
def ci_enabled
return render_404 unless @project.gitlab_ci?
return render_404 unless @project.builds_enabled?
end
def ci_project
......
app/controllers/projects/blob_controller.rb
View file @ 0b540a0f
......@@ -175,7 +175,7 @@ class Projects::BlobController < Projects::ApplicationController
if params[:file].present?
params[:file_name] = params[:file].original_filename
end
File.join(@path, File.basename(params[:file_name]))
File.join(@path, params[:file_name])
else
@path
end
......
app/controllers/projects/builds_controller.rb
View file @ 0b540a0f
......@@ -2,23 +2,25 @@ class Projects::BuildsController < Projects::ApplicationController
before_action :ci_project
before_action :build, except: [:index, :cancel_all]
before_action :authorize_admin_project!, except: [:index, :show, :status]
before_action :authorize_manage_builds!, except: [:index, :show, :status]
before_action :authorize_download_build_artifacts!, only: [:download]
layout "project"
def index
@scope = params[:scope]
@all_builds = project.ci_builds
@builds = @all_builds.order('created_at DESC')
@builds =
case @scope
when 'all'
@all_builds
@builds
when 'finished'
@all_builds.finished
@builds.finished
else
@all_builds.running_or_pending
@builds.running_or_pending.reverse_order
end
@builds = @builds.order('created_at DESC').page(params[:page]).per(30)
@builds = @builds.page(params[:page]).per(30)
end
def cancel_all
......@@ -29,7 +31,7 @@ class Projects::BuildsController < Projects::ApplicationController
def show
@builds = @ci_project.commits.find_by_sha(@build.sha).builds.order('id DESC')
@builds = @builds.where("id not in (?)", @build.id).page(params[:page]).per(20)
@builds = @builds.where("id not in (?)", @build.id)
@commit = @build.commit
respond_to do |format|
......@@ -41,17 +43,25 @@ class Projects::BuildsController < Projects::ApplicationController
end
def retry
if @build.commands.blank?
unless @build.retryable?
return page_404
end
build = Ci::Build.retry(@build)
if params[:return_to]
redirect_to URI.parse(params[:return_to]).path
else
redirect_to build_path(build)
end
def download
unless artifacts_file.file_storage?
return redirect_to artifacts_file.url
end
unless artifacts_file.exists?
return not_found!
end
send_file artifacts_file.path, disposition: 'attachment'
end
def status
......@@ -70,7 +80,27 @@ class Projects::BuildsController < Projects::ApplicationController
@build ||= ci_project.builds.unscoped.find_by!(id: params[:id])
end
def artifacts_file
build.artifacts_file
end
def build_path(build)
namespace_project_build_path(build.gl_project.namespace, build.gl_project, build)
end
def authorize_manage_builds!
unless can?(current_user, :manage_builds, project)
return page_404
end
end
def authorize_download_build_artifacts!
unless can?(current_user, :download_build_artifacts, @project)
if current_user.nil?
return authenticate_user!
else
return render_404
end
end
end
end
app/controllers/projects/ci_services_controller.rb
View file @ 0b540a0f
......@@ -14,23 +14,23 @@ class Projects::CiServicesController < Projects::ApplicationController
end
def update
if @service.update_attributes(service_params)
redirect_to edit_namespace_project_ci_service_path(@project, @project.namespace, @service.to_param)
if service.update_attributes(service_params)
redirect_to edit_namespace_project_ci_service_path(@project.namespace, @project, service.to_param)
else
render 'edit'
end
end
def test
last_build = @project.builds.last
last_build = @project.ci_builds.last
if @service.execute(last_build)
if service.execute(last_build)
message = { notice: 'We successfully tested the service' }
else
message = { alert: 'We tried to test the service but error occurred' }
end
redirect_to :back, message
redirect_back_or_default(options: message)
end
private
......
app/controllers/projects/ci_web_hooks_controller.rb
View file @ 0b540a0f
......@@ -24,7 +24,7 @@ class Projects::CiWebHooksController < Projects::ApplicationController
def test
Ci::TestHookService.new.execute(hook, current_user)
redirect_to :back
redirect_back_or_default(default: { action: 'index' })
end
def destroy
......
app/controllers/projects/commit_controller.rb
View file @ 0b540a0f
......@@ -4,16 +4,17 @@
class Projects::CommitController < Projects::ApplicationController
# Authorize
before_action :require_non_empty_project
before_action :authorize_download_code!
before_action :authorize_download_code!, except: [:cancel_builds]
before_action :authorize_manage_builds!, only: [:cancel_builds]
before_action :commit
before_action :authorize_manage_builds!, only: [:cancel_builds, :retry_builds]
before_action :define_show_vars, only: [:show, :builds]
def show
return git_not_found! unless @commit
@line_notes = commit.notes.inline
@diffs = @commit.diffs
@note = @project.build_commit_note(commit)
@notes_count = commit.notes.count
@notes = commit.notes.not_inline.fresh
@noteable = @commit
@comments_allowed = @reply_allowed = true
......@@ -22,8 +23,6 @@ class Projects::CommitController < Projects::ApplicationController
commit_id: @commit.id
}
@ci_commit = project.ci_commit(commit.sha)
respond_to do |format|
format.html
format.diff { render text: @commit.to_diff }
......@@ -31,20 +30,25 @@ class Projects::CommitController < Projects::ApplicationController
end
end
def ci
@ci_commit = @project.ci_commit(@commit.sha)
@builds = @ci_commit.builds if @ci_commit
@notes_count = @commit.notes.count
def builds
@ci_project = @project.gitlab_ci_project
end
def cancel_builds
@ci_commit = @project.ci_commit(@commit.sha)
@ci_commit.builds.running_or_pending.each(&:cancel)
ci_commit.builds.running_or_pending.each(&:cancel)
redirect_to builds_namespace_project_commit_path(project.namespace, project, commit.sha)
end
redirect_to ci_namespace_project_commit_path(project.namespace, project, commit.sha)
def retry_builds
ci_commit.builds.latest.failed.each do |build|
if build.retryable?
Ci::Build.retry(build)
end
end
redirect_to builds_namespace_project_commit_path(project.namespace, project, commit.sha)
end
def branches
@branches = @project.repository.branch_names_contains(commit.id)
......@@ -52,7 +56,26 @@ class Projects::CommitController < Projects::ApplicationController
render layout: false
end
private
def commit
@commit ||= @project.commit(params[:id])
end
def ci_commit
@ci_commit ||= project.ci_commit(commit.sha)
end
def define_show_vars
@diffs = commit.diffs
@notes_count = commit.notes.count
@builds = ci_commit.builds if ci_commit
end
def authorize_manage_builds!
unless can?(current_user, :manage_builds, project)
return page_404
end
end
end
app/controllers/projects/commits_controller.rb
View file @ 0b540a0f
......@@ -12,7 +12,7 @@ class Projects::CommitsController < Projects::ApplicationController
@limit, @offset = (params[:limit] || 40), (params[:offset] || 0)
@commits = @repo.commits(@ref, @path, @limit, @offset)
@note_counts = Note.where(commit_id: @commits.map(&:id)).
@note_counts = project.notes.where(commit_id: @commits.map(&:id)).
group(:commit_id).count
respond_to do |format|
......
app/controllers/projects/compare_controller.rb
View file @ 0b540a0f
......@@ -12,14 +12,16 @@ class Projects::CompareController < Projects::ApplicationController
def show
base_ref = Addressable::URI.unescape(params[:from])
@ref = head_ref = Addressable::URI.unescape(params[:to])
diff_options = { ignore_whitespace_change: true } if params[:w] == '1'
compare_result = CompareService.new.
execute(@project, head_ref, @project, base_ref)
execute(@project, head_ref, @project, base_ref, diff_options)
if compare_result
@commits = compare_result.commits
@commits = Commit.decorate(compare_result.commits, @project)
@diffs = compare_result.diffs
@commit = @commits.last
@first_commit = @commits.first
@line_notes = []
end
end
......
app/controllers/projects/deploy_keys_controller.rb
View file @ 0b540a0f
......@@ -46,7 +46,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
def disable
@project.deploy_keys_projects.find_by(deploy_key_id: params[:id]).destroy
redirect_to :back
redirect_back_or_default(default: { action: 'index' })
end
protected
......
app/controllers/projects/hooks_controller.rb
View file @ 0b540a0f
......@@ -37,7 +37,7 @@ class Projects::HooksController < Projects::ApplicationController
flash[:alert] = 'Hook execution failed. Ensure the project has commits.'
end
redirect_to :back
redirect_back_or_default(default: { action: 'index' })
end
def destroy
......
app/controllers/projects/issues_controller.rb
View file @ 0b540a0f
......@@ -14,6 +14,9 @@ class Projects::IssuesController < Projects::ApplicationController
# Allow issues bulk update
before_action :authorize_admin_issues!, only: [:bulk_update]
# Cross-reference merge requests
before_action :closed_by_merge_requests, only: [:show]
respond_to :html
def index
......@@ -103,7 +106,7 @@ class Projects::IssuesController < Projects::ApplicationController
def bulk_update
result = Issues::BulkUpdateService.new(project, current_user, bulk_update_params).execute
redirect_to :back, notice: "#{result[:count]} issues updated"
redirect_back_or_default(default: { action: 'index' }, options: { notice: "#{result[:count]} issues updated" })
end
def toggle_subscription
......@@ -112,6 +115,10 @@ class Projects::IssuesController < Projects::ApplicationController
render nothing: true
end
def closed_by_merge_requests
@closed_by_merge_requests ||= @issue.closed_by_merge_requests(current_user)
end
protected
def issue
......@@ -151,10 +158,12 @@ class Projects::IssuesController < Projects::ApplicationController
end
def issue_params
params.require(:issue).permit(
permitted = params.require(:issue).permit(
:title, :assignee_id, :position, :description,
:milestone_id, :state_event, :task_num, label_ids: []
)
params[:issue][:title].strip! if params[:issue][:title]
permitted
end
def bulk_update_params
......
app/controllers/projects/releases_controller.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/controllers/projects/tags_controller.rb
View file @ 0b540a0f
This diff is collapsed.
app/controllers/projects_controller.rb
View file @ 0b540a0f
This diff is collapsed.
app/controllers/search_controller.rb
View file @ 0b540a0f
This diff is collapsed.
app/controllers/sherlock/application_controller.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/controllers/sherlock/file_samples_controller.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/controllers/sherlock/queries_controller.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/controllers/sherlock/transactions_controller.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/finders/groups_finder.rb
View file @ 0b540a0f
This diff is collapsed.
app/finders/issuable_finder.rb
View file @ 0b540a0f
This diff is collapsed.
app/finders/milestones_finder.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/helpers/appearances_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/auth_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/builds_helper.rb deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
app/helpers/ci/gitlab_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/ci_status_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/clipboard_helper.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/helpers/diff_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/events_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/gitlab_markdown_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/issues_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/labels_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/milestones_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/notifications_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/preferences_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/projects_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/search_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/helpers/tab_helper.rb
View file @ 0b540a0f
This diff is collapsed.
app/mailers/abuse_report_mailer.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/models/ability.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/application_setting.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/ci/application_setting.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/ci/build.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/ci/commit.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/ci/event.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/ci/project.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/ci/project_status.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/ci/runner.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/ci/runner_project.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/ci/service.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/ci/trigger.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/ci/trigger_request.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/ci/variable.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/ci/web_hook.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/commit.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/commit_status.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/concerns/issuable.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/concerns/mentionable.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/concerns/participable.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/concerns/sortable.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/event.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/generic_commit_status.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/global_label.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/models/group.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/hooks/project_hook.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/hooks/service_hook.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/hooks/system_hook.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/hooks/web_hook.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/issue.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/label.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/lfs_object.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/models/lfs_objects_project.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/models/merge_request.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/merge_request_diff.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/milestone.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/namespace.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/note.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/project.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/project_wiki.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/release.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/models/repository.rb
View file @ 0b540a0f
This diff is collapsed.
app/models/user.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/archive_repository_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/ci/create_builds_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/ci/image_for_build_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/compare_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/create_tag_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/delete_tag_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/files/create_dir_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/files/create_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/git_push_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/issues/update_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/milestones/group_service.rb deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
app/services/notes/update_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/projects/create_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/projects/fork_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/system_hooks_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/services/system_note_service.rb
View file @ 0b540a0f
This diff is collapsed.
app/uploaders/artifact_uploader.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/uploaders/attachment_uploader.rb
View file @ 0b540a0f
This diff is collapsed.
app/uploaders/avatar_uploader.rb
View file @ 0b540a0f
This diff is collapsed.
app/uploaders/file_uploader.rb
View file @ 0b540a0f
This diff is collapsed.
app/uploaders/lfs_object_uploader.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/uploaders/uploader_helper.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/abuse_report_mailer/notify.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/abuse_report_mailer/notify.text.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/admin/applications/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/admin/deploy_keys/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/admin/identities/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/admin/labels/_form.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/admin/services/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/admin/users/_head.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/admin/users/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/ci/admin/events/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/ci/admin/projects/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/ci/admin/runners/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/ci/admin/runners/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/ci/events/index.html.haml deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
app/views/ci/lints/_create.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/ci/lints/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/ci/projects/index.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/ci/user_sessions/new.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/dashboard/groups/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/events/_event_issue.atom.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/events/_event_note.atom.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/events/_event_push.atom.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/explore/snippets/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/groups/edit.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/groups/milestones/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/groups/milestones/new.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/groups/milestones/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/help/_shortcuts.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/import/bitbucket/status.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/import/fogbugz/status.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/import/github/status.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/import/gitlab/status.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/import/gitorious/status.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/layouts/_piwik.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/layouts/_search.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/layouts/ci/_nav_admin.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/layouts/ci/project.html.haml deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
app/views/layouts/header/_default.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/layouts/nav/_group.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/layouts/nav/_profile.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/layouts/nav/_project.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/layouts/notify.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/notify/_note_message.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/notify/new_issue_email.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/profiles/_event_table.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/_activity.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/_files.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/_last_commit.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/_readme.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/activity.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/blob/_blob.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/blob/_new_dir.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/blob/_upload.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/blob/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/builds/_build.html.haml deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
app/views/projects/builds/_header_title.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/builds/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/builds/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/buttons/_star.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/commits/_head.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/diffs/_diffs.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/diffs/_file.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/edit.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/empty.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/graphs/_head.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/graphs/ci.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/graphs/ci/_builds.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/graphs/ci/_overall.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/graphs/commits.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/graphs/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/hooks/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/imports/new.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/issues/_closed_by_box.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/issues/_issues.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/issues/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/labels/destroy.js.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/labels/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/new.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/notes/_note.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/releases/edit.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/remove_fork.js.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/runners/edit.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/runners/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/runners/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/services/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/snippets/_actions.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/snippets/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/snippets/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/tags/_download.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/tags/_tag.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/tags/destroy.js.haml deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
app/views/projects/tags/new.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/tags/show.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/tree/_readme.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/tree/_tree_header.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/tree/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/triggers/index.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/variables/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/wikis/_form.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/projects/wikis/history.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/search/_category.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/search/results/_commit.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/shared/_clone_panel.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/shared/_logo.svg 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/shared/issuable/_filter.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/shared/issuable/_form.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/shared/projects/_list.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/shared/snippets/_header.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/sherlock/file_samples/show.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/sherlock/queries/_backtrace.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/sherlock/queries/_general.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/sherlock/queries/show.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/sherlock/transactions/_file_samples.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/sherlock/transactions/_general.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/sherlock/transactions/_queries.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/sherlock/transactions/index.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/sherlock/transactions/show.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/snippets/_actions.html.haml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/views/snippets/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/users/_projects.html.haml deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
app/views/users/calendar.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/views/users/show.html.haml
View file @ 0b540a0f
This diff is collapsed.
app/workers/repository_archive_cache_worker.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
app/workers/repository_archive_worker.rb deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
app/workers/stuck_ci_builds_worker.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
config/environments/test.rb
View file @ 0b540a0f
This diff is collapsed.
config/gitlab.yml.example
View file @ 0b540a0f
This diff is collapsed.
config/initializers/1_settings.rb
View file @ 0b540a0f
This diff is collapsed.
config/initializers/2_app.rb
View file @ 0b540a0f
This diff is collapsed.
config/initializers/inflections.rb
View file @ 0b540a0f
This diff is collapsed.
config/initializers/rack_profiler.rb deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
config/initializers/session_store.rb
View file @ 0b540a0f
This diff is collapsed.
config/initializers/sherlock.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
config/initializers/state_machine_patch.rb deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
config/locales/sherlock.en.yml 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
config/routes.rb
View file @ 0b540a0f
This diff is collapsed.
db/fixtures/development/05_users.rb
View file @ 0b540a0f
This diff is collapsed.
db/fixtures/development/07_milestones.rb
View file @ 0b540a0f
This diff is collapsed.
db/fixtures/development/09_issues.rb
View file @ 0b540a0f
This diff is collapsed.
db/fixtures/development/12_snippets.rb
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151013092124_add_artifacts_file_to_builds.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151016195706_add_notes_line_code_index.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151019111551_fix_build_tags.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151019111703_fail_build_without_names.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151020145526_add_services_template_index.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151020173516_ci_limits_to_mysql.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151020173906_add_ci_builds_index_for_status.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151023112551_fail_build_with_empty_name.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151023144219_remove_satellites.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151026182941_add_project_path_index.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151103001141_add_public_to_group.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151103133339_add_shared_runners_setting.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151103134857_create_lfs_objects.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151103134958_create_lfs_objects_projects.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151104105513_add_file_to_lfs_objects.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151105094515_create_releases.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151114113410_add_index_for_lfs_oid_and_size.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/20151116144118_add_unique_for_lfs_oid_index.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
db/migrate/limits_to_mysql.rb
View file @ 0b540a0f
This diff is collapsed.
db/schema.rb
View file @ 0b540a0f
This diff is collapsed.
doc/README.md
View file @ 0b540a0f
This diff is collapsed.
doc/api/commits.md
View file @ 0b540a0f
This diff is collapsed.
doc/api/projects.md
View file @ 0b540a0f
This diff is collapsed.
doc/api/repositories.md
View file @ 0b540a0f
This diff is collapsed.
doc/api/repository_files.md
View file @ 0b540a0f
This diff is collapsed.
doc/api/tags.md 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/ci/api/README.md
View file @ 0b540a0f
This diff is collapsed.
doc/ci/api/projects.md
View file @ 0b540a0f
This diff is collapsed.
doc/ci/api/runners.md
View file @ 0b540a0f
This diff is collapsed.
doc/ci/docker/using_docker_build.md
View file @ 0b540a0f
This diff is collapsed.
doc/ci/docker/using_docker_images.md
View file @ 0b540a0f
This diff is collapsed.
doc/ci/examples/README.md
View file @ 0b540a0f
This diff is collapsed.
doc/ci/examples/test-clojure-application.md
View file @ 0b540a0f
This diff is collapsed.
doc/ci/quick_start/README.md
View file @ 0b540a0f
This diff is collapsed.
doc/ci/yaml/README.md
View file @ 0b540a0f
This diff is collapsed.
doc/customization/libravatar.md
View file @ 0b540a0f
This diff is collapsed.
doc/development/architecture.md
View file @ 0b540a0f
This diff is collapsed.
doc/development/profiling.md
View file @ 0b540a0f
This diff is collapsed.
doc/development/rake_tasks.md
View file @ 0b540a0f
This diff is collapsed.
doc/development/shared_files.md 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/development/shell_commands.md
View file @ 0b540a0f
This diff is collapsed.
doc/hooks/custom_hooks.md
View file @ 0b540a0f
This diff is collapsed.
doc/install/database_mysql.md
View file @ 0b540a0f
This diff is collapsed.
doc/install/installation.md
View file @ 0b540a0f
This diff is collapsed.
doc/install/requirements.md
View file @ 0b540a0f
This diff is collapsed.
doc/integration/facebook.md 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/integration/facebook_api_keys.png 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/integration/facebook_app_settings.png 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/integration/facebook_website_url.png 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/integration/ldap.md
View file @ 0b540a0f
This diff is collapsed.
doc/integration/omniauth.md
View file @ 0b540a0f
This diff is collapsed.
doc/markdown/markdown.md
View file @ 0b540a0f
This diff is collapsed.
doc/operations/unicorn.md
View file @ 0b540a0f
This diff is collapsed.
doc/permissions/permissions.md
View file @ 0b540a0f
This diff is collapsed.
doc/raketasks/backup_restore.md
View file @ 0b540a0f
This diff is collapsed.
doc/release/monthly.md
View file @ 0b540a0f
This diff is collapsed.
doc/release/security.md
View file @ 0b540a0f
This diff is collapsed.
doc/ssh/README.md
View file @ 0b540a0f
This diff is collapsed.
doc/update/6.x-or-7.x-to-7.14.md
View file @ 0b540a0f
This diff is collapsed.
doc/update/7.14-to-8.0.md
View file @ 0b540a0f
This diff is collapsed.
doc/update/8.0-to-8.1.md 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/update/8.1-to-8.2.md 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/update/mysql_to_postgresql.md
View file @ 0b540a0f
This diff is collapsed.
doc/update/patch_versions.md
View file @ 0b540a0f
This diff is collapsed.
doc/web_hooks/web_hooks.md
View file @ 0b540a0f
This diff is collapsed.
doc/workflow/README.md
View file @ 0b540a0f
This diff is collapsed.
doc/workflow/gitlab_flow.md
View file @ 0b540a0f
This diff is collapsed.
doc/workflow/merge_requests.md
View file @ 0b540a0f
This diff is collapsed.
doc/workflow/merge_requests/commit_compare.png 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/workflow/merge_requests/merge_request_diff.png 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/workflow/milestones.md 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/workflow/milestones/form.png 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/workflow/milestones/group_form.png 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/workflow/releases.md 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/workflow/releases/new_tag.png 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc/workflow/releases/tags.png 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
doc_styleguide.md
View file @ 0b540a0f
This diff is collapsed.
features/groups.feature
View file @ 0b540a0f
This diff is collapsed.
features/profile/profile.feature
View file @ 0b540a0f
This diff is collapsed.
features/project/commits/tags.feature
View file @ 0b540a0f
This diff is collapsed.
features/project/merge_requests.feature
View file @ 0b540a0f
This diff is collapsed.
features/project/project.feature
View file @ 0b540a0f
This diff is collapsed.
features/project/snippets.feature
View file @ 0b540a0f
This diff is collapsed.
features/snippets/snippets.feature
View file @ 0b540a0f
This diff is collapsed.
features/steps/abuse_reports.rb
View file @ 0b540a0f
This diff is collapsed.
features/steps/groups.rb
View file @ 0b540a0f
This diff is collapsed.
features/steps/profile/profile.rb
View file @ 0b540a0f
This diff is collapsed.
features/steps/project/commits/tags.rb
View file @ 0b540a0f
This diff is collapsed.
features/steps/project/graph.rb
View file @ 0b540a0f
This diff is collapsed.
features/steps/project/merge_requests.rb
View file @ 0b540a0f
This diff is collapsed.
features/steps/project/project.rb
View file @ 0b540a0f
This diff is collapsed.
features/steps/project/snippets.rb
View file @ 0b540a0f
This diff is collapsed.
features/steps/shared/paths.rb
View file @ 0b540a0f
This diff is collapsed.
features/steps/shared/project.rb
View file @ 0b540a0f
This diff is collapsed.
features/steps/shared/project_tab.rb
View file @ 0b540a0f
This diff is collapsed.
features/steps/snippets/snippets.rb
View file @ 0b540a0f
This diff is collapsed.
features/steps/snippets/user.rb
View file @ 0b540a0f
This diff is collapsed.
lib/api/api.rb
View file @ 0b540a0f
This diff is collapsed.
lib/api/entities.rb
View file @ 0b540a0f
This diff is collapsed.
lib/api/files.rb
View file @ 0b540a0f
This diff is collapsed.
lib/api/helpers.rb
View file @ 0b540a0f
This diff is collapsed.
lib/api/projects.rb
View file @ 0b540a0f
This diff is collapsed.
lib/api/repositories.rb
View file @ 0b540a0f
This diff is collapsed.
lib/api/tags.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/backup/artifacts.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/backup/builds.rb
View file @ 0b540a0f
This diff is collapsed.
lib/backup/database.rb
View file @ 0b540a0f
This diff is collapsed.
lib/backup/files.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/backup/manager.rb
View file @ 0b540a0f
This diff is collapsed.
lib/backup/repository.rb
View file @ 0b540a0f
This diff is collapsed.
lib/backup/uploads.rb
View file @ 0b540a0f
This diff is collapsed.
lib/ci/api/api.rb
View file @ 0b540a0f
This diff is collapsed.
lib/ci/api/builds.rb
View file @ 0b540a0f
This diff is collapsed.
lib/ci/api/entities.rb
View file @ 0b540a0f
This diff is collapsed.
lib/ci/api/helpers.rb
View file @ 0b540a0f
This diff is collapsed.
lib/ci/charts.rb
View file @ 0b540a0f
This diff is collapsed.
lib/ci/gitlab_ci_yaml_processor.rb
View file @ 0b540a0f
This diff is collapsed.
lib/ci/migrate/builds.rb deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
lib/ci/migrate/database.rb deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
lib/ci/migrate/manager.rb deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
lib/ci/migrate/tags.rb deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
lib/ci/status.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/file_streamer.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/backend/grack_auth.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/compare_result.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/current_settings.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/database.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/force_push_check.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/git_ref_validator.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/google_code_import/importer.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/inline_diff.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/lfs/response.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/lfs/router.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/markdown.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/markdown/redactor_filter.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/markdown/reference_filter.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/markdown/reference_gatherer_filter.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/markdown/relative_link_filter.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/markdown/sanitization_filter.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/o_auth/provider.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/project_search_results.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/push_data_builder.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/reference_extractor.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/regex.rb
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/sherlock.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/sherlock/collection.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/sherlock/file_sample.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/sherlock/line_profiler.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/sherlock/line_sample.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/sherlock/location.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/sherlock/middleware.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/sherlock/query.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/sherlock/transaction.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/gitlab/upgrader.rb
View file @ 0b540a0f
This diff is collapsed.
lib/support/init.d/gitlab
View file @ 0b540a0f
This diff is collapsed.
lib/support/init.d/gitlab.default.example
View file @ 0b540a0f
This diff is collapsed.
lib/support/nginx/gitlab
View file @ 0b540a0f
This diff is collapsed.
lib/support/nginx/gitlab-ssl
View file @ 0b540a0f
This diff is collapsed.
lib/tasks/ci/migrate.rake deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
lib/tasks/flay.rake 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/tasks/flog.rake 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/tasks/gitlab/backup.rake
View file @ 0b540a0f
This diff is collapsed.
lib/tasks/gitlab/check.rake
View file @ 0b540a0f
This diff is collapsed.
lib/tasks/gitlab/shell.rake
View file @ 0b540a0f
This diff is collapsed.
lib/tasks/grape.rake 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
lib/tasks/spinach.rake
View file @ 0b540a0f
This diff is collapsed.
lib/uploaded_file.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/benchmarks/lib/gitlab/markdown/reference_filter_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/benchmarks/models/milestone_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/benchmarks/models/user_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/benchmarks/services/projects/create_service_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/controllers/abuse_reports_controller_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/controllers/invites_controller_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/factories/ci/projects.rb
View file @ 0b540a0f
This diff is collapsed.
spec/factories/labels.rb
View file @ 0b540a0f
This diff is collapsed.
spec/factories/lfs_objects.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/factories/lfs_objects_projects.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/factories/merge_requests.rb
View file @ 0b540a0f
This diff is collapsed.
spec/factories/releases.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/features/admin/admin_users_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/features/builds_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/features/ci/events_spec.rb deleted 100644 → 0
View file @ 3d50b99d
This diff is collapsed.
spec/features/commits_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/features/markdown_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/features/projects_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/features/runners_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/finders/group_finder_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/helpers/gitlab_markdown_helper_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/helpers/issues_helper_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/helpers/labels_helper_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/helpers/search_helper_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/backend/grack_auth_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/lfs/lfs_router_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/markdown/redactor_filter_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/push_data_builder_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/reference_extractor_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/sherlock/collection_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/sherlock/file_sample_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/sherlock/line_profiler_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/sherlock/line_sample_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/sherlock/location_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/sherlock/middleware_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/sherlock/query_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/lib/gitlab/sherlock/transaction_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/mailers/notify_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/application_setting_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/build_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/ci/commit_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/ci/project_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/ci/runner_project_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/ci/runner_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/ci/service_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/ci/trigger_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/ci/variable_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/ci/web_hook_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/commit_status_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/concerns/issuable_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/generic_commit_status_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/group_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/issue_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/label_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/milestone_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/namespace_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/project_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/project_wiki_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/release_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/models/repository_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/models/user_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/requests/api/api_helpers_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/requests/api/commit_status_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/requests/api/files_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/requests/api/projects_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/requests/api/repositories_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/requests/api/services_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/requests/api/tags_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/requests/api/users_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/requests/ci/api/builds_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/requests/ci/api/commits_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/requests/ci/api/projects_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/requests/ci/api/triggers_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/services/git_push_service_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/services/milestones/close_service_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/services/milestones/create_service_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
spec/services/projects/fork_service_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/services/system_note_service_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/support/filter_spec_helper.rb
View file @ 0b540a0f
This diff is collapsed.
spec/support/markdown_feature.rb
View file @ 0b540a0f
This diff is collapsed.
spec/support/mentionable_shared_examples.rb
View file @ 0b540a0f
This diff is collapsed.
spec/support/test_env.rb
View file @ 0b540a0f
This diff is collapsed.
spec/tasks/gitlab/backup_rake_spec.rb
View file @ 0b540a0f
This diff is collapsed.
spec/workers/stuck_ci_builds_worker_spec.rb 0 → 100644
View file @ 0b540a0f
This diff is collapsed.
vendor/assets/javascripts/clipboard.js 0 → 100644
View file @ 0b540a0f
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