Skip to content

G
gitlab-ce
Commit 85ad95be authored by Tomasz Maczukin's avatar Tomasz Maczukin
Browse files
Options

Merge branch 'master' into fix/visibility-level-setting-in-forked-projects 

* master: (296 commits)
  fox tests
  Don't rescue Exception, but StandardError
  adressing comments
  Update gitlab-shell documentation [ci skip]
  Align hash literals in IssuesFinder spec
  Fix tests
  Fix 'Attach a file' link in new tag form
  Add link to git-lfs client  [ci skip]
  Do not limit workhorse POST/PUT size in NGINX
  added specs
  added spinach tests
  Since GitLab CI is enabled by default, remove enabling it by pushing .gitlab-ci.yml
  Fix tests
  Commits without .gitlab-ci.yml are marked as skipped
  Changelog entry for finding issues performance
  Use a JOIN in IssuableFinder#by_project
  Memoize IssuableFinder#projects
  Removed trailing whitespace from IssuableFinder
  Added benchmark for IssuesFinder
  Updated DB schema with new issues/projects indexes
  ...

Conflicts:
	app/models/project.rb
parents 1144b70a 0383f84d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 9065 additions and 3034 deletions
.gitignore
View file @ 85ad95be
......@@ -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 @ 85ad95be
......@@ -73,3 +73,17 @@ brakeman:
tags:
- ruby
- mysql
flog:
script:
- bundle exec rake flog
tags:
- ruby
- mysql
flay:
script:
- bundle exec rake flay
tags:
- ruby
- mysql
CHANGELOG
View file @ 85ad95be
Please view this file on the master branch, on stable branches it's out of date.
v 8.2.0 (unreleased)
- Force update refs/merge-requests/X/head upon a push to the source branch of a merge request (Stan Hu)
v 8.3.0 (unreleased)
v 8.2.0
- Improved performance of finding projects and groups in various places
- Improved performance of rendering user profile pages and Atom feeds
- Fix grouping of contributors by email in graph.
- Improved performance of finding issues with/without labels
- 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)
- Commits without .gitlab-ci.yml are marked as skipped
- Save detailed error when YAML syntax is invalid
- Since GitLab CI is enabled by default, remove enabling it by pushing .gitlab-ci.yml
- Added build artifacts
- 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
......@@ -13,23 +28,52 @@ v 8.2.0 (unreleased)
- 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
- Use issue editor as cross reference comment author when issue is edited with a new mention.
- Improve personal snippet access workflow (Douglas Alexandre)
- [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
- Add email notification to former assignee upon unassignment (Adam Lieskovský)
- 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
- Add option to create merge request when editing/creating a file (Dirceu Tiegs)
- Prevent the last owner of a group from being able to delete themselves by 'adding' themselves as a master (James Lopez)
- Add Award Emoji to issue and merge request pages
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
- New design for user profile page
- Use issue editor as cross reference comment author when issue is edited with a new mention
- Add Facebook authentication
v 8.1.1
v 8.1.2
- Fix cloning Wiki repositories via HTTP (Stan Hu)
- Add migration to remove satellites directory
- Fix specific runners visibility
......@@ -39,14 +83,15 @@ v 8.1.1
- 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
v 8.1.0 (unreleased)
- 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.
......
CONTRIBUTING.md
View file @ 85ad95be
......@@ -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
......@@ -181,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 @ 85ad95be
......@@ -40,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
......@@ -51,14 +51,10 @@ 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'
......@@ -113,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'
......@@ -185,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'
......@@ -215,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'
......@@ -265,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 @ 85ad95be
......@@ -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)
......@@ -491,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)
......@@ -617,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)
......@@ -692,7 +692,13 @@ GEM
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
stamp (0.6.0)
state_machine (1.2.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)
......@@ -779,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)
......@@ -802,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)
......@@ -822,21 +827,23 @@ 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)
......@@ -878,11 +885,10 @@ 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.3)
redis-rails (~> 4.0.0)
......@@ -913,7 +919,7 @@ DEPENDENCIES
spring-commands-teaspoon (~> 0.0.2)
sprockets (~> 2.12.3)
stamp (~> 0.6.0)
state_machine (~> 1.2.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 @ 85ad95be
......@@ -40,7 +40,12 @@ Workflow labels are purposely not very detailed since that would be hard to keep
- *Awaiting confirmation of fix*: The issue should already be solved in **master** (generally you can avoid this workflow item and just close the issue right away)
- *Attached MR*: There is a MR attached and the discussion should happen there
- We need to let issues stay in sync with the MR's. We can do this with a "Closing #XXXX" or "Fixes #XXXX" comment in the MR. We can't close the issue when there is a merge request because sometimes a MR is not good and we just close the MR, then the issue must stay.
- *Awaiting developer action/feedback*: Issue needs to be fixed or clarified by a developer
- *Developer*: needs help from a developer
- *UX* needs needs help from a UX designer
- *Frontend* needs help from a Front-end engineer
- *Graphics* needs help from a Graphics designer
Example workflow: when a UX designer provided a design but it needs frontend work they remove the UX label and add the frontend label.
## Functional labels
......@@ -119,6 +124,6 @@ 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][https://gitlab.com/gitlab-org/gitlab-ce/issues].
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].
still an issue I encourage you to open it on the \[GitLab.com issue tracker\](https://gitlab.com/gitlab-org/gitlab-ce/issues).
VERSION
View file @ 85ad95be
8.1.0.pre
8.3.0.pre
app/assets/javascripts/awards_handler.coffee 0 → 100644
View file @ 85ad95be
class @AwardsHandler
constructor: (@post_emoji_url, @noteable_type, @noteable_id) ->
addAward: (emoji) ->
@postEmoji emoji, =>
@addAwardToEmojiBar(emoji)
addAwardToEmojiBar: (emoji, custom_path = '') ->
if @exist(emoji)
if @isActive(emoji)
@decrementCounter(emoji)
else
counter = @findEmojiIcon(emoji).siblings(".counter")
counter.text(parseInt(counter.text()) + 1)
counter.parent().addClass("active")
@addMeToAuthorList(emoji)
else
@createEmoji(emoji, custom_path)
exist: (emoji) ->
@findEmojiIcon(emoji).length > 0
isActive: (emoji) ->
@findEmojiIcon(emoji).parent().hasClass("active")
decrementCounter: (emoji) ->
counter = @findEmojiIcon(emoji).siblings(".counter")
if parseInt(counter.text()) > 1
counter.text(parseInt(counter.text()) - 1)
counter.parent().removeClass("active")
@removeMeFromAuthorList(emoji)
else
award = counter.parent()
award.tooltip("destroy")
award.remove()
removeMeFromAuthorList: (emoji) ->
award_block = @findEmojiIcon(emoji).parent()
authors = award_block.attr("data-original-title").split(", ")
authors = _.without(authors, "me").join(", ")
award_block.attr("title", authors)
@resetTooltip(award_block)
addMeToAuthorList: (emoji) ->
award_block = @findEmojiIcon(emoji).parent()
authors = award_block.attr("data-original-title").split(", ")
authors.push("me")
award_block.attr("title", authors.join(", "))
@resetTooltip(award_block)
resetTooltip: (award) ->
award.tooltip("destroy")
# "destroy" call is asynchronous, this is why we need to set timeout.
setTimeout (->
award.tooltip()
), 200
createEmoji: (emoji, custom_path) ->
nodes = []
nodes.push("<div class='award active' title='me'>")
nodes.push("<div class='icon' data-emoji='" + emoji + "'>")
nodes.push(@getImage(emoji, custom_path))
nodes.push("</div>")
nodes.push("<div class='counter'>1")
nodes.push("</div></div>")
$(".awards-controls").before(nodes.join("\n"))
$(".award").tooltip()
getImage: (emoji, custom_path) ->
if custom_path
$(".awards-menu li").first().html().replace(/emoji\/.*\.png/, custom_path)
else
$("li[data-emoji='" + emoji + "']").html()
postEmoji: (emoji, callback) ->
$.post @post_emoji_url, { note: {
note: emoji
noteable_type: @noteable_type
noteable_id: @noteable_id
}},(data) ->
if data.ok
callback.call()
findEmojiIcon: (emoji) ->
$(".icon[data-emoji='" + emoji + "']")
\ No newline at end of file
app/assets/javascripts/blob/blob_file_dropzone.js.coffee
View file @ 85ad95be
......@@ -23,18 +23,6 @@ class @BlobFileDropzone
init: ->
this.on 'addedfile', (file) ->
$('.dropzone-alerts').html('').hide()
commit_message = form.find('#commit_message')[0]
if /^Upload/.test(commit_message.placeholder)
commit_message.placeholder = 'Upload ' + file.name
return
this.on 'removedfile', (file) ->
commit_message = form.find('#commit_message')[0]
if /^Upload/.test(commit_message.placeholder)
commit_message.placeholder = 'Upload new file'
return
......@@ -47,8 +35,9 @@ class @BlobFileDropzone
return
this.on 'sending', (file, xhr, formData) ->
formData.append('new_branch', form.find('#new_branch').val())
formData.append('commit_message', form.find('#commit_message').val())
formData.append('new_branch', form.find('.js-new-branch').val())
formData.append('create_merge_request', form.find('.js-create-merge-request').val())
formData.append('commit_message', form.find('.js-commit-message').val())
return
# Override behavior of adding error underneath preview
......
app/assets/javascripts/dispatcher.js.coffee
View file @ 85ad95be
......@@ -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/javascripts/new_commit_form.js.coffee 0 → 100644
View file @ 85ad95be
class @NewCommitForm
constructor: (form) ->
@newBranch = form.find('.js-new-branch')
@originalBranch = form.find('.js-original-branch')
@createMergeRequest = form.find('.js-create-merge-request')
@createMergeRequestFormGroup = form.find('.js-create-merge-request-form-group')
@renderDestination()
@newBranch.keyup @renderDestination
renderDestination: =>
different = @newBranch.val() != @originalBranch.val()
if different
@createMergeRequestFormGroup.show()
@createMergeRequest.prop('checked', true) unless @wasDifferent
else
@createMergeRequestFormGroup.hide()
@createMergeRequest.prop('checked', false)
@wasDifferent = different
app/assets/javascripts/notes.js.coffee
View file @ 85ad95be
......@@ -113,13 +113,16 @@ class @Notes
renderNote: (note) ->
# render note if it not present in loaded list
# or skip if rendered
if @isNewNote(note)
if @isNewNote(note) && !note.award
@note_ids.push(note.id)
$('ul.main-notes-list').
append(note.html).
syntaxHighlight()
@initTaskList()
if note.award
awards_handler.addAwardToEmojiBar(note.note, note.emoji_path)
###
Check if note does not exists on page
###
......@@ -255,7 +258,6 @@ class @Notes
###
addNote: (xhr, note, status) =>
@renderNote(note)
@updateVotes()
###
Called in response to the new note form being submitted
......@@ -473,9 +475,6 @@ class @Notes
form = $(e.target).closest(".js-discussion-note-form")
@removeDiscussionNoteForm(form)
updateVotes: ->
true
###
Called after an attachment file has been selected.
......
app/assets/javascripts/stat_graph_contributors_util.js.coffee
View file @ 85ad95be
......@@ -6,7 +6,7 @@ window.ContributorsStatGraphUtil =
for entry in log
@add_date(entry.date, total) unless total[entry.date]?
data = by_author[entry.author_name] #|| by_email[entry.author_email]
data = by_author[entry.author_name] || by_email[entry.author_email]
data ?= @add_author(entry, by_author, by_email)
@add_date(entry.date, data) unless data[entry.date]
......@@ -96,4 +96,3 @@ window.ContributorsStatGraphUtil =
true
else
false
\ No newline at end of file
app/assets/stylesheets/framework/blocks.scss
View file @ 85ad95be
......@@ -28,6 +28,10 @@
border-bottom: 1px solid $border-color;
color: $gl-gray;
&.oneline-block {
line-height: 42px;
}
&.white {
background-color: white;
}
......
app/assets/stylesheets/framework/callout.scss
View file @ 85ad95be
......@@ -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 @ 85ad95be
......@@ -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 }
......@@ -327,6 +328,10 @@ table {
}
}
.well {
margin-bottom: 0;
}
.search_box {
@extend .well;
text-align: center;
......
app/assets/stylesheets/framework/header.scss
View file @ 85ad95be
......@@ -118,6 +118,10 @@ header {
}
}
}
.impersonation i {
color: $red-normal;
}
}
@mixin collapsed-header {
......
app/assets/stylesheets/framework/layout.scss
View file @ 85ad95be
......@@ -5,7 +5,6 @@ html {
body {
padding-top: $header-height;
text-rendering: geometricPrecision;
}
}
......
app/assets/stylesheets/framework/lists.scss
View file @ 85ad95be
......@@ -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 @ 85ad95be
......@@ -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 @ 85ad95be
......@@ -72,9 +72,10 @@
list-style: none;
> li {
@include clearfix;
padding: 10px 0;
border-bottom: 1px solid #EEE;
overflow: hidden;
display: block;
margin: 0px;
......
app/assets/stylesheets/framework/sidebar.scss
View file @ 85ad95be
......@@ -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,6 +240,7 @@
width: 100%;
padding: 10px 22px;
overflow: hidden;
outline: none;
img {
width: 36px;
......
app/assets/stylesheets/framework/tw_bootstrap.scss
View file @ 85ad95be
......@@ -172,7 +172,7 @@
}
.panel-body {
form {
form, pre {
margin: 0;
}
......
app/assets/stylesheets/framework/typography.scss
View file @ 85ad95be
......@@ -173,7 +173,6 @@
*
*/
body {
text-rendering:optimizeLegibility;
-webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px;
}
......
app/assets/stylesheets/pages/builds.scss
View file @ 85ad95be
......@@ -21,7 +21,7 @@
.autoscroll-container {
position: fixed;
bottom: 10px;
bottom: 20px;
right: 20px;
z-index: 100;
}
......@@ -34,7 +34,7 @@
a {
display: block;
margin-bottom: 5px;
margin-bottom: 10px;
}
}
......
app/assets/stylesheets/pages/commit.scss
View file @ 85ad95be
......@@ -56,6 +56,7 @@
li {
padding: 3px 0px;
line-height: 20px;
}
}
.new-file {
......
app/assets/stylesheets/pages/commits.scss
View file @ 85ad95be
......@@ -115,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 @ 85ad95be
......@@ -367,7 +367,6 @@
.inline-parallel-buttons {
float: right;
margin-top: -5px;
}
// Mobile
......
app/assets/stylesheets/pages/events.scss
View file @ 85ad95be
......@@ -4,7 +4,7 @@
*/
.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 $table-border-color;
......@@ -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/issuable.scss
View file @ 85ad95be
......@@ -101,3 +101,71 @@
background-color: $background-color;
}
}
.awards {
@include clearfix;
line-height: 34px;
margin: 2px 0;
.award {
@include border-radius(5px);
border: 1px solid;
padding: 0px 10px;
float: left;
margin: 0 5px;
border-color: $border-color;
cursor: pointer;
&.active {
border-color: $border-gray-light;
background-color: $gray-light;
.counter {
font-weight: bold;
}
}
.icon {
float: left;
margin-right: 10px;
}
.counter {
float: left;
}
}
.awards-controls {
margin-left: 10px;
float: left;
.add-award {
font-size: 24px;
color: $gl-gray;
position: relative;
top: 2px;
&:hover,
&:link {
text-decoration: none;
}
}
.awards-menu {
padding: $gl-padding;
min-width: 214px;
> li {
margin: 5px;
}
}
}
.awards-menu{
li {
float: left;
margin: 3px;
}
}
}
app/assets/stylesheets/pages/merge_requests.scss
View file @ 85ad95be
......@@ -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 {
......
app/assets/stylesheets/pages/note_form.scss
View file @ 85ad95be
......@@ -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/sherlock.scss 0 → 100644
View file @ 85ad95be
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/controllers/admin/application_controller.rb
View file @ 85ad95be
......@@ -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 @ 85ad95be
......@@ -57,6 +57,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:version_check_enabled,
:admin_notification_email,
:user_oauth_applications,
:shared_runners_enabled,
:max_artifacts_size,
restricted_visibility_levels: [],
import_sources: []
)
......
app/controllers/admin/impersonation_controller.rb 0 → 100644
View file @ 85ad95be
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 @ 85ad95be
......@@ -63,12 +63,6 @@ class Admin::UsersController < Admin::ApplicationController
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),
......
app/controllers/ci/lints_controller.rb
View file @ 85ad95be
......@@ -15,10 +15,10 @@ module Ci
@builds = @config_processor.builds
@status = true
end
rescue Ci::GitlabCiYamlProcessor::ValidationError => e
rescue Ci::GitlabCiYamlProcessor::ValidationError, Psych::SyntaxError => e
@error = e.message
@status = false
rescue Exception
rescue
@error = "Undefined error"
@status = false
end
......
app/controllers/ci/projects_controller.rb
View file @ 85ad95be
......@@ -26,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/concerns/creates_merge_request_for_commit.rb 0 → 100644
View file @ 85ad95be
module CreatesMergeRequestForCommit
extend ActiveSupport::Concern
def new_merge_request_path
if @project.forked?
target_project = @project.forked_from_project || @project
target_branch = target_project.repository.root_ref
else
target_project = @project
target_branch = @ref
end
new_namespace_project_merge_request_path(
@project.namespace,
@project,
merge_request: {
source_project_id: @project.id,
target_project_id: target_project.id,
source_branch: @new_branch,
target_branch: target_branch
}
)
end
def create_merge_request?
params[:create_merge_request] && @new_branch != @ref
end
end
app/controllers/concerns/global_milestones.rb 0 → 100644
View file @ 85ad95be
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/concerns/issues_action.rb 0 → 100644
View file @ 85ad95be
module IssuesAction
extend ActiveSupport::Concern
def issues
@issues = get_issues_collection
@issues = @issues.page(params[:page]).per(ApplicationController::PER_PAGE)
@issues = @issues.preload(:author, :project)
respond_to do |format|
format.html
format.atom { render layout: false }
end
end
end
app/controllers/concerns/merge_requests_action.rb 0 → 100644
View file @ 85ad95be
module MergeRequestsAction
extend ActiveSupport::Concern
def merge_requests
@merge_requests = get_merge_requests_collection
@merge_requests = @merge_requests.page(params[:page]).per(ApplicationController::PER_PAGE)
@merge_requests = @merge_requests.preload(:author, :target_project)
end
end
app/controllers/dashboard/milestones_controller.rb
View file @ 85ad95be
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 @ 85ad95be
class DashboardController < Dashboard::ApplicationController
include IssuesAction
include MergeRequestsAction
before_action :event_filter, only: :activity
before_action :projects, only: [:issues, :merge_requests]
respond_to :html
def merge_requests
@merge_requests = get_merge_requests_collection
@merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
@merge_requests = @merge_requests.preload(:author, :target_project)
end
def issues
@issues = get_issues_collection
@issues = @issues.page(params[:page]).per(PER_PAGE)
@issues = @issues.preload(:author, :project)
respond_to do |format|
format.html
format.atom { render layout: false }
end
end
def activity
@last_push = current_user.recent_push
......@@ -47,4 +34,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 @ 85ad95be
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 @ 85ad95be
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 @ 85ad95be
class Groups::GroupMembersController < Groups::ApplicationController
skip_before_action :authenticate_user!, only: [:index]
before_action :group
# Authorize
before_action :authorize_read_group!
before_action :authorize_admin_group!, except: [:index, :leave]
before_action :authorize_admin_group_member!, only: [:create, :resend_invite]
before_action :authorize_admin_group_member!, except: [:index, :leave]
def index
@project = @group.projects.find(params[:project_id]) if params[:project_id]
......@@ -18,7 +16,8 @@ class Groups::GroupMembersController < Groups::ApplicationController
end
@members = @members.order('access_level DESC').page(params[:page]).per(50)
@group_member = GroupMember.new
@group_member = @group.group_members.new
end
def create
......@@ -28,25 +27,24 @@ class Groups::GroupMembersController < Groups::ApplicationController
end
def update
@member = @group.group_members.find(params[:id])
@group_member = @group.group_members.find(params[:id])
return render_403 unless can?(current_user, :update_group_member, @member)
return render_403 unless can?(current_user, :update_group_member, @group_member)
@member.update_attributes(member_params)
@group_member.update_attributes(member_params)
end
def destroy
@group_member = @group.group_members.find(params[:id])
if can?(current_user, :destroy_group_member, @group_member) # May fail if last owner.
return render_403 unless can?(current_user, :destroy_group_member, @group_member)
@group_member.destroy
respond_to do |format|
format.html { redirect_to group_group_members_path(@group), notice: 'User was successfully removed from group.' }
format.js { render nothing: true }
end
else
return render_403
end
end
def resend_invite
......@@ -64,10 +62,11 @@ class Groups::GroupMembersController < Groups::ApplicationController
end
def leave
@group_member = @group.group_members.where(user_id: current_user.id).first
@group_member = @group.group_members.find_by(user_id: current_user)
if can?(current_user, :destroy_group_member, @group_member)
@group_member.destroy
redirect_to(dashboard_groups_path, notice: "You left #{group.name} group.")
else
if @group.last_owner?(current_user)
......@@ -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 @ 85ad95be
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 @ 85ad95be
class GroupsController < Groups::ApplicationController
include IssuesAction
include MergeRequestsAction
skip_before_action :authenticate_user!, only: [:show, :issues, :merge_requests]
respond_to :html
before_action :group, except: [:new, :create]
......@@ -53,23 +56,6 @@ class GroupsController < Groups::ApplicationController
end
end
def merge_requests
@merge_requests = get_merge_requests_collection
@merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
@merge_requests = @merge_requests.preload(:author, :target_project)
end
def issues
@issues = get_issues_collection
@issues = @issues.page(params[:page]).per(PER_PAGE)
@issues = @issues.preload(:author, :project)
respond_to do |format|
format.html
format.atom { render layout: false }
end
end
def edit
end
......
app/controllers/projects/application_controller.rb
View file @ 85ad95be
......@@ -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 @ 85ad95be
# Controller for viewing a file's blame
class Projects::BlobController < Projects::ApplicationController
include ExtractsPath
include CreatesMergeRequestForCommit
include ActionView::Helpers::SanitizeHelper
# Raised when given an invalid file path
......@@ -22,21 +23,9 @@ class Projects::BlobController < Projects::ApplicationController
end
def create
result = Files::CreateService.new(@project, current_user, @commit_params).execute
if result[:status] == :success
flash[:notice] = "The changes have been successfully committed"
respond_to do |format|
format.html { redirect_to namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path)) }
format.json { render json: { message: "success", filePath: namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path)) } }
end
else
flash[:alert] = result[:message]
respond_to do |format|
format.html { render :new }
format.json { render json: { message: "failed", filePath: namespace_project_blob_path(@project.namespace, @project, @id) } }
end
end
create_commit(Files::CreateService, success_path: after_create_path,
failure_view: :new,
failure_path: namespace_project_new_blob_path(@project.namespace, @project, @ref))
end
def show
......@@ -47,21 +36,9 @@ class Projects::BlobController < Projects::ApplicationController
end
def update
result = Files::UpdateService.new(@project, current_user, @commit_params).execute
if result[:status] == :success
flash[:notice] = "Your changes have been successfully committed"
respond_to do |format|
format.html { redirect_to after_edit_path }
format.json { render json: { message: "success", filePath: after_edit_path } }
end
else
flash[:alert] = result[:message]
respond_to do |format|
format.html { render :edit }
format.json { render json: { message: "failed", filePath: namespace_project_new_blob_path(@project.namespace, @project, @id) } }
end
end
create_commit(Files::UpdateService, success_path: after_edit_path,
failure_view: :edit,
failure_path: namespace_project_blob_path(@project.namespace, @project, @id))
end
def preview
......@@ -77,7 +54,7 @@ class Projects::BlobController < Projects::ApplicationController
if result[:status] == :success
flash[:notice] = "Your changes have been successfully committed"
redirect_to namespace_project_tree_path(@project.namespace, @project, @target_branch)
redirect_to after_destroy_path
else
flash[:alert] = result[:message]
render :show
......@@ -131,15 +108,51 @@ class Projects::BlobController < Projects::ApplicationController
render_404
end
def create_commit(service, success_path:, failure_view:, failure_path:)
result = service.new(@project, current_user, @commit_params).execute
if result[:status] == :success
flash[:notice] = "Your changes have been successfully committed"
respond_to do |format|
format.html { redirect_to success_path }
format.json { render json: { message: "success", filePath: success_path } }
end
else
flash[:alert] = result[:message]
respond_to do |format|
format.html { render failure_view }
format.json { render json: { message: "failed", filePath: failure_path } }
end
end
end
def after_create_path
@after_create_path ||=
if create_merge_request?
new_merge_request_path
else
namespace_project_blob_path(@project.namespace, @project, File.join(@new_branch, @file_path))
end
end
def after_edit_path
@after_edit_path ||=
if from_merge_request
if create_merge_request?
new_merge_request_path
elsif from_merge_request && @new_branch == @ref
diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) +
"#file-path-#{hexdigest(@path)}"
elsif @target_branch.present?
namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path))
else
namespace_project_blob_path(@project.namespace, @project, @id)
namespace_project_blob_path(@project.namespace, @project, File.join(@new_branch, @path))
end
end
def after_destroy_path
@after_destroy_path ||=
if create_merge_request?
new_merge_request_path
else
namespace_project_tree_path(@project.namespace, @project, @new_branch)
end
end
......@@ -154,7 +167,7 @@ class Projects::BlobController < Projects::ApplicationController
def editor_variables
@current_branch = @ref
@target_branch = params[:new_branch].present? ? sanitized_new_branch_name : @ref
@new_branch = params[:new_branch].present? ? sanitized_new_branch_name : @ref
@file_path =
if action_name.to_s == 'create'
......@@ -174,7 +187,7 @@ class Projects::BlobController < Projects::ApplicationController
@commit_params = {
file_path: @file_path,
current_branch: @current_branch,
target_branch: @target_branch,
target_branch: @new_branch,
commit_message: params[:commit_message],
file_content: params[:content],
file_content_encoding: params[:encoding]
......
app/controllers/projects/builds_controller.rb
View file @ 85ad95be
......@@ -3,6 +3,7 @@ class Projects::BuildsController < Projects::ApplicationController
before_action :build, except: [:index, :cancel_all]
before_action :authorize_manage_builds!, except: [:index, :show, :status]
before_action :authorize_download_build_artifacts!, only: [:download]
layout "project"
......@@ -51,6 +52,18 @@ class Projects::BuildsController < Projects::ApplicationController
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
render json: @build.to_json(only: [:status, :id, :sha, :coverage], methods: :sha)
end
......@@ -67,6 +80,10 @@ 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
......@@ -76,4 +93,14 @@ class Projects::BuildsController < Projects::ApplicationController
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/compare_controller.rb
View file @ 85ad95be
......@@ -12,15 +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 = Commit.decorate(compare_result.commits, @project)
@diffs = compare_result.diffs
@commit = @commits.last
@first_commit = @commits.first
@commit = @project.commit(head_ref)
@first_commit = @project.commit(base_ref)
@line_notes = []
end
end
......
app/controllers/projects/imports_controller.rb
View file @ 85ad95be
......@@ -28,8 +28,8 @@ class Projects::ImportsController < Projects::ApplicationController
if @project.import_finished?
redirect_to(project_path(@project)) and return
else
redirect_to new_namespace_project_import_path(@project.namespace,
@project) && return
redirect_to(new_namespace_project_import_path(@project.namespace,
@project)) and return
end
end
end
......
app/controllers/projects/issues_controller.rb
View file @ 85ad95be
......@@ -60,7 +60,7 @@ class Projects::IssuesController < Projects::ApplicationController
def show
@participants = @issue.participants(current_user)
@note = @project.notes.new(noteable: @issue)
@notes = @issue.notes.with_associations.fresh
@notes = @issue.notes.nonawards.with_associations.fresh
@noteable = @issue
respond_with(@issue)
......@@ -158,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/merge_requests_controller.rb
View file @ 85ad95be
......@@ -31,6 +31,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
@merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
@merge_requests = @merge_requests.preload(:target_project)
respond_to do |format|
format.html
......@@ -253,7 +254,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
# Build a note object for comment form
@note = @project.notes.new(noteable: @merge_request)
@notes = @merge_request.mr_and_commit_notes.inc_author.fresh
@notes = @merge_request.mr_and_commit_notes.nonawards.inc_author.fresh
@discussions = Note.discussions_from_notes(@notes)
@noteable = @merge_request
......@@ -275,11 +276,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def merge_request_params
params.require(:merge_request).permit(
permitted = params.require(:merge_request).permit(
:title, :assignee_id, :source_project_id, :source_branch,
:target_project_id, :target_branch, :milestone_id,
:state_event, :description, :task_num, label_ids: []
)
params[:merge_request][:title].strip! if params[:merge_request][:title]
permitted
end
# Make sure merge requests created before 8.0
......
app/controllers/projects/notes_controller.rb
View file @ 85ad95be
......@@ -3,7 +3,7 @@ class Projects::NotesController < Projects::ApplicationController
before_action :authorize_read_note!
before_action :authorize_create_note!, only: [:create]
before_action :authorize_admin_note!, only: [:update, :destroy]
before_action :find_current_user_notes, except: [:destroy, :delete_attachment]
before_action :find_current_user_notes, except: [:destroy, :delete_attachment, :award_toggle]
def index
current_fetched_at = Time.now.to_i
......@@ -58,6 +58,27 @@ class Projects::NotesController < Projects::ApplicationController
end
end
def award_toggle
noteable = note_params[:noteable_type] == "issue" ? Issue : MergeRequest
noteable = noteable.find_by!(id: note_params[:noteable_id], project: project)
data = {
author: current_user,
is_award: true,
note: note_params[:note]
}
note = noteable.notes.find_by(data)
if note
note.destroy
else
Notes::CreateService.new(project, current_user, note_params).execute
end
render json: { ok: true }
end
private
def note
......@@ -111,6 +132,9 @@ class Projects::NotesController < Projects::ApplicationController
id: note.id,
discussion_id: note.discussion_id,
html: note_to_html(note),
award: note.is_award,
emoji_path: note.is_award ? ::AwardEmoji.path_to_emoji_image(note.note) : "",
note: note.note,
discussion_html: note_to_discussion_html(note),
discussion_with_diff_html: note_to_discussion_with_diff_html(note)
}
......
app/controllers/projects/project_members_controller.rb
View file @ 85ad95be
class Projects::ProjectMembersController < Projects::ApplicationController
# Authorize
before_action :authorize_admin_project!, except: :leave
before_action :authorize_admin_project_member!, except: :leave
def index
@project_members = @project.project_members
......@@ -29,10 +29,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
@project_member = @project.project_members.new
end
def new
@project_member = @project.project_members.new
end
def create
@project.team.add_users(params[:user_ids].split(','), params[:access_level], current_user)
......@@ -41,11 +37,17 @@ class Projects::ProjectMembersController < Projects::ApplicationController
def update
@project_member = @project.project_members.find(params[:id])
return render_403 unless can?(current_user, :update_project_member, @project_member)
@project_member.update_attributes(member_params)
end
def destroy
@project_member = @project.project_members.find(params[:id])
return render_403 unless can?(current_user, :destroy_project_member, @project_member)
@project_member.destroy
respond_to do |format|
......@@ -71,17 +73,23 @@ class Projects::ProjectMembersController < Projects::ApplicationController
end
def leave
if @project.namespace == current_user.namespace
message = 'You can not leave your own project. Transfer or delete the project.'
return redirect_back_or_default(default: { action: 'index' }, options: { alert: message })
end
@project_member = @project.project_members.find_by(user_id: current_user)
@project.project_members.find_by(user_id: current_user).destroy
if can?(current_user, :destroy_project_member, @project_member)
@project_member.destroy
respond_to do |format|
format.html { redirect_to dashboard_projects_path }
format.html { redirect_to dashboard_projects_path, notice: "You left the project." }
format.js { render nothing: true }
end
else
if current_user == @project.owner
message = 'You can not leave your own project. Transfer or delete the project.'
redirect_back_or_default(default: { action: 'index' }, options: { alert: message })
else
render_403
end
end
end
def apply_import
......
app/controllers/projects/releases_controller.rb 0 → 100644
View file @ 85ad95be
class Projects::ReleasesController < Projects::ApplicationController
# Authorize
before_action :require_non_empty_project
before_action :authorize_download_code!
before_action :authorize_push_code!
before_action :tag
before_action :release
def edit
end
def update
release.update_attributes(release_params)
redirect_to namespace_project_tag_path(@project.namespace, @project, @tag.name)
end
private
def tag
@tag ||= @repository.find_tag(params[:tag_id])
end
def release
@release ||= @project.releases.find_or_initialize_by(tag: @tag.name)
end
def release_params
params.require(:release).permit(:description)
end
end
app/controllers/projects/tags_controller.rb
View file @ 85ad95be
......@@ -8,15 +8,23 @@ class Projects::TagsController < Projects::ApplicationController
def index
sorted = VersionSorter.rsort(@repository.tag_names)
@tags = Kaminari.paginate_array(sorted).page(params[:page]).per(PER_PAGE)
@releases = project.releases.where(tag: @tags)
end
def show
@tag = @repository.find_tag(params[:id])
@release = @project.releases.find_or_initialize_by(tag: @tag.name)
@commit = @repository.commit(@tag.target)
end
def create
result = CreateTagService.new(@project, current_user).
execute(params[:tag_name], params[:ref], params[:message])
execute(params[:tag_name], params[:ref], params[:message], params[:release_description])
if result[:status] == :success
@tag = result[:tag]
redirect_to namespace_project_tags_path(@project.namespace, @project)
redirect_to namespace_project_tag_path(@project.namespace, @project, @tag.name)
else
@error = result[:message]
render action: 'new'
......@@ -26,12 +34,6 @@ class Projects::TagsController < Projects::ApplicationController
def destroy
DeleteTagService.new(project, current_user).execute(params[:id])
respond_to do |format|
format.html do
redirect_to namespace_project_tags_path(@project.namespace,
@project)
end
format.js
end
redirect_to namespace_project_tags_path(@project.namespace, @project)
end
end
app/controllers/projects/tree_controller.rb
View file @ 85ad95be
# Controller for viewing a repository's file structure
class Projects::TreeController < Projects::ApplicationController
include ExtractsPath
include CreatesMergeRequestForCommit
include ActionView::Helpers::SanitizeHelper
before_action :require_non_empty_project, except: [:new, :create]
......@@ -43,7 +44,7 @@ class Projects::TreeController < Projects::ApplicationController
if result && result[:status] == :success
flash[:notice] = "The directory has been successfully created"
respond_to do |format|
format.html { redirect_to namespace_project_blob_path(@project.namespace, @project, File.join(@new_branch, @dir_name)) }
format.html { redirect_to after_create_dir_path }
end
else
flash[:alert] = message
......@@ -53,6 +54,8 @@ class Projects::TreeController < Projects::ApplicationController
end
end
private
def assign_dir_vars
@new_branch = params[:new_branch].present? ? sanitize(strip_tags(params[:new_branch])) : @ref
@dir_name = File.join(@path, params[:dir_name])
......@@ -63,4 +66,12 @@ class Projects::TreeController < Projects::ApplicationController
commit_message: params[:commit_message],
}
end
def after_create_dir_path
if create_merge_request?
new_merge_request_path
else
namespace_project_blob_path(@project.namespace, @project, File.join(@new_branch, @dir_name))
end
end
end
app/controllers/projects_controller.rb
View file @ 85ad95be
......@@ -72,8 +72,7 @@ class ProjectsController < ApplicationController
def remove_fork
return access_denied! unless can?(current_user, :remove_fork_project, @project)
if @project.forked?
@project.forked_project_link.destroy
if @project.unlink_fork
flash[:notice] = 'The fork relationship has been removed.'
end
end
......@@ -213,7 +212,8 @@ class ProjectsController < ApplicationController
params.require(:project).permit(
:name, :path, :description, :issues_tracker, :tag_list,
:issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, :default_branch,
:wiki_enabled, :visibility_level, :import_url, :last_activity_at, :namespace_id, :avatar
:wiki_enabled, :visibility_level, :import_url, :last_activity_at, :namespace_id, :avatar,
:builds_enabled
)
end
......
app/controllers/sherlock/application_controller.rb 0 → 100644
View file @ 85ad95be
module Sherlock
class ApplicationController < ::ApplicationController
before_action :find_transaction
def find_transaction
if params[:transaction_id]
@transaction = Gitlab::Sherlock.collection.
find_transaction(params[:transaction_id])
end
end
end
end
app/controllers/sherlock/file_samples_controller.rb 0 → 100644
View file @ 85ad95be
module Sherlock
class FileSamplesController < Sherlock::ApplicationController
def show
@file_sample = @transaction.find_file_sample(params[:id])
end
end
end
app/controllers/sherlock/queries_controller.rb 0 → 100644
View file @ 85ad95be
module Sherlock
class QueriesController < Sherlock::ApplicationController
def show
@query = @transaction.find_query(params[:id])
end
end
end
app/controllers/sherlock/transactions_controller.rb 0 → 100644
View file @ 85ad95be
module Sherlock
class TransactionsController < Sherlock::ApplicationController
def index
@transactions = Gitlab::Sherlock.collection.newest_first
end
def show
@transaction = Gitlab::Sherlock.collection.find_transaction(params[:id])
render_404 unless @transaction
end
def destroy_all
Gitlab::Sherlock.collection.clear
redirect_to(:back)
end
end
end
app/controllers/snippets_controller.rb
View file @ 85ad95be
class SnippetsController < ApplicationController
before_action :snippet, only: [:show, :edit, :destroy, :update, :raw]
# Allow read snippet
before_action :authorize_read_snippet!, only: [:show]
# Allow modify snippet
before_action :authorize_update_snippet!, only: [:edit, :update]
......@@ -79,8 +82,12 @@ class SnippetsController < ApplicationController
[Snippet::PUBLIC, Snippet::INTERNAL]).
find(params[:id])
else
PersonalSnippet.are_public.find(params[:id])
PersonalSnippet.find(params[:id])
end
end
def authorize_read_snippet!
authenticate_user! unless can?(current_user, :read_personal_snippet, @snippet)
end
def authorize_update_snippet!
......
app/controllers/users_controller.rb
View file @ 85ad95be
......@@ -3,14 +3,11 @@ class UsersController < ApplicationController
before_action :set_user
def show
@contributed_projects = contributed_projects.joined(@user).
reject(&:forked?)
@contributed_projects = contributed_projects.joined(@user).reject(&:forked?)
@projects = @user.personal_projects.
where(id: authorized_projects_ids).includes(:namespace)
@projects = PersonalProjectsFinder.new(@user).execute(current_user)
# Collect only groups common for both users
@groups = @user.groups & GroupsFinder.new.execute(current_user)
@groups = JoinedGroupsFinder.new(@user).execute(current_user)
respond_to do |format|
format.html
......@@ -53,16 +50,8 @@ class UsersController < ApplicationController
@user = User.find_by_username!(params[:username])
end
def authorized_projects_ids
# Projects user can view
@authorized_projects_ids ||=
ProjectsFinder.new.execute(current_user).pluck(:id)
end
def contributed_projects
@contributed_projects = Project.
where(id: authorized_projects_ids & @user.contributed_projects_ids).
includes(:namespace)
ContributedProjectsFinder.new(@user).execute(current_user)
end
def contributions_calendar
......@@ -73,9 +62,13 @@ class UsersController < ApplicationController
def load_events
# Get user activity feed for projects common for both users
@events = @user.recent_events.
where(project_id: authorized_projects_ids).
with_associations
merge(projects_for_current_user).
references(:project).
with_associations.
limit_recent(20, params[:offset])
end
@events = @events.limit(20).offset(params[:offset] || 0)
def projects_for_current_user
ProjectsFinder.new.execute(current_user)
end
end
app/finders/contributed_projects_finder.rb 0 → 100644
View file @ 85ad95be
class ContributedProjectsFinder
def initialize(user)
@user = user
end
# Finds the projects "@user" contributed to, limited to either public projects
# or projects visible to the given user.
#
# current_user - When given the list of the projects is limited to those only
# visible by this user.
#
# Returns an ActiveRecord::Relation.
def execute(current_user = nil)
if current_user
relation = projects_visible_to_user(current_user)
else
relation = public_projects
end
relation.includes(:namespace).order_id_desc
end
private
def projects_visible_to_user(current_user)
authorized = @user.contributed_projects.visible_to_user(current_user)
union = Gitlab::SQL::Union.
new([authorized.select(:id), public_projects.select(:id)])
Project.where("projects.id IN (#{union.to_sql})")
end
def public_projects
@user.contributed_projects.public_only
end
end
app/finders/groups_finder.rb
View file @ 85ad95be
class GroupsFinder
def execute(current_user, options = {})
all_groups(current_user)
# Finds the groups available to the given user.
#
# current_user - The user to find the groups for.
#
# Returns an ActiveRecord::Relation.
def execute(current_user = nil)
if current_user
relation = groups_visible_to_user(current_user)
else
relation = public_groups
end
relation.order_id_desc
end
private
def all_groups(current_user)
group_ids = if current_user
if current_user.authorized_groups.any?
# User has access to groups
#
# Return only:
# groups with public projects
# groups with internal projects
# groups with joined projects
#
Project.public_and_internal_only.pluck(:namespace_id) +
current_user.authorized_groups.pluck(:id)
else
# User has no group membership
#
# Return only:
# groups with public projects
# groups with internal projects
#
Project.public_and_internal_only.pluck(:namespace_id)
# This method returns the groups "current_user" can see.
def groups_visible_to_user(current_user)
base = groups_for_projects(public_and_internal_projects)
union = Gitlab::SQL::Union.
new([base.select(:id), current_user.authorized_groups.select(:id)])
Group.where("namespaces.id IN (#{union.to_sql})")
end
else
# Not authenticated
#
# Return only:
# groups with public projects
Project.public_only.pluck(:namespace_id)
def public_groups
groups_for_projects(public_projects)
end
def groups_for_projects(projects)
Group.public_and_given_groups(projects.select(:namespace_id))
end
def public_projects
Project.unscoped.public_only
end
Group.where("public IS TRUE OR id IN(?)", group_ids)
def public_and_internal_projects
Project.unscoped.public_and_internal_only
end
end
app/finders/issuable_finder.rb
View file @ 85ad95be
......@@ -77,11 +77,11 @@ class IssuableFinder
return @projects if defined?(@projects)
if project?
project
@projects = project
elsif current_user && params[:authorized_only].presence && !current_user_related?
current_user.authorized_projects
@projects = current_user.authorized_projects
else
ProjectsFinder.new.execute(current_user)
@projects = ProjectsFinder.new.execute(current_user)
end
end
......@@ -190,8 +190,10 @@ class IssuableFinder
def by_project(items)
items =
if projects
items.of_projects(projects).references(:project)
if project?
items.of_projects(projects).references_project
elsif projects
items.merge(projects.reorder(nil)).join_project
else
items.none
end
......@@ -206,7 +208,9 @@ class IssuableFinder
end
def sort(items)
items.sort(params[:sort])
# Ensure we always have an explicit sort order (instead of inheriting
# multiple orders when combining ActiveRecord::Relation objects).
params[:sort] ? items.sort(params[:sort]) : items.reorder(id: :desc)
end
def by_assignee(items)
......
app/finders/joined_groups_finder.rb 0 → 100644
View file @ 85ad95be
# Class for finding the groups a user is a member of.
class JoinedGroupsFinder
def initialize(user = nil)
@user = user
end
# Finds the groups of the source user, optionally limited to those visible to
# the current user.
#
# current_user - If given the groups of "@user" will only include the groups
# "current_user" can also see.
#
# Returns an ActiveRecord::Relation.
def execute(current_user = nil)
if current_user
relation = groups_visible_to_user(current_user)
else
relation = public_groups
end
relation.order_id_desc
end
private
# Returns the groups the user in "current_user" can see.
#
# This list includes all public/internal projects as well as the projects of
# "@user" that "current_user" also has access to.
def groups_visible_to_user(current_user)
base = @user.authorized_groups.visible_to_user(current_user)
extra = public_and_internal_groups
union = Gitlab::SQL::Union.new([base.select(:id), extra.select(:id)])
Group.where("namespaces.id IN (#{union.to_sql})")
end
def public_groups
groups_for_projects(@user.authorized_projects.public_only)
end
def public_and_internal_groups
groups_for_projects(@user.authorized_projects.public_and_internal_only)
end
def groups_for_projects(projects)
@user.groups.public_and_given_groups(projects.select(:namespace_id))
end
end
app/finders/milestones_finder.rb 0 → 100644
View file @ 85ad95be
class MilestonesFinder
def execute(projects, params)
milestones = Milestone.of_projects(projects)
milestones = milestones.order("due_date ASC")
case params[:state]
when 'closed' then milestones.closed
when 'all' then milestones
else milestones.active
end
end
end
app/finders/notes_finder.rb
View file @ 85ad95be
......@@ -12,9 +12,9 @@ class NotesFinder
when "commit"
project.notes.for_commit_id(target_id).not_inline
when "issue"
project.issues.find(target_id).notes.inc_author
project.issues.find(target_id).notes.nonawards.inc_author
when "merge_request"
project.merge_requests.find(target_id).mr_and_commit_notes.inc_author
project.merge_requests.find(target_id).mr_and_commit_notes.nonawards.inc_author
when "snippet", "project_snippet"
project.snippets.find(target_id).notes
else
......
app/finders/personal_projects_finder.rb 0 → 100644
View file @ 85ad95be
class PersonalProjectsFinder
def initialize(user)
@user = user
end
# Finds the projects belonging to the user in "@user", limited to either
# public projects or projects visible to the given user.
#
# current_user - When given the list of projects is limited to those only
# visible by this user.
#
# Returns an ActiveRecord::Relation.
def execute(current_user = nil)
if current_user
relation = projects_visible_to_user(current_user)
else
relation = public_projects
end
relation.includes(:namespace).order_id_desc
end
private
def projects_visible_to_user(current_user)
authorized = @user.personal_projects.visible_to_user(current_user)
union = Gitlab::SQL::Union.
new([authorized.select(:id), public_and_internal_projects.select(:id)])
Project.where("projects.id IN (#{union.to_sql})")
end
def public_projects
@user.personal_projects.public_only
end
def public_and_internal_projects
@user.personal_projects.public_and_internal_only
end
end
app/finders/projects_finder.rb
View file @ 85ad95be
class ProjectsFinder
def execute(current_user, options = {})
# Returns all projects, optionally including group projects a user has access
# to.
#
# ## Examples
#
# Retrieving all public projects:
#
# ProjectsFinder.new.execute
#
# Retrieving all public/internal projects and those the given user has access
# to:
#
# ProjectsFinder.new.execute(some_user)
#
# Retrieving all public/internal projects as well as the group's projects the
# user has access to:
#
# ProjectsFinder.new.execute(some_user, group: some_group)
#
# Returns an ActiveRecord::Relation.
def execute(current_user = nil, options = {})
group = options[:group]
if group
group_projects(current_user, group)
base, extra = group_projects(current_user, group)
else
all_projects(current_user)
base, extra = all_projects(current_user)
end
if base and extra
union = Gitlab::SQL::Union.new([base.select(:id), extra.select(:id)])
Project.where("projects.id IN (#{union.to_sql})")
else
base
end
end
......@@ -13,77 +41,36 @@ class ProjectsFinder
def group_projects(current_user, group)
if current_user
if group.users.include?(current_user)
# User is group member
#
# Return ALL group projects
group.projects
else
projects_members = ProjectMember.in_projects(group.projects).
with_user(current_user)
if projects_members.any?
# User is a project member
#
# Return only:
# public projects
# internal projects
# joined projects
#
group.projects.where(
"projects.id IN (?) OR projects.visibility_level IN (?)",
projects_members.pluck(:source_id),
Project.public_and_internal_levels
)
else
# User has no access to group or group projects
#
# Return only:
# public projects
# internal projects
#
[
group_projects_for_user(current_user, group),
group.projects.public_and_internal_only
end
end
]
else
# Not authenticated
#
# Return only:
# public projects
group.projects.public_only
[group.projects.public_only]
end
end
def all_projects(current_user)
if current_user
if current_user.authorized_projects.any?
# User has access to private projects
#
# Return only:
# public projects
# internal projects
# joined projects
#
Project.where(
"projects.id IN (?) OR projects.visibility_level IN (?)",
current_user.authorized_projects.pluck(:id),
Project.public_and_internal_levels
)
[current_user.authorized_projects, public_and_internal_projects]
else
# User has no access to private projects
#
# Return only:
# public projects
# internal projects
#
Project.public_and_internal_only
[Project.public_only]
end
end
def group_projects_for_user(current_user, group)
if group.users.include?(current_user)
group.projects
else
# Not authenticated
#
# Return only:
# public projects
Project.public_only
group.projects.visible_to_user(current_user)
end
end
def public_projects
Project.unscoped.public_only
end
def public_and_internal_projects
Project.unscoped.public_and_internal_only
end
end
app/helpers/diff_helper.rb
View file @ 85ad95be
module DiffHelper
def diff_view
params[:view] == 'parallel' ? 'parallel' : 'inline'
end
def allowed_diff_size
if diff_hard_limit_enabled?
Commit::DIFF_HARD_LIMIT_FILES
......@@ -132,25 +136,11 @@ module DiffHelper
end
def inline_diff_btn
params_copy = params.dup
params_copy[:view] = 'inline'
# Always use HTML to handle case where JSON diff rendered this button
params_copy.delete(:format)
link_to url_for(params_copy), id: "inline-diff-btn", class: (params[:view] != 'parallel' ? 'btn btn-sm active' : 'btn btn-sm') do
'Inline'
end
diff_btn('Inline', 'inline', diff_view == 'inline')
end
def parallel_diff_btn
params_copy = params.dup
params_copy[:view] = 'parallel'
# Always use HTML to handle case where JSON diff rendered this button
params_copy.delete(:format)
link_to url_for(params_copy), id: "parallel-diff-btn", class: (params[:view] == 'parallel' ? 'btn active btn-sm' : 'btn btn-sm') do
'Side-by-side'
end
diff_btn('Side-by-side', 'parallel', diff_view == 'parallel')
end
def submodule_link(blob, ref, repository = @repository)
......@@ -171,7 +161,7 @@ module DiffHelper
def commit_for_diff(diff)
if diff.deleted_file
first_commit = @first_commit || @commit
first_commit.parent
first_commit.parent || @first_commit
else
@commit
end
......@@ -187,4 +177,18 @@ module DiffHelper
def editable_diff?(diff)
!diff.deleted_file && @merge_request && @merge_request.source_project
end
private
def diff_btn(title, name, selected)
params_copy = params.dup
params_copy[:view] = name
# Always use HTML to handle case where JSON diff rendered this button
params_copy.delete(:format)
link_to url_for(params_copy), id: "#{name}-diff-btn", class: (selected ? 'btn active' : 'btn') do
title
end
end
end
app/helpers/events_helper.rb
View file @ 85ad95be
......@@ -108,6 +108,11 @@ module EventsHelper
end
end
elsif event.push?
push_event_feed_url(event)
end
end
def push_event_feed_url(event)
if event.push_with_commits? && event.md_ref?
if event.commits_count > 1
namespace_project_compare_url(event.project.namespace, event.project,
......@@ -122,7 +127,6 @@ module EventsHelper
event.ref_name)
end
end
end
def event_feed_summary(event)
if event.issue?
......@@ -198,7 +202,7 @@ module EventsHelper
xml.link href: event_link
xml.title truncate(event_title, length: 80)
xml.updated event.created_at.xmlschema
xml.media :thumbnail, width: "40", height: "40", url: avatar_icon(event.author_email)
xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(event.author_email))
xml.author do |author|
xml.name event.author_name
xml.email event.author_email
......
app/helpers/gitlab_markdown_helper.rb
View file @ 85ad95be
......@@ -46,39 +46,13 @@ module GitlabMarkdownHelper
end
def markdown(text, context = {})
return "" unless text.present?
context.reverse_merge!(
path: @path,
pipeline: :default,
project: @project,
project_wiki: @project_wiki,
ref: @ref
)
user = current_user if defined?(current_user)
html = Gitlab::Markdown.render(text, context)
Gitlab::Markdown.post_process(html, pipeline: context[:pipeline], project: @project, user: user)
process_markdown(text, context)
end
# TODO (rspeicher): Remove all usages of this helper and just call `markdown`
# with a custom pipeline depending on the content being rendered
def gfm(text, options = {})
return "" unless text.present?
options.reverse_merge!(
path: @path,
pipeline: :default,
project: @project,
project_wiki: @project_wiki,
ref: @ref
)
user = current_user if defined?(current_user)
html = Gitlab::Markdown.gfm(text, options)
Gitlab::Markdown.post_process(html, pipeline: options[:pipeline], project: @project, user: user)
process_markdown(text, options, :gfm)
end
def asciidoc(text)
......@@ -204,4 +178,26 @@ module GitlabMarkdownHelper
''
end
end
def process_markdown(text, options, method = :markdown)
return "" unless text.present?
options.reverse_merge!(
path: @path,
pipeline: :default,
project: @project,
project_wiki: @project_wiki,
ref: @ref
)
user = current_user if defined?(current_user)
html = if method == :gfm
Gitlab::Markdown.gfm(text, options)
else
Gitlab::Markdown.render(text, options)
end
Gitlab::Markdown.post_process(html, pipeline: options[:pipeline], project: @project, user: user)
end
end
app/helpers/issues_helper.rb
View file @ 85ad95be
......@@ -74,7 +74,7 @@ module IssuesHelper
issue.project, issue)
xml.title truncate(issue.title, length: 80)
xml.updated issue.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
xml.media :thumbnail, width: "40", height: "40", url: avatar_icon(issue.author_email)
xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(issue.author_email))
xml.author do |author|
xml.name issue.author_name
xml.email issue.author_email
......@@ -87,6 +87,31 @@ module IssuesHelper
merge_requests.map(&:to_reference).to_sentence(last_word_connector: ', or ')
end
def url_to_emoji(name)
emoji_path = ::AwardEmoji.path_to_emoji_image(name)
url_to_image(emoji_path)
end
def emoji_author_list(notes, current_user)
list = notes.map do |note|
note.author == current_user ? "me" : note.author.username
end
list.join(", ")
end
def emoji_list
::AwardEmoji::EMOJI_LIST
end
def note_active_class(notes, current_user)
if current_user && notes.pluck(:author_id).include?(current_user.id)
"active"
else
""
end
end
# Required for Gitlab::Markdown::IssueReferenceFilter
module_function :url_for_issue
end
app/helpers/labels_helper.rb
View file @ 85ad95be
......@@ -100,7 +100,7 @@ module LabelsHelper
Label.where(project_id: @projects)
end
grouped_labels = Labels::GroupService.new(labels).execute
grouped_labels = GlobalLabel.build_collection(labels)
grouped_labels.unshift(Label::None)
grouped_labels.unshift(Label::Any)
......
app/helpers/merge_requests_helper.rb
View file @ 85ad95be
......@@ -8,14 +8,6 @@ module MergeRequestsHelper
)
end
def new_mr_path_for_fork_from_push_event(event)
new_namespace_project_merge_request_path(
event.project.namespace,
event.project,
new_mr_from_push_event(event, event.project.forked_from_project)
)
end
def new_mr_from_push_event(event, target_project)
{
merge_request: {
......
app/helpers/milestones_helper.rb
View file @ 85ad95be
......@@ -28,7 +28,7 @@ module MilestonesHelper
Milestone.where(project_id: @projects)
end.active
grouped_milestones = Milestones::GroupService.new(milestones).execute
grouped_milestones = GlobalMilestone.build_collection(milestones)
grouped_milestones.unshift(Milestone::None)
grouped_milestones.unshift(Milestone::Any)
......
app/helpers/namespaces_helper.rb
View file @ 85ad95be
......@@ -17,15 +17,6 @@ module NamespacesHelper
grouped_options_for_select(options, selected)
end
def namespace_select_tag(id, opts = {})
css_class = "ajax-namespace-select "
css_class << "multiselect " if opts[:multiple]
css_class << (opts[:class] || '')
value = opts[:selected] || ''
hidden_field_tag(id, value, class: css_class)
end
def namespace_icon(namespace, size = 40)
if namespace.kind_of?(Group)
group_icon(namespace)
......
app/helpers/notifications_helper.rb
View file @ 85ad95be
......@@ -16,40 +16,28 @@ module NotificationsHelper
def notification_list_item(notification_level, user_membership)
case notification_level
when Notification::N_DISABLED
content_tag(:li, class: active_level_for(user_membership, Notification::N_DISABLED)) do
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_DISABLED } do
icon('microphone-slash fw', text: 'Disabled')
end
end
update_notification_link(Notification::N_DISABLED, user_membership, 'Disabled', 'microphone-slash')
when Notification::N_PARTICIPATING
content_tag(:li, class: active_level_for(user_membership, Notification::N_PARTICIPATING)) do
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_PARTICIPATING } do
icon('volume-up fw', text: 'Participate')
end
end
update_notification_link(Notification::N_PARTICIPATING, user_membership, 'Participate', 'volume-up')
when Notification::N_WATCH
content_tag(:li, class: active_level_for(user_membership, Notification::N_WATCH)) do
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_WATCH } do
icon('eye fw', text: 'Watch')
end
end
update_notification_link(Notification::N_WATCH, user_membership, 'Watch', 'eye')
when Notification::N_MENTION
content_tag(:li, class: active_level_for(user_membership, Notification::N_MENTION)) do
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_MENTION } do
icon('at fw', text: 'On mention')
end
end
update_notification_link(Notification::N_MENTION, user_membership, 'On mention', 'at')
when Notification::N_GLOBAL
content_tag(:li, class: active_level_for(user_membership, Notification::N_GLOBAL)) do
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_GLOBAL } do
icon('globe fw', text: 'Global')
end
end
update_notification_link(Notification::N_GLOBAL, user_membership, 'Global', 'globe')
else
# do nothing
end
end
def update_notification_link(notification_level, user_membership, title, icon)
content_tag(:li, class: active_level_for(user_membership, notification_level)) do
link_to '#', class: 'update-notification', data: { notification_level: notification_level } do
icon("#{icon} fw", text: title)
end
end
end
def notification_label(user_membership)
Notification.new(user_membership).to_s
end
......
app/helpers/projects_helper.rb
View file @ 85ad95be
......@@ -117,7 +117,7 @@ module ProjectsHelper
nav_tabs << :merge_requests
end
if project.gitlab_ci? && can?(current_user, :read_build, project)
if project.builds_enabled? && can?(current_user, :read_build, project)
nav_tabs << :builds
end
......@@ -253,14 +253,6 @@ module ProjectsHelper
filename_path(project, :version)
end
def hidden_pass_url(original_url)
result = URI(original_url)
result.password = '*****' unless result.password.nil?
result
rescue
original_url
end
def project_wiki_path_with_version(proj, page, version, is_newest)
url_params = is_newest ? {} : { version_id: version }
namespace_project_wiki_path(proj.namespace, proj, page, url_params)
......
app/helpers/selects_helper.rb
View file @ 85ad95be
......@@ -35,8 +35,20 @@ module SelectsHelper
end
def groups_select_tag(id, opts = {})
css_class = "ajax-groups-select "
css_class << "multiselect " if opts[:multiple]
opts[:class] ||= ''
opts[:class] << ' ajax-groups-select'
select2_tag(id, opts)
end
def namespace_select_tag(id, opts = {})
opts[:class] ||= ''
opts[:class] << ' ajax-namespace-select'
select2_tag(id, opts)
end
def select2_tag(id, opts = {})
css_class = ''
css_class << 'multiselect ' if opts[:multiple]
css_class << (opts[:class] || '')
value = opts[:selected] || ''
......
app/mailers/emails/issues.rb
View file @ 85ad95be
module Emails
module Issues
def new_issue_email(recipient_id, issue_id)
@issue = Issue.find(issue_id)
@project = @issue.project
@target_url = namespace_project_issue_url(@project.namespace, @project, @issue)
mail_new_thread(@issue,
from: sender(@issue.author_id),
to: recipient(recipient_id),
subject: subject("#{@issue.title} (##{@issue.iid})"))
SentNotification.record(@issue, recipient_id, reply_key)
issue_mail_with_notification(issue_id, recipient_id) do
mail_new_thread(@issue, issue_thread_options(@issue.author_id, recipient_id))
end
end
def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id, updated_by_user_id)
@issue = Issue.find(issue_id)
issue_mail_with_notification(issue_id, recipient_id) do
@previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
@project = @issue.project
@target_url = namespace_project_issue_url(@project.namespace, @project, @issue)
mail_answer_thread(@issue,
from: sender(updated_by_user_id),
to: recipient(recipient_id),
subject: subject("#{@issue.title} (##{@issue.iid})"))
SentNotification.record(@issue, recipient_id, reply_key)
mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
end
end
def closed_issue_email(recipient_id, issue_id, updated_by_user_id)
@issue = Issue.find issue_id
@project = @issue.project
issue_mail_with_notification(issue_id, recipient_id) do
@updated_by = User.find updated_by_user_id
@target_url = namespace_project_issue_url(@project.namespace, @project, @issue)
mail_answer_thread(@issue,
from: sender(updated_by_user_id),
to: recipient(recipient_id),
subject: subject("#{@issue.title} (##{@issue.iid})"))
SentNotification.record(@issue, recipient_id, reply_key)
mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
end
end
def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id)
@issue = Issue.find issue_id
issue_mail_with_notification(issue_id, recipient_id) do
@issue_status = status
@project = @issue.project
@updated_by = User.find updated_by_user_id
@target_url = namespace_project_issue_url(@project.namespace, @project, @issue)
mail_answer_thread(@issue,
from: sender(updated_by_user_id),
mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
end
end
private
def issue_thread_options(sender_id, recipient_id)
{
from: sender(sender_id),
to: recipient(recipient_id),
subject: subject("#{@issue.title} (##{@issue.iid})"))
subject: subject("#{@issue.title} (##{@issue.iid})")
}
end
def issue_mail_with_notification(issue_id, recipient_id)
@issue = Issue.find(issue_id)
@project = @issue.project
@target_url = namespace_project_issue_url(@project.namespace, @project, @issue)
yield
SentNotification.record(@issue, recipient_id, reply_key)
end
......
app/mailers/emails/notes.rb
View file @ 85ad95be
module Emails
module Notes
def note_commit_email(recipient_id, note_id)
@note = Note.find(note_id)
note_mail_with_notification(note_id, recipient_id) do
@commit = @note.noteable
@project = @note.project
@target_url = namespace_project_commit_url(@project.namespace, @project,
@commit, anchor:
"note_#{@note.id}")
@target_url = namespace_project_commit_url(*note_target_url_options)
mail_answer_thread(@commit,
from: sender(@note.author_id),
to: recipient(recipient_id),
subject: subject("#{@commit.title} (#{@commit.short_id})"))
SentNotification.record_note(@note, recipient_id, reply_key)
end
end
def note_issue_email(recipient_id, note_id)
@note = Note.find(note_id)
note_mail_with_notification(note_id, recipient_id) do
@issue = @note.noteable
@project = @note.project
@target_url = namespace_project_issue_url(@project.namespace, @project,
@issue, anchor:
"note_#{@note.id}")
mail_answer_thread(@issue,
from: sender(@note.author_id),
to: recipient(recipient_id),
subject: subject("#{@issue.title} (##{@issue.iid})"))
SentNotification.record_note(@note, recipient_id, reply_key)
@target_url = namespace_project_issue_url(*note_target_url_options)
mail_answer_thread(@issue, note_thread_options(recipient_id))
end
end
def note_merge_request_email(recipient_id, note_id)
@note = Note.find(note_id)
note_mail_with_notification(note_id, recipient_id) do
@merge_request = @note.noteable
@project = @note.project
@target_url = namespace_project_merge_request_url(@project.namespace,
@project,
@merge_request, anchor:
"note_#{@note.id}")
mail_answer_thread(@merge_request,
@target_url = namespace_project_merge_request_url(*note_target_url_options)
mail_answer_thread(@merge_request, note_thread_options(recipient_id))
end
end
private
def note_target_url_options
[@project.namespace, @project, @note.noteable, anchor: "note_#{@note.id}"]
end
def note_thread_options(recipient_id)
{
from: sender(@note.author_id),
to: recipient(recipient_id),
subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
subject: subject("#{@note.noteable.title} (##{@note.noteable.iid})")
}
end
def note_mail_with_notification(note_id, recipient_id)
@note = Note.find(note_id)
@project = @note.project
yield
SentNotification.record_note(@note, recipient_id, reply_key)
SentNotification.record(@note, recipient_id, reply_key)
end
end
end
app/models/ability.rb
View file @ 85ad95be
class Ability
class << self
def allowed(user, subject)
return not_auth_abilities(user, subject) if user.nil?
return [] unless user.kind_of?(User)
return anonymous_abilities(user, subject) if user.nil?
return [] unless user.is_a?(User)
return [] if user.blocked?
case subject.class.name
......@@ -15,19 +15,30 @@ class Ability
when "Group" then group_abilities(user, subject)
when "Namespace" then namespace_abilities(user, subject)
when "GroupMember" then group_member_abilities(user, subject)
when "ProjectMember" then project_member_abilities(user, subject)
else []
end.concat(global_abilities(user))
end
# List of possible abilities
# for non-authenticated user
def not_auth_abilities(user, subject)
project = if subject.kind_of?(Project)
# List of possible abilities for anonymous user
def anonymous_abilities(user, subject)
case true
when subject.is_a?(PersonalSnippet)
anonymous_personal_snippet_abilities(subject)
when subject.is_a?(Project) || subject.respond_to?(:project)
anonymous_project_abilities(subject)
when subject.is_a?(Group) || subject.respond_to?(:group)
anonymous_group_abilities(subject)
else
[]
end
end
def anonymous_project_abilities(subject)
project = if subject.is_a?(Project)
subject
elsif subject.respond_to?(:project)
subject.project
else
nil
subject.project
end
if project && project.public?
......@@ -47,12 +58,15 @@ class Ability
rules - project_disabled_features_rules(project)
else
group = if subject.kind_of?(Group)
[]
end
end
def anonymous_group_abilities(subject)
group = if subject.is_a?(Group)
subject
elsif subject.respond_to?(:group)
subject.group
else
nil
subject.group
end
if group && group.public_profile?
......@@ -61,6 +75,13 @@ class Ability
[]
end
end
def anonymous_personal_snippet_abilities(snippet)
if snippet.public?
[:read_personal_snippet]
else
[]
end
end
def global_abilities(user)
......@@ -154,6 +175,7 @@ class Ability
:create_merge_request,
:create_wiki,
:manage_builds,
:download_build_artifacts,
:push_code
]
end
......@@ -230,18 +252,19 @@ class Ability
# Only group masters and group owners can create new projects in group
if group.has_master?(user) || group.has_owner?(user) || user.admin?
rules.push(*[
rules += [
:create_projects,
])
:admin_milestones
]
end
# Only group owner and administrators can admin group
if group.has_owner?(user) || user.admin?
rules.push(*[
rules += [
:admin_group,
:admin_namespace,
:admin_group_member
])
]
end
rules.flatten
......@@ -252,16 +275,15 @@ class Ability
# Only namespace owner and administrators can admin it
if namespace.owner == user || user.admin?
rules.push(*[
rules += [
:create_projects,
:admin_namespace
])
]
end
rules.flatten
end
[:issue, :merge_request].each do |name|
define_method "#{name}_abilities" do |user, subject|
rules = []
......@@ -278,7 +300,7 @@ class Ability
end
end
[:note, :project_snippet, :personal_snippet].each do |name|
[:note, :project_snippet].each do |name|
define_method "#{name}_abilities" do |user, subject|
rules = []
......@@ -298,20 +320,62 @@ class Ability
end
end
def personal_snippet_abilities(user, snippet)
rules = []
if snippet.author == user
rules += [
:read_personal_snippet,
:update_personal_snippet,
:admin_personal_snippet
]
end
if snippet.public? || snippet.internal?
rules << :read_personal_snippet
end
rules
end
def group_member_abilities(user, subject)
rules = []
target_user = subject.user
group = subject.group
unless group.last_owner?(target_user)
can_manage = group_abilities(user, group).include?(:admin_group_member)
if can_manage && (user != target_user)
if can_manage && user != target_user
rules << :update_group_member
rules << :destroy_group_member
end
if !group.last_owner?(user) && (can_manage || (user == target_user))
if user == target_user
rules << :destroy_group_member
end
end
rules
end
def project_member_abilities(user, subject)
rules = []
target_user = subject.user
project = subject.project
unless target_user == project.owner
can_manage = project_abilities(user, project).include?(:admin_project_member)
if can_manage && user != target_user
rules << :update_project_member
rules << :destroy_project_member
end
if user == target_user
rules << :destroy_project_member
end
end
rules
end
......
app/models/application_setting.rb
View file @ 85ad95be
......@@ -23,6 +23,10 @@
# after_sign_out_path :string(255)
# session_expire_delay :integer default(10080), not null
# import_sources :text
# help_page_text :text
# admin_notification_email :string(255)
# shared_runners_enabled :boolean default(TRUE), not null
# max_artifacts_size :integer default(100), not null
#
class ApplicationSetting < ActiveRecord::Base
......@@ -68,9 +72,15 @@ class ApplicationSetting < ActiveRecord::Base
end
end
after_commit do
Rails.cache.write('application_setting.last', self)
end
def self.current
Rails.cache.fetch('application_setting.last') do
ApplicationSetting.last
end
end
def self.create_from_defaults
create(
......@@ -87,7 +97,9 @@ class ApplicationSetting < ActiveRecord::Base
default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'],
default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'],
restricted_signup_domains: Settings.gitlab['restricted_signup_domains'],
import_sources: ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git']
import_sources: ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git'],
shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'],
max_artifacts_size: Settings.gitlab_ci['max_artifacts_size'],
)
end
......
app/models/ci/application_setting.rb
View file @ 85ad95be
# == Schema Information
#
# Table name: application_settings
# Table name: ci_application_settings
#
# id :integer not null, primary key
# all_broken_builds :boolean
......@@ -13,9 +13,15 @@ module Ci
class ApplicationSetting < ActiveRecord::Base
extend Ci::Model
after_commit do
Rails.cache.write('ci_application_setting.last', self)
end
def self.current
Rails.cache.fetch('ci_application_setting.last') do
Ci::ApplicationSetting.last
end
end
def self.create_from_defaults
create(
......
app/models/ci/build.rb
View file @ 85ad95be
# == Schema Information
#
# Table name: builds
# Table name: ci_builds
#
# id :integer not null, primary key
# project_id :integer
......@@ -11,16 +11,24 @@
# updated_at :datetime
# started_at :datetime
# runner_id :integer
# commit_id :integer
# coverage :float
# commit_id :integer
# commands :text
# job_id :integer
# name :string(255)
# deploy :boolean default(FALSE)
# options :text
# allow_failure :boolean default(FALSE), not null
# stage :string(255)
# deploy :boolean default(FALSE)
# trigger_request_id :integer
# stage_idx :integer
# tag :boolean
# ref :string(255)
# user_id :integer
# type :string(255)
# target_url :string(255)
# description :string(255)
# artifacts_file :text
#
module Ci
......@@ -39,6 +47,8 @@ module Ci
scope :ignore_failures, ->() { where(allow_failure: false) }
scope :similar, ->(build) { where(ref: build.ref, tag: build.tag, trigger_request_id: build.trigger_request_id) }
mount_uploader :artifacts_file, ArtifactUploader
acts_as_taggable
# To prevent db load megabytes of data from trace
......@@ -217,6 +227,14 @@ module Ci
"#{dir_to_trace}/#{id}.log"
end
def token
project.token
end
def valid_token? token
project.valid_token? token
end
def target_url
Gitlab::Application.routes.url_helpers.
namespace_project_build_url(gl_project.namespace, gl_project, self)
......@@ -248,6 +266,13 @@ module Ci
pending? && !any_runners_online?
end
def download_url
if artifacts_file.exists?
Gitlab::Application.routes.url_helpers.
download_namespace_project_build_path(gl_project.namespace, gl_project, self)
end
end
private
def yaml_variables
......
app/models/ci/commit.rb
View file @ 85ad95be
# == Schema Information
#
# Table name: commits
# Table name: ci_commits
#
# id :integer not null, primary key
# project_id :integer
......@@ -13,6 +13,7 @@
# tag :boolean default(FALSE)
# yaml_errors :text
# committed_at :datetime
# gl_project_id :integer
#
module Ci
......@@ -187,13 +188,13 @@ module Ci
end
def config_processor
return nil unless ci_yaml_file
@config_processor ||= Ci::GitlabCiYamlProcessor.new(ci_yaml_file, gl_project.path_with_namespace)
rescue Ci::GitlabCiYamlProcessor::ValidationError => e
rescue Ci::GitlabCiYamlProcessor::ValidationError, Psych::SyntaxError => e
save_yaml_error(e.message)
nil
rescue Exception => e
logger.error e.message + "\n" + e.backtrace.join("\n")
save_yaml_error("Undefined yaml error")
rescue
save_yaml_error("Undefined error")
nil
end
......
app/models/ci/event.rb
View file @ 85ad95be
This diff is collapsed.
app/models/ci/project.rb
View file @ 85ad95be
This diff is collapsed.
app/models/ci/runner.rb
View file @ 85ad95be
This diff is collapsed.
app/models/ci/runner_project.rb
View file @ 85ad95be
This diff is collapsed.
app/models/ci/service.rb
View file @ 85ad95be
This diff is collapsed.
app/models/ci/trigger.rb
View file @ 85ad95be
This diff is collapsed.
app/models/ci/trigger_request.rb
View file @ 85ad95be
This diff is collapsed.
app/models/ci/variable.rb
View file @ 85ad95be
This diff is collapsed.
app/models/ci/web_hook.rb
View file @ 85ad95be
This diff is collapsed.
app/models/commit_status.rb
View file @ 85ad95be
This diff is collapsed.
app/models/concerns/issuable.rb
View file @ 85ad95be
This diff is collapsed.
app/models/concerns/sortable.rb
View file @ 85ad95be
This diff is collapsed.
app/models/event.rb
View file @ 85ad95be
This diff is collapsed.
app/models/generic_commit_status.rb
View file @ 85ad95be
This diff is collapsed.
app/models/group.rb
View file @ 85ad95be
This diff is collapsed.
app/models/hooks/project_hook.rb
View file @ 85ad95be
This diff is collapsed.
app/models/hooks/service_hook.rb
View file @ 85ad95be
This diff is collapsed.
app/models/hooks/system_hook.rb
View file @ 85ad95be
This diff is collapsed.
app/models/hooks/web_hook.rb
View file @ 85ad95be
This diff is collapsed.
app/models/label.rb
View file @ 85ad95be
This diff is collapsed.
app/models/lfs_object.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/models/lfs_objects_project.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/models/member.rb
View file @ 85ad95be
This diff is collapsed.
app/models/merge_request.rb
View file @ 85ad95be
This diff is collapsed.
app/models/merge_request_diff.rb
View file @ 85ad95be
This diff is collapsed.
app/models/namespace.rb
View file @ 85ad95be
This diff is collapsed.
app/models/note.rb
View file @ 85ad95be
This diff is collapsed.
app/models/project.rb
View file @ 85ad95be
This diff is collapsed.
app/models/project_wiki.rb
View file @ 85ad95be
This diff is collapsed.
app/models/release.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/models/repository.rb
View file @ 85ad95be
This diff is collapsed.
app/models/user.rb
View file @ 85ad95be
This diff is collapsed.
app/services/compare_service.rb
View file @ 85ad95be
This diff is collapsed.
app/services/create_tag_service.rb
View file @ 85ad95be
This diff is collapsed.
app/services/delete_tag_service.rb
View file @ 85ad95be
This diff is collapsed.
app/services/git_push_service.rb
View file @ 85ad95be
This diff is collapsed.
app/services/issuable_base_service.rb
View file @ 85ad95be
This diff is collapsed.
app/services/issues/update_service.rb
View file @ 85ad95be
This diff is collapsed.
app/services/labels/group_service.rb deleted 100644 → 0
View file @ 1144b70a
This diff is collapsed.
app/services/milestones/group_service.rb deleted 100644 → 0
View file @ 1144b70a
This diff is collapsed.
app/services/notes/create_service.rb
View file @ 85ad95be
This diff is collapsed.
app/services/notification_service.rb
View file @ 85ad95be
This diff is collapsed.
app/services/projects/create_service.rb
View file @ 85ad95be
This diff is collapsed.
app/services/projects/fork_service.rb
View file @ 85ad95be
This diff is collapsed.
app/services/system_hooks_service.rb
View file @ 85ad95be
This diff is collapsed.
app/uploaders/artifact_uploader.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/uploaders/attachment_uploader.rb
View file @ 85ad95be
This diff is collapsed.
app/uploaders/avatar_uploader.rb
View file @ 85ad95be
This diff is collapsed.
app/uploaders/file_uploader.rb
View file @ 85ad95be
This diff is collapsed.
app/uploaders/lfs_object_uploader.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/uploaders/uploader_helper.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/admin/labels/_form.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/admin/users/_head.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/admin/users/_profile.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/ci/lints/show.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/groups/milestones/index.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/groups/milestones/new.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/groups/milestones/show.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/groups/show.atom.builder
View file @ 85ad95be
This diff is collapsed.
app/views/help/_shortcuts.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/import/bitbucket/status.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/import/fogbugz/status.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/import/github/status.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/import/gitlab/status.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/import/gitorious/status.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/layouts/_piwik.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/layouts/_search.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/layouts/header/_default.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/layouts/nav/_project.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/layouts/notify.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/_activity.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/_home_panel.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/_zen.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/blob/_actions.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/blob/_new_dir.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/blob/_remove.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/blob/_upload.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/blob/edit.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/blob/new.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/blob/show.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/builds/show.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/buttons/_download.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/projects/buttons/_fork.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/buttons/_star.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/commit/show.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/commits/_head.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/diffs/_diffs.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/diffs/_file.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/edit.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/graphs/_head.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/graphs/ci.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/graphs/ci/_builds.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/graphs/ci/_overall.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/graphs/commits.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/graphs/show.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/hooks/index.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/imports/new.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/imports/show.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/issues/_issue.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/new.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/notes/_form.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/notes/_note.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/releases/edit.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/projects/show.atom.builder
View file @ 85ad95be
This diff is collapsed.
app/views/projects/tags/_download.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/projects/tags/_tag.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/tags/destroy.js.haml deleted 100644 → 0
View file @ 1144b70a
This diff is collapsed.
app/views/projects/tags/new.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/projects/tags/show.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/projects/wikis/_form.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/shared/_clone_panel.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/shared/_confirm_modal.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/shared/_import_form.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/shared/_new_commit_form.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/shared/issuable/_filter.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/shared/issuable/_form.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/shared/projects/_list.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/sherlock/file_samples/show.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/sherlock/queries/_backtrace.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/sherlock/queries/_general.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/sherlock/queries/show.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/sherlock/transactions/_file_samples.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/sherlock/transactions/_general.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/sherlock/transactions/_queries.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/sherlock/transactions/index.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/sherlock/transactions/show.html.haml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
app/views/users/show.atom.builder
View file @ 85ad95be
This diff is collapsed.
app/views/users/show.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/votes/_votes_block.html.haml
View file @ 85ad95be
This diff is collapsed.
app/views/votes/_votes_inline.html.haml deleted 100644 → 0
View file @ 1144b70a
This diff is collapsed.
app/workers/repository_fork_worker.rb
View file @ 85ad95be
This diff is collapsed.
app/workers/repository_import_worker.rb
View file @ 85ad95be
This diff is collapsed.
config/environments/test.rb
View file @ 85ad95be
This diff is collapsed.
config/gitlab.yml.example
View file @ 85ad95be
This diff is collapsed.
config/initializers/1_settings.rb
View file @ 85ad95be
This diff is collapsed.
config/initializers/rack_profiler.rb deleted 100644 → 0
View file @ 1144b70a
This diff is collapsed.
config/initializers/session_store.rb
View file @ 85ad95be
This diff is collapsed.
config/initializers/sherlock.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
config/initializers/state_machine_patch.rb deleted 100644 → 0
View file @ 1144b70a
This diff is collapsed.
config/locales/sherlock.en.yml 0 → 100644
View file @ 85ad95be
This diff is collapsed.
config/routes.rb
View file @ 85ad95be
This diff is collapsed.
db/migrate/20151013092124_add_artifacts_file_to_builds.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
db/migrate/20151103133339_add_shared_runners_setting.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
db/migrate/20151103134857_create_lfs_objects.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
db/migrate/20151103134958_create_lfs_objects_projects.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
db/migrate/20151104105513_add_file_to_lfs_objects.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
db/migrate/20151105094515_create_releases.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
db/migrate/20151106000015_add_is_award_to_notes.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
db/migrate/20151109134526_add_issues_state_index.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
db/migrate/20151110125604_add_import_error_to_project.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
db/migrate/20151114113410_add_index_for_lfs_oid_and_size.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
db/migrate/20151116144118_add_unique_for_lfs_oid_index.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
db/migrate/20151118162244_add_projects_public_index.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
db/schema.rb
View file @ 85ad95be
This diff is collapsed.
doc/api/commits.md
View file @ 85ad95be
This diff is collapsed.
doc/api/merge_requests.md
View file @ 85ad95be
This diff is collapsed.
doc/api/notes.md
View file @ 85ad95be
This diff is collapsed.
doc/api/projects.md
View file @ 85ad95be
This diff is collapsed.
doc/api/repositories.md
View file @ 85ad95be
This diff is collapsed.
doc/api/tags.md 0 → 100644
View file @ 85ad95be
This diff is collapsed.
doc/ci/docker/using_docker_build.md
View file @ 85ad95be
This diff is collapsed.
doc/ci/quick_start/README.md
View file @ 85ad95be
This diff is collapsed.
doc/ci/yaml/README.md
View file @ 85ad95be
This diff is collapsed.
doc/customization/libravatar.md
View file @ 85ad95be
This diff is collapsed.
doc/development/architecture.md
View file @ 85ad95be
This diff is collapsed.
doc/development/profiling.md
View file @ 85ad95be
This diff is collapsed.
doc/hooks/custom_hooks.md
View file @ 85ad95be
This diff is collapsed.
doc/install/database_mysql.md
View file @ 85ad95be
This diff is collapsed.
doc/install/installation.md
View file @ 85ad95be
This diff is collapsed.
doc/integration/ldap.md
View file @ 85ad95be
This diff is collapsed.
doc/integration/omniauth.md
View file @ 85ad95be
This diff is collapsed.
doc/markdown/markdown.md
View file @ 85ad95be
This diff is collapsed.
doc/operations/unicorn.md
View file @ 85ad95be
This diff is collapsed.
doc/raketasks/backup_restore.md
View file @ 85ad95be
This diff is collapsed.
doc/release/monthly.md
View file @ 85ad95be
This diff is collapsed.
doc/release/security.md
View file @ 85ad95be
This diff is collapsed.
doc/ssh/README.md
View file @ 85ad95be
This diff is collapsed.
doc/update/6.x-or-7.x-to-7.14.md
View file @ 85ad95be
This diff is collapsed.
doc/update/8.1-to-8.2.md
View file @ 85ad95be
This diff is collapsed.
doc/update/mysql_to_postgresql.md
View file @ 85ad95be
This diff is collapsed.
doc/workflow/README.md
View file @ 85ad95be
This diff is collapsed.
doc/workflow/git_lfs.md 0 → 100644
View file @ 85ad95be
This diff is collapsed.
doc/workflow/gitlab_flow.md
View file @ 85ad95be
This diff is collapsed.
doc/workflow/merge_requests.md
View file @ 85ad95be
This diff is collapsed.
doc/workflow/merge_requests/commit_compare.png 0 → 100644
View file @ 85ad95be
This diff is collapsed.
doc/workflow/merge_requests/merge_request_diff.png 0 → 100644
View file @ 85ad95be
This diff is collapsed.
doc/workflow/milestones.md 0 → 100644
View file @ 85ad95be
This diff is collapsed.
doc/workflow/milestones/form.png 0 → 100644
View file @ 85ad95be
This diff is collapsed.
doc/workflow/milestones/group_form.png 0 → 100644
View file @ 85ad95be
This diff is collapsed.
doc/workflow/releases.md 0 → 100644
View file @ 85ad95be
This diff is collapsed.
doc/workflow/releases/new_tag.png 0 → 100644
View file @ 85ad95be
This diff is collapsed.
doc/workflow/releases/tags.png 0 → 100644
View file @ 85ad95be
This diff is collapsed.
features/groups.feature
View file @ 85ad95be
This diff is collapsed.
features/project/commits/tags.feature
View file @ 85ad95be
This diff is collapsed.
features/project/issues/award_emoji.feature 0 → 100644
View file @ 85ad95be
This diff is collapsed.
features/project/merge_requests.feature
View file @ 85ad95be
This diff is collapsed.
features/steps/dashboard/new_project.rb
View file @ 85ad95be
This diff is collapsed.
features/steps/groups.rb
View file @ 85ad95be
This diff is collapsed.
features/steps/project/commits/tags.rb
View file @ 85ad95be
This diff is collapsed.
features/steps/project/graph.rb
View file @ 85ad95be
This diff is collapsed.
features/steps/project/issues/award_emoji.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
features/steps/project/merge_requests.rb
View file @ 85ad95be
This diff is collapsed.
features/steps/shared/paths.rb
View file @ 85ad95be
This diff is collapsed.
lib/api/api.rb
View file @ 85ad95be
This diff is collapsed.
lib/api/entities.rb
View file @ 85ad95be
This diff is collapsed.
lib/api/helpers.rb
View file @ 85ad95be
This diff is collapsed.
lib/api/projects.rb
View file @ 85ad95be
This diff is collapsed.
lib/api/repositories.rb
View file @ 85ad95be
This diff is collapsed.
lib/api/tags.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/award_emoji.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/backup/artifacts.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/backup/manager.rb
View file @ 85ad95be
This diff is collapsed.
lib/ci/api/api.rb
View file @ 85ad95be
This diff is collapsed.
lib/ci/api/builds.rb
View file @ 85ad95be
This diff is collapsed.
lib/ci/api/entities.rb
View file @ 85ad95be
This diff is collapsed.
lib/ci/api/helpers.rb
View file @ 85ad95be
This diff is collapsed.
lib/ci/charts.rb
View file @ 85ad95be
This diff is collapsed.
lib/ci/gitlab_ci_yaml_processor.rb
View file @ 85ad95be
This diff is collapsed.
lib/file_streamer.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/backend/grack_auth.rb
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/backend/shell.rb
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/compare_result.rb
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/current_settings.rb
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/github_import/importer.rb
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/google_code_import/importer.rb
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/inline_diff.rb
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/lfs/response.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/lfs/router.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/markdown/abstract_reference_filter.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/markdown/relative_link_filter.rb
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/sherlock.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/sherlock/collection.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/sherlock/file_sample.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/sherlock/line_profiler.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/sherlock/line_sample.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/sherlock/location.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/sherlock/middleware.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/sherlock/query.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/sherlock/transaction.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/gitlab/sql/union.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/support/nginx/gitlab
View file @ 85ad95be
This diff is collapsed.
lib/support/nginx/gitlab-ssl
View file @ 85ad95be
This diff is collapsed.
lib/tasks/flay.rake 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/tasks/flog.rake 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/tasks/gitlab/backup.rake
View file @ 85ad95be
This diff is collapsed.
lib/tasks/grape.rake 0 → 100644
View file @ 85ad95be
This diff is collapsed.
lib/uploaded_file.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/benchmarks/finders/issues_finder_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/controllers/snippets_controller_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/controllers/users_controller_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/factories.rb
View file @ 85ad95be
This diff is collapsed.
spec/factories/ci/projects.rb
View file @ 85ad95be
This diff is collapsed.
spec/factories/labels.rb
View file @ 85ad95be
This diff is collapsed.
spec/factories/lfs_objects.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/factories/lfs_objects_projects.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/factories/merge_requests.rb
View file @ 85ad95be
This diff is collapsed.
spec/factories/releases.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/features/admin/admin_users_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/features/builds_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/features/commits_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/features/runners_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/finders/contributed_projects_finder_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/finders/group_finder_spec.rb deleted 100644 → 0
View file @ 1144b70a
This diff is collapsed.
spec/finders/groups_finder_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/finders/joined_groups_finder_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/finders/personal_projects_finder_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/finders/projects_finder_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/helpers/issues_helper_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/lib/gitlab/lfs/lfs_router_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/lib/gitlab/sherlock/collection_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/lib/gitlab/sherlock/file_sample_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/lib/gitlab/sherlock/line_profiler_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/lib/gitlab/sherlock/line_sample_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/lib/gitlab/sherlock/location_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/lib/gitlab/sherlock/middleware_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/lib/gitlab/sherlock/query_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/lib/gitlab/sherlock/transaction_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/lib/gitlab/sql/union_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/lib/votes_spec.rb deleted 100644 → 0
View file @ 1144b70a
This diff is collapsed.
spec/models/application_setting_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/build_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/ci/commit_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/ci/project_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/ci/runner_project_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/ci/runner_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/ci/service_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/ci/trigger_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/ci/variable_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/ci/web_hook_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/commit_status_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/event_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/generic_commit_status_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/group_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/label_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/namespace_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/note_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/project_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/project_wiki_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/models/release_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/models/user_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/requests/api/commit_status_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/requests/api/projects_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/requests/api/repositories_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/requests/api/services_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/requests/api/tags_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/requests/api/users_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/requests/ci/api/builds_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/requests/ci/api/commits_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/requests/ci/api/projects_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/requests/ci/api/triggers_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/services/issues/update_service_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/services/milestones/close_service_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/services/milestones/create_service_spec.rb 0 → 100644
View file @ 85ad95be
This diff is collapsed.
spec/services/notes/create_service_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/services/projects/fork_service_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/tasks/gitlab/backup_rake_spec.rb
View file @ 85ad95be
This diff is collapsed.
spec/workers/repository_fork_worker_spec.rb
View file @ 85ad95be
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