Skip to content

G
gitlab-ce
Commit 9f2f6f12 authored by Valery Sizov's avatar Valery Sizov
Browse files
Options

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

parents 9417c5d0 e77a9a34
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2493 additions and 3225 deletions
.rubocop.yml
View file @ 9f2f6f12
......@@ -937,10 +937,9 @@ Lint/Void:
##################### Performance ############################
# TODO: Enable Casecmp Cop.
# Use `casecmp` rather than `downcase ==`.
Performance/Casecmp:
Enabled: false
Enabled: true
# TODO: Enable DoubleStartEndWith Cop.
# Use `str.{start,end}_with?(x, ..., y, ...)` instead of
......@@ -990,11 +989,12 @@ Performance/RedundantSortBy:
# string.
Performance/StartWith:
Enabled: false
# Use `tr` instead of `gsub` when you are replacing the same number of
# characters. Use `delete` instead of `gsub` when you are deleting
# characters.
Performance/StringReplacement:
Enabled: false
Enabled: true
# TODO: Enable TimesMap Cop.
# Checks for `.times.map` calls.
......
CHANGELOG
View file @ 9f2f6f12
Please view this file on the master branch, on stable branches it's out of date.
v 8.8.0 (unreleased)
- Fix error when using link to uploads in global snippets
- Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
- Use a case-insensitive comparison in sanitizing URI schemes
- Project#open_branches has been cleaned up and no longer loads entire records into memory.
- Escape HTML in commit titles in system note messages
- Improve multiple branch push performance by memoizing permission checking
- Log to application.log when an admin starts and stops impersonating a user
- Updated gitlab_git to 10.1.0
- GitAccess#protected_tag? no longer loads all tags just to check if a single one exists
- Reduce delay in destroying a project from 1-minute to immediately
- Make build status canceled if any of the jobs was canceled and none failed
- Upgrade Sidekiq to 4.1.2
- Sanitize repo paths in new project error message
- Bump mail_room to 0.7.0 to fix stuck IDLE connections
- Remove future dates from contribution calendar graph.
- Support e-mail notifications for comments on project snippets
- Use ActionDispatch Remote IP for Akismet checking
- Fix error when visiting commit builds page before build was updated
- Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project
- Update SVG sanitizer to conform to SVG 1.1
- Updated search UI
- Display informative message when new milestone is created
- Sanitize milestones and labels titles
- Support multi-line tag messages. !3833 (Calin Seciu)
- Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
- Added button to toggle whitespaces changes on diff view
- Backport GitLab Enterprise support from EE
- Backport GitHub Enterprise import support from EE
- Create tags using Rugged for performance reasons. !3745
- API: Expose Issue#user_notes_count. !3126 (Anton Popov)
- Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
- Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
- Add eager load paths to help prevent dependency load issues in Sidekiq workers. !3724
- Added multiple colors for labels in dropdowns when dups happen.
- Improve description for the Two-factor Authentication sign-in screen. (Connor Shea)
- API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
- Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
- Expire repository exists? and has_visible_content? caches after a push if necessary
- Fix unintentional filtering bug in issues sorted by milestone due (Takuya Noguchi)
- Fix adding a todo for private group members (Ahmad Sherif)
- Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
v 8.7.4
- Fix always showing build notification message when switching between merge requests
- Links for Redmine issue references are generated correctly again (Benedikt Huss)
- Fix an issue when filtering merge requests with more than one label. !3886
v 8.7.3
- Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
- Merge request widget displays TeamCity build state and code coverage correctly again.
- Fix the line code when importing PR review comments from GitHub. !4010
- Wikis are now initialized on legacy projects when checking repositories
v 8.7.2
- The "New Branch" button is now loaded asynchronously
- Fix error 500 when trying to create a wiki page
- Updated spacing between notification label and button
- Label titles in filters are now escaped properly
v 8.7.1
- Throttle the update of `project.last_activity_at` to 1 minute. !3848
......
Gemfile
View file @ 9f2f6f12
......@@ -207,7 +207,7 @@ gem 'licensee', '~> 8.0.0'
gem "rack-attack", '~> 4.3.1'
# Ace editor
gem 'ace-rails-ap', '~> 2.0.1'
gem 'ace-rails-ap', '~> 4.0.2'
# Keyboard shortcuts
gem 'mousetrap-rails', '~> 1.4.6'
......@@ -228,7 +228,6 @@ gem 'gitlab_emoji', '~> 0.3.0'
gem 'gon', '~> 6.0.1'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.1.0'
gem 'jquery-scrollto-rails', '~> 1.4.3'
gem 'jquery-ui-rails', '~> 5.0.0'
gem 'raphael-rails', '~> 2.1.2'
gem 'request_store', '~> 1.3.0'
......@@ -252,7 +251,6 @@ group :development do
gem "foreman"
gem 'brakeman', '~> 3.2.0', require: false
gem "annotate", "~> 2.7.0"
gem 'letter_opener_web', '~> 1.3.0'
gem 'quiet_assets', '~> 1.0.2'
gem 'rerun', '~> 0.11.0'
......@@ -330,7 +328,7 @@ gem "newrelic_rpm", '~> 3.14'
gem 'octokit', '~> 4.3.0'
gem "mail_room", "~> 0.6.1"
gem "mail_room", "~> 0.7"
gem 'email_reply_parser', '~> 0.5.8'
......
Gemfile.lock
View file @ 9f2f6f12
......@@ -3,7 +3,7 @@ GEM
specs:
CFPropertyList (2.3.2)
RedCloth (4.2.9)
ace-rails-ap (2.0.1)
ace-rails-ap (4.0.2)
actionmailer (4.2.6)
actionpack (= 4.2.6)
actionview (= 4.2.6)
......@@ -51,9 +51,6 @@ GEM
activerecord (>= 3.0)
akismet (2.0.0)
allocations (1.0.4)
annotate (2.7.0)
activerecord (>= 3.2, < 6.0)
rake (~> 10.4)
arel (6.0.3)
asana (0.4.0)
faraday (~> 0.9)
......@@ -134,7 +131,7 @@ GEM
execjs
coffee-script-source (1.10.0)
colorize (0.7.7)
concurrent-ruby (1.0.1)
concurrent-ruby (1.0.2)
connection_pool (2.2.0)
coveralls (0.8.13)
json (~> 1.8)
......@@ -375,7 +372,7 @@ GEM
gitlab-license (0.0.4)
gitlab_emoji (0.3.1)
gemojione (~> 2.2, >= 2.2.1)
gitlab_git (10.0.2)
gitlab_git (10.1.0)
activesupport (~> 4.0)
charlock_holmes (~> 0.7.3)
github-linguist (~> 4.7.0)
......@@ -459,8 +456,6 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-scrollto-rails (1.4.3)
railties (> 3.1, < 5.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
......@@ -491,7 +486,7 @@ GEM
systemu (~> 2.6.2)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mail_room (0.6.1)
mail_room (0.7.0)
method_source (0.8.2)
mime-types (2.99.1)
mimemagic (0.3.0)
......@@ -764,7 +759,7 @@ GEM
rack
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
sidekiq (4.1.1)
sidekiq (4.1.2)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
redis (~> 3.2, >= 3.2.1)
......@@ -912,7 +907,7 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.2.9)
ace-rails-ap (~> 2.0.1)
ace-rails-ap (~> 4.0.2)
activerecord-deprecated_finders (~> 1.0.3)
activerecord-session_store (~> 0.1.0)
acts-as-taggable-on (~> 3.4)
......@@ -920,7 +915,6 @@ DEPENDENCIES
after_commit_queue
akismet (~> 2.0)
allocations (~> 1.0)
annotate (~> 2.7.0)
asana (~> 0.4.0)
asciidoctor (~> 1.5.2)
attr_encrypted (~> 1.3.4)
......@@ -989,14 +983,13 @@ DEPENDENCIES
influxdb (~> 0.2)
jquery-atwho-rails (~> 1.3.2)
jquery-rails (~> 4.1.0)
jquery-scrollto-rails (~> 1.4.3)
jquery-turbolinks (~> 2.1.0)
jquery-ui-rails (~> 5.0.0)
kaminari (~> 0.16.3)
letter_opener_web (~> 1.3.0)
licensee (~> 8.0.0)
loofah (~> 2.0.3)
mail_room (~> 0.6.1)
mail_room (~> 0.7)
method_source (~> 0.8)
minitest (~> 5.7.0)
mousetrap-rails (~> 1.4.6)
......@@ -1095,4 +1088,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
1.12.1
1.12.3
README.md
View file @ 9f2f6f12
# GitLab
[![build status](https://ci.gitlab.com/projects/1/status.svg?ref=master)](https://ci.gitlab.com/projects/1?ref=master)
[![build status](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/build.svg)](https://gitlab.com/gitlab-org/gitlab-ce/commits/master)
[![Build Status](https://semaphoreci.com/api/v1/projects/2f1a5809-418b-4cc2-a1f4-819607579fe7/400484/shields_badge.svg)](https://semaphoreci.com/gitlabhq/gitlabhq)
[![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
[![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.svg?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq?branch=master)
......@@ -50,6 +50,10 @@ To see how GitLab looks please see the [features page on our website](https://ab
- Completely free and open source (MIT Expat license)
- Powered by [Ruby on Rails](https://github.com/rails/rails)
## Hiring
We're hiring developers, support people, and production engineers all the time, please see our [jobs page](https://about.gitlab.com/jobs/).
## Editions
There are two editions of GitLab:
......@@ -61,11 +65,11 @@ There are two editions of GitLab:
On [about.gitlab.com](https://about.gitlab.com/) you can find more information about:
- [Subscriptions](https://about.gitlab.com/subscription/)
- [Subscriptions](https://about.gitlab.com/pricing/)
- [Consultancy](https://about.gitlab.com/consultancy/)
- [Community](https://about.gitlab.com/community/)
- [Hosted GitLab.com](https://about.gitlab.com/gitlab-com/) use GitLab as a free service
- [GitLab Enterprise Edition](https://about.gitlab.com/gitlab-ee/) with additional features aimed at larger organizations.
- [GitLab Enterprise Edition](https://about.gitlab.com/features/#enterprise) with additional features aimed at larger organizations.
- [GitLab CI](https://about.gitlab.com/gitlab-ci/) a continuous integration (CI) server that is easy to integrate with GitLab.
## Requirements
......
app/assets/javascripts/application.js.coffee
View file @ 9f2f6f12
......@@ -207,6 +207,7 @@ $ ->
$('.header-content .title').toggle()
$('.header-content .navbar-collapse').toggle()
$('.navbar-toggle').toggleClass('active')
$('.navbar-toggle i').toggleClass("fa-angle-right fa-angle-left")
# Show/hide comments on diff
$("body").on "click", ".js-toggle-diff-comments", (e) ->
......
app/assets/javascripts/ci/application.js.coffee
View file @ 9f2f6f12
# This is a manifest file that'll be compiled into application.js, which will include all the files
# listed below.
#
# Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
# or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
#
# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
# the compiled file.
#
# WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
# GO AFTER THE REQUIRES BELOW.
#
#= require pager
#= require jquery_nested_form
#= require_tree .
#
$(document).on 'click', '.edit-runner-link', (event) ->
event.preventDefault()
descr = $(this).closest('.runner-description').first()
descr.addClass('hide')
form = descr.next('.runner-description-form')
descrInput = form.find('input.description')
originalValue = descrInput.val()
form.removeClass('hide')
form.find('.cancel').on 'click', (event) ->
event.preventDefault()
form.addClass('hide')
descrInput.val(originalValue)
descr.removeClass('hide')
$(document).on 'click', '.assign-all-runner', ->
$(this).replaceWith('<i class="fa fa-refresh fa-spin"></i> Assign in progress..')
......
app/assets/javascripts/merge_request_widget.js.coffee
View file @ 9f2f6f12
......@@ -9,11 +9,12 @@ class @MergeRequestWidget
constructor: (@opts) ->
$('#modal_merge_info').modal(show: false)
@firstCICheck = true
@readyForCICheck = true
@readyForCICheck = false
clearInterval @fetchBuildStatusInterval
@clearEventListeners()
@addEventListeners()
@getCIStatus(false)
@pollCIStatus()
notifyPermissions()
......@@ -79,20 +80,18 @@ class @MergeRequestWidget
$.getJSON @opts.ci_status_url, (data) =>
@readyForCICheck = true
if @firstCICheck
@firstCICheck = false
@opts.ci_status = data.status
if @opts.ci_status is ''
@opts.ci_status = data.status
if data.status is ''
return
if data.status isnt @opts.ci_status and data.status?
if @firstCICheck || data.status isnt @opts.ci_status and data.status?
@opts.ci_status = data.status
@showCIStatus data.status
if data.coverage
@showCICoverage data.coverage
if showNotification
# The first check should only update the UI, a notification
# should only be displayed on status changes
if showNotification and not @firstCICheck
status = @ciLabelForStatus(data.status)
if status is "preparing"
......@@ -115,8 +114,7 @@ class @MergeRequestWidget
@close()
Turbolinks.visit _this.opts.builds_path
)
@opts.ci_status = data.status
@firstCICheck = false
showCIStatus: (state) ->
$('.ci_widget').hide()
......
app/assets/javascripts/shortcuts_issuable.coffee
View file @ 9f2f6f12
......@@ -6,6 +6,10 @@ class @ShortcutsIssuable extends ShortcutsNavigation
super()
Mousetrap.bind('a', @openSidebarDropdown.bind(@, 'assignee'))
Mousetrap.bind('m', @openSidebarDropdown.bind(@, 'milestone'))
Mousetrap.bind('r', =>
@replyWithSelectedText()
return false
)
Mousetrap.bind('j', =>
@prevIssue()
return false
......
app/assets/javascripts/sidebar.js.coffee
View file @ 9f2f6f12
......@@ -12,7 +12,7 @@ toggleSidebar = ->
niceScrollBars.updateScrollBar();
), 300
$(document).on("click", '.toggle-nav-collapse', (e) ->
$(document).on("click", '.toggle-nav-collapse, .side-nav-toggle', (e) ->
e.preventDefault()
toggleSidebar()
......
app/assets/stylesheets/framework/avatar.scss
View file @ 9f2f6f12
......@@ -28,6 +28,7 @@
&.s46 { width: 46px; height: 46px; margin-right: 15px; }
&.s48 { width: 48px; height: 48px; margin-right: 10px; }
&.s60 { width: 60px; height: 60px; margin-right: 12px; }
&.s70 { width: 70px; height: 70px; margin-right: 14px; }
&.s90 { width: 90px; height: 90px; margin-right: 15px; }
&.s110 { width: 110px; height: 110px; margin-right: 15px; }
&.s140 { width: 140px; height: 140px; margin-right: 20px; }
......
app/assets/stylesheets/framework/blocks.scss
View file @ 9f2f6f12
......@@ -18,7 +18,7 @@
line-height: 36px;
}
.gray-content-block {
.row-content-block {
margin-top: 0;
margin-bottom: -$gl-padding;
background-color: $background-color;
......@@ -81,6 +81,11 @@
margin-left: 10px;
}
}
&.build-content {
background-color: $white-light;
border-top: none;
}
}
.cover-block {
......@@ -113,7 +118,7 @@
line-height: 1.1;
h1 {
color: #313236;
color: $gl-gray-dark;
margin-bottom: 6px;
font-size: 23px;
}
......@@ -150,6 +155,41 @@
right: auto;
}
}
&.groups-cover-block {
background: $white-light;
border-bottom: 1px solid $border-color;
text-align: left;
padding: 24px 0;
.group-info {
.cover-title {
margin-top: 9px;
}
p {
margin-bottom: 0;
}
}
@media (max-width: $screen-xs-max) {
text-align: center;
.avatar {
float: none;
}
}
}
.group-info {
h1 {
display: inline;
font-weight: normal;
font-size: 24px;
color: $gl-title-color;
}
}
}
.block-connector {
......
app/assets/stylesheets/framework/buttons.scss
View file @ 9f2f6f12
......@@ -59,7 +59,7 @@
}
@mixin btn-gray {
@include btn-color($gray-light, $border-gray-light, $gray-normal, $border-gray-light, $gray-dark, $border-gray-dark, #313236);
@include btn-color($gray-light, $border-gray-light, $gray-normal, $border-gray-light, $gray-dark, $border-gray-dark, $gl-gray-dark);
}
@mixin btn-white {
......@@ -251,3 +251,10 @@
.btn-file-option {
background: linear-gradient(180deg, $white-light 25%, $gray-light 100%);
}
.btn-build {
margin-left: 10px;
i {
color: $gl-icon-color;
}
}
app/assets/stylesheets/framework/gitlab-theme.scss
View file @ 9f2f6f12
......@@ -24,6 +24,10 @@
background-color: $color-darker;
a {
color: #fff;
h3 {
color: #fff;
}
}
}
}
......
app/assets/stylesheets/framework/header.scss
View file @ 9f2f6f12
......@@ -8,7 +8,7 @@ header {
&.navbar-empty {
height: 58px;
background: #fff;
border-bottom: 1px solid #eee;
border-bottom: 1px solid $btn-gray-hover;
.center-logo {
margin: 11px 0;
......@@ -22,14 +22,22 @@ header {
}
&.navbar-gitlab {
padding: 0 20px;
padding: 0 16px;
z-index: 100;
margin-bottom: 0;
min-height: $header-height;
height: $header-height;
background-color: $background-color;
border: none;
border-bottom: 1px solid $border-color;
@media (max-width: $screen-xs-min) {
padding: 0 16px;
}
&.with-horizontal-nav {
border-bottom: none;
}
.container-fluid {
width: 100% !important;
filter: none;
......@@ -56,16 +64,44 @@ header {
margin: 6px 0;
border-radius: 0;
position: absolute;
right: 2px;
right: -10px;
padding: 6px 10px;
&:hover {
background-color: #eee;
background-color: $btn-gray-hover;
}
&.active {
color: $gl-icon-color;
}
}
}
&.header-collapsed {
padding: 0 16px;
}
.side-nav-toggle {
display: none;
position: absolute;
left: -10px;
margin: 6px 0;
padding: 6px 10px;
border: none;
background-color: $background-color;
&:hover {
background-color: $btn-gray-hover;
}
&:focus {
outline: none;
}
@media (max-width: $screen-xs-min) {
display: block;
}
}
}
.header-content {
......@@ -73,6 +109,10 @@ header {
height: $header-height;
padding-right: 40px;
@media (max-width: $screen-xs-min) {
padding-left: 40px;
}
@media (min-width: $screen-sm-min) {
padding-right: 0;
}
......@@ -141,6 +181,10 @@ header {
@media (min-width: $screen-md-min) {
@include collapsed-header;
}
@media (max-width: $screen-xs-min) {
margin-left: 0;
}
}
.header-expanded {
......@@ -149,6 +193,10 @@ header {
@media (min-width: $screen-md-min) {
margin-left: $sidebar_width;
}
@media (max-width: $screen-xs-min) {
margin-left: 0;
}
}
@media (max-width: $screen-xs-max) {
......
app/assets/stylesheets/framework/mobile.scss
View file @ 9f2f6f12
......@@ -30,7 +30,7 @@
}
.rss-btn {
display: none !important;
display: none;
}
.project-home-links {
......
app/assets/stylesheets/framework/nav.scss
View file @ 9f2f6f12
......@@ -26,8 +26,8 @@
}
&.active a {
color: #000;
border-bottom: 2px solid #4688f1;
border-bottom: 2px solid $link-underline-blue;
color: $black;
}
.badge {
......@@ -140,6 +140,12 @@
}
}
.project-filter-form {
input {
background-color: $background-color;
}
}
@media (max-width: $screen-xs-max) {
padding-bottom: 0;
......@@ -187,13 +193,35 @@
}
.layout-nav {
position: fixed;
top: $header-height;
width: 100%;
z-index: 1;
background: $background-color;
border-bottom: 1px solid $border-color;
transition-duration: .3s;
.container-fluid {
position: relative;
}
.controls {
float: right;
position: relative;
top: 10px;
padding: 7px 0 0;
i {
color: $layout-link-gray;
}
.fa-rss,
.fa-cog {
font-size: 16px;
}
.fa-caret-down {
margin-left: 5px;
color: $gl-icon-color;
}
.dropdown {
margin-left: 7px;
......@@ -202,5 +230,34 @@
.nav-links {
border-bottom: none;
height: 51px;
white-space: nowrap;
overflow-x: auto;
li {
a {
padding-top: 10px;
}
a, i {
color: $layout-link-gray;
}
&.active {
a, i {
color: $black;
}
}
.badge {
color: $gl-icon-color;
}
}
}
}
.page-with-layout-nav {
margin-top: 50px;
}
app/assets/stylesheets/framework/sidebar.scss
View file @ 9f2f6f12
......@@ -3,6 +3,7 @@
position: absolute;
width: 58px;
cursor: pointer;
margin-top: 8px;
}
.page-with-sidebar {
......@@ -62,7 +63,7 @@
float: left;
height: $header-height;
width: 100%;
padding: 11px 0 11px 22px;
padding-left: 22px;
overflow: hidden;
outline: none;
transition-duration: .3s;
......@@ -85,7 +86,7 @@
margin: 0;
margin-left: 50px;
font-size: 19px;
line-height: 41px;
line-height: 50px;
font-weight: normal;
}
}
......@@ -97,7 +98,7 @@
}
.sidebar-user {
padding: 9px 22px;
padding: 7px 22px;
position: fixed;
bottom: 40px;
width: $sidebar_width;
......@@ -209,15 +210,33 @@
}
}
.sidebar-wrapper {
&.hidden-nav {
width: 0;
}
}
.page-sidebar-collapsed {
padding-left: $sidebar_collapsed_width;
@media (max-width: $screen-xs-min) {
padding-left: 0;
}
.sidebar-wrapper {
width: $sidebar_collapsed_width;
@media (max-width: $screen-xs-min) {
width: 0;
}
.header-logo {
width: $sidebar_collapsed_width;
@media (max-width: $screen-xs-min) {
width: 0;
}
a {
padding-left: ($sidebar_collapsed_width - 36) / 2;
......@@ -243,17 +262,35 @@
.collapse-nav a {
width: $sidebar_collapsed_width;
@media (max-width: $screen-xs-min) {
width: 0;
}
}
.sidebar-user {
padding-left: ($sidebar_collapsed_width - 36) / 2;
width: $sidebar_collapsed_width;
@media (max-width: $screen-xs-min) {
width: 0;
padding-left: 0;
padding-right: 0;
}
.username {
display: none;
}
}
}
.layout-nav {
padding-right: $sidebar_collapsed_width;
@media (max-width: $screen-xs-min) {
padding-right: 0;;
}
}
}
.page-sidebar-expanded {
......@@ -263,6 +300,10 @@
padding-left: $sidebar_width;
}
@media (max-width: $screen-xs-min) {
padding-left: 0;
}
.sidebar-wrapper {
width: $sidebar_width;
......@@ -280,6 +321,20 @@
}
}
}
.layout-nav {
@media (max-width: $screen-xs-min) {
padding-right: 0;;
}
@media (min-width: $screen-xs-min) and (max-width: $screen-md-min) {
padding-right: 62px;
}
@media (min-width: $screen-md-min) {
padding-right: $sidebar_width;
}
}
}
.right-sidebar-collapsed {
......
app/assets/stylesheets/framework/tables.scss
View file @ 9f2f6f12
......@@ -32,17 +32,11 @@ table {
th {
background-color: $background-color;
font-weight: normal;
font-size: 15px;
border-bottom: 1px solid $border-color;
&.sortable {
cursor: pointer;
}
border-bottom: none;
}
td {
border-color: $table-border-color;
border-bottom: 1px solid $border-color;
}
}
}
......
app/assets/stylesheets/framework/tw_bootstrap.scss
View file @ 9f2f6f12
......@@ -81,7 +81,7 @@
// Labels
.label {
padding: 2px 4px;
padding: 4px 5px;
font-size: 13px;
font-style: normal;
font-weight: normal;
......
app/assets/stylesheets/framework/typography.scss
View file @ 9f2f6f12
......@@ -42,14 +42,14 @@
margin: 24px 0 12px;
padding: 0 0 10px;
border-bottom: 1px solid #e7e9ed;
color: #313236;
color: $gl-gray-dark;
}
h2 {
font-size: 1.2em;
font-weight: 600;
margin: 24px 0 12px;
color: #313236;
color: $gl-gray-dark;
}
h3 {
......
app/assets/stylesheets/framework/variables.scss
View file @ 9f2f6f12
......@@ -12,7 +12,7 @@ $gutter_inner_width: 258px;
*/
$border-color: #e5e5e5;
$focus-border-color: #3aabf0;
$table-border-color: #eef0f2;
$table-border-color: #ececec;
$background-color: #fafafa;
/*
......@@ -20,7 +20,7 @@ $background-color: #fafafa;
*/
$gl-font-size: 15px;
$gl-title-color: #333;
$gl-text-color: #555;
$gl-text-color: #5c5c5c;
$gl-text-green: #4a2;
$gl-text-red: #d12f19;
$gl-text-orange: #d90;
......@@ -30,6 +30,7 @@ $gl-placeholder-color: #8f8f8f;
$gl-icon-color: $gl-placeholder-color;
$gl-grayish-blue: #7f8fa4;
$gl-gray: $gl-text-color;
$gl-gray-dark: #313236;
$gl-header-color: $gl-title-color;
/*
......@@ -65,7 +66,7 @@ $gl-padding-top: 10px;
$row-hover: #f4f8fe;
$progress-color: #c0392b;
$avatar_radius: 50%;
$header-height: 58px;
$header-height: 50px;
$fixed-layout-width: 1280px;
$gl-avatar-size: 40px;
$error-exclamation-point: #e62958;
......@@ -74,6 +75,9 @@ $btn-transparent-color: #8f8f8f;
$settings-icon-size: 18px;
$provider-btn-group-border: #e5e5e5;
$provider-btn-not-active-color: #4688f1;
$link-underline-blue: #4a8bee;
$layout-link-gray: #7e7c7c;
$todo-alert-blue: #428bca;
/*
* Color schema
......@@ -108,6 +112,7 @@ $red-light: #e52c5a;
$red-normal: #d22852;
$red-dark: darken($red-normal, 5%);
$black: #000;
$black-transparent: rgba(0, 0, 0, 0.3);
$border-white-light: #f1f2f4;
......@@ -210,6 +215,7 @@ $dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color;
$btn-active-gray: #ececec;
$btn-placeholder-gray: #c7c7c7;
$btn-white-active: #848484;
$btn-gray-hover: #eee;
/*
* Award emoji
......
app/assets/stylesheets/pages/builds.scss
View file @ 9f2f6f12
......@@ -83,3 +83,12 @@
}
}
}
table.builds {
.build-link {
a {
color: $gl-dark-link-color;
}
}
}
app/assets/stylesheets/pages/commit.scss
View file @ 9f2f6f12
......@@ -31,9 +31,23 @@
}
.commit-committer-link,
.commit-author-link {
color: #444;
color: $gl-gray;
font-weight: bold;
}
.time_ago {
margin-left: 8px;
}
.fa-clipboard {
color: $dropdown-title-btn-color;
}
.commit-info {
&.branches {
margin-left: 8px;
}
}
}
.commit-box {
......@@ -42,7 +56,7 @@
.commit-title {
margin: 0;
font-size: 23px;
color: #313236;
color: $gl-gray-dark;
}
.commit-description {
......@@ -83,6 +97,14 @@
}
}
.commit-action-buttons {
i {
color: $gl-icon-color;
font-size: 13px;
margin-right: 3px;
}
}
/*
* Commit message textarea for web editor and
* custom merge request message
......
app/assets/stylesheets/pages/detail_page.scss
View file @ 9f2f6f12
......@@ -22,7 +22,7 @@
.title {
margin: 0;
font-size: 23px;
color: #313236;
color: $gl-gray-dark;
}
.description {
......
app/assets/stylesheets/pages/merge_requests.scss
View file @ 9f2f6f12
......@@ -104,7 +104,7 @@
font-weight: 600;
font-size: 17px;
margin: 5px 0;
color: #313236;
color: $gl-gray-dark;
}
p:last-child {
......@@ -136,7 +136,7 @@
}
.label-branch {
color: #313236;
color: $gl-gray-dark;
font-family: $monospace_font;
font-weight: bold;
overflow: hidden;
......@@ -272,3 +272,19 @@
display: inline-block;
width: 250px;
}
.table-holder {
.builds {
th {
background-color: $white-light;
color: $gl-placeholder-color;
}
th,
td {
padding: 16px;
}
}
}
app/assets/stylesheets/pages/milestone.scss
View file @ 9f2f6f12
......@@ -28,7 +28,7 @@ li.milestone {
// Issue title
span a {
color: rgba(0,0,0,0.64);
color: $gl-text-color;
}
}
}
......@@ -51,7 +51,7 @@ li.milestone {
margin-top: 7px;
.issuable-number {
color: rgba(0,0,0,0.44);
color: $gl-placeholder-color;
margin-right: 5px;
}
.avatar {
......
app/assets/stylesheets/pages/notes.scss
View file @ 9f2f6f12
......@@ -114,10 +114,6 @@ ul.notes {
word-break: keep-all;
}
}
a {
word-break: break-all;
}
}
.note-header {
......@@ -172,6 +168,11 @@ ul.notes {
.notes {
background-color: $white-light;
}
a code {
top: 0;
margin-right: 0;
}
}
}
}
......
app/assets/stylesheets/pages/profile.scss
View file @ 9f2f6f12
......@@ -205,3 +205,21 @@
text-align: center;
}
}
.user-profile {
@media (max-width: $screen-xs-max) {
.cover-block {
padding-top: 20px;
}
.cover-controls {
position: static;
margin-bottom: 20px;
.btn {
display: inline-block;
width: 46%;
}
}
}
}
app/assets/stylesheets/pages/projects.scss
View file @ 9f2f6f12
......@@ -178,7 +178,7 @@
.option-title {
font-weight: normal;
display: inline-block;
color: #313236;
color: $gl-gray-dark;
}
.option-descr {
......
app/assets/stylesheets/pages/status.scss
View file @ 9f2f6f12
.container-fluid {
.ci-status {
padding: 2px 7px;
margin-right: 5px;
margin-right: 10px;
border: 1px solid #eee;
white-space: nowrap;
@include border-radius(4px);
......
app/assets/stylesheets/pages/todos.scss
View file @ 9f2f6f12
......@@ -6,9 +6,16 @@
.navbar-nav {
li {
.badge.todos-pending-count {
background-color: $gl-icon-color;
margin-top: -5px;
font-weight: normal;
background: $todo-alert-blue;
margin-left: -17px;
font-size: 11px;
color: white;
padding: 3px;
padding-top: 1px;
padding-bottom: 1px;
border-radius: 3px;
}
}
}
......
app/assets/stylesheets/pages/tree.scss
View file @ 9f2f6f12
......@@ -16,7 +16,7 @@
tr {
> td, > th {
line-height: 26px;
line-height: 23px;
}
&:hover {
......
app/controllers/admin/impersonations_controller.rb
View file @ 9f2f6f12
......@@ -7,6 +7,8 @@ class Admin::ImpersonationsController < Admin::ApplicationController
warden.set_user(impersonator, scope: :user)
Gitlab::AppLogger.info("User #{original_user.username} has stopped impersonating #{impersonator.username}")
session[:impersonator_id] = nil
redirect_to admin_user_path(original_user)
......
app/controllers/admin/users_controller.rb
View file @ 9f2f6f12
......@@ -41,6 +41,8 @@ class Admin::UsersController < Admin::ApplicationController
warden.set_user(user, scope: :user)
Gitlab::AppLogger.info("User #{current_user.username} has started impersonating #{user.username}")
flash[:alert] = "You are now impersonating #{user.username}"
redirect_to root_path
......
app/controllers/dashboard/labels_controller.rb
View file @ 9f2f6f12
class Dashboard::LabelsController < Dashboard::ApplicationController
def index
labels = Label.where(project_id: projects).select(:title, :color).uniq(:title)
labels = Label.where(project_id: projects).select(:id, :title, :color).uniq(:title)
respond_to do |format|
format.json { render json: labels }
......
app/helpers/blob_helper.rb
View file @ 9f2f6f12
......@@ -131,7 +131,7 @@ module BlobHelper
# elements and attributes. Note that this whitelist is by no means complete
# and may omit some elements.
def sanitize_svg(blob)
blob.data = Loofah.scrub_fragment(blob.data, :strip).to_xml
blob.data = Gitlab::Sanitizers::SVG.clean(blob.data)
blob
end
......
app/helpers/nav_helper.rb
View file @ 9f2f6f12
......@@ -34,10 +34,13 @@ module NavHelper
end
def nav_header_class
if nav_menu_collapsed?
"header-collapsed"
else
"header-expanded"
end
class_name =
if nav_menu_collapsed?
"header-collapsed"
else
"header-expanded"
end
class_name += " with-horizontal-nav" if defined?(nav) && nav
class_name
end
end
app/helpers/projects_helper.rb
View file @ 9f2f6f12
......@@ -200,12 +200,8 @@ module ProjectsHelper
end
def repository_size(project = @project)
"#{project.repository_size} MB"
rescue
# In order to prevent 500 error
# when application cannot allocate memory
# to calculate repo size - just show 'Unknown'
'unknown'
size_in_bytes = project.repository_size * 1.megabyte
number_to_human_size(size_in_bytes, delimiter: ',', precision: 2)
end
def default_url_to_repo(project = @project)
......@@ -359,4 +355,10 @@ module ProjectsHelper
)
end
end
def sanitize_repo_path(message)
return '' unless message.present?
message.strip.gsub(Gitlab.config.gitlab_shell.repos_path.chomp('/'), "[REPOS PATH]")
end
end
app/models/abuse_report.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: abuse_reports
#
# id :integer not null, primary key
# reporter_id :integer
# user_id :integer
# message :text
# created_at :datetime
# updated_at :datetime
#
class AbuseReport < ActiveRecord::Base
belongs_to :reporter, class_name: 'User'
belongs_to :user
......
app/models/application_setting.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: application_settings
#
# id :integer not null, primary key
# default_projects_limit :integer
# signup_enabled :boolean
# signin_enabled :boolean
# gravatar_enabled :boolean
# sign_in_text :text
# created_at :datetime
# updated_at :datetime
# home_page_url :string(255)
# default_branch_protection :integer default(2)
# help_text :text
# restricted_visibility_levels :text
# version_check_enabled :boolean default(TRUE)
# max_attachment_size :integer default(10), not null
# default_project_visibility :integer
# default_snippet_visibility :integer
# default_group_visibility :integer
# restricted_signup_domains :text
# user_oauth_applications :boolean default(TRUE)
# 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
# runners_registration_token :string
# require_two_factor_authentication :boolean default(FALSE)
# two_factor_grace_period :integer default(48)
# metrics_enabled :boolean default(FALSE)
# metrics_host :string default("localhost")
# metrics_username :string
# metrics_password :string
# metrics_pool_size :integer default(16)
# metrics_timeout :integer default(10)
# metrics_method_call_threshold :integer default(10)
# recaptcha_enabled :boolean default(FALSE)
# recaptcha_site_key :string
# recaptcha_private_key :string
# metrics_port :integer default(8089)
# sentry_enabled :boolean default(FALSE)
# sentry_dsn :string
# email_author_in_body :boolean default(FALSE)
#
class ApplicationSetting < ActiveRecord::Base
include TokenAuthenticatable
add_authentication_token_field :runners_registration_token
......
app/models/audit_event.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: audit_events
#
# id :integer not null, primary key
# author_id :integer not null
# type :string(255) not null
# entity_id :integer not null
# entity_type :string(255) not null
# details :text
# created_at :datetime
# updated_at :datetime
#
class AuditEvent < ActiveRecord::Base
serialize :details, Hash
......
app/models/broadcast_message.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: broadcast_messages
#
# id :integer not null, primary key
# message :text not null
# starts_at :datetime
# ends_at :datetime
# created_at :datetime
# updated_at :datetime
# color :string(255)
# font :string(255)
#
class BroadcastMessage < ActiveRecord::Base
include Sortable
......
app/models/ci/build.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: ci_builds
#
# id :integer not null, primary key
# project_id :integer
# status :string(255)
# finished_at :datetime
# trace :text
# created_at :datetime
# updated_at :datetime
# started_at :datetime
# runner_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)
# 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
# gl_project_id :integer
# artifacts_metadata :text
# erased_by_id :integer
# erased_at :datetime
#
module Ci
class Build < CommitStatus
belongs_to :runner, class_name: 'Ci::Runner'
......
app/models/ci/commit.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: ci_commits
#
# id :integer not null, primary key
# project_id :integer
# ref :string(255)
# sha :string(255)
# before_sha :string(255)
# push_data :text
# created_at :datetime
# updated_at :datetime
# tag :boolean default(FALSE)
# yaml_errors :text
# committed_at :datetime
# gl_project_id :integer
#
module Ci
class Commit < ActiveRecord::Base
extend Ci::Model
......
app/models/ci/runner.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: ci_runners
#
# id :integer not null, primary key
# token :string(255)
# created_at :datetime
# updated_at :datetime
# description :string(255)
# contacted_at :datetime
# active :boolean default(TRUE), not null
# is_shared :boolean default(FALSE)
# name :string(255)
# version :string(255)
# revision :string(255)
# platform :string(255)
# architecture :string(255)
#
module Ci
class Runner < ActiveRecord::Base
extend Ci::Model
......
app/models/ci/runner_project.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: ci_runner_projects
#
# id :integer not null, primary key
# runner_id :integer not null
# project_id :integer
# created_at :datetime
# updated_at :datetime
# gl_project_id :integer
#
module Ci
class RunnerProject < ActiveRecord::Base
extend Ci::Model
......
app/models/ci/trigger.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: ci_triggers
#
# id :integer not null, primary key
# token :string(255)
# project_id :integer
# deleted_at :datetime
# created_at :datetime
# updated_at :datetime
# gl_project_id :integer
#
module Ci
class Trigger < ActiveRecord::Base
extend Ci::Model
......
app/models/ci/trigger_request.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: ci_trigger_requests
#
# id :integer not null, primary key
# trigger_id :integer not null
# variables :text
# created_at :datetime
# updated_at :datetime
# commit_id :integer
#
module Ci
class TriggerRequest < ActiveRecord::Base
extend Ci::Model
......
app/models/ci/variable.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: ci_variables
#
# id :integer not null, primary key
# project_id :integer
# key :string(255)
# value :text
# encrypted_value :text
# encrypted_value_salt :string(255)
# encrypted_value_iv :string(255)
# gl_project_id :integer
#
module Ci
class Variable < ActiveRecord::Base
extend Ci::Model
......
app/models/commit_status.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: ci_builds
#
# id :integer not null, primary key
# project_id :integer
# status :string(255)
# finished_at :datetime
# trace :text
# created_at :datetime
# updated_at :datetime
# started_at :datetime
# runner_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)
# 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
# gl_project_id :integer
#
class CommitStatus < ActiveRecord::Base
include Statuseable
......
app/models/concerns/issuable.rb
View file @ 9f2f6f12
......@@ -35,8 +35,8 @@ module Issuable
scope :only_opened, -> { with_state(:opened) }
scope :only_reopened, -> { with_state(:reopened) }
scope :closed, -> { with_state(:closed) }
scope :order_milestone_due_desc, -> { joins(:milestone).reorder('milestones.due_date DESC, milestones.id DESC') }
scope :order_milestone_due_asc, -> { joins(:milestone).reorder('milestones.due_date ASC, milestones.id ASC') }
scope :order_milestone_due_desc, -> { outer_join_milestone.reorder('milestones.due_date IS NULL ASC, milestones.due_date DESC, milestones.id DESC') }
scope :order_milestone_due_asc, -> { outer_join_milestone.reorder('milestones.due_date IS NULL ASC, milestones.due_date ASC, milestones.id ASC') }
scope :without_label, -> { joins("LEFT OUTER JOIN label_links ON label_links.target_type = '#{name}' AND label_links.target_id = #{table_name}.id").where(label_links: { id: nil }) }
scope :order_weight_desc, -> { reorder('weight IS NOT NULL, weight DESC') }
scope :order_weight_asc, -> { reorder('weight ASC') }
......@@ -44,6 +44,7 @@ module Issuable
scope :join_project, -> { joins(:project) }
scope :references_project, -> { references(:project) }
scope :non_archived, -> { join_project.where(projects: { archived: false }) }
scope :outer_join_milestone, -> { joins("LEFT OUTER JOIN milestones ON milestones.id = #{table_name}.milestone_id") }
delegate :name,
:email,
......@@ -127,8 +128,8 @@ module Issuable
end
def with_label(title)
if title.is_a?(Array) && title.count > 1
joins(:labels).where(labels: { title: title }).group('issues.id').having("count(distinct labels.title) = #{title.count}")
if title.is_a?(Array) && title.size > 1
joins(:labels).where(labels: { title: title }).group(arel_table[:id]).having("COUNT(DISTINCT labels.title) = #{title.size}")
else
joins(:labels).where(labels: { title: title })
end
......@@ -163,6 +164,10 @@ module Issuable
notes.awards.where(note: "thumbsup").count
end
def user_notes_count
notes.user.count
end
def subscribed_without_subscriptions?(user)
participants(user).include?(user)
end
......
app/models/concerns/mentionable.rb
View file @ 9f2f6f12
......@@ -43,8 +43,8 @@ module Mentionable
self
end
def all_references(current_user = self.author, text = nil)
ext = Gitlab::ReferenceExtractor.new(self.project, current_user, self.author)
def all_references(current_user = nil, text = nil)
ext = Gitlab::ReferenceExtractor.new(self.project, current_user || self.author, self.author)
if text
ext.analyze(text)
......
app/models/deploy_key.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: keys
#
# id :integer not null, primary key
# user_id :integer
# created_at :datetime
# updated_at :datetime
# key :text
# title :string(255)
# type :string(255)
# fingerprint :string(255)
# public :boolean default(FALSE), not null
#
class DeployKey < Key
has_many :deploy_keys_projects, dependent: :destroy
has_many :projects, through: :deploy_keys_projects
......
app/models/deploy_keys_project.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: deploy_keys_projects
#
# id :integer not null, primary key
# deploy_key_id :integer not null
# project_id :integer not null
# created_at :datetime
# updated_at :datetime
#
class DeployKeysProject < ActiveRecord::Base
belongs_to :project
belongs_to :deploy_key
......
app/models/email.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: emails
#
# id :integer not null, primary key
# user_id :integer not null
# email :string(255) not null
# created_at :datetime
# updated_at :datetime
#
class Email < ActiveRecord::Base
include Sortable
......
app/models/event.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: events
#
# id :integer not null, primary key
# target_type :string(255)
# target_id :integer
# title :string(255)
# data :text
# project_id :integer
# created_at :datetime
# updated_at :datetime
# action :integer
# author_id :integer
#
class Event < ActiveRecord::Base
include Sortable
default_scope { where.not(author_id: nil) }
......
app/models/forked_project_link.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: forked_project_links
#
# id :integer not null, primary key
# forked_to_project_id :integer not null
# forked_from_project_id :integer not null
# created_at :datetime
# updated_at :datetime
#
class ForkedProjectLink < ActiveRecord::Base
belongs_to :forked_to_project, class_name: Project
belongs_to :forked_from_project, class_name: Project
......
app/models/generic_commit_status.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: ci_builds
#
# id :integer not null, primary key
# project_id :integer
# status :string(255)
# finished_at :datetime
# trace :text
# created_at :datetime
# updated_at :datetime
# started_at :datetime
# runner_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)
# 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
# gl_project_id :integer
#
class GenericCommitStatus < CommitStatus
before_validation :set_default_values
......
app/models/group.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: namespaces
#
# id :integer not null, primary key
# name :string(255) not null
# path :string(255) not null
# owner_id :integer
# visibility_level :integer default(20), not null
# created_at :datetime
# updated_at :datetime
# type :string(255)
# description :string(255) default(""), not null
# avatar :string(255)
#
require 'carrierwave/orm/activerecord'
class Group < Namespace
......
app/models/hooks/project_hook.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: web_hooks
#
# id :integer not null, primary key
# url :string(2000)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# type :string(255) default("ProjectHook")
# service_id :integer
# push_events :boolean default(TRUE), not null
# issues_events :boolean default(FALSE), not null
# merge_requests_events :boolean default(FALSE), not null
# tag_push_events :boolean default(FALSE)
# group_id :integer
# note_events :boolean default(FALSE), not null
# enable_ssl_verification :boolean default(TRUE)
# build_events :boolean default(FALSE), not null
# token :string
#
class ProjectHook < WebHook
include CustomModelNaming
......
app/models/hooks/service_hook.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: web_hooks
#
# id :integer not null, primary key
# url :string(2000)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# type :string(255) default("ProjectHook")
# service_id :integer
# push_events :boolean default(TRUE), not null
# issues_events :boolean default(FALSE), not null
# merge_requests_events :boolean default(FALSE), not null
# tag_push_events :boolean default(FALSE)
# group_id :integer
# note_events :boolean default(FALSE), not null
# enable_ssl_verification :boolean default(TRUE)
# build_events :boolean default(FALSE), not null
# token :string
#
class ServiceHook < WebHook
belongs_to :service
......
app/models/hooks/system_hook.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: web_hooks
#
# id :integer not null, primary key
# url :string(2000)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# type :string(255) default("ProjectHook")
# service_id :integer
# push_events :boolean default(TRUE), not null
# issues_events :boolean default(FALSE), not null
# merge_requests_events :boolean default(FALSE), not null
# tag_push_events :boolean default(FALSE)
# group_id :integer
# note_events :boolean default(FALSE), not null
# enable_ssl_verification :boolean default(TRUE)
# build_events :boolean default(FALSE), not null
# token :string
#
class SystemHook < WebHook
def async_execute(data, hook_name)
Sidekiq::Client.enqueue(SystemHookWorker, id, data, hook_name)
......
app/models/hooks/web_hook.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: web_hooks
#
# id :integer not null, primary key
# url :string(2000)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# type :string(255) default("ProjectHook")
# service_id :integer
# push_events :boolean default(TRUE), not null
# issues_events :boolean default(FALSE), not null
# merge_requests_events :boolean default(FALSE), not null
# tag_push_events :boolean default(FALSE)
# group_id :integer
# note_events :boolean default(FALSE), not null
# enable_ssl_verification :boolean default(TRUE)
# build_events :boolean default(FALSE), not null
# token :string
#
class WebHook < ActiveRecord::Base
include Sortable
include HTTParty
......
app/models/identity.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: identities
#
# id :integer not null, primary key
# extern_uid :string(255)
# provider :string(255)
# user_id :integer
# created_at :datetime
# updated_at :datetime
#
class Identity < ActiveRecord::Base
include Sortable
include CaseSensitivity
......
app/models/issue.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: issues
#
# id :integer not null, primary key
# title :string(255)
# assignee_id :integer
# author_id :integer
# project_id :integer
# created_at :datetime
# updated_at :datetime
# position :integer default(0)
# branch_name :string(255)
# description :text
# milestone_id :integer
# state :string(255)
# iid :integer
# updated_by_id :integer
# moved_to_id :integer
#
require 'carrierwave/orm/activerecord'
class Issue < ActiveRecord::Base
......
app/models/key.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: keys
#
# id :integer not null, primary key
# user_id :integer
# created_at :datetime
# updated_at :datetime
# key :text
# title :string(255)
# type :string(255)
# fingerprint :string(255)
# public :boolean default(FALSE), not null
#
require 'digest/md5'
class Key < ActiveRecord::Base
......
app/models/label.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: labels
#
# id :integer not null, primary key
# title :string(255)
# color :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# template :boolean default(FALSE)
# description :string(255)
#
class Label < ActiveRecord::Base
include Referable
include Subscribable
......@@ -117,6 +103,10 @@ class Label < ActiveRecord::Base
LabelsHelper::text_color_for_bg(self.color)
end
def title=(value)
write_attribute(:title, Sanitize.clean(value.to_s)) if value.present?
end
private
def label_format_reference(format = :id)
......
app/models/label_link.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: label_links
#
# id :integer not null, primary key
# label_id :integer
# target_id :integer
# target_type :string(255)
# created_at :datetime
# updated_at :datetime
#
class LabelLink < ActiveRecord::Base
belongs_to :target, polymorphic: true
belongs_to :label
......
app/models/lfs_object.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: lfs_objects
#
# id :integer not null, primary key
# oid :string(255) not null
# size :integer not null
# created_at :datetime
# updated_at :datetime
# file :string(255)
#
class LfsObject < ActiveRecord::Base
has_many :lfs_objects_projects, dependent: :destroy
has_many :projects, through: :lfs_objects_projects
......
app/models/lfs_objects_project.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: lfs_objects_projects
#
# id :integer not null, primary key
# lfs_object_id :integer not null
# project_id :integer not null
# created_at :datetime
# updated_at :datetime
#
class LfsObjectsProject < ActiveRecord::Base
belongs_to :project
belongs_to :lfs_object
......
app/models/member.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: members
#
# id :integer not null, primary key
# access_level :integer not null
# source_id :integer not null
# source_type :string(255) not null
# user_id :integer
# notification_level :integer not null
# type :string(255)
# created_at :datetime
# updated_at :datetime
# created_by_id :integer
# invite_email :string(255)
# invite_token :string(255)
# invite_accepted_at :datetime
#
class Member < ActiveRecord::Base
include Sortable
include Gitlab::Access
......
app/models/members/group_member.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: members
#
# id :integer not null, primary key
# access_level :integer not null
# source_id :integer not null
# source_type :string(255) not null
# user_id :integer
# notification_level :integer not null
# type :string(255)
# created_at :datetime
# updated_at :datetime
# created_by_id :integer
# invite_email :string(255)
# invite_token :string(255)
# invite_accepted_at :datetime
#
class GroupMember < Member
SOURCE_TYPE = 'Namespace'
......
app/models/members/project_member.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: members
#
# id :integer not null, primary key
# access_level :integer not null
# source_id :integer not null
# source_type :string(255) not null
# user_id :integer
# notification_level :integer not null
# type :string(255)
# created_at :datetime
# updated_at :datetime
# created_by_id :integer
# invite_email :string(255)
# invite_token :string(255)
# invite_accepted_at :datetime
#
class ProjectMember < Member
SOURCE_TYPE = 'Project'
......
app/models/merge_request.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: merge_requests
#
# id :integer not null, primary key
# target_branch :string(255) not null
# source_branch :string(255) not null
# source_project_id :integer not null
# author_id :integer
# assignee_id :integer
# title :string(255)
# created_at :datetime
# updated_at :datetime
# milestone_id :integer
# state :string(255)
# merge_status :string(255)
# target_project_id :integer not null
# iid :integer
# description :text
# position :integer default(0)
# locked_at :datetime
# updated_by_id :integer
# merge_error :string(255)
# merge_params :text
# merge_when_build_succeeds :boolean default(FALSE), not null
# merge_user_id :integer
# merge_commit_sha :string
#
class MergeRequest < ActiveRecord::Base
include InternalId
include Issuable
......
app/models/merge_request_diff.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: merge_request_diffs
#
# id :integer not null, primary key
# state :string(255)
# st_commits :text
# st_diffs :text
# merge_request_id :integer not null
# created_at :datetime
# updated_at :datetime
#
class MergeRequestDiff < ActiveRecord::Base
include Sortable
......
app/models/milestone.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: milestones
#
# id :integer not null, primary key
# title :string(255) not null
# project_id :integer not null
# description :text
# due_date :date
# created_at :datetime
# updated_at :datetime
# state :string(255)
# iid :integer
#
class Milestone < ActiveRecord::Base
# Represents a "No Milestone" state used for filtering Issues and Merge
# Requests that have no milestone assigned.
......@@ -130,6 +115,10 @@ class Milestone < ActiveRecord::Base
nil
end
def title=(value)
write_attribute(:title, Sanitize.clean(value.to_s)) if value.present?
end
# Sorts the issues for the given IDs.
#
# This method runs a single SQL query using a CASE statement to update the
......
app/models/namespace.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: namespaces
#
# id :integer not null, primary key
# name :string(255) not null
# path :string(255) not null
# owner_id :integer
# created_at :datetime
# updated_at :datetime
# type :string(255)
# description :string(255) default(""), not null
# avatar :string(255)
#
class Namespace < ActiveRecord::Base
include Sortable
include Gitlab::ShellAdapter
......
app/models/note.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: notes
#
# id :integer not null, primary key
# note :text
# noteable_type :string(255)
# author_id :integer
# created_at :datetime
# updated_at :datetime
# project_id :integer
# attachment :string(255)
# line_code :string(255)
# commit_id :string(255)
# noteable_id :integer
# system :boolean default(FALSE), not null
# st_diff :text
# updated_by_id :integer
# is_award :boolean default(FALSE), not null
#
require 'carrierwave/orm/activerecord'
class Note < ActiveRecord::Base
......
app/models/oauth_access_token.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: oauth_access_tokens
#
# id :integer not null, primary key
# resource_owner_id :integer
# application_id :integer
# token :string not null
# refresh_token :string
# expires_in :integer
# revoked_at :datetime
# created_at :datetime not null
# scopes :string
#
class OauthAccessToken < ActiveRecord::Base
belongs_to :resource_owner, class_name: 'User'
belongs_to :application, class_name: 'Doorkeeper::Application'
......
app/models/personal_snippet.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: snippets
#
# id :integer not null, primary key
# title :string(255)
# content :text
# author_id :integer not null
# project_id :integer
# created_at :datetime
# updated_at :datetime
# file_name :string(255)
# type :string(255)
# visibility_level :integer default(0), not null
#
class PersonalSnippet < Snippet
# Elastic search configuration (it does not support STI)
document_type 'snippet'
......
app/models/project.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: projects
#
# id :integer not null, primary key
# name :string(255)
# path :string(255)
# description :text
# created_at :datetime
# updated_at :datetime
# creator_id :integer
# issues_enabled :boolean default(TRUE), not null
# wall_enabled :boolean default(TRUE), not null
# merge_requests_enabled :boolean default(TRUE), not null
# wiki_enabled :boolean default(TRUE), not null
# namespace_id :integer
# issues_tracker :string(255) default("gitlab"), not null
# issues_tracker_id :string(255)
# snippets_enabled :boolean default(TRUE), not null
# last_activity_at :datetime
# import_url :string(255)
# visibility_level :integer default(0), not null
# archived :boolean default(FALSE), not null
# avatar :string(255)
# import_status :string(255)
# repository_size :float default(0.0)
# star_count :integer default(0), not null
# import_type :string(255)
# import_source :string(255)
# commit_count :integer default(0)
# import_error :text
# ci_id :integer
# builds_enabled :boolean default(TRUE), not null
# shared_runners_enabled :boolean default(TRUE), not null
# runners_token :string
# build_coverage_regex :string
# build_allow_git_fetch :boolean default(TRUE), not null
# build_timeout :integer default(3600), not null
# pending_delete :boolean default(FALSE)
# public_builds :boolean default(TRUE), not null
# merge_requests_template :text
# merge_requests_rebase_enabled :boolean default(FALSE)
# approvals_before_merge :integer default(0), not null
# reset_approvals_on_push :boolean default(TRUE)
# merge_requests_ff_only_enabled :boolean default(FALSE)
# issues_template :text
# mirror :boolean default(FALSE), not null
# mirror_last_update_at :datetime
# mirror_last_successful_update_at :datetime
# mirror_user_id :integer
# mirror_trigger_builds :boolean default(FALSE), not null
# main_language :string
#
require 'carrierwave/orm/activerecord'
class Project < ActiveRecord::Base
......@@ -76,7 +22,6 @@ class Project < ActiveRecord::Base
default_value_for :merge_requests_enabled, gitlab_config_features.merge_requests
default_value_for :builds_enabled, gitlab_config_features.builds
default_value_for :wiki_enabled, gitlab_config_features.wiki
default_value_for :wall_enabled, false
default_value_for :snippets_enabled, gitlab_config_features.snippets
default_value_for(:shared_runners_enabled) { current_application_settings.shared_runners_enabled }
......@@ -889,7 +834,7 @@ class Project < ActiveRecord::Base
# Check if current branch name is marked as protected in the system
def protected_branch?(branch_name)
protected_branches.where(name: branch_name).any?
protected_branch_names.include?(branch_name)
end
def developers_can_push_to_protected_branch?(branch_name)
......@@ -1185,6 +1130,13 @@ class Project < ActiveRecord::Base
Dir.exist?(public_pages_path)
end
def schedule_delete!(user_id, params)
# Queue this task for after the commit, so once we mark pending_delete it will run
run_after_commit { ProjectDestroyWorker.perform_async(id, user_id, params) }
update_attribute(:pending_delete, true)
end
def pages_url
# The hostname always needs to be in downcased
# All web servers convert hostname to lowercase
......
app/models/project_import_data.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: project_import_data
#
# id :integer not null, primary key
# project_id :integer
# data :text
#
require 'carrierwave/orm/activerecord'
class ProjectImportData < ActiveRecord::Base
......
app/models/project_services/asana_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
require 'asana'
class AsanaService < Service
......
app/models/project_services/assembla_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
class AssemblaService < Service
include HTTParty
......
app/models/project_services/bamboo_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
class BambooService < CiService
include HTTParty
......
app/models/project_services/buildkite_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
require "addressable/uri"
class BuildkiteService < CiService
......
app/models/project_services/builds_email_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
class BuildsEmailService < Service
prop_accessor :recipients
boolean_accessor :add_pusher
......
app/models/project_services/campfire_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
class CampfireService < Service
prop_accessor :token, :subdomain, :room
validates :token, presence: true, if: :activated?
......
app/models/project_services/ci_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
# Base class for CI services
# List methods you need to implement to get your CI service
# working with GitLab Merge Requests
......
app/models/project_services/custom_issue_tracker_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
class CustomIssueTrackerService < IssueTrackerService
prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
......
app/models/project_services/drone_ci_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
class DroneCiService < CiService
prop_accessor :drone_url, :token, :enable_ssl_verification
......
app/models/project_services/emails_on_push_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
class EmailsOnPushService < Service
prop_accessor :send_from_committer_email
prop_accessor :disable_diffs
......
app/models/project_services/external_wiki_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
class ExternalWikiService < Service
include HTTParty
......
app/models/project_services/flowdock_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
require "flowdock-git-hook"
class FlowdockService < Service
......
app/models/project_services/gemnasium_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
require "gemnasium/gitlab_service"
class GemnasiumService < Service
......
app/models/project_services/gitlab_ci_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
# TODO(ayufan): The GitLabCiService is deprecated and the type should be removed when the database entries are removed
class GitlabCiService < CiService
# We override the active accessor to always make GitLabCiService disabled
......
app/models/project_services/gitlab_issue_tracker_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
class GitlabIssueTrackerService < IssueTrackerService
include Gitlab::Routing.url_helpers
......
app/models/project_services/hipchat_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
class HipchatService < Service
MAX_COMMITS = 3
......
app/models/project_services/irker_service.rb
View file @ 9f2f6f12
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
# build_events :boolean default(FALSE), not null
#
require 'uri'
class IrkerService < Service
......
app/models/project_services/jira_service.rb
View file @ 9f2f6f12
This diff is collapsed.
app/models/project_snippet.rb
View file @ 9f2f6f12
This diff is collapsed.
app/models/protected_branch.rb
View file @ 9f2f6f12
This diff is collapsed.
app/models/release.rb
View file @ 9f2f6f12
This diff is collapsed.
app/models/repository.rb
View file @ 9f2f6f12
This diff is collapsed.
app/models/security_event.rb
View file @ 9f2f6f12
This diff is collapsed.
app/models/sent_notification.rb
View file @ 9f2f6f12
This diff is collapsed.
app/models/service.rb
View file @ 9f2f6f12
This diff is collapsed.
app/models/snippet.rb
View file @ 9f2f6f12
This diff is collapsed.
app/models/subscription.rb
View file @ 9f2f6f12
This diff is collapsed.
app/models/todo.rb
View file @ 9f2f6f12
This diff is collapsed.
app/models/user.rb
View file @ 9f2f6f12
This diff is collapsed.
app/models/users_star_project.rb
View file @ 9f2f6f12
This diff is collapsed.
app/services/git_push_service.rb
View file @ 9f2f6f12
This diff is collapsed.
app/services/git_tag_push_service.rb
View file @ 9f2f6f12
This diff is collapsed.
app/services/issues/move_service.rb
View file @ 9f2f6f12
This diff is collapsed.
app/services/projects/destroy_service.rb
View file @ 9f2f6f12
This diff is collapsed.
app/services/system_note_service.rb
View file @ 9f2f6f12
This diff is collapsed.
app/views/admin/builds/_build.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/admin/builds/index.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/admin/logs/show.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/admin/runners/_runner.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/admin/users/index.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/dashboard/todos/index.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/events/_event_last_push.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/explore/groups/index.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/explore/snippets/index.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/groups/activity.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/groups/edit.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/groups/issues.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/groups/merge_requests.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/groups/milestones/index.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/groups/projects.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/groups/show.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/help/ui.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/layouts/_page.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/layouts/group.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/layouts/group_settings.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/layouts/header/_default.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/layouts/nav/_dashboard.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/layouts/nav/_explore.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/layouts/nav/_group.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/profiles/show.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/_last_push.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/_readme.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/branches/index.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/builds/index.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/builds/show.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/commits/_head.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/commits/show.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/compare/index.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/compare/show.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/empty.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/graphs/ci.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/graphs/commits.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/graphs/show.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/imports/new.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/issues/_issue.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/network/_head.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/releases/edit.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/show.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/snippets/index.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/tags/index.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/tags/new.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/projects/tags/show.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/search/_results.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/shared/issuable/_filter.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/shared/issuable/_form.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/shared/milestones/_top.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/shared/snippets/_header.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/sherlock/queries/show.html.haml
View file @ 9f2f6f12
This diff is collapsed.
app/views/users/show.html.haml
View file @ 9f2f6f12
This diff is collapsed.
config/application.rb
View file @ 9f2f6f12
This diff is collapsed.
config/gitlab.teatro.yml
View file @ 9f2f6f12
This diff is collapsed.
config/gitlab.yml.example
View file @ 9f2f6f12
This diff is collapsed.
config/initializers/1_settings.rb
View file @ 9f2f6f12
This diff is collapsed.
config/initializers/5_backend.rb
View file @ 9f2f6f12
This diff is collapsed.
config/initializers/trusted_proxies.rb
View file @ 9f2f6f12
This diff is collapsed.
db/migrate/20160508194200_remove_wall_enabled_from_projects.rb 0 → 100644
View file @ 9f2f6f12
This diff is collapsed.
db/schema.rb
View file @ 9f2f6f12
This diff is collapsed.
doc/api/build_triggers.md
View file @ 9f2f6f12
This diff is collapsed.
doc/api/issues.md
View file @ 9f2f6f12
This diff is collapsed.
doc/api/merge_requests.md
View file @ 9f2f6f12
This diff is collapsed.
doc/api/notes.md
View file @ 9f2f6f12
This diff is collapsed.
doc/api/users.md
View file @ 9f2f6f12
This diff is collapsed.
doc/ci/docker/using_docker_build.md
View file @ 9f2f6f12
This diff is collapsed.
doc/ci/docker/using_docker_images.md
View file @ 9f2f6f12
This diff is collapsed.
doc/ci/examples/README.md
View file @ 9f2f6f12
This diff is collapsed.
doc/ci/examples/php.md
View file @ 9f2f6f12
This diff is collapsed.
doc/ci/services/mysql.md
View file @ 9f2f6f12
This diff is collapsed.
doc/ci/services/postgres.md
View file @ 9f2f6f12
This diff is collapsed.
doc/ci/services/redis.md
View file @ 9f2f6f12
This diff is collapsed.
doc/ci/ssh_keys/README.md
View file @ 9f2f6f12
This diff is collapsed.
doc/development/instrumentation.md
View file @ 9f2f6f12
This diff is collapsed.
doc/development/testing.md
View file @ 9f2f6f12
This diff is collapsed.
doc/install/requirements.md
View file @ 9f2f6f12
This diff is collapsed.
docker/README.md
View file @ 9f2f6f12
This diff is collapsed.
features/groups.feature
View file @ 9f2f6f12
This diff is collapsed.
features/project/commits/tags.feature deleted 100644 → 0
View file @ 9417c5d0
This diff is collapsed.
features/steps/group/milestones.rb
View file @ 9f2f6f12
This diff is collapsed.
features/steps/groups.rb
View file @ 9f2f6f12
This diff is collapsed.
features/steps/project/commits/tags.rb deleted 100644 → 0
View file @ 9417c5d0
This diff is collapsed.
features/steps/user.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/api/api.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/api/api_guard.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/api/commit_statuses.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/api/entities.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/banzai/filter/issue_reference_filter.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/banzai/filter/sanitization_filter.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/banzai/filter/upload_link_filter.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/ci/api/api.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/gitlab.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/gitlab/bitbucket_import/client.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/gitlab/database.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/gitlab/diff/parser.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/gitlab/git_access.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/gitlab/markup_helper.rb
View file @ 9f2f6f12
This diff is collapsed.
lib/gitlab/sanitizers/svg.rb 0 → 100644
View file @ 9f2f6f12
This diff is collapsed.
lib/gitlab/sanitizers/svg/whitelist.rb 0 → 100644
View file @ 9f2f6f12
This diff is collapsed.
lib/tasks/gitlab/db.rake
View file @ 9f2f6f12
This diff is collapsed.
spec/factories/abuse_reports.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/factories/broadcast_messages.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/factories/forked_project_links.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/factories/label_links.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/factories/labels.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/factories/lfs_objects.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/factories/lfs_objects_projects.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/factories/merge_requests.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/factories/notes.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/factories/oauth_access_tokens.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/factories/projects.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/factories/releases.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/factories/todos.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/features/issues_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/features/merge_requests/user_lists_merge_requests_spec.rb 0 → 100644
View file @ 9f2f6f12
This diff is collapsed.
spec/features/tags/master_creates_tag_spec.rb 0 → 100644
View file @ 9f2f6f12
This diff is collapsed.
spec/features/tags/master_deletes_tag_spec.rb 0 → 100644
View file @ 9f2f6f12
This diff is collapsed.
spec/features/tags/master_updates_tag_spec.rb 0 → 100644
View file @ 9f2f6f12
This diff is collapsed.
spec/features/tags/master_views_tags_spec.rb 0 → 100644
View file @ 9f2f6f12
This diff is collapsed.
spec/fixtures/sanitized.svg 0 → 100644
View file @ 9f2f6f12
This diff is collapsed.
spec/fixtures/unsanitized.svg 0 → 100644
View file @ 9f2f6f12
This diff is collapsed.
spec/helpers/blob_helper_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/helpers/projects_helper_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/initializers/trusted_proxies_spec.rb 0 → 100644
View file @ 9f2f6f12
This diff is collapsed.
spec/javascripts/merge_request_widget_spec.js.coffee 0 → 100644
View file @ 9f2f6f12
This diff is collapsed.
spec/models/abuse_report_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/application_setting_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/broadcast_message_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/ci/commit_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/ci/runner_project_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/ci/runner_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/ci/trigger_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/ci/variable_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/commit_status_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/deploy_key_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/deploy_keys_project_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/email_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/event_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/forked_project_link_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/generic_commit_status_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/group_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/identity_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/issue_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/key_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/label_link_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/label_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/member_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/milestone_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/namespace_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/note_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/project_snippet_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/project_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/protected_branch_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/release_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/service_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/snippet_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/todo_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/models/user_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/requests/api/issues_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/requests/api/merge_requests_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/services/issues/move_service_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/services/merge_requests/build_service_spec.rb 0 → 100644
View file @ 9f2f6f12
This diff is collapsed.
spec/services/system_note_service_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
spec/services/todo_service_spec.rb
View file @ 9f2f6f12
This diff is collapsed.
vendor/assets/javascripts/jquery.scrollTo.js 0 → 100755
View file @ 9f2f6f12
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