Skip to content

G
gitlab-ce
Commit 6e3df42c authored by James Lopez's avatar James Lopez
Browse files
Options

fix merge conflicts

parents f2f345e6 53ad33e4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8922 additions and 929 deletions
.rubocop.yml
View file @ 6e3df42c
......@@ -21,6 +21,7 @@ AllCops:
- 'lib/email_validator.rb'
- 'lib/gitlab/upgrader.rb'
- 'lib/gitlab/seeder.rb'
- 'generator_templates/**/*'
##################### Style ##################################
......
CHANGELOG
View file @ 6e3df42c
Please view this file on the master branch, on stable branches it's out of date.
v 8.8.0 (unreleased)
v 8.8.2 (unreleased)
- Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources
v 8.8.1
- Add documentation for the "Health Check" feature
- Allow anonymous users to access a public project's pipelines
- Fix MySQL compatibility in zero downtime migrations helpers
- Fix the CI login to Container Registry (the gitlab-ci-token user)
v 8.8.0
- Implement GFM references for milestones (Alejandro Rodríguez)
- Snippets tab under user profile. !4001 (Long Nguyen)
- Fix error when using link to uploads in global snippets
- Fix Error 500 when attempting to retrieve project license when HEAD points to non-existent ref
- Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
- Use a case-insensitive comparison in sanitizing URI schemes
- Toggle sign-up confirmation emails in application settings
- Make it possible to prevent tagged runner from picking untagged jobs
- Added `InlineDiffFilter` to the markdown parser. (Adam Butler)
- Added inline diff styling for `change_title` system notes. (Adam Butler)
- Project#open_branches has been cleaned up and no longer loads entire records into memory.
- Escape HTML in commit titles in system note messages
- Fix scope used when accessing container registry
- Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios
- Improve multiple branch push performance by memoizing permission checking
- Log to application.log when an admin starts and stops impersonating a user
- Changing the confidentiality of an issue now creates a new system note (Alex Moore-Niemi)
- 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
......@@ -21,6 +38,7 @@ v 8.8.0 (unreleased)
- 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
- Fix API leak of notes of unauthorized issues, snippets and merge requests
- 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
......@@ -36,13 +54,15 @@ v 8.8.0 (unreleased)
- Added button to toggle whitespaces changes on diff view
- Backport GitHub Enterprise import support from EE
- Create tags using Rugged for performance reasons. !3745
- Allow guests to set notification level in projects
- API: Expose Issue#user_notes_count. !3126 (Anton Popov)
- Don't show forks button when user can't view forks
- Fix atom feed links and rendering
- 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.
- Always group commits by server timezone, not commit timestamp
- Show commits in the same order as `git log`
- 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)
......@@ -58,10 +78,16 @@ v 8.8.0 (unreleased)
- Add counter metrics for rails cache
- Import pull requests from GitHub where the source or target branches were removed
- All Grape API helpers are now instrumented
- Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
- Fixed advice on invalid permissions on upload path !2948 (Ludovic Perrine)
- Allows MR authors to have the source branch removed when merging the MR. !2801 (Jeroen Jacobs)
- When creating a .gitignore file a dropdown with templates will be provided
v 8.7.6
- Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
- Fix import by `Any Git URL` broken if the URL contains a space
- Fix import from GitLab.com to a private instance failure. !4181
- Fix external imports not finding the import data. !4106
v 8.7.5
- Fix relative links in wiki pages. !4050
......@@ -83,6 +109,7 @@ v 8.7.3
- 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
- Remove animate.css in favor of a smaller subset of animations. !3937 (Connor Shea)
v 8.7.2
- The "New Branch" button is now loaded asynchronously
......@@ -891,7 +918,7 @@ v 8.1.3
- Use issue editor as cross reference comment author when issue is edited with a new mention
- Add Facebook authentication
v 8.1.2
v 8.1.1
- Fix cloning Wiki repositories via HTTP (Stan Hu)
- Add migration to remove satellites directory
- Fix specific runners visibility
......@@ -1516,20 +1543,17 @@ v 7.10.0
- Fix stuck Merge Request merging events from old installations (Ben Bodenmiller)
- Fix merge request comments on files with multiple commits
- Fix Resource Owner Password Authentication Flow
v 7.9.4
- Security: Fix project import URL regex to prevent arbitary local repos from being imported
- Fixed issue where only 25 commits would load in file listings
- Fix LDAP identities after config update
v 7.9.3
- Contains no changes
- Add icons to Add dropdown items.
- Allow admin to create public deploy keys that are accessible to any project.
- Warn when gitlab-shell version doesn't match requirement.
- Skip email confirmation when set by admin or via LDAP.
- Only allow users to reference groups, projects, issues, MRs, commits they have access to.
v 7.9.4
- Security: Fix project import URL regex to prevent arbitary local repos from being imported
- Fixed issue where only 25 commits would load in file listings
- Fix LDAP identities after config update
v 7.9.3
- Contains no changes
......
Gemfile
View file @ 6e3df42c
......@@ -325,7 +325,7 @@ gem "mail_room", "~> 0.7"
gem 'email_reply_parser', '~> 0.5.8'
## CI
gem 'activerecord-session_store', '~> 0.1.0'
gem 'activerecord-session_store', '~> 1.0.0'
gem "nested_form", '~> 0.3.2'
# OAuth
......
Gemfile.lock
View file @ 6e3df42c
......@@ -33,10 +33,12 @@ GEM
activemodel (= 4.2.6)
activesupport (= 4.2.6)
arel (~> 6.0)
activerecord-session_store (0.1.2)
actionpack (>= 4.0.0, < 5)
activerecord (>= 4.0.0, < 5)
railties (>= 4.0.0, < 5)
activerecord-session_store (1.0.0)
actionpack (>= 4.0, < 5.1)
activerecord (>= 4.0, < 5.1)
multi_json (~> 1.11, >= 1.11.2)
rack (>= 1.5.2, < 3)
railties (>= 4.0, < 5.1)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
......@@ -883,7 +885,7 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.2.9)
ace-rails-ap (~> 4.0.2)
activerecord-session_store (~> 0.1.0)
activerecord-session_store (~> 1.0.0)
acts-as-taggable-on (~> 3.4)
addressable (~> 2.3.8)
after_commit_queue
......
app/assets/javascripts/api.js.coffee
View file @ 6e3df42c
@Api =
groups_path: "/api/:version/groups.json"
group_path: "/api/:version/groups/:id.json"
namespaces_path: "/api/:version/namespaces.json"
group_projects_path: "/api/:version/groups/:id/projects.json"
projects_path: "/api/:version/projects.json"
labels_path: "/api/:version/projects/:id/labels"
license_path: "/api/:version/licenses/:key"
groupsPath: "/api/:version/groups.json"
groupPath: "/api/:version/groups/:id.json"
namespacesPath: "/api/:version/namespaces.json"
groupProjectsPath: "/api/:version/groups/:id/projects.json"
projectsPath: "/api/:version/projects.json"
labelsPath: "/api/:version/projects/:id/labels"
licensePath: "/api/:version/licenses/:key"
gitignorePath: "/api/:version/gitignores/:key"
group: (group_id, callback) ->
url = Api.buildUrl(Api.group_path)
url = Api.buildUrl(Api.groupPath)
url = url.replace(':id', group_id)
$.ajax(
......@@ -22,7 +23,7 @@
# Return groups list. Filtered by query
# Only active groups retrieved
groups: (query, skip_ldap, callback) ->
url = Api.buildUrl(Api.groups_path)
url = Api.buildUrl(Api.groupsPath)
$.ajax(
url: url
......@@ -36,7 +37,7 @@
# Return namespaces list. Filtered by query
namespaces: (query, callback) ->
url = Api.buildUrl(Api.namespaces_path)
url = Api.buildUrl(Api.namespacesPath)
$.ajax(
url: url
......@@ -50,7 +51,7 @@
# Return projects list. Filtered by query
projects: (query, order, callback) ->
url = Api.buildUrl(Api.projects_path)
url = Api.buildUrl(Api.projectsPath)
$.ajax(
url: url
......@@ -64,7 +65,7 @@
callback(projects)
newLabel: (project_id, data, callback) ->
url = Api.buildUrl(Api.labels_path)
url = Api.buildUrl(Api.labelsPath)
url = url.replace(':id', project_id)
data.private_token = gon.api_token
......@@ -80,7 +81,7 @@
# Return group projects list. Filtered by query
groupProjects: (group_id, query, callback) ->
url = Api.buildUrl(Api.group_projects_path)
url = Api.buildUrl(Api.groupProjectsPath)
url = url.replace(':id', group_id)
$.ajax(
......@@ -95,7 +96,7 @@
# Return text for a specific license
licenseText: (key, data, callback) ->
url = Api.buildUrl(Api.license_path).replace(':key', key)
url = Api.buildUrl(Api.licensePath).replace(':key', key)
$.ajax(
url: url
......@@ -103,6 +104,12 @@
).done (license) ->
callback(license)
gitignoreText: (key, callback) ->
url = Api.buildUrl(Api.gitignorePath).replace(':key', key)
$.get url, (gitignore) ->
callback(gitignore)
buildUrl: (url) ->
url = gon.relative_url_root + url if gon.relative_url_root?
return url.replace(':version', gon.api_version)
app/assets/javascripts/blob/blob_gitignore_selector.js.coffee 0 → 100644
View file @ 6e3df42c
class @BlobGitignoreSelector
constructor: (opts) ->
{
@dropdown
@editor
@$wrapper = @dropdown.closest('.gitignore-selector')
@$filenameInput = $('#file_name')
@data = @dropdown.data('filenames')
} = opts
@dropdown.glDropdown(
data: @data,
filterable: true,
selectable: true,
search:
fields: ['name']
clicked: @onClick
text: (gitignore) ->
gitignore.name
)
@toggleGitignoreSelector()
@bindEvents()
bindEvents: ->
@$filenameInput
.on 'keyup blur', (e) =>
@toggleGitignoreSelector()
toggleGitignoreSelector: ->
filename = @$filenameInput.val() or $('.editor-file-name').text().trim()
@$wrapper.toggleClass 'hidden', filename isnt '.gitignore'
onClick: (item, el, e) =>
e.preventDefault()
@requestIgnoreFile(item.name)
requestIgnoreFile: (name) ->
Api.gitignoreText name, @requestIgnoreFileSuccess.bind(@)
requestIgnoreFileSuccess: (gitignore) ->
@editor.setValue(gitignore.content, 1)
@editor.focus()
class @BlobGitignoreSelectors
constructor: (opts) ->
{
@$dropdowns = $('.js-gitignore-selector')
@editor
} = opts
@$dropdowns.each (i, dropdown) =>
$dropdown = $(dropdown)
new BlobGitignoreSelector(
dropdown: $dropdown,
editor: @editor
)
app/assets/javascripts/blob/edit_blob.js.coffee
View file @ 6e3df42c
......@@ -13,6 +13,7 @@ class @EditBlob
@initModePanesAndLinks()
new BlobLicenseSelector(@editor)
new BlobGitignoreSelectors(editor: @editor)
initModePanesAndLinks: ->
@$editModePanes = $(".js-edit-mode-pane")
......
app/assets/javascripts/gfm_auto_complete.js.coffee
View file @ 6e3df42c
......@@ -18,6 +18,10 @@ GitLab.GfmAutoComplete =
Issues:
template: '<li><small>${id}</small> ${title}</li>'
# Milestones
Milestones:
template: '<li>${title}</li>'
# Add GFM auto-completion to all input fields, that accept GFM input.
setup: (wrap) ->
@input = $('.js-gfm-input')
......@@ -81,6 +85,19 @@ GitLab.GfmAutoComplete =
title: sanitize(i.title)
search: "#{i.iid} #{i.title}"
@input.atwho
at: '%'
alias: 'milestones'
searchKey: 'search'
displayTpl: @Milestones.template
insertTpl: '${atwho-at}"${title}"'
callbacks:
beforeSave: (milestones) ->
$.map milestones, (m) ->
id: m.iid
title: sanitize(m.title)
search: "#{m.title}"
@input.atwho
at: '!'
alias: 'mergerequests'
......@@ -105,6 +122,8 @@ GitLab.GfmAutoComplete =
@input.atwho 'load', '@', data.members
# load issues
@input.atwho 'load', 'issues', data.issues
# load milestones
@input.atwho 'load', 'milestones', data.milestones
# load merge requests
@input.atwho 'load', 'mergerequests', data.mergerequests
# load emojis
......
app/assets/javascripts/gl_dropdown.js.coffee
View file @ 6e3df42c
......@@ -60,9 +60,36 @@ class GitLabDropdownFilter
results = data
if search_text isnt ''
results = fuzzaldrinPlus.filter(data, search_text,
key: @options.keys
)
# When data is an array of objects therefore [object Array] e.g.
# [
# { prop: 'foo' },
# { prop: 'baz' }
# ]
if _.isArray(data)
results = fuzzaldrinPlus.filter(data, search_text,
key: @options.keys
)
else
# If data is grouped therefore an [object Object]. e.g.
# {
# groupName1: [
# { prop: 'foo' },
# { prop: 'baz' }
# ],
# groupName2: [
# { prop: 'abc' },
# { prop: 'def' }
# ]
# }
if gl.utils.isObject data
results = {}
for key, group of data
tmp = fuzzaldrinPlus.filter(group, search_text,
key: @options.keys
)
if tmp.length
results[key] = tmp.map (item) -> item
@options.callback results
else
......@@ -141,8 +168,9 @@ class GitLabDropdown
searchFields = if @options.search then @options.search.fields else [];
if @options.data
# If data is an array
if _.isArray @options.data
# If we provided data
# data could be an array of objects or a group of arrays
if _.isObject(@options.data) and not _.isFunction(@options.data)
@fullData = @options.data
@parseData @options.data
else
......@@ -230,19 +258,33 @@ class GitLabDropdown
parseData: (data) ->
@renderedData = data
# Render each row
html = $.map data, (obj) =>
return @renderItem(obj)
if @options.filterable and data.length is 0
# render no matching results
html = [@noResults()]
else
# Handle array groups
if gl.utils.isObject data
html = []
for name, groupData of data
# Add header for each group
html.push(@renderItem(header: name, name))
@renderData(groupData, name)
.map (item) ->
html.push item
else
# Render each row
html = @renderData(data)
# Render the full menu
full_html = @renderMenu(html.join(""))
@appendMenu(full_html)
renderData: (data, group = false) ->
data.map (obj, index) =>
return @renderItem(obj, group, index)
shouldPropagate: (e) =>
if @options.multiSelect
$target = $(e.target)
......@@ -299,11 +341,10 @@ class GitLabDropdown
selector = '.dropdown-content'
if @dropdown.find(".dropdown-toggle-page").length
selector = ".dropdown-page-one .dropdown-content"
$(selector, @dropdown).html html
# Render the row
renderItem: (data) ->
renderItem: (data, group = false, index = false) ->
html = ""
# Divider
......@@ -346,8 +387,13 @@ class GitLabDropdown
if @highlight
text = @highlightTextMatches(text, @filterInput.val())
if group
groupAttrs = "data-group='#{group}' data-index='#{index}'"
else
groupAttrs = ''
html = "<li>
<a href='#{url}' class='#{cssClass}'>
<a href='#{url}' #{groupAttrs} class='#{cssClass}'>
#{text}
</a>
</li>"
......@@ -377,9 +423,15 @@ class GitLabDropdown
rowClicked: (el) ->
fieldName = @options.fieldName
selectedIndex = el.parent().index()
if @renderedData
selectedObject = @renderedData[selectedIndex]
groupName = el.data('group')
if groupName
selectedIndex = el.data('index')
selectedObject = @renderedData[groupName][selectedIndex]
else
selectedIndex = el.closest('li').index()
selectedObject = @renderedData[selectedIndex]
value = if @options.id then @options.id(selectedObject, el) else selectedObject.id
field = @dropdown.parent().find("input[name='#{fieldName}'][value='#{value}']")
if el.hasClass(ACTIVE_CLASS)
......@@ -460,7 +512,7 @@ class GitLabDropdown
return false
if currentKeyCode is 13
@selectRowAtIndex currentIndex
@selectRowAtIndex if currentIndex < 0 then 0 else currentIndex
removeArrayKeyEvent: ->
$('body').off 'keydown'
......
app/assets/javascripts/issuable_form.js.coffee
View file @ 6e3df42c
......@@ -20,6 +20,15 @@ class @IssuableForm
@initWip()
$issuableDueDate = $('#issuable-due-date')
if $issuableDueDate.length
$('.datepicker').datepicker(
dateFormat: 'yy-mm-dd',
onSelect: (dateText, inst) ->
$issuableDueDate.val dateText
).datepicker 'setDate', $.datepicker.parseDate('yy-mm-dd', $issuableDueDate.val())
initAutosave: ->
new Autosave @titleField, [
document.location.pathname,
......
app/assets/javascripts/lib/type_utility.js.coffee 0 → 100644
View file @ 6e3df42c
((w) ->
w.gl ?= {}
w.gl.utils ?= {}
w.gl.utils.isObject = (obj) ->
obj? and (obj.constructor is Object)
) window
app/assets/javascripts/merge_request_widget.js.coffee
View file @ 6e3df42c
......@@ -113,7 +113,7 @@ class @MergeRequestWidget
switch state
when "failed", "canceled", "not_found"
@setMergeButtonClass('btn-danger')
when "running", "pending"
when "running"
@setMergeButtonClass('btn-warning')
when "success"
@setMergeButtonClass('btn-create')
......@@ -126,6 +126,6 @@ class @MergeRequestWidget
$('.ci_widget:visible .ci-coverage').text(text)
setMergeButtonClass: (css_class) ->
$('.accept_merge_request')
$('.js-merge-button')
.removeClass('btn-danger btn-warning btn-create')
.addClass(css_class)
app/assets/stylesheets/application.scss
View file @ 6e3df42c
......@@ -10,7 +10,6 @@
*= require dropzone/basic
*= require cal-heatmap
*= require cropper.css
*= require animate
*/
/*
......
app/assets/stylesheets/framework.scss
View file @ 6e3df42c
......@@ -5,6 +5,7 @@
@import 'framework/tw_bootstrap';
@import "framework/layout";
@import "framework/animations.scss";
@import "framework/avatar.scss";
@import "framework/blocks.scss";
@import "framework/buttons.scss";
......
app/assets/stylesheets/framework/animations.scss 0 → 100644
View file @ 6e3df42c
// This file is based off animate.css 3.5.1, available here:
// https://github.com/daneden/animate.css/blob/3.5.1/animate.css
//
// animate.css - http://daneden.me/animate
// Version - 3.5.1
// Licensed under the MIT license - http://opensource.org/licenses/MIT
//
// Copyright (c) 2016 Daniel Eden
.animated {
-webkit-animation-duration: 1s;
animation-duration: 1s;
-webkit-animation-fill-mode: both;
animation-fill-mode: both;
}
.animated.infinite {
-webkit-animation-iteration-count: infinite;
animation-iteration-count: infinite;
}
.animated.hinge {
-webkit-animation-duration: 2s;
animation-duration: 2s;
}
.animated.flipOutX,
.animated.flipOutY,
.animated.bounceIn,
.animated.bounceOut {
-webkit-animation-duration: .75s;
animation-duration: .75s;
}
@-webkit-keyframes pulse {
from {
-webkit-transform: scale3d(1, 1, 1);
transform: scale3d(1, 1, 1);
}
50% {
-webkit-transform: scale3d(1.05, 1.05, 1.05);
transform: scale3d(1.05, 1.05, 1.05);
}
to {
-webkit-transform: scale3d(1, 1, 1);
transform: scale3d(1, 1, 1);
}
}
@keyframes pulse {
from {
-webkit-transform: scale3d(1, 1, 1);
transform: scale3d(1, 1, 1);
}
50% {
-webkit-transform: scale3d(1.05, 1.05, 1.05);
transform: scale3d(1.05, 1.05, 1.05);
}
to {
-webkit-transform: scale3d(1, 1, 1);
transform: scale3d(1, 1, 1);
}
}
.pulse {
-webkit-animation-name: pulse;
animation-name: pulse;
}
app/assets/stylesheets/framework/files.scss
View file @ 6e3df42c
......@@ -36,22 +36,6 @@
}
}
.filename {
&.old {
display: inline-block;
span.idiff {
background-color: #f8cbcb;
}
}
&.new {
display: inline-block;
span.idiff {
background-color: #a6f3a6;
}
}
}
a:not(.btn) {
color: $gl-dark-link-color;
}
......
app/assets/stylesheets/framework/forms.scss
View file @ 6e3df42c
......@@ -28,10 +28,6 @@ input[type='text'].danger {
}
label {
&.control-label {
@extend .col-sm-2;
}
&.inline-label {
margin: 0;
}
......@@ -41,6 +37,10 @@ label {
}
}
.control-label {
@extend .col-sm-2;
}
.inline-input-group {
width: 250px;
}
......
app/assets/stylesheets/framework/typography.scss
View file @ 6e3df42c
......@@ -269,3 +269,11 @@ h1, h2, h3, h4 {
text-align: right;
}
}
.idiff.deletion {
background: $line-removed-dark;
}
.idiff.addition {
background: $line-added-dark;
}
app/assets/stylesheets/framework/variables.scss
View file @ 6e3df42c
......@@ -12,7 +12,7 @@ $gutter_inner_width: 258px;
*/
$border-color: #e5e5e5;
$focus-border-color: #3aabf0;
$table-border-color: #ececec;
$table-border-color: #f0f0f0;
$background-color: #fafafa;
/*
......@@ -178,6 +178,7 @@ $table-border-gray: #f0f0f0;
$line-target-blue: #eaf3fc;
$line-select-yellow: #fcf8e7;
$line-select-yellow-dark: #f0e2bd;
/*
* Fonts
*/
......
app/assets/stylesheets/framework/zen.scss
View file @ 6e3df42c
......@@ -32,7 +32,7 @@
}
}
.zen-cotrol {
.zen-control {
padding: 0;
color: #555;
background: none;
......
app/assets/stylesheets/mailers/repository_push_email.scss 0 → 100644
View file @ 6e3df42c
@import "framework/variables";
table.code {
width: 100%;
font-family: monospace;
border: none;
border-collapse: separate;
margin: 0;
padding: 0;
-premailer-cellpadding: 0;
-premailer-cellspacing: 0;
-premailer-width: 100%;
td {
line-height: $code_line_height;
font-family: monospace;
font-size: $code_font_size;
}
td.diff-line-num {
margin: 0;
padding: 0;
border: none;
background: $background-color;
color: rgba(0, 0, 0, 0.3);
padding: 0 5px;
border-right: 1px solid $border-color;
text-align: right;
min-width: 35px;
max-width: 50px;
width: 35px;
}
td.line_content {
display: block;
margin: 0;
padding: 0 0.5em;
border: none;
white-space: pre;
}
}
@import "highlight/white";
app/assets/stylesheets/pages/editor.scss
View file @ 6e3df42c
......@@ -23,7 +23,7 @@
.file-title {
@extend .monospace;
line-height: 42px;
line-height: 35px;
padding-top: 7px;
padding-bottom: 7px;
......@@ -43,7 +43,7 @@
.editor-file-name {
@extend .monospace;
float: left;
margin-right: 10px;
}
......@@ -59,7 +59,22 @@
}
.encoding-selector,
.license-selector {
.license-selector,
.gitignore-selector {
display: inline-block;
vertical-align: top;
font-family: $regular_font;
}
.gitignore-selector {
.dropdown {
line-height: 21px;
}
.dropdown-menu-toggle {
vertical-align: top;
width: 220px;
}
}
}
app/assets/stylesheets/pages/pipelines.scss 0 → 100644
View file @ 6e3df42c
.pipeline-stage {
overflow: hidden;
text-overflow: ellipsis;
}
app/assets/stylesheets/pages/projects.scss
View file @ 6e3df42c
......@@ -7,7 +7,7 @@
}
.no-ssh-key-message, .project-limit-message {
background-color: #f28d35;
margin-bottom: 16px;
margin-bottom: 0;
}
.new_project,
.edit_project {
......@@ -149,6 +149,10 @@
white-space: nowrap;
margin: 0 11px 0 4px;
a {
color: inherit;
}
&:hover {
background: #fff;
}
......@@ -161,7 +165,7 @@
display: inline-table;
margin-right: 12px;
a {
> a {
margin: -1px;
}
}
......
app/controllers/admin/abuse_reports_controller.rb
View file @ 6e3df42c
......@@ -9,6 +9,6 @@ class Admin::AbuseReportsController < Admin::ApplicationController
abuse_report.remove_user(deleted_by: current_user) if params[:remove_user]
abuse_report.destroy
render nothing: true
head :ok
end
end
app/controllers/admin/broadcast_messages_controller.rb
View file @ 6e3df42c
......@@ -32,7 +32,7 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController
respond_to do |format|
format.html { redirect_back_or_default(default: { action: 'index' }) }
format.js { render nothing: true }
format.js { head :ok }
end
end
......
app/controllers/admin/keys_controller.rb
View file @ 6e3df42c
......@@ -6,7 +6,7 @@ class Admin::KeysController < Admin::ApplicationController
respond_to do |format|
format.html
format.js { render nothing: true }
format.js { head :ok }
end
end
......
app/controllers/admin/runners_controller.rb
View file @ 6e3df42c
......@@ -9,23 +9,18 @@ class Admin::RunnersController < Admin::ApplicationController
end
def show
@builds = @runner.builds.order('id DESC').first(30)
@projects =
if params[:search].present?
::Project.search(params[:search])
else
Project.all
end
@projects = @projects.where.not(id: @runner.projects.select(:id)) if @runner.projects.any?
@projects = @projects.page(params[:page]).per(30)
assign_builds_and_projects
end
def update
@runner.update_attributes(runner_params)
respond_to do |format|
format.js
format.html { redirect_to admin_runner_path(@runner) }
if @runner.update_attributes(runner_params)
respond_to do |format|
format.js
format.html { redirect_to admin_runner_path(@runner) }
end
else
assign_builds_and_projects
render 'show'
end
end
......@@ -60,4 +55,16 @@ class Admin::RunnersController < Admin::ApplicationController
def runner_params
params.require(:runner).permit(Ci::Runner::FORM_EDITABLE)
end
def assign_builds_and_projects
@builds = runner.builds.order('id DESC').first(30)
@projects =
if params[:search].present?
::Project.search(params[:search])
else
Project.all
end
@projects = @projects.where.not(id: runner.projects.select(:id)) if runner.projects.any?
@projects = @projects.page(params[:page]).per(30)
end
end
app/controllers/admin/spam_logs_controller.rb
View file @ 6e3df42c
......@@ -11,7 +11,7 @@ class Admin::SpamLogsController < Admin::ApplicationController
redirect_to admin_spam_logs_path, notice: "User #{spam_log.user.username} was successfully removed."
else
spam_log.destroy
render nothing: true
head :ok
end
end
end
app/controllers/admin/users_controller.rb
View file @ 6e3df42c
......@@ -154,7 +154,7 @@ class Admin::UsersController < Admin::ApplicationController
respond_to do |format|
format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") }
format.js { render nothing: true }
format.js { head :ok }
end
end
......
app/controllers/concerns/toggle_subscription_action.rb
View file @ 6e3df42c
......@@ -6,7 +6,7 @@ module ToggleSubscriptionAction
subscribable_resource.toggle_subscription(current_user)
render nothing: true
head :ok
end
private
......
app/controllers/dashboard/todos_controller.rb
View file @ 6e3df42c
......@@ -12,7 +12,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
respond_to do |format|
format.html { redirect_to dashboard_todos_path, notice: todo_notice }
format.js { render nothing: true }
format.js { head :ok }
format.json do
render json: { count: @todos.size, done_count: current_user.todos.done.count }
end
......@@ -24,7 +24,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
respond_to do |format|
format.html { redirect_to dashboard_todos_path, notice: 'All todos were marked as done.' }
format.js { render nothing: true }
format.js { head :ok }
format.json do
find_todos
render json: { count: @todos.size, done_count: current_user.todos.done.count }
......
app/controllers/groups/group_members_controller.rb
View file @ 6e3df42c
......@@ -40,7 +40,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
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 }
format.js { head :ok }
end
end
......
app/controllers/jwt_controller.rb
View file @ 6e3df42c
......@@ -36,7 +36,7 @@ class JwtController < ApplicationController
end
def authenticate_project(login, password)
if login == 'gitlab_ci_token'
if login == 'gitlab-ci-token'
Project.find_by(builds_enabled: true, runners_token: password)
end
end
......
app/controllers/profiles/emails_controller.rb
View file @ 6e3df42c
......@@ -24,7 +24,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
respond_to do |format|
format.html { redirect_to profile_emails_url }
format.js { render nothing: true }
format.js { head :ok }
end
end
......
app/controllers/profiles/keys_controller.rb
View file @ 6e3df42c
......@@ -32,7 +32,7 @@ class Profiles::KeysController < Profiles::ApplicationController
respond_to do |format|
format.html { redirect_to profile_keys_url }
format.js { render nothing: true }
format.js { head :ok }
end
end
......
app/controllers/projects/container_registry_controller.rb 0 → 100644
View file @ 6e3df42c
class Projects::ContainerRegistryController < Projects::ApplicationController
before_action :verify_registry_enabled
before_action :authorize_read_container_image!
before_action :authorize_update_container_image!, only: [:destroy]
layout 'project'
def index
@tags = container_registry_repository.tags
end
def destroy
url = namespace_project_container_registry_index_path(project.namespace, project)
if tag.delete
redirect_to url
else
redirect_to url, alert: 'Failed to remove tag'
end
end
private
def verify_registry_enabled
render_404 unless Gitlab.config.registry.enabled
end
def container_registry_repository
@container_registry_repository ||= project.container_registry_repository
end
def tag
@tag ||= container_registry_repository.tag(params[:id])
end
end
app/controllers/projects/imports_controller.rb
View file @ 6e3df42c
......@@ -20,6 +20,7 @@ class Projects::ImportsController < Projects::ApplicationController
@project.import_retry
else
@project.import_start
@project.add_import_job
end
end
......
app/controllers/projects/merge_requests_controller.rb
View file @ 6e3df42c
......@@ -334,7 +334,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
params.require(:merge_request).permit(
:title, :assignee_id, :source_project_id, :source_branch,
:target_project_id, :target_branch, :milestone_id,
:state_event, :description, :task_num, label_ids: []
:state_event, :description, :task_num, :force_remove_source_branch,
label_ids: []
)
end
......
app/controllers/projects/milestones_controller.rb
View file @ 6e3df42c
......@@ -75,7 +75,7 @@ class Projects::MilestonesController < Projects::ApplicationController
respond_to do |format|
format.html { redirect_to namespace_project_milestones_path }
format.js { render nothing: true }
format.js { head :ok }
end
end
......
app/controllers/projects/notes_controller.rb
View file @ 6e3df42c
......@@ -43,7 +43,7 @@ class Projects::NotesController < Projects::ApplicationController
end
respond_to do |format|
format.js { render nothing: true }
format.js { head :ok }
end
end
......@@ -52,7 +52,7 @@ class Projects::NotesController < Projects::ApplicationController
note.update_attribute(:attachment, nil)
respond_to do |format|
format.js { render nothing: true }
format.js { head :ok }
end
end
......
app/controllers/projects/pipelines_controller.rb 0 → 100644
View file @ 6e3df42c
class Projects::PipelinesController < Projects::ApplicationController
before_action :pipeline, except: [:index, :new, :create]
before_action :commit, only: [:show]
before_action :authorize_read_pipeline!
before_action :authorize_create_pipeline!, only: [:new, :create]
before_action :authorize_update_pipeline!, only: [:retry, :cancel]
def index
@scope = params[:scope]
all_pipelines = project.ci_commits
@pipelines_count = all_pipelines.count
@running_or_pending_count = all_pipelines.running_or_pending.count
@pipelines = PipelinesFinder.new(project).execute(all_pipelines, @scope)
@pipelines = @pipelines.order(id: :desc).page(params[:page]).per(30)
end
def new
@pipeline = project.ci_commits.new(ref: @project.default_branch)
end
def create
@pipeline = Ci::CreatePipelineService.new(project, current_user, create_params).execute
unless @pipeline.persisted?
render 'new'
return
end
redirect_to namespace_project_pipeline_path(project.namespace, project, @pipeline)
end
def show
end
def retry
pipeline.retry_failed
redirect_back_or_default default: namespace_project_pipelines_path(project.namespace, project)
end
def cancel
pipeline.cancel_running
redirect_back_or_default default: namespace_project_pipelines_path(project.namespace, project)
end
private
def create_params
params.require(:pipeline).permit(:ref)
end
def pipeline
@pipeline ||= project.ci_commits.find_by!(id: params[:id])
end
def commit
@commit ||= @pipeline.commit_data
end
end
app/controllers/projects/project_members_controller.rb
View file @ 6e3df42c
......@@ -55,7 +55,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
format.html do
redirect_to namespace_project_project_members_path(@project.namespace, @project)
end
format.js { render nothing: true }
format.js { head :ok }
end
end
......@@ -81,7 +81,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
respond_to do |format|
format.html { redirect_to dashboard_projects_path, notice: "You left the project." }
format.js { render nothing: true }
format.js { head :ok }
end
else
if current_user == @project.owner
......
app/controllers/projects/protected_branches_controller.rb
View file @ 6e3df42c
......@@ -39,7 +39,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
respond_to do |format|
format.html { redirect_to namespace_project_protected_branches_path }
format.js { render nothing: true }
format.js { head :ok }
end
end
......
app/controllers/projects/runners_controller.rb
View file @ 6e3df42c
......@@ -20,7 +20,7 @@ class Projects::RunnersController < Projects::ApplicationController
if @runner.update_attributes(runner_params)
redirect_to runner_path(@runner), notice: 'Runner was successfully updated.'
else
redirect_to runner_path(@runner), alert: 'Runner was not updated.'
render 'edit'
end
end
......
app/controllers/projects/variables_controller.rb
View file @ 6e3df42c
......@@ -3,20 +3,44 @@ class Projects::VariablesController < Projects::ApplicationController
layout 'project_settings'
def index
@variable = Ci::Variable.new
end
def show
@variable = @project.variables.find(params[:id])
end
def update
if project.update_attributes(project_params)
@variable = @project.variables.find(params[:id])
if @variable.update_attributes(project_params)
redirect_to namespace_project_variables_path(project.namespace, project), notice: 'Variable was successfully updated.'
else
render action: "show"
end
end
def create
@variable = Ci::Variable.new(project_params)
if @variable.valid? && @project.variables << @variable
redirect_to namespace_project_variables_path(project.namespace, project), notice: 'Variables were successfully updated.'
else
render action: 'show'
render action: "index"
end
end
def destroy
@key = @project.variables.find(params[:id])
@key.destroy
redirect_to namespace_project_variables_path(project.namespace, project), notice: 'Variable was successfully removed.'
end
private
def project_params
params.require(:project).permit({ variables_attributes: [:id, :key, :value, :_destroy] })
params.require(:variable).permit([:id, :key, :value, :_destroy])
end
end
app/controllers/projects_controller.rb
View file @ 6e3df42c
......@@ -101,13 +101,7 @@ class ProjectsController < Projects::ApplicationController
respond_to do |format|
format.html do
if current_user
@membership = @project.team.find_member(current_user.id)
if @membership
@notification_setting = current_user.notification_settings_for(@project)
end
end
@notification_setting = current_user.notification_settings_for(@project) if current_user
if @project.repository_exists?
if @project.empty_repo?
......@@ -147,6 +141,7 @@ class ProjectsController < Projects::ApplicationController
@suggestions = {
emojis: AwardEmoji.urls,
issues: autocomplete.issues,
milestones: autocomplete.milestones,
mergerequests: autocomplete.merge_requests,
members: participants
}
......
app/controllers/registrations_controller.rb
View file @ 6e3df42c
......@@ -38,7 +38,7 @@ class RegistrationsController < Devise::RegistrationsController
end
def after_sign_up_path_for(user)
user.confirmed_at.present? ? dashboard_projects_path : users_almost_there_path
user.confirmed? ? dashboard_projects_path : users_almost_there_path
end
def after_inactive_sign_up_path_for(_resource)
......
app/finders/pipelines_finder.rb 0 → 100644
View file @ 6e3df42c
class PipelinesFinder
attr_reader :project
def initialize(project)
@project = project
end
def execute(pipelines, scope)
case scope
when 'running'
pipelines.running_or_pending
when 'branches'
from_ids(pipelines, ids_for_ref(pipelines, branches))
when 'tags'
from_ids(pipelines, ids_for_ref(pipelines, tags))
else
pipelines
end
end
private
def ids_for_ref(pipelines, refs)
pipelines.where(ref: refs).group(:ref).select('max(id)')
end
def from_ids(pipelines, ids)
pipelines.unscoped.where(id: ids)
end
def branches
project.repository.branches.map(&:name)
end
def tags
project.repository.tags.map(&:name)
end
end
app/finders/todos_finder.rb
View file @ 6e3df42c
......@@ -36,7 +36,7 @@ class TodosFinder
private
def action_id?
action_id.present? && [Todo::ASSIGNED, Todo::MENTIONED].include?(action_id.to_i)
action_id.present? && [Todo::ASSIGNED, Todo::MENTIONED, Todo::BUILD_FAILED].include?(action_id.to_i)
end
def action_id
......
app/helpers/blob_helper.rb
View file @ 6e3df42c
......@@ -184,4 +184,14 @@ module BlobHelper
Other: licenses.reject(&:featured).map { |license| [license.name, license.key] }
}
end
def gitignore_names
return @gitignore_names if defined?(@gitignore_names)
@gitignore_names = {
Global: Gitlab::Gitignore.global.map { |gitignore| { name: gitignore.name } },
# Note that the key here doesn't cover it really
Languages: Gitlab::Gitignore.languages_frameworks.map{ |gitignore| { name: gitignore.name } }
}
end
end
app/helpers/ci_status_helper.rb
View file @ 6e3df42c
......@@ -38,19 +38,30 @@ module CiStatusHelper
icon(icon_name + ' fw')
end
def render_ci_status(ci_commit, tooltip_placement: 'auto left')
# TODO: split this method into
# - render_commit_status
# - render_pipeline_status
link_to ci_icon_for_status(ci_commit.status),
ci_status_path(ci_commit),
class: "ci-status-link ci-status-icon-#{ci_commit.status.dasherize}",
title: "Build #{ci_label_for_status(ci_commit.status)}",
data: { toggle: 'tooltip', placement: tooltip_placement }
def render_commit_status(commit, tooltip_placement: 'auto left')
project = commit.project
path = builds_namespace_project_commit_path(project.namespace, project, commit)
render_status_with_link('commit', commit.status, path, tooltip_placement)
end
def render_pipeline_status(pipeline, tooltip_placement: 'auto left')
project = pipeline.project
path = namespace_project_pipeline_path(project.namespace, project, pipeline)
render_status_with_link('pipeline', pipeline.status, path, tooltip_placement)
end
def no_runners_for_project?(project)
project.runners.blank? &&
Ci::Runner.shared.blank?
end
private
def render_status_with_link(type, status, path, tooltip_placement)
link_to ci_icon_for_status(status),
path,
class: "ci-status-link ci-status-icon-#{status.dasherize}",
title: "#{type.titleize}: #{ci_label_for_status(status)}",
data: { toggle: 'tooltip', placement: tooltip_placement }
end
end
app/helpers/diff_helper.rb
View file @ 6e3df42c
......@@ -2,8 +2,8 @@ module DiffHelper
def mark_inline_diffs(old_line, new_line)
old_diffs, new_diffs = Gitlab::Diff::InlineDiff.new(old_line, new_line).inline_diffs
marked_old_line = Gitlab::Diff::InlineDiffMarker.new(old_line).mark(old_diffs)
marked_new_line = Gitlab::Diff::InlineDiffMarker.new(new_line).mark(new_diffs)
marked_old_line = Gitlab::Diff::InlineDiffMarker.new(old_line).mark(old_diffs, mode: :deletion)
marked_new_line = Gitlab::Diff::InlineDiffMarker.new(new_line).mark(new_diffs, mode: :addition)
[marked_old_line, marked_new_line]
end
......
app/helpers/emails_helper.rb
View file @ 6e3df42c
......@@ -32,12 +32,6 @@ module EmailsHelper
nil
end
def color_email_diff(diffcontent)
formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', inline_theme: 'github')
lexer = Rouge::Lexers::Diff
raw formatter.format(lexer.lex(diffcontent))
end
def password_reset_token_valid_time
valid_hours = Devise.reset_password_within / 60 / 60
if valid_hours >= 24
......
app/helpers/gitlab_routing_helper.rb
View file @ 6e3df42c
......@@ -33,6 +33,10 @@ module GitlabRoutingHelper
namespace_project_builds_path(project.namespace, project, *args)
end
def project_container_registry_path(project, *args)
namespace_project_container_registry_index_path(project.namespace, project, *args)
end
def activity_project_path(project, *args)
activity_namespace_project_path(project.namespace, project, *args)
end
......
app/helpers/projects_helper.rb
View file @ 6e3df42c
......@@ -124,11 +124,7 @@ module ProjectsHelper
end
def license_short_name(project)
no_license_key = project.repository.license_key.nil? ||
# Back-compat if cache contains 'no-license', can be removed in a few weeks
project.repository.license_key == 'no-license'
return 'LICENSE' if no_license_key
return 'LICENSE' if project.repository.license_key.nil?
license = Licensee::License.new(project.repository.license_key)
......@@ -148,10 +144,18 @@ module ProjectsHelper
nav_tabs << :merge_requests
end
if can?(current_user, :read_pipeline, project)
nav_tabs << :pipelines
end
if can?(current_user, :read_build, project)
nav_tabs << :builds
end
if Gitlab.config.registry.enabled && can?(current_user, :read_container_image, project)
nav_tabs << :container_registry
end
if can?(current_user, :admin_project, project)
nav_tabs << :settings
end
......
app/helpers/todos_helper.rb
View file @ 6e3df42c
......@@ -11,6 +11,7 @@ module TodosHelper
case todo.action
when Todo::ASSIGNED then 'assigned you'
when Todo::MENTIONED then 'mentioned you on'
when Todo::BUILD_FAILED then 'The build failed for your'
end
end
......@@ -28,8 +29,11 @@ module TodosHelper
namespace_project_commit_path(todo.project.namespace.becomes(Namespace), todo.project,
todo.target, anchor: anchor)
else
polymorphic_path([todo.project.namespace.becomes(Namespace),
todo.project, todo.target], anchor: anchor)
path = [todo.project.namespace.becomes(Namespace), todo.project, todo.target]
path.unshift(:builds) if todo.build_failed?
polymorphic_path(path, anchor: anchor)
end
end
......
app/mailers/emails/projects.rb
View file @ 6e3df42c
......@@ -65,7 +65,8 @@ module Emails
# used in notify layout
@target_url = @message.target_url
@project = Project.find project_id
@project = Project.find(project_id)
@diff_notes_disabled = true
add_project_headers
headers['X-GitLab-Author'] = @message.author_username
......
app/mailers/notify.rb
View file @ 6e3df42c
......@@ -10,6 +10,8 @@ class Notify < BaseMailer
include Emails::Builds
add_template_helper MergeRequestsHelper
add_template_helper DiffHelper
add_template_helper BlobHelper
add_template_helper EmailsHelper
def test_email(recipient_email, subject, body)
......
app/models/ability.rb
View file @ 6e3df42c
......@@ -60,6 +60,7 @@ class Ability
:read_project_member,
:read_merge_request,
:read_note,
:read_pipeline,
:read_commit_status,
:read_container_image,
:download_code
......@@ -205,6 +206,7 @@ class Ability
:read_commit_status,
:read_build,
:read_container_image,
:read_pipeline,
]
end
......@@ -216,6 +218,8 @@ class Ability
:update_commit_status,
:create_build,
:update_build,
:create_pipeline,
:update_pipeline,
:create_merge_request,
:create_wiki,
:push_code,
......@@ -248,6 +252,7 @@ class Ability
:admin_commit_status,
:admin_build,
:admin_container_image,
:admin_pipeline
]
end
......@@ -290,6 +295,7 @@ class Ability
unless project.builds_enabled
rules += named_abilities('build')
rules += named_abilities('pipeline')
end
unless project.container_registry_enabled
......
app/models/application_setting.rb
View file @ 6e3df42c
......@@ -7,7 +7,7 @@ class ApplicationSetting < ActiveRecord::Base
serialize :restricted_visibility_levels
serialize :import_sources
serialize :disabled_oauth_sign_in_sources
serialize :disabled_oauth_sign_in_sources, Array
serialize :restricted_signup_domains, Array
attr_accessor :restricted_signup_domains_raw
......
app/models/ci/build.rb
View file @ 6e3df42c
......@@ -53,6 +53,7 @@ module Ci
new_build.stage_idx = build.stage_idx
new_build.trigger_request = build.trigger_request
new_build.save
MergeRequests::AddTodoWhenBuildFailsService.new(build.project, nil).close(new_build)
new_build
end
end
......@@ -290,9 +291,15 @@ module Ci
end
def can_be_served?(runner)
return false unless has_tags? || runner.run_untagged?
(tag_list - runner.tag_list).empty?
end
def has_tags?
tag_list.any?
end
def any_runners_online?
project.any_runners? { |runner| runner.active? && runner.online? && can_be_served?(runner) }
end
......
app/models/ci/commit.rb
View file @ 6e3df42c
......@@ -8,8 +8,6 @@ module Ci
has_many :builds, class_name: 'Ci::Build'
has_many :trigger_requests, dependent: :destroy, class_name: 'Ci::TriggerRequest'
delegate :stages, to: :statuses
validates_presence_of :sha
validates_presence_of :status
validate :valid_commit_sha
......@@ -22,7 +20,8 @@ module Ci
end
def self.stages
CommitStatus.where(commit: all).stages
# We use pluck here due to problems with MySQL which doesn't allow LIMIT/OFFSET in queries
CommitStatus.where(commit: pluck(:id)).stages
end
def project_id
......@@ -67,6 +66,25 @@ module Ci
end
end
def cancel_running
builds.running_or_pending.each(&:cancel)
end
def retry_failed
builds.latest.failed.select(&:retryable?).each(&:retry)
end
def latest?
return false unless ref
commit = project.commit(ref)
return false unless commit
commit.sha == sha
end
def triggered?
trigger_requests.any?
end
def create_builds(user, trigger_request = nil)
return unless config_processor
config_processor.stages.any? do |stage|
......
app/models/ci/runner.rb
View file @ 6e3df42c
......@@ -4,7 +4,7 @@ module Ci
LAST_CONTACT_TIME = 5.minutes.ago
AVAILABLE_SCOPES = %w[specific shared active paused online]
FORM_EDITABLE = %i[description tag_list active]
FORM_EDITABLE = %i[description tag_list active run_untagged]
has_many :builds, class_name: 'Ci::Build'
has_many :runner_projects, dependent: :destroy, class_name: 'Ci::RunnerProject'
......@@ -26,6 +26,8 @@ module Ci
.where("ci_runner_projects.gl_project_id = :project_id OR ci_runners.is_shared = true", project_id: project_id)
end
validate :tag_constraints
acts_as_taggable
# Searches for runners matching the given query.
......@@ -96,5 +98,18 @@ module Ci
def short_sha
token[0...8] if token
end
def has_tags?
tag_list.any?
end
private
def tag_constraints
unless has_tags? || run_untagged?
errors.add(:tags_list,
'can not be empty when runner is not allowed to pick untagged jobs')
end
end
end
end
app/models/commit_status.rb
View file @ 6e3df42c
......@@ -14,7 +14,8 @@ class CommitStatus < ActiveRecord::Base
alias_attribute :author, :user
scope :latest, -> { where(id: unscope(:select).select('max(id)').group(:name, :commit_id)) }
scope :ordered, -> { order(:ref, :stage_idx, :name) }
scope :retried, -> { where.not(id: latest) }
scope :ordered, -> { order(:name) }
scope :ignored, -> { where(allow_failure: true, status: [:failed, :canceled]) }
state_machine :status, initial: :pending do
......@@ -45,6 +46,10 @@ class CommitStatus < ActiveRecord::Base
after_transition [:pending, :running] => :success do |commit_status|
MergeRequests::MergeWhenBuildSucceedsService.new(commit_status.commit.project, nil).trigger(commit_status)
end
after_transition any => :failed do |commit_status|
MergeRequests::AddTodoWhenBuildFailsService.new(commit_status.commit.project, nil).execute(commit_status)
end
end
delegate :sha, :short_sha, to: :commit
......@@ -54,13 +59,15 @@ class CommitStatus < ActiveRecord::Base
end
def self.stages
order_by = 'max(stage_idx)'
group('stage').order(order_by).pluck(:stage, order_by).map(&:first).compact
# We group by stage name, but order stages by theirs' index
unscoped.from(all, :sg).group('stage').order('max(stage_idx)', 'stage').pluck('sg.stage')
end
def self.stages_status
all.stages.inject({}) do |h, stage|
h[stage] = all.where(stage: stage).status
# We execute subquery for each stage to calculate a stage status
statuses = unscoped.from(all, :sg).group('stage').pluck('sg.stage', all.where('stage=sg.stage').status_sql)
statuses.inject({}) do |h, k|
h[k.first] = k.last
h
end
end
......
app/models/merge_request.rb
View file @ 6e3df42c
......@@ -286,6 +286,18 @@ class MergeRequest < ActiveRecord::Base
last_commit == source_project.commit(source_branch)
end
def should_remove_source_branch?
merge_params['should_remove_source_branch'].present?
end
def force_remove_source_branch?
merge_params['force_remove_source_branch'].present?
end
def remove_source_branch?
should_remove_source_branch? || force_remove_source_branch?
end
def mr_and_commit_notes
# Fetch comments only from last 100 commits
commits_for_notes_limit = 100
......@@ -426,7 +438,10 @@ class MergeRequest < ActiveRecord::Base
self.merge_when_build_succeeds = false
self.merge_user = nil
self.merge_params = nil
if merge_params
merge_params.delete('should_remove_source_branch')
merge_params.delete('commit_message')
end
self.save
end
......
app/models/merge_request_diff.rb
View file @ 6e3df42c
......@@ -98,9 +98,7 @@ class MergeRequestDiff < ActiveRecord::Base
commits = compare.commits
if commits.present?
commits = Commit.decorate(commits, merge_request.source_project).
sort_by(&:created_at).
reverse
commits = Commit.decorate(commits, merge_request.source_project).reverse
end
commits
......
app/models/milestone.rb
View file @ 6e3df42c
......@@ -59,8 +59,27 @@ class Milestone < ActiveRecord::Base
end
end
def self.reference_prefix
'%'
end
def self.reference_pattern
nil
# NOTE: The iid pattern only matches when all characters on the expression
# are digits, so it will match %2 but not %2.1 because that's probably a
# milestone name and we want it to be matched as such.
@reference_pattern ||= %r{
(#{Project.reference_pattern})?
#{Regexp.escape(reference_prefix)}
(?:
(?<milestone_iid>
\d+(?!\S\w)\b # Integer-based milestone iid, or
) |
(?<milestone_name>
[^"\s]+\b | # String-based single-word milestone title, or
"[^"]+" # String-based multi-word milestone surrounded in quotes
)
)
}x
end
def self.link_reference_pattern
......@@ -81,13 +100,26 @@ class Milestone < ActiveRecord::Base
end
end
def to_reference(from_project = nil)
escaped_title = self.title.gsub("]", "\\]")
h = Gitlab::Routing.url_helpers
url = h.namespace_project_milestone_url(self.project.namespace, self.project, self)
##
# Returns the String necessary to reference this Milestone in Markdown
#
# format - Symbol format to use (default: :iid, optional: :name)
#
# Examples:
#
# Milestone.first.to_reference # => "%1"
# Milestone.first.to_reference(format: :name) # => "%\"goal\""
# Milestone.first.to_reference(project) # => "gitlab-org/gitlab-ce%1"
#
def to_reference(from_project = nil, format: :iid)
format_reference = milestone_format_reference(format)
reference = "#{self.class.reference_prefix}#{format_reference}"
"[#{escaped_title}](#{url})"
if cross_project_reference?(from_project)
project.to_reference + reference
else
reference
end
end
def reference_link_text(from_project = nil)
......@@ -159,4 +191,16 @@ class Milestone < ActiveRecord::Base
issues.where(id: ids).
update_all(["position = CASE #{conditions} ELSE position END", *pairs])
end
private
def milestone_format_reference(format = :iid)
raise ArgumentError, 'Unknown format' unless [:iid, :name].include?(format)
if format == :name && !name.include?('"')
%("#{name}")
else
iid
end
end
end
app/models/namespace.rb
View file @ 6e3df42c
......@@ -110,6 +110,10 @@ class Namespace < ActiveRecord::Base
# Ensure old directory exists before moving it
gitlab_shell.add_namespace(path_was)
if any_project_has_container_registry_tags?
raise Exception.new('Namespace cannot be moved, because at least one project has tags in container registry')
end
if gitlab_shell.mv_namespace(path_was, path)
Gitlab::UploadsTransfer.new.rename_namespace(path_was, path)
......@@ -131,6 +135,10 @@ class Namespace < ActiveRecord::Base
end
end
def any_project_has_container_registry_tags?
projects.any?(&:has_container_registry_tags?)
end
def send_update_instructions
projects.each do |project|
project.send_move_instructions("#{path_was}/#{project.path}")
......
app/models/project.rb
View file @ 6e3df42c
......@@ -171,17 +171,17 @@ class Project < ActiveRecord::Base
scope :sorted_by_activity, -> { reorder(last_activity_at: :desc) }
scope :sorted_by_stars, -> { reorder('projects.star_count DESC') }
scope :sorted_by_names, -> { joins(:namespace).reorder('namespaces.name ASC, projects.name ASC') }
scope :without_user, ->(user) { where('projects.id NOT IN (:ids)', ids: user.authorized_projects.map(&:id) ) }
scope :without_team, ->(team) { team.projects.present? ? where('projects.id NOT IN (:ids)', ids: team.projects.map(&:id)) : scoped }
scope :not_in_group, ->(group) { where('projects.id NOT IN (:ids)', ids: group.project_ids ) }
scope :in_namespace, ->(namespace_ids) { where(namespace_id: namespace_ids) }
scope :in_group_namespace, -> { joins(:group) }
scope :personal, ->(user) { where(namespace_id: user.namespace_id) }
scope :joined, ->(user) { where('namespace_id != ?', user.namespace_id) }
scope :visible_to_user, ->(user) { where(id: user.authorized_projects.select(:id).reorder(nil)) }
scope :non_archived, -> { where(archived: false) }
scope :for_milestones, ->(ids) { joins(:milestones).where('milestones.id' => ids).distinct }
scope :with_push, -> { joins(:events).where('events.action = ?', Event::PUSHED) }
scope :active, -> { joins(:issues, :notes, :merge_requests).order('issues.created_at, notes.created_at, merge_requests.created_at DESC') }
scope :abandoned, -> { where('projects.last_activity_at < ?', 6.months.ago) }
state_machine :import_status, initial: :none do
event :import_start do
......@@ -204,23 +204,10 @@ class Project < ActiveRecord::Base
state :finished
state :failed
after_transition any => :started, do: :schedule_add_import_job
after_transition any => :finished, do: :clear_import_data
after_transition any => :finished, do: :reset_cache_and_import_attrs
end
class << self
def abandoned
where('projects.last_activity_at < ?', 6.months.ago)
end
def with_push
joins(:events).where('events.action = ?', Event::PUSHED)
end
def active
joins(:issues, :notes, :merge_requests).order('issues.created_at, notes.created_at, merge_requests.created_at DESC')
end
# Searches for a list of projects based on the query given in `query`.
#
# On PostgreSQL this method uses "ILIKE" to perform a case-insensitive
......@@ -282,10 +269,6 @@ class Project < ActiveRecord::Base
projects.iwhere('projects.path' => project_path).take
end
def find_by_ci_id(id)
find_by(ci_id: id.to_i)
end
def visibility_levels
Gitlab::VisibilityLevel.options
end
......@@ -316,10 +299,6 @@ class Project < ActiveRecord::Base
joins(join_body).reorder('join_note_counts.amount DESC')
end
def visible_to_user(user)
where(id: user.authorized_projects.select(:id).reorder(nil))
end
end
def team
......@@ -330,12 +309,30 @@ class Project < ActiveRecord::Base
@repository ||= Repository.new(path_with_namespace, self)
end
def container_registry_url
if container_registry_enabled? && Gitlab.config.registry.enabled
"#{Gitlab.config.registry.host_with_port}/#{path_with_namespace}"
def container_registry_repository
return unless Gitlab.config.registry.enabled
@container_registry_repository ||= begin
token = Auth::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace)
url = Gitlab.config.registry.api_url
host_port = Gitlab.config.registry.host_port
registry = ContainerRegistry::Registry.new(url, token: token, path: host_port)
registry.repository(path_with_namespace)
end
end
def container_registry_repository_url
if Gitlab.config.registry.enabled
"#{Gitlab.config.registry.host_port}/#{path_with_namespace}"
end
end
def has_container_registry_tags?
return unless container_registry_repository
container_registry_repository.tags.any?
end
def commit(id = 'HEAD')
repository.commit(id)
end
......@@ -349,10 +346,6 @@ class Project < ActiveRecord::Base
id && persisted?
end
def schedule_add_import_job
run_after_commit(:add_import_job)
end
def add_import_job
if forked?
job_id = RepositoryForkWorker.perform_async(self.id, forked_from_project.path_with_namespace, self.namespace.path)
......@@ -367,7 +360,7 @@ class Project < ActiveRecord::Base
end
end
def clear_import_data
def reset_cache_and_import_attrs
update(import_error: nil)
ProjectCacheWorker.perform_async(self.id)
......@@ -376,14 +369,14 @@ class Project < ActiveRecord::Base
end
def import_url=(value)
import_url = Gitlab::ImportUrl.new(value)
import_url = Gitlab::UrlSanitizer.new(value)
create_or_update_import_data(credentials: import_url.credentials)
super(import_url.sanitized_url)
end
def import_url
if import_data && super
import_url = Gitlab::ImportUrl.new(super, credentials: import_data.credentials)
import_url = Gitlab::UrlSanitizer.new(super, credentials: import_data.credentials)
import_url.full_url
else
super
......@@ -433,12 +426,7 @@ class Project < ActiveRecord::Base
end
def safe_import_url
result = URI.parse(self.import_url)
result.password = '*****' unless result.password.nil?
result.user = '*****' unless result.user.nil? || result.user == "git" #tokens or other data may be saved as user
result.to_s
rescue
self.import_url
Gitlab::UrlSanitizer.new(import_url).masked_url
end
def check_limit
......@@ -751,6 +739,11 @@ class Project < ActiveRecord::Base
expire_caches_before_rename(old_path_with_namespace)
if has_container_registry_tags?
# we currently doesn't support renaming repository if it contains tags in container registry
raise Exception.new('Project cannot be renamed, because tags are present in its container registry')
end
if gitlab_shell.mv_repository(old_path_with_namespace, new_path_with_namespace)
# If repository moved successfully we need to send update instructions to users.
# However we cannot allow rollback since we moved repository
......
app/models/project_services/slack_service/issue_message.rb
View file @ 6e3df42c
......@@ -34,7 +34,12 @@ class SlackService
private
def message
"#{user_name} #{state} #{issue_link} in #{project_link}: *#{title}*"
case state
when "opened"
"[#{project_link}] Issue #{state} by #{user_name}"
else
"[#{project_link}] Issue #{issue_link} #{state} by #{user_name}"
end
end
def opened_issue?
......@@ -42,7 +47,11 @@ class SlackService
end
def description_message
[{ text: format(description), color: attachment_color }]
[{
title: issue_title,
title_link: issue_url,
text: format(description),
color: "#C95823" }]
end
def project_link
......@@ -50,7 +59,11 @@ class SlackService
end
def issue_link
"[issue ##{issue_iid}](#{issue_url})"
"[#{issue_title}](#{issue_url})"
end
def issue_title
"##{issue_iid} #{title}"
end
end
end
app/models/repository.rb
View file @ 6e3df42c
......@@ -245,7 +245,7 @@ class Repository
def cache_keys
%i(size branch_names tag_names commit_count
readme version contribution_guide changelog
license_blob license_key)
license_blob license_key gitignore)
end
def build_cache
......@@ -256,6 +256,10 @@ class Repository
end
end
def expire_gitignore
cache.expire(:gitignore)
end
def expire_tags_cache
cache.expire(:tag_names)
@tags = nil
......@@ -472,33 +476,37 @@ class Repository
def changelog
cache.fetch(:changelog) do
tree(:head).blobs.find do |file|
file.name =~ /\A(changelog|history|changes|news)/i
end
file_on_head(/\A(changelog|history|changes|news)/i)
end
end
def license_blob
return nil if !exists? || empty?
return nil unless head_exists?
cache.fetch(:license_blob) do
tree(:head).blobs.find do |file|
file.name =~ /\A(licen[sc]e|copying)(\..+|\z)/i
end
file_on_head(/\A(licen[sc]e|copying)(\..+|\z)/i)
end
end
def license_key
return nil if !exists? || empty?
return nil unless head_exists?
cache.fetch(:license_key) do
Licensee.license(path).try(:key)
end
end
def gitlab_ci_yml
def gitignore
return nil if !exists? || empty?
cache.fetch(:gitignore) do
file_on_head(/\A\.gitignore\z/)
end
end
def gitlab_ci_yml
return nil unless head_exists?
@gitlab_ci_yml ||= tree(:head).blobs.find do |file|
file.name == '.gitlab-ci.yml'
end
......@@ -854,7 +862,7 @@ class Repository
def search_files(query, ref)
offset = 2
args = %W(#{Gitlab.config.git.bin_path} grep -i -I -n --before-context #{offset} --after-context #{offset} -e #{Regexp.escape(query)} #{ref || root_ref})
args = %W(#{Gitlab.config.git.bin_path} grep -i -I -n --before-context #{offset} --after-context #{offset} -E -e #{Regexp.escape(query)} #{ref || root_ref})
Gitlab::Popen.popen(args, path_to_repo).first.scrub.split(/^--$/)
end
......@@ -965,7 +973,7 @@ class Repository
end
def main_language
return if empty? || rugged.head_unborn?
return unless head_exists?
Linguist::Repository.new(rugged, rugged.head.target_id).language
end
......@@ -985,4 +993,12 @@ class Repository
def cache
@cache ||= RepositoryCache.new(path_with_namespace)
end
def head_exists?
exists? && !empty? && !rugged.head_unborn?
end
def file_on_head(regex)
tree(:head).blobs.find { |file| file.name =~ regex }
end
end
app/models/todo.rb
View file @ 6e3df42c
class Todo < ActiveRecord::Base
ASSIGNED = 1
MENTIONED = 2
ASSIGNED = 1
MENTIONED = 2
BUILD_FAILED = 3
belongs_to :author, class_name: "User"
belongs_to :note
......@@ -28,6 +29,10 @@ class Todo < ActiveRecord::Base
state :done
end
def build_failed?
action == BUILD_FAILED
end
def body
if note.present?
note.note
......
app/models/user.rb
View file @ 6e3df42c
......@@ -397,11 +397,6 @@ class User < ActiveRecord::Base
owned_groups.select(:id), namespace.id).joins(:namespace)
end
# Team membership in authorized projects
def tm_in_authorized_projects
ProjectMember.where(source_id: authorized_projects.map(&:id), user_id: self.id)
end
def is_admin?
admin
end
......@@ -491,10 +486,6 @@ class User < ActiveRecord::Base
"#{name} (#{username})"
end
def tm_of(project)
project.project_member_by_id(self.id)
end
def already_forked?(project)
!!fork_of(project)
end
......
app/services/auth/container_registry_authentication_service.rb
View file @ 6e3df42c
......@@ -6,7 +6,7 @@ module Auth
return error('not found', 404) unless registry.enabled
if params[:offline_token]
return error('forbidden', 403) unless current_user
return error('unauthorized', 401) unless current_user || project
else
return error('forbidden', 403) unless scope
end
......@@ -14,6 +14,17 @@ module Auth
{ token: authorized_token(scope).encoded }
end
def self.full_access_token(*names)
registry = Gitlab.config.registry
token = JSONWebToken::RSAToken.new(registry.key)
token.issuer = registry.issuer
token.audience = AUDIENCE
token[:access] = names.map do |name|
{ type: 'repository', name: name, actions: %w(*) }
end
token.encoded
end
private
def authorized_token(*accesses)
......
app/services/ci/create_pipeline_service.rb 0 → 100644
View file @ 6e3df42c
module Ci
class CreatePipelineService < BaseService
def execute
pipeline = project.ci_commits.new(params)
unless ref_names.include?(params[:ref])
pipeline.errors.add(:base, 'Reference not found')
return pipeline
end
unless commit
pipeline.errors.add(:base, 'Commit not found')
return pipeline
end
unless can?(current_user, :create_pipeline, project)
pipeline.errors.add(:base, 'Insufficient permissions to create a new pipeline')
return pipeline
end
begin
Ci::Commit.transaction do
pipeline.sha = commit.id
unless pipeline.config_processor
pipeline.errors.add(:base, pipeline.yaml_errors || 'Missing .gitlab-ci.yml file')
raise ActiveRecord::Rollback
end
pipeline.save!
pipeline.create_builds(current_user)
end
rescue
pipeline.errors.add(:base, 'The pipeline could not be created. Please try again.')
end
pipeline
end
private
def ref_names
@ref_names ||= project.repository.ref_names
end
def commit
@commit ||= project.commit(params[:ref])
end
end
end
app/services/create_commit_builds_service.rb
View file @ 6e3df42c
......@@ -18,19 +18,16 @@ class CreateCommitBuildsService
return false
end
commit = project.ci_commit(sha, ref)
unless commit
commit = project.ci_commits.new(sha: sha, ref: ref, before_sha: before_sha, tag: tag)
commit = Ci::Commit.new(project: project, sha: sha, ref: ref, before_sha: before_sha, tag: tag)
# Skip creating ci_commit when no gitlab-ci.yml is found
unless commit.ci_yaml_file
return false
end
# Create a new ci_commit
commit.save!
# Skip creating ci_commit when no gitlab-ci.yml is found
unless commit.ci_yaml_file
return false
end
# Create a new ci_commit
commit.save!
# Skip creating builds for commits that have [ci skip]
unless commit.skip_ci?
# Create builds for commit
......
app/services/issues/update_service.rb
View file @ 6e3df42c
......@@ -24,6 +24,10 @@ module Issues
todo_service.reassigned_issue(issue, current_user)
end
if issue.previous_changes.include?('confidential')
create_confidentiality_note(issue)
end
added_labels = issue.labels - old_labels
if added_labels.present?
notification_service.relabeled_issue(issue, added_labels, current_user)
......@@ -37,5 +41,11 @@ module Issues
def close_service
Issues::CloseService
end
private
def create_confidentiality_note(issue)
SystemNoteService.change_issue_confidentiality(issue, issue.project, current_user)
end
end
end
app/services/merge_requests/add_todo_when_build_fails_service.rb 0 → 100644
View file @ 6e3df42c
module MergeRequests
class AddTodoWhenBuildFailsService < MergeRequests::BaseService
# Adds a todo to the parent merge_request when a CI build fails
def execute(commit_status)
each_merge_request(commit_status) do |merge_request|
todo_service.merge_request_build_failed(merge_request)
end
end
# Closes any pending build failed todos for the parent MRs when a build is retried
def close(commit_status)
each_merge_request(commit_status) do |merge_request|
todo_service.merge_request_build_retried(merge_request)
end
end
end
end
app/services/merge_requests/base_service.rb
View file @ 6e3df42c
......@@ -38,5 +38,30 @@ module MergeRequests
def filter_params
super(:merge_request)
end
def merge_request_from(commit_status)
branches = commit_status.ref
# This is for ref-less builds
branches ||= @project.repository.branch_names_contains(commit_status.sha)
return [] if branches.blank?
merge_requests = @project.origin_merge_requests.opened.where(source_branch: branches).to_a
merge_requests += @project.fork_merge_requests.opened.where(source_branch: branches).to_a
merge_requests.uniq.select(&:source_project)
end
def each_merge_request(commit_status)
merge_request_from(commit_status).each do |merge_request|
ci_commit = merge_request.ci_commit
next unless ci_commit
next unless ci_commit.sha == commit_status.sha
yield merge_request, ci_commit
end
end
end
end
app/services/merge_requests/create_service.rb
View file @ 6e3df42c
......@@ -8,11 +8,14 @@ module MergeRequests
@project = Project.find(params[:target_project_id]) if params[:target_project_id]
filter_params
label_params = params[:label_ids]
merge_request = MergeRequest.new(params.except(:label_ids))
label_params = params.delete(:label_ids)
force_remove_source_branch = params.delete(:force_remove_source_branch)
merge_request = MergeRequest.new(params)
merge_request.source_project = source_project
merge_request.target_project ||= source_project
merge_request.author = current_user
merge_request.merge_params['force_remove_source_branch'] = force_remove_source_branch
if merge_request.save
merge_request.update_attributes(label_ids: label_params)
......
app/services/merge_requests/merge_service.rb
View file @ 6e3df42c
......@@ -45,10 +45,14 @@ module MergeRequests
def after_merge
MergeRequests::PostMergeService.new(project, current_user).execute(merge_request)
if params[:should_remove_source_branch].present?
DeleteBranchService.new(@merge_request.source_project, current_user).
if params[:should_remove_source_branch].present? || @merge_request.force_remove_source_branch?
DeleteBranchService.new(@merge_request.source_project, branch_deletion_user).
execute(merge_request.source_branch)
end
end
def branch_deletion_user
@merge_request.force_remove_source_branch? ? @merge_request.author : current_user
end
end
end
app/services/merge_requests/merge_when_build_succeeds_service.rb
View file @ 6e3df42c
......@@ -20,15 +20,9 @@ module MergeRequests
# Triggers the automatic merge of merge_request once the build succeeds
def trigger(commit_status)
merge_requests = merge_request_from(commit_status)
merge_requests.each do |merge_request|
each_merge_request(commit_status) do |merge_request, ci_commit|
next unless merge_request.merge_when_build_succeeds?
next unless merge_request.mergeable?
ci_commit = merge_request.ci_commit
next unless ci_commit
next unless ci_commit.sha == commit_status.sha
next unless ci_commit.success?
MergeWorker.perform_async(merge_request.id, merge_request.merge_user_id, merge_request.merge_params)
......@@ -47,20 +41,5 @@ module MergeRequests
end
end
private
def merge_request_from(commit_status)
branches = commit_status.ref
# This is for ref-less builds
branches ||= @project.repository.branch_names_contains(commit_status.sha)
return [] if branches.blank?
merge_requests = @project.origin_merge_requests.opened.where(source_branch: branches).to_a
merge_requests += @project.fork_merge_requests.opened.where(source_branch: branches).to_a
merge_requests.uniq.select(&:source_project)
end
end
end
app/services/merge_requests/refresh_service.rb
View file @ 6e3df42c
......@@ -12,6 +12,7 @@ module MergeRequests
close_merge_requests
reload_merge_requests
reset_merge_when_build_succeeds
mark_pending_todos_done
# Leave a system note if a branch was deleted/added
if branch_added? || branch_removed?
......@@ -80,6 +81,12 @@ module MergeRequests
merge_requests_for_source_branch.each(&:reset_merge_when_build_succeeds)
end
def mark_pending_todos_done
merge_requests_for_source_branch.each do |merge_request|
todo_service.merge_request_push(merge_request, @current_user)
end
end
def find_new_commits
if branch_added?
@commits = []
......
app/services/merge_requests/update_service.rb
View file @ 6e3df42c
......@@ -11,6 +11,8 @@ module MergeRequests
params.except!(:target_project_id)
params.except!(:source_branch)
merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch)
update(merge_request)
end
......
app/services/projects/autocomplete_service.rb
View file @ 6e3df42c
......@@ -4,6 +4,10 @@ module Projects
@project.issues.visible_to_user(current_user).opened.select([:iid, :title])
end
def milestones
@project.milestones.active.reorder(due_date: :asc, title: :asc).select([:iid, :title])
end
def merge_requests
@project.merge_requests.opened.select([:iid, :title])
end
......
app/services/projects/create_service.rb
View file @ 6e3df42c
......@@ -6,6 +6,7 @@ module Projects
def execute
forked_from_project_id = params.delete(:forked_from_project_id)
import_data = params.delete(:import_data)
@project = Project.new(params)
......@@ -49,16 +50,14 @@ module Projects
@project.build_forked_project_link(forked_from_project_id: forked_from_project_id)
end
Project.transaction do
@project.save
save_project_and_import_data(import_data)
if @project.persisted? && !@project.import?
raise 'Failed to create repository' unless @project.create_repository
end
end
@project.import_start if @project.import?
after_create_actions if @project.persisted?
@project.add_import_job if @project.import?
@project
rescue => e
message = "Unable to save project: #{e.message}"
......@@ -93,8 +92,16 @@ module Projects
unless @project.group
@project.team << [current_user, :master, current_user]
end
end
@project.import_start if @project.import?
def save_project_and_import_data(import_data)
Project.transaction do
@project.create_or_update_import_data(data: import_data[:data], credentials: import_data[:credentials]) if import_data
if @project.save && !@project.import?
raise 'Failed to create repository' unless @project.create_repository
end
end
end
end
end
app/services/projects/destroy_service.rb
View file @ 6e3df42c
......@@ -26,6 +26,10 @@ module Projects
Project.transaction do
project.destroy!
unless remove_registry_tags
raise_error('Failed to remove project container registry. Please try again or contact administrator')
end
unless remove_repository(repo_path)
raise_error('Failed to remove project repository. Please try again or contact administrator')
end
......@@ -59,6 +63,12 @@ module Projects
end
end
def remove_registry_tags
return true unless Gitlab.config.registry.enabled
project.container_registry_repository.delete_tags
end
def raise_error(message)
raise DestroyError.new(message)
end
......
app/services/projects/transfer_service.rb
View file @ 6e3df42c
......@@ -34,6 +34,11 @@ module Projects
raise TransferError.new("Project with same path in target namespace already exists")
end
if project.has_container_registry_tags?
# we currently doesn't support renaming repository if it contains tags in container registry
raise TransferError.new('Project cannot be transferred, because tags are present in its container registry')
end
project.expire_caches_before_rename(old_path)
# Apply new namespace id and visibility level
......
app/services/system_note_service.rb
View file @ 6e3df42c
......@@ -169,12 +169,33 @@ class SystemNoteService
#
# Returns the created Note object
def self.change_title(noteable, project, author, old_title)
return unless noteable.respond_to?(:title)
new_title = noteable.title.dup
body = "Title changed from **#{old_title}** to **#{noteable.title}**"
old_diffs, new_diffs = Gitlab::Diff::InlineDiff.new(old_title, new_title).inline_diffs
marked_old_title = Gitlab::Diff::InlineDiffMarker.new(old_title).mark(old_diffs, mode: :deletion, markdown: true)
marked_new_title = Gitlab::Diff::InlineDiffMarker.new(new_title).mark(new_diffs, mode: :addition, markdown: true)
body = "Changed title: **#{marked_old_title}** → **#{marked_new_title}**"
create_note(noteable: noteable, project: project, author: author, note: body)
end
# Called when the confidentiality changes
#
# issue - Issue object
# project - Project owning the issue
# author - User performing the change
#
# Example Note text:
#
# "Made the issue confidential"
#
# Returns the created Note object
def self.change_issue_confidentiality(issue, project, author)
body = issue.confidential ? 'Made the issue confidential' : 'Made the issue visible'
create_note(noteable: issue, project: project, author: author, note: body)
end
# Called when a branch in Noteable is changed
#
# noteable - Noteable object
......
app/services/todo_service.rb
View file @ 6e3df42c
......@@ -80,6 +80,30 @@ class TodoService
mark_pending_todos_as_done(merge_request, current_user)
end
# When a build fails on the HEAD of a merge request we should:
#
# * create a todo for that user to fix it
#
def merge_request_build_failed(merge_request)
create_build_failed_todo(merge_request)
end
# When a new commit is pushed to a merge request we should:
#
# * mark all pending todos related to the merge request for that user as done
#
def merge_request_push(merge_request, current_user)
mark_pending_todos_as_done(merge_request, current_user)
end
# When a build is retried to a merge request we should:
#
# * mark all pending todos related to the merge request for the author as done
#
def merge_request_build_retried(merge_request)
mark_pending_todos_as_done(merge_request, merge_request.author)
end
# When create a note we should:
#
# * mark all pending todos related to the noteable for the note author as done
......@@ -145,6 +169,12 @@ class TodoService
create_todos(mentioned_users, attributes)
end
def create_build_failed_todo(merge_request)
author = merge_request.author
attributes = attributes_for_todo(merge_request.project, merge_request, author, Todo::BUILD_FAILED)
create_todos(author, attributes)
end
def attributes_for_target(target)
attributes = {
project_id: target.project.id,
......
app/views/admin/runners/show.html.haml
View file @ 6e3df42c
......@@ -9,8 +9,6 @@
%span.runner-state.runner-state-specific
Specific
- if @runner.shared?
.bs-callout.bs-callout-success
%h4 This runner will process builds from ALL UNASSIGNED projects
......
app/views/dashboard/todos/_todo.html.haml
View file @ 6e3df42c
%li{class: "todo todo-#{todo.done? ? 'done' : 'pending'}", id: dom_id(todo), data:{url: todo_target_path(todo)} }
.todo-item.todo-block
= image_tag avatar_icon(todo.author_email, 40), class: 'avatar s40', alt:''
.todo-title.title
%span.author-name
- if todo.author
= link_to_author(todo)
- else
(removed)
- unless todo.build_failed?
%span.author-name
- if todo.author
= link_to_author(todo)
- else
(removed)
%span.todo-label
= todo_action_name(todo)
- if todo.target
......
app/views/groups/_activities.html.haml
View file @ 6e3df42c
......@@ -4,7 +4,7 @@
.nav-block
- if current_user
.controls
= link_to dashboard_projects_path(:atom, { private_token: current_user.private_token }), class: 'btn rss-btn' do
= link_to group_path(@group, format: :atom, private_token: current_user.private_token), class: 'btn rss-btn' do
%i.fa.fa-rss
= render 'shared/event_filter'
......
app/views/groups/issues.atom.builder
View file @ 6e3df42c
This diff is collapsed.
app/views/layouts/nav/_project.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/layouts/notify.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/_md_preview.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/_zen.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/blob/_editor.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/buttons/_fork.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/ci/commits/_commit.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/commit/_builds.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/commit/_ci_stage.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/container_registry/_header_title.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/container_registry/_tag.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/container_registry/index.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/diffs/_file.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/empty.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/hooks/index.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/pipelines/_header_title.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/pipelines/_info.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/pipelines/index.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/pipelines/new.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/pipelines/show.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/runners/_form.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/runners/edit.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/runners/show.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/triggers/index.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/variables/_content.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/variables/_form.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/variables/_table.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/variables/index.html.haml 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
app/views/projects/variables/show.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/shared/groups/_list.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/views/shared/issuable/_form.html.haml
View file @ 6e3df42c
This diff is collapsed.
app/workers/emails_on_push_worker.rb
View file @ 6e3df42c
This diff is collapsed.
app/workers/repository_import_worker.rb
View file @ 6e3df42c
This diff is collapsed.
config/application.rb
View file @ 6e3df42c
This diff is collapsed.
config/gitlab.yml.example
View file @ 6e3df42c
This diff is collapsed.
config/initializers/1_settings.rb
View file @ 6e3df42c
This diff is collapsed.
config/routes.rb
View file @ 6e3df42c
This diff is collapsed.
db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
db/schema.rb
View file @ 6e3df42c
This diff is collapsed.
doc/README.md
View file @ 6e3df42c
This diff is collapsed.
doc/administration/container_registry.md 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
doc/api/README.md
View file @ 6e3df42c
This diff is collapsed.
doc/api/groups.md
View file @ 6e3df42c
This diff is collapsed.
doc/api/runners.md
View file @ 6e3df42c
This diff is collapsed.
doc/ci/quick_start/README.md
View file @ 6e3df42c
This diff is collapsed.
doc/ci/runners/README.md
View file @ 6e3df42c
This diff is collapsed.
doc/ci/triggers/README.md
View file @ 6e3df42c
This diff is collapsed.
doc/ci/yaml/README.md
View file @ 6e3df42c
This diff is collapsed.
doc/development/migration_style_guide.md
View file @ 6e3df42c
This diff is collapsed.
doc/markdown/markdown.md
View file @ 6e3df42c
This diff is collapsed.
doc/monitoring/health_check.md 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
doc/monitoring/img/health_check_token.png 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
doc/permissions/permissions.md
View file @ 6e3df42c
This diff is collapsed.
doc/workflow/notifications.md
View file @ 6e3df42c
This diff is collapsed.
features/steps/dashboard/dashboard.rb
View file @ 6e3df42c
This diff is collapsed.
features/steps/project/commits/commits.rb
View file @ 6e3df42c
This diff is collapsed.
features/steps/project/merge_requests.rb
View file @ 6e3df42c
This diff is collapsed.
generator_templates/active_record/migration/migration.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
lib/api/api.rb
View file @ 6e3df42c
This diff is collapsed.
lib/api/entities.rb
View file @ 6e3df42c
This diff is collapsed.
lib/api/gitignores.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
lib/api/notes.rb
View file @ 6e3df42c
This diff is collapsed.
lib/api/runners.rb
View file @ 6e3df42c
This diff is collapsed.
lib/backup/manager.rb
View file @ 6e3df42c
This diff is collapsed.
lib/backup/registry.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
lib/banzai/filter/inline_diff_filter.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
lib/banzai/pipeline/gfm_pipeline.rb
View file @ 6e3df42c
This diff is collapsed.
lib/ci/api/runners.rb
View file @ 6e3df42c
This diff is collapsed.
lib/container_registry/blob.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
lib/container_registry/client.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
lib/container_registry/config.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
lib/container_registry/registry.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
lib/container_registry/repository.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
lib/container_registry/tag.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
lib/gitlab/database/migration_helpers.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
lib/gitlab/diff/inline_diff_marker.rb
View file @ 6e3df42c
This diff is collapsed.
lib/gitlab/email/message/repository_push.rb
View file @ 6e3df42c
This diff is collapsed.
lib/gitlab/gitignore.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
lib/gitlab/gitlab_import/importer.rb
View file @ 6e3df42c
This diff is collapsed.
lib/gitlab/regex.rb
View file @ 6e3df42c
This diff is collapsed.
lib/gitlab/sanitizers/svg.rb
View file @ 6e3df42c
This diff is collapsed.
lib/gitlab/sanitizers/svg/whitelist.rb
View file @ 6e3df42c
This diff is collapsed.
lib/support/nginx/registry-ssl 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
lib/tasks/gitlab/backup.rake
View file @ 6e3df42c
This diff is collapsed.
lib/tasks/gitlab/check.rake
View file @ 6e3df42c
This diff is collapsed.
lib/tasks/gitlab/update_gitignore.rake 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/factories/todos.rb
View file @ 6e3df42c
This diff is collapsed.
spec/features/container_registry_spec.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/features/issues_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/features/markdown_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/features/pipelines_spec.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/features/projects/files/gitignore_dropdown_spec.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/features/runners_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/features/variables_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/fixtures/container_registry/config_blob.json 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/fixtures/container_registry/tag_manifest.json 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/fixtures/markdown.md.erb
View file @ 6e3df42c
This diff is collapsed.
spec/helpers/diff_helper_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/lib/banzai/filter/inline_diff_filter_spec.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/lib/container_registry/blob_spec.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/lib/container_registry/registry_spec.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/lib/container_registry/repository_spec.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/lib/container_registry/tag_spec.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/lib/gitlab/database/migration_helpers_spec.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/lib/gitlab/gitignore_spec.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/lib/gitlab/import_url_spec.rb deleted 100644 → 0
View file @ f2f345e6
This diff is collapsed.
spec/lib/gitlab/url_sanitizer_spec.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/mailers/notify_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/models/build_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/models/ci/commit_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/models/ci/runner_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/models/namespace_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/models/project_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/models/repository_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/requests/api/gitignores_spec.rb 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
spec/requests/api/licenses_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/requests/api/notes_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/requests/api/runners_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/requests/ci/api/builds_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/requests/ci/api/runners_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/requests/jwt_controller_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/services/issues/update_service_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/services/notification_service_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/services/system_note_service_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/services/todo_service_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/support/markdown_feature.rb
View file @ 6e3df42c
This diff is collapsed.
spec/support/matchers/markdown_matchers.rb
View file @ 6e3df42c
This diff is collapsed.
spec/support/stub_gitlab_calls.rb
View file @ 6e3df42c
This diff is collapsed.
spec/tasks/gitlab/backup_rake_spec.rb
View file @ 6e3df42c
This diff is collapsed.
spec/workers/post_receive_spec.rb
View file @ 6e3df42c
This diff is collapsed.
vendor/assets/stylesheets/animate.css deleted 100644 → 0
View file @ f2f345e6
This diff is collapsed.
vendor/gitignore/Actionscript.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Ada.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Agda.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Android.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/AppEngine.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/AppceleratorTitanium.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/ArchLinuxPackages.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Autotools.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/C++.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/C.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/CFWheels.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/CMake.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/CUDA.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/CakePHP.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/ChefCookbook.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Clojure.gitignore 0 → 120000
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/CodeIgniter.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/CommonLisp.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Composer.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Concrete5.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Coq.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/CraftCMS.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/D.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/DM.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Dart.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Delphi.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Drupal.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/EPiServer.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Eagle.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Elisp.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Elixir.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Elm.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Erlang.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/ExpressionEngine.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/ExtJs.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Fancy.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Finale.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/ForceDotCom.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Fortran.gitignore 0 → 120000
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/FuelPHP.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/GWT.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Gcov.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/GitBook.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Anjuta.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Archives.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/BricxCC.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/CVS.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Calabash.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Cloud9.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/CodeKit.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/DartEditor.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Dreamweaver.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Dropbox.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Eclipse.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/EiffelStudio.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Emacs.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Ensime.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Espresso.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/FlexBuilder.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/GPG.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/IPythonNotebook.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/JDeveloper.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/JetBrains.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/KDevelop4.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Kate.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Lazarus.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/LibreOffice.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Linux.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/LyX.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Matlab.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Mercurial.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/MicrosoftOffice.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/ModelSim.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Momentics.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/MonoDevelop.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/NetBeans.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Ninja.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/NotepadPP.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/OSX.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Otto.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Redcar.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Redis.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/SBT.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/SVN.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/SlickEdit.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/SublimeText.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/SynopsysVCS.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Tags.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/TextMate.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/TortoiseGit.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Vagrant.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Vim.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/VirtualEnv.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/VisualStudioCode.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/WebMethods.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Windows.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/Xcode.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Global/XilinxISE.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Go.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Gradle.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Grails.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Haskell.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/IGORPro.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Idris.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Java.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Jboss.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Jekyll.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Joomla.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/KiCad.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Kohana.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/LabVIEW.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Laravel.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Leiningen.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/LemonStand.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Lilypond.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Lithium.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Lua.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Magento.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Maven.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Mercury.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/MetaProgrammingSystem.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Nanoc.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Nim.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Node.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/OCaml.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Objective-C.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Opa.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/OpenCart.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/OracleForms.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Packer.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Perl.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Phalcon.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/PlayFramework.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Plone.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Prestashop.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Processing.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Python.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Qooxdoo.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Qt.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/R.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/README.md 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/ROS.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Rails.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/RhodesRhomobile.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Ruby.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Rust.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/SCons.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Sass.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Scala.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Scheme.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Scrivener.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Sdcc.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/SeamGen.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/SketchUp.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Smalltalk.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Stella.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/SugarCRM.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Swift.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Symfony.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/SymphonyCMS.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/TeX.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Terraform.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Textpattern.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/TurboGears2.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Typo3.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Umbraco.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Unity.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/UnrealEngine.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/VVVV.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/VisualStudio.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Waf.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/WordPress.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Xojo.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Yeoman.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Yii.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/ZendFramework.gitignore 0 → 100644
View file @ 6e3df42c
This diff is collapsed.
vendor/gitignore/Zephir.gitignore 0 → 100644
View file @ 6e3df42c
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