Skip to content

G
gitlab-ce
Commit 4e77b0b5 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 

Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake
Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parents 6d688217 232e6b40
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3607 additions and 982 deletions
.travis.yml
View file @ 4e77b0b5
language: ruby
env:
- DB=mysql TRAVIS=true
global:
- DB=mysql
- TRAVIS=true
matrix:
- TASK=spinach
- TASK=spec
- TASK=jasmine:ci
before_install:
- sudo apt-get install libicu-dev -y
- gem install charlock_holmes -v="0.6.9"
branches:
only:
- 'master'
......@@ -11,8 +16,9 @@ rvm:
- 2.0.0
services:
- mysql
- postgresql
before_script:
- "cp config/database.yml.$DB config/database.yml"
- "cp config/gitlab.yml.example config/gitlab.yml"
script: "bundle exec rake gitlab:test --trace"
- "bundle exec rake db:setup"
- "bundle exec rake db:seed_fu"
script: "bundle exec rake $TASK --trace"
CHANGELOG
View file @ 4e77b0b5
v 6.3.0
- API for adding gitlab-ci service
- Init script now waits for pids to appear after (re)starting before reporting status (Rovanion Luckey)
- Restyle project home page
- Grammar fixes
- Show branches list (which branches contains commit) on commit page (Andrew Kumanyaev)
- Security improvements
- Added support for GitLab CI 4.0
- Fixed issue with 500 error when group did not exist
- Ability to leave project
- You can create file in repo using UI
- You can remove file from repo using UI
- API: dropped default_branch attribute from project during creation
- Project default_branch is not stored in db any more. It takes from repo now.
- Admin broadcast messages
- UI improvements
- Dont show last push widget if user removed this branch
- Fix 500 error for repos with newline in file name
- Extended html titles
- API: create/update/delete repo files
- Admin can transfer project to any namespace
- API: projects/all for admin users
- Fix recent branches order
v 6.2.4
- Security: Cast API private_token to string (CVE-2013-4580)
- Security: Require gitlab-shell 1.7.8 (CVE-2013-4581, CVE-2013-4582, CVE-2013-4583)
- Fix for Git SSH access for LDAP users
v 6.2.3
- Security: More protection against CVE-2013-4489
- Security: Require gitlab-shell 1.7.4 (CVE-2013-4490, CVE-2013-4546)
- Fix sidekiq rake tasks
v 6.2.2
- Security: Update gitlab_git (CVE-2013-4489)
v 6.2.1
- Security: Fix issue with generated passwords for new users
v 6.2.0
- Public project pages are now visible to everyone (files, issues, wik, etc.)
THIS MEANS YOUR ISSUES AND WIKI FOR PUBLIC PROJECTS ARE PUBLICLY VISIBLE AFTER THE UPGRADE
......@@ -15,7 +55,7 @@ v 6.2.0
- Extended User API to expose admin and can_create_group for user creation/updating (Boyan Tabakov)
- API: Remove group
- API: Remove project
- Avatar upload on profile page with a maximum of 200KB (Steven Thonus)
- Avatar upload on profile page with a maximum of 100KB (Steven Thonus)
- Store the sessions in Redis instead of the cookie store
- Fixed relative links in markdown
- User must confirm his email if signup enabled
......@@ -83,6 +123,14 @@ v 6.0.0
- Improved MR comments logic
- Render readme file for projects in public area
v 5.4.2
- Security: Cast API private_token to string (CVE-2013-4580)
- Security: Require gitlab-shell 1.7.8 (CVE-2013-4581, CVE-2013-4582, CVE-2013-4583)
v 5.4.1
- Security: Fixes for CVE-2013-4489
- Security: Require gitlab-shell 1.7.4 (CVE-2013-4490, CVE-2013-4546)
v 5.4.0
- Ability to edit own comments
- Documentation improvements
......
CONTRIBUTING.md
View file @ 4e77b0b5
......@@ -5,9 +5,18 @@ This guide details how to use issues and pull requests to improve GitLab.
- [Closing policy for issues and pull requests](#closing-policy-for-issues-and-pull-requests)
- [Issue tracker](#issue-tracker)
- [Pull requests](#pull-requests)
- [Security vulnerabilities](#security-vulnerabilities)
If you want to know how the GitLab team handles contributions have a look at [the GitLab contributing process](PROCESS.md).
## Contributor license agreement
By submitting code as an individual you agree to the [individual contributor license agreement](doc/legal/individual_contributor_license_agreement.md). By submitting code as an entity you agree to the [corporate contributor license agreement](doc/legal/corporate_contributor_license_agreement.md).
## Security vulnerability disclosure
Please report suspected security vulnerabilities in private to support@gitlab.com, also see the [disclosure section on the GitLab.com website](http://www.gitlab.com/disclosure/). Please do NOT create publicly viewable issues for suspected security vulnerabilities.
## Closing policy for issues and pull requests
GitLab is a popular open source project and the capacity to deal with issues and pull requests is limited. Out of respect for our volunteers, issues and pull requests not in line with the guidelines listed in this document may be closed without notice.
......
Gemfile
View file @ 4e77b0b5
......@@ -8,7 +8,7 @@ def linux_only(require_as)
RUBY_PLATFORM.include?('linux') && require_as
end
gem "rails", "3.2.13"
gem "rails", "3.2.15"
# Supported DBs
gem "mysql2", group: :mysql
......
Gemfile.lock
View file @ 4e77b0b5
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.13)
actionpack (= 3.2.13)
mail (~> 2.5.3)
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
actionmailer (3.2.15)
actionpack (= 3.2.15)
mail (~> 2.5.4)
actionpack (3.2.15)
activemodel (= 3.2.15)
activesupport (= 3.2.15)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
......@@ -14,19 +14,19 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.13)
activesupport (= 3.2.13)
activemodel (3.2.15)
activesupport (= 3.2.15)
builder (~> 3.0.0)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activerecord (3.2.15)
activemodel (= 3.2.15)
activesupport (= 3.2.15)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activesupport (3.2.13)
i18n (= 0.6.1)
activeresource (3.2.15)
activemodel (= 3.2.15)
activesupport (= 3.2.15)
activesupport (3.2.15)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
acts-as-taggable-on (2.4.1)
rails (>= 3, < 5)
......@@ -34,7 +34,7 @@ GEM
annotate (2.6.0.beta2)
activerecord (>= 2.3.0)
rake (>= 0.8.7)
arel (3.0.2)
arel (3.0.3)
asciidoctor (0.1.3)
awesome_print (1.2.0)
backports (3.3.2)
......@@ -108,7 +108,7 @@ GEM
warden (~> 1.2.1)
devise-async (0.8.0)
devise (>= 2.2, < 3.2)
diff-lcs (1.2.4)
diff-lcs (1.2.5)
dotenv (0.8.0)
email_spec (1.4.0)
launchy (~> 2.1)
......@@ -171,7 +171,7 @@ GEM
stringex (~> 1.5.1)
gitlab-grack (1.0.1)
rack (~> 1.4.1)
gitlab-grit (2.6.1)
gitlab-grit (2.6.3)
charlock_holmes (~> 0.6.9)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
......@@ -235,7 +235,7 @@ GEM
multi_json (~> 1.0)
multi_xml (>= 0.5.2)
httpauth (0.2.0)
i18n (0.6.1)
i18n (0.6.5)
jasmine (1.3.2)
jasmine-core (~> 1.3.1)
rack (~> 1.0)
......@@ -274,11 +274,11 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.1)
mime-types (1.25)
mime-types (1.25.1)
minitest (4.7.4)
modernizr (2.6.2)
sprockets (~> 2.0)
multi_json (1.8.0)
multi_json (1.8.2)
multi_xml (0.5.4)
multipart-post (1.2.0)
mysql2 (0.3.11)
......@@ -348,14 +348,14 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.13)
actionmailer (= 3.2.13)
actionpack (= 3.2.13)
activerecord (= 3.2.13)
activeresource (= 3.2.13)
activesupport (= 3.2.13)
rails (3.2.15)
actionmailer (= 3.2.15)
actionpack (= 3.2.15)
activerecord (= 3.2.15)
activeresource (= 3.2.15)
activesupport (= 3.2.15)
bundler (~> 1.0)
railties (= 3.2.13)
railties (= 3.2.15)
rails-dev-tweaks (0.6.1)
actionpack (~> 3.1)
railties (~> 3.1)
......@@ -368,9 +368,9 @@ GEM
i18n
require_all
ruby-progressbar
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
railties (3.2.15)
actionpack (= 3.2.15)
activesupport (= 3.2.15)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
......@@ -514,7 +514,7 @@ GEM
multi_json (~> 1.5)
twitter-stream (~> 0.1)
tins (0.11.0)
treetop (1.4.14)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbolinks (1.2.0)
......@@ -523,7 +523,7 @@ GEM
eventmachine (>= 0.12.8)
http_parser.rb (~> 0.5.1)
simple_oauth (~> 0.1.4)
tzinfo (0.3.37)
tzinfo (0.3.38)
uglifier (2.1.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
......@@ -615,7 +615,7 @@ DEPENDENCIES
quiet_assets (~> 1.0.1)
rack-attack
rack-mini-profiler
rails (= 3.2.13)
rails (= 3.2.15)
rails-dev-tweaks
rails_best_practices
raphael-rails (~> 2.1.2)
......
README.md
View file @ 4e77b0b5
......@@ -64,9 +64,10 @@ If you want to contribute, please first read our [Contributing Guidelines](https
* [Installation guides](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Unofficial-Installation-Guides) public wiki with unofficial guides to install GitLab on different operating systems.
* [BitNami one-click installers](http://bitnami.com/stack/gitlab)
* [TurnKey Linux virtual appliance](http://www.turnkeylinux.org/gitlab)
* [Digital Ocean 1-Click Application Install](https://www.digitalocean.com/) Have a new server up in 55 seconds. Digital Ocean uses SSD disks which is great for an IO intensive app as GitLab. Look for GitLab under 'Select Image' => 'Applications' when creating a droplet.
* [BitNami one-click installers](http://bitnami.com/stack/gitlab) Get an image with GitLab and GitLab CI preinstalled for Amazon Web Services, Azure, VMware or your local server.
### New versions and upgrading
......@@ -99,7 +100,7 @@ Start it with [Foreman](https://github.com/ddollar/foreman)
or start each component separately
bundle exec rails s
bundle exec rake sidekiq:start
script/background_jobs start
### Run the tests
......
app/assets/javascripts/api.js.coffee
View file @ 4e77b0b5
......@@ -3,6 +3,7 @@
user_path: "/api/:version/users/:id.json"
notes_path: "/api/:version/projects/:id/notes.json"
ldap_groups_path: "/api/:version/ldap/groups.json"
namespaces_path: "/api/:version/namespaces.json"
# Get 20 (depends on api) recent notes
# and sort the ascending from oldest to newest
......@@ -50,6 +51,20 @@
).done (users) ->
callback(users)
# Return namespaces list. Filtered by query
namespaces: (query, callback) ->
url = Api.buildUrl(Api.namespaces_path)
$.ajax(
url: url
data:
private_token: gon.api_token
search: query
per_page: 20
dataType: "json"
).done (namespaces) ->
callback(namespaces)
buildUrl: (url) ->
url = gon.relative_url_root + url if gon.relative_url_root?
return url.replace(':version', gon.api_version)
......
app/assets/javascripts/main.js.coffee
View file @ 4e77b0b5
......@@ -123,6 +123,10 @@ $ ->
$(@).next('table').show()
$(@).remove()
$(".content").on "click", ".js-details-expand", ->
$(@).next('.js-details-contain').removeClass("hide")
$(@).remove()
(($) ->
_chosen = $.fn.chosen
$.fn.extend chosen: (options) ->
......
app/assets/javascripts/namespace_select.js.coffee 0 → 100644
View file @ 4e77b0b5
$ ->
namespaceFormatResult = (namespace) ->
markup = "<div class='namespace-result'>"
markup += "<span class='namespace-kind'>" + namespace.kind + "</span>"
markup += "<span class='namespace-path'>" + namespace.path + "</span>"
markup += "</div>"
markup
formatSelection = (namespace) ->
namespace.kind + ": " + namespace.path
$('.ajax-namespace-select').each (i, select) ->
$(select).select2
placeholder: "Search for namespace"
multiple: $(select).hasClass('multiselect')
minimumInputLength: 0
query: (query) ->
Api.namespaces query.term, (namespaces) ->
data = { results: namespaces }
query.callback(data)
dropdownCssClass: "ajax-namespace-dropdown"
formatResult: namespaceFormatResult
formatSelection: formatSelection
app/assets/javascripts/notes.js
View file @ 4e77b0b5
......@@ -233,10 +233,12 @@ var NoteList = {
form.show();
var textarea = form.find("textarea");
var p = $("<p></p>").text(textarea.val());
var hidden_div = $('<div class="note-original-content"></div>').append(p);
form.append(hidden_div);
hidden_div.hide();
if (form.find(".note-original-content").length === 0) {
var p = $("<p></p>").text(textarea.val());
var hidden_div = $('<div class="note-original-content"></div>').append(p);
form.append(hidden_div);
hidden_div.hide();
}
textarea.focus();
},
......@@ -532,6 +534,8 @@ var NoteList = {
note_text.html(response.note).show();
var note_form = note_li.find(".note-edit-form");
var original_content = note_form.find(".note-original-content");
original_content.remove();
note_form.hide();
note_form.find(".btn-save").enableButton();
......
app/assets/javascripts/project.js.coffee
View file @ 4e77b0b5
......@@ -6,10 +6,10 @@ class Project
@initEvents()
initEvents: ->
disableButtonIfEmptyField '#project_name', '.project-submit'
$('#project_issues_enabled').change ->
if ($(this).is(':checked') == true)
$('#project_issues_tracker').removeAttr('disabled')
......@@ -29,7 +29,7 @@ class Project
$ ->
# Git clone panel switcher
scope = $ '.project_clone_holder'
scope = $ '.git-clone-holder'
if scope.length > 0
$('a, button', scope).click ->
$('a, button', scope).removeClass 'active'
......@@ -40,3 +40,9 @@ $ ->
# Ref switcher
$('.project-refs-select').on 'change', ->
$(@).parents('form').submit()
$('.hide-no-ssh-message').on 'click', (e) ->
path = '/'
$.cookie('hide_no_ssh_message', 'false', { path: path })
$(@).parents('.no-ssh-key-message').hide()
e.preventDefault()
app/assets/stylesheets/common.scss
View file @ 4e77b0b5
......@@ -86,13 +86,6 @@ span.update-author {
font-weight: bold;
}
.label {
padding: 1px 4px;
font-size: 12px;
font-style: normal;
font-weight: normal;
}
.field_with_errors {
display: inline;
}
......@@ -136,6 +129,10 @@ p.time {
}
}
.highlight {
text-shadow: none;
}
.highlight_word {
border-bottom: 2px solid #F90;
}
......@@ -223,7 +220,6 @@ li.note {
.error-message {
padding: 10px;
background: #C67;
padding-left: 20px;
margin: 0;
color: #FFF;
......@@ -231,8 +227,18 @@ li.note {
color: #fff;
text-decoration: underline;
}
&.centered {
text-align: center;
}
.no-ssh-key-message {
padding: 10px 0;
background: #C67;
margin: 0;
color: #FFF;
text-align: center;
a {
color: #fff;
text-decoration: underline;
}
}
......@@ -349,3 +355,40 @@ table {
@extend .btn-new;
padding: 5px 15px;
}
.broadcast-message {
padding: 10px;
text-align: center;
background: #555;
color: #BBB;
}
.ajax-users-select {
width: 400px;
&.input-large {
width: 210px;
}
}
.user-result {
.user-image {
float: left;
}
.user-name {
}
.user-username {
color: #999;
}
}
.namespace-result {
.namespace-kind {
color: #AAA;
font-weight: normal;
}
.namespace-path {
margin-left: 10px;
font-weight: bolder;
}
}
app/assets/stylesheets/gitlab_bootstrap/avatar.scss
View file @ 4e77b0b5
......@@ -2,8 +2,8 @@
float: left;
margin-right: 12px;
width: 40px;
border: 1px solid #ddd;
padding: 1px;
@include border-radius(4px);
&.avatar-inline {
float: none;
......
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
View file @ 4e77b0b5
......@@ -32,12 +32,9 @@
}
&.ui-box-show {
text-shadow: 0 1px 1px #fff;
color: #666;
margin:20px 0;
background: #FFF;
box-shadow: inset 0 1px 0 #fff, 0 1px 5px #f1f1f1;
@include linear-gradient(#fafafa, #f1f1f1);
background: #FAFAFA;
.control-group {
margin-bottom: 0;
......@@ -45,11 +42,13 @@
}
&.ui-box-danger {
background: #f7f7f7;
border: none;
.title {
@include linear-gradient(#F26E5E, #bd362f);
background: #D65;
color: #fff;
text-shadow: 0 1px 1px #900;
font-weight: bold;
}
}
......@@ -99,9 +98,9 @@
}
.title {
@include bg-gray-gradient;
border-bottom: 1px solid #CCC;
color: #456;
background-color: #EEE;
border-bottom: 1px solid #DDD;
color: #666;
font-size: 16px;
text-shadow: 0 1px 1px #fff;
padding: 0 10px;
......
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
View file @ 4e77b0b5
.btn {
display: inline-block;
padding: 6px 12px;
margin-bottom: 0;
font-size: 13px;
line-height: $baseLineHeight;
font-weight: normal;
text-align: center;
vertical-align: middle;
cursor: pointer;
border: 1px solid #BBB;
color: $style_color;
@include border-radius($baseBorderRadius);
@include box-shadow(inset 0 1px 0 rgba(255,255,255,.2));
@include linear-gradient(#f1f1f1, #e1e1e1);
text-shadow: 0 1px 1px #FFF;
text-decoration: none;
background-image: none;
border: 1px solid transparent;
white-space: nowrap;
padding: 6px 12px;
font-size: 13px;
line-height: 18px;
border-radius: 4px;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
-o-user-select: none;
user-select: none;
color: #444444;
background-color: #fff;
border-color: #ccc;
text-shadow: none;
&.hover,
&:hover {
color: $style_color;
background: #f1f1f1;
border-color: #AAA;
color: #444444;
text-decoration: none;
@include linear-gradient(#fAfAfA, #f1f1f1);
background-color: #ebebeb;
border-color: #adadad;
}
&.focus,
&:focus {
color: #444444;
text-decoration: none;
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
&.active,
&:active {
background-image: none;
outline: 0;
text-decoration: none;
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
background-image: none;
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
}
&.disabled,
&[disabled] {
cursor: default;
background-image: none;
@include opacity(65);
@include box-shadow(none);
cursor: not-allowed;
pointer-events: none;
opacity: 0.65;
filter: alpha(opacity=65);
-webkit-box-shadow: none;
box-shadow: none;
}
&.btn-primary {
color: #FFF;
border-color: #189;
text-shadow: 0 1px 1px #189;
@include linear-gradient(#4AC, #289);
color: #ffffff;
background-color: #429bca;
border-color: #358ebd;
&.hover,
&:hover,
&.disabled,
&[disabled] {
color: #FFF;
background: #389;
color: #ffffff;
background-color: #3286b1;
border-color: #286e8e;
}
}
&.btn-success {
color: #FFF;
border-color: #1A1;
text-shadow: 0 1px 1px #FFF;
text-shadow: 0 1px 1px #181;
@include linear-gradient(#62C452, #51a351);
color: #ffffff;
background-color: #5cb85c;
border-color: #4cae4c;
&.hover,
&:hover,
&.disabled,
&[disabled] {
color: #FFF;
background: #2A2;
color: #ffffff;
background-color: #47a447;
border-color: #398439;
}
}
&.btn-danger {
color: #FFF;
text-shadow: 0 1px 1px #811;
border-color: #BD362F;
@include linear-gradient(#EE5F5B, #BD362F);
color: #ffffff;
background-color: #d9534f;
border-color: #d43f3a;
&.hover,
&:hover,
&.disabled,
&[disabled] {
color: #FFF;
background: #A22;
color: #ffffff;
background-color: #d2322d;
border-color: #ac2925;
}
}
......@@ -138,4 +148,11 @@
margin-right: 7px;
float: left;
}
&.btn-block {
width: 100%;
margin: 0;
padding: 6px 0;
margin-bottom: 15px;
}
}
app/assets/stylesheets/gitlab_bootstrap/common.scss
View file @ 4e77b0b5
/** COLORS **/
.cgray { color: gray }
.clgray { color: #BBB }
.cred { color: #D12F19 }
.cgreen { color: #4a2 }
.cblue { color: #29A }
......@@ -88,6 +89,19 @@ pre.well-pre {
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
}
.label {
padding: 2px 4px;
font-size: 12px;
font-style: normal;
font-weight: normal;
&.label-gray {
background-color: #eee;
color: #999;
text-shadow: none;
}
}
/** Big Labels **/
.state-label {
font-size: 14px;
......@@ -109,3 +123,7 @@ pre.well-pre {
color: #FFF;
}
}
.dropdown-menu > li > a {
text-shadow: none;
}
app/assets/stylesheets/gitlab_bootstrap/files.scss
View file @ 4e77b0b5
......@@ -11,8 +11,8 @@
}
.file-title {
border-bottom: 1px solid #bbb;
@include bg-dark-gray-gradient;
background: #DDD;
border-bottom: 1px solid #CCC;
text-shadow: 0 1px 1px #fff;
margin: 0;
font-weight: normal;
......
app/assets/stylesheets/gitlab_bootstrap/forms.scss
View file @ 4e77b0b5
......@@ -3,6 +3,16 @@ form {
label {
@extend .control-label;
&.radio-label {
text-align: left;
width: 100%;
margin-left: 0;
input[type="radio"] {
margin-top: 1px !important;
}
}
}
}
......@@ -49,3 +59,9 @@ fieldset legend {
font-size: 16px;
margin-bottom: 10px;
}
.datetime-controls {
select {
width: 100px;
}
}
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
View file @ 4e77b0b5
......@@ -25,6 +25,7 @@
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
background-image: -webkit-linear-gradient($from, $to);
background-image: -moz-linear-gradient($from, $to);
background-image: -ms-linear-gradient($from, $to);
background-image: -o-linear-gradient($from, $to);
}
......@@ -45,6 +46,7 @@
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));
background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
background-image: -ms-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
}
......@@ -53,6 +55,7 @@
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
}
......@@ -60,6 +63,7 @@
background: #eee;
background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
background-image: -ms-linear-gradient(#e9e9e9, #d7d7d7);
background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
}
......@@ -85,10 +89,26 @@
}
code { padding: 0 4px; }
h1 { margin-top: 30px;}
h2 { margin-top: 25px;}
h3 { margin-top: 20px;}
h4 { margin-top: 15px;}
h1 {
margin-top: 45px;
font-size: 2.5em;
}
h2 {
margin-top: 40px;
font-size: 2em;
}
h3 {
margin-top: 35px;
font-size: 2em;
}
h4 {
margin-top: 30px;
font-size: 1.5em;
}
blockquote p {
color: #888;
......@@ -103,6 +123,16 @@
background: #EEE;
}
}
code {
font-size: inherit;
font-weight: inherit;
color: #555;
}
li {
line-height: 1.5;
}
}
@mixin page-title {
......
app/assets/stylesheets/sections/admin.scss
View file @ 4e77b0b5
......@@ -21,3 +21,9 @@
.controls { margin-left: 130px; }
.form-actions { padding-left: 130px; background: #fff }
}
.broadcast-messages {
.message {
line-height: 2;
}
}
app/assets/stylesheets/sections/commits.scss
View file @ 4e77b0b5
......@@ -16,36 +16,29 @@
.header {
@extend .clearfix;
background: #DDD;
border-bottom: 1px solid #CCC;
padding: 5px 5px 5px 10px;
color: #555;
border-bottom: 1px solid #CCC;
background: #eee;
// TODO Replace with linear-gradient mixin
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
a{
color: $style_color;
}
> span {
font-family: $monospace_font;
font-size: 14px;
line-height: 30px;
line-height: 2;
}
a.view-file{
.view-file {
font-weight: bold;
float: right;
background-color: #EEE;
}
.commit-short-id{
.commit-short-id {
font-family: $monospace_font;
font-size: smaller;
}
.file-mode{
.file-mode {
font-family: $monospace_font;
}
}
......@@ -55,13 +48,13 @@
background: #FFF;
color: #333;
font-size: 12px;
.old{
span.idiff{
.old {
span.idiff {
background-color: #FAA;
}
}
.new{
span.idiff{
.new {
span.idiff {
background-color: #AFA;
}
}
......@@ -293,6 +286,7 @@
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
ul, li{
......
app/assets/stylesheets/sections/dashboard.scss
View file @ 4e77b0b5
......@@ -51,7 +51,7 @@
li {
&.active {
a {
@include linear-gradient(#f5f5f5, #eee);
background-color: #EEE;
border-bottom: 1px solid #EEE !important;
&:hover {
background: #eee;
......@@ -74,7 +74,7 @@
}
.project-name, .group-name {
font-size: 16px;
font-size: 15px;
}
.arrow {
......
app/assets/stylesheets/sections/events.scss
View file @ 4e77b0b5
......@@ -47,7 +47,7 @@
.event-title {
color: #333;
font-weight: normal;
font-size: 15px;
font-size: 14px;
.author_name {
color: #333;
}
......@@ -60,14 +60,14 @@
color: #666;
}
.event-note {
color: #555;
color: #666;
margin-top: 5px;
pre {
border: none;
background: #f9f9f9;
border-radius: 0;
color: #555;
color: #666;
margin: 0 20px;
}
......@@ -142,19 +142,19 @@
.filter_icon {
a {
text-align:center;
border-left: 3px solid $primary_color;
background: #f9f9f9;
background: #EEE;
margin-bottom: 10px;
float: left;
padding: 9px 7px;
padding: 9px 6px;
font-size: 18px;
width: 26px;
@include border-radius(3px);
}
&.inactive {
a {
color: #DDD;
border-left: 3px solid #EEE;
background: #f9f9f9;
}
}
}
......
app/assets/stylesheets/sections/header.scss
View file @ 4e77b0b5
......@@ -36,8 +36,8 @@ header {
float: left;
margin-right: 9px;
position: relative;
top: -5px;
padding-top: 5px;
top: -3px;
padding-top: 3px;
a {
float: left;
......
app/assets/stylesheets/sections/merge_requests.scss
View file @ 4e77b0b5
......@@ -110,9 +110,29 @@
.merge-request-angle {
text-align: center;
margin: 0;
margin: 0 auto;
background: #eee;
border-radius: 100px;
width: 60px;
line-height: 60px;
color: #777;
text-shadow: 0 1px 2px #FFF;
}
.merge-request-form-info {
padding: 15px 0;
padding-top: 15px;
}
.merge-request-branches {
.commit-row-message {
font-weight: normal !important;
}
.chosen-container .chosen-single {
padding: 2px 0 2px 10px;
span {
font-weight: bold;
color: #555;
}
}
}
app/assets/stylesheets/sections/projects.scss
View file @ 4e77b0b5
......@@ -14,25 +14,76 @@
}
}
.project_clone_panel {
.project-home-panel {
border-bottom: 1px solid #DDD;
padding-bottom: 25px;
margin-bottom: 30px;
.project-home-title {
font-size: 18px;
color: #777;
margin: 0;
line-height: 32px;
}
.project-home-dropdown {
margin-left: 10px;
float: right;
}
.project-home-extra {
margin-top: 15px;
.project-home-desc {
float: left;
color: #999;
}
.project-home-links {
float: right;
a {
margin-left: 10px;
}
}
}
.public-label {
font-size: 14px;
background: #f1f1f1;
padding: 8px 10px;
border-radius: 4px;
margin-left: 10px;
color: #888;
text-shadow: 0 1px 1px #FFF;
}
}
.git-clone-holder {
float: right;
border: 1px solid #E1E1E1;
@include border-radius(4px);
@include bg-gray-gradient;
padding: 4px 7px;
border: 1px solid #CCC;
margin-bottom: 20px;
.btn {
padding: 4px 12px;
margin-left: 3px;
border: none;
background: none;
box-shadow: none;
color: #29b;
padding: 6px;
&.active {
color: #333;
font-weight: bold;
}
}
}
.project_clone_holder {
input[type="text"] {
margin-left: 2px;
border: none;
border-radius: 0;
border-left: 1px solid #E1E1E1;
@extend .monospace;
border: 1px solid #BBB;
box-shadow: none;
margin-left: -1px;
background: #FFF;
background: #FAFAFA;
padding: 6px 10px;
}
}
......@@ -81,16 +132,16 @@ ul.nav.nav-projects-tabs {
.my-projects {
li {
.project-title {
font-size: 14px;
}
.project-info {
margin-bottom: 10px;
}
.access-icon i {
.access-icon {
color: #AAA;
margin-left: 10px;
i {
color: #AAA;
}
}
}
}
......@@ -115,3 +166,61 @@ ul.nav.nav-projects-tabs {
color: #777;
}
}
.project-side {
.btn-block {
background-image: none;
background-color: #F1f1f1;
border-color: #EEE;
&:hover {
background-color: #eee;
border-color: #DDD;
}
}
.project-fork-icon {
float: left;
font-size: 26px;
margin-right: 10px;
line-height: 1.5;
}
}
.transfer-project .chosen-container {
min-width: 200px;
}
/** Branch/tag selector **/
.project-refs-form {
margin: 0;
span {
background:none !important;
position:static !important;
width:auto !important;
height:auto !important;
}
}
.project-refs-select {
width: 120px;
}
.project-refs-form .chosen-container {
position: relative;
top: 0;
left: 0;
margin-right: 10px;
.chosen-single span {
font-weight: bold;
color: #555;
}
&.chosen-container-active {
.chosen-drop {
min-width: 400px;
}
.chosen-results {
max-height: 400px;
}
}
}
app/assets/stylesheets/selects.scss
View file @ 4e77b0b5
/* CHZN reset few styles */
.chosen-container-single .chosen-single {
background: #FFF;
border: 1px solid #bbb;
box-shadow: none;
}
.chosen-container-active .chosen-single {
background: #fff;
}
.ajax-users-select {
width: 400px;
&.input-large {
width: 210px;
}
}
.user-result {
.user-image {
float: left;
}
.user-name {
}
.user-username {
color: #999;
}
}
/** Branch/tag selector **/
.project-refs-form {
margin: 0;
span {
background:none !important;
position:static !important;
width:auto !important;
height:auto !important;
}
}
.project-refs-select {
width: 120px;
}
.project-refs-form .chosen-container {
position: relative;
top: 0;
left: 0;
margin-right: 10px;
.chosen-drop {
min-width: 400px;
.chosen-results {
max-height: 300px;
}
.chosen-search input {
min-width: 365px;
}
}
}
/** Fix for Search Dropdown Border **/
/** Chosen.js selectbox style override **/
.chosen-container {
min-width: 100px;
.chosen-search {
input:focus {
@include box-shadow(none);
}
.chosen-single {
background: #EEE !important;
border: 1px solid #DDD !important;
@include box-shadow(none !important);
@include border-radius(4px !important);
}
.chosen-drop {
margin: 7px 0;
min-width: 200px;
border: 1px solid #bbb;
@include border-radius(0);
.chosen-results {
margin-top: 5px;
max-height: 300px;
.group-result {
color: $style_color;
border-bottom: 1px solid #EEE;
padding: 8px;
}
.active-result {
@include border-radius(0);
&.highlighted {
background: $hover;
color: $style_color;
}
&.result-selected {
background: #EEE;
border-left: 4px solid #CCC;
}
}
}
.chosen-search {
@include bg-gray-gradient;
input {
min-width: 165px;
border-color: #CCC;
}
}
.chosen-results li.highlighted {
background: #29b;
}
}
.chosen-container .chosen-single,
.chosen-container.chosen-with-drop .chosen-single {
@include bg-light-gray-gradient;
div {
background: transparent;
border-left: none;
.chosen-drop {
margin-top: 10px;
border: 1px solid #DDD !important;
@include border-radius(4px !important);
}
span {
font-weight: normal;
.chosen-search input {
border: 1px solid #CCC !important;
@include box-shadow(none !important);
}
}
/** Select2 styling **/
.select2-container .select2-choice {
background: #f1f1f1;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, whitesmoke), to(#e1e1e1));
background-image: -webkit-linear-gradient(whitesmoke 6.6%, #e1e1e1);
background-image: -moz-linear-gradient(whitesmoke 6.6%, #e1e1e1);
background-image: -o-linear-gradient(whitesmoke 6.6%, #e1e1e1);
@include bg-light-gray-gradient;
}
.select2-container .select2-choice div {
......
app/assets/stylesheets/themes/ui_color.scss
View file @ 4e77b0b5
......@@ -27,6 +27,12 @@
background: #435;
border-left: 1px solid #658;
}
.nav > li > a {
color: #98B;
}
.search-input {
border-color: #98B;
}
}
}
}
......
app/assets/stylesheets/themes/ui_mars.scss
View file @ 4e77b0b5
......@@ -23,12 +23,17 @@
background-color: #373D47;
}
}
.separator {
background: #373D47;
border-left: 1px solid #575D67;
}
.nav > li > a {
color: #979DA7;
}
.search-input {
border-color: #979DA7;
}
}
}
.separator {
background: #31363E;
border-left: 1px solid #666;
}
}
}
app/assets/stylesheets/themes/ui_modern.scss
View file @ 4e77b0b5
......@@ -27,6 +27,12 @@
background: #234;
border-left: 1px solid #456;
}
.nav > li > a {
color: #89A;
}
.search-input {
border-color: #89A;
}
}
}
}
......
app/contexts/base_context.rb
View file @ 4e77b0b5
......@@ -17,4 +17,3 @@ class BaseContext
abilities.allowed?(object, action, subject)
end
end
app/contexts/commit_load_context.rb
View file @ 4e77b0b5
......@@ -18,6 +18,7 @@ class CommitLoadContext < BaseContext
result[:note] = project.build_commit_note(commit)
result[:line_notes] = line_notes
result[:notes_count] = project.notes.for_commit_id(commit.id).count
result[:branches] = project.repository.branch_names_contains(commit.id)
begin
result[:suppress_diff] = true if commit.diff_suppress? && !params[:force_show_diff]
......
app/contexts/files/base_context.rb 0 → 100644
View file @ 4e77b0b5
module Files
class BaseContext < ::BaseContext
attr_reader :ref, :path
def initialize(project, user, params, ref, path = nil)
@project, @current_user, @params = project, user, params.dup
@ref = ref
@path = path
end
private
def error(message)
{
error: message,
status: :error
}
end
def success
{
error: '',
status: :success
}
end
def repository
project.repository
end
end
end
app/contexts/files/create_context.rb 0 → 100644
View file @ 4e77b0b5
module Files
class CreateContext < BaseContext
def execute
allowed = if project.protected_branch?(ref)
can?(current_user, :push_code_to_protected_branches, project)
else
can?(current_user, :push_code, project)
end
unless allowed
return error("You are not allowed to create file in this branch")
end
unless repository.branch_names.include?(ref)
return error("You can only create files if you are on top of a branch")
end
file_name = File.basename(path)
file_path = path
unless file_name =~ Gitlab::Regex.path_regex
return error("Your changes could not be commited, because file name contains not allowed characters")
end
blob = repository.blob_at(ref, file_path)
if blob
return error("Your changes could not be commited, because file with such name exists")
end
new_file_action = Gitlab::Satellite::NewFileAction.new(current_user, project, ref, file_path)
created_successfully = new_file_action.commit!(
params[:content],
params[:commit_message]
)
if created_successfully
success
else
error("Your changes could not be commited, because the file has been changed")
end
end
end
end
app/contexts/files/delete_context.rb 0 → 100644
View file @ 4e77b0b5
module Files
class DeleteContext < BaseContext
def execute
allowed = if project.protected_branch?(ref)
can?(current_user, :push_code_to_protected_branches, project)
else
can?(current_user, :push_code, project)
end
unless allowed
return error("You are not allowed to push into this branch")
end
unless repository.branch_names.include?(ref)
return error("You can only create files if you are on top of a branch")
end
blob = repository.blob_at(ref, path)
unless blob
return error("You can only edit text files")
end
delete_file_action = Gitlab::Satellite::DeleteFileAction.new(current_user, project, ref, path)
deleted_successfully = delete_file_action.commit!(
nil,
params[:commit_message]
)
if deleted_successfully
success
else
error("Your changes could not be commited, because the file has been changed")
end
end
end
end
app/contexts/files/update_context.rb 0 → 100644
View file @ 4e77b0b5
module Files
class UpdateContext < BaseContext
def execute
allowed = if project.protected_branch?(ref)
can?(current_user, :push_code_to_protected_branches, project)
else
can?(current_user, :push_code, project)
end
unless allowed
return error("You are not allowed to push into this branch")
end
unless repository.branch_names.include?(ref)
return error("You can only create files if you are on top of a branch")
end
blob = repository.blob_at(ref, path)
unless blob
return error("You can only edit text files")
end
new_file_action = Gitlab::Satellite::EditFileAction.new(current_user, project, ref, path)
created_successfully = new_file_action.commit!(
params[:content],
params[:commit_message]
)
if created_successfully
success
else
error("Your changes could not be commited, because the file has been changed")
end
end
end
end
app/contexts/projects/create_context.rb
View file @ 4e77b0b5
......@@ -47,8 +47,6 @@ module Projects
@project.creator = current_user
if @project.save
@project.discover_default_branch
unless @project.group
@project.users_projects.create(
project_access: UsersProject::MASTER,
......
app/contexts/projects/update_context.rb
View file @ 4e77b0b5
......@@ -3,6 +3,16 @@ module Projects
def execute(role = :default)
params[:project].delete(:namespace_id)
params[:project].delete(:public) unless can?(current_user, :change_public_mode, project)
new_branch = params[:project].delete(:default_branch)
if project.repository.exists? && new_branch != project.repository.root_ref
GitlabShellWorker.perform_async(
:update_repository_head,
project.path_with_namespace,
new_branch
)
end
project.update_attributes(params[:project], as: role)
end
end
......
app/contexts/search_context.rb
View file @ 4e77b0b5
......@@ -10,11 +10,14 @@ class SearchContext
query = Shellwords.shellescape(query) if query.present?
return result unless query.present?
projects = Project.where(id: project_ids)
result[:projects] = projects.search(query).limit(20)
result[:projects] = Project.where("projects.id in (?) OR projects.public = true", project_ids).search(query).limit(20)
# Search inside single project
single_project_search(Project.where(id: project_ids), query)
result
end
def single_project_search(projects, query)
project = projects.first if projects.length == 1
if params[:search_code].present?
......@@ -24,7 +27,6 @@ class SearchContext
result[:issues] = Issue.where(project_id: project_ids).search(query).order('updated_at DESC').limit(20)
result[:wiki_pages] = []
end
result
end
def result
......
app/controllers/admin/background_jobs_controller.rb
View file @ 4e77b0b5
class Admin::BackgroundJobsController < Admin::ApplicationController
def show
@sidekiq_processes = `ps -U #{Settings.gitlab.user} -o euser,pid,pcpu,pmem,stat,start,command | grep sidekiq | grep -v grep`
end
end
app/controllers/admin/broadcast_messages_controller.rb 0 → 100644
View file @ 4e77b0b5
class Admin::BroadcastMessagesController < Admin::ApplicationController
before_filter :broadcast_messages
def index
@broadcast_message = BroadcastMessage.new
end
def create
@broadcast_message = BroadcastMessage.new(params[:broadcast_message])
if @broadcast_message.save
redirect_to admin_broadcast_messages_path, notice: 'Broadcast Message was successfully created.'
else
render :index
end
end
def destroy
BroadcastMessage.find(params[:id]).destroy
respond_to do |format|
format.html { redirect_to :back }
format.js { render nothing: true }
end
end
protected
def broadcast_messages
@broadcast_messages ||= BroadcastMessage.order("starts_at DESC").page(params[:page])
end
end
app/controllers/admin/dashboard_controller.rb
View file @ 4e77b0b5
......@@ -2,5 +2,6 @@ class Admin::DashboardController < Admin::ApplicationController
def index
@projects = Project.order("created_at DESC").limit(10)
@users = User.order("created_at DESC").limit(10)
@groups = Group.order("created_at DESC").limit(10)
end
end
app/controllers/admin/projects_controller.rb
View file @ 4e77b0b5
class Admin::ProjectsController < Admin::ApplicationController
before_filter :project, only: [:edit, :show, :update, :destroy, :team_update]
before_filter :project, only: [:show, :transfer]
before_filter :group, only: [:show, :transfer]
before_filter :repository, only: [:show, :transfer]
def index
owner_id = params[:owner_id]
......@@ -14,8 +16,16 @@ class Admin::ProjectsController < Admin::ApplicationController
end
def show
@repository = @project.repository
@group = @project.group
end
def transfer
result = ::Projects::TransferContext.new(@project, current_user, project: params).execute(:admin)
if result
redirect_to [:admin, @project]
else
render :show
end
end
protected
......@@ -26,4 +36,12 @@ class Admin::ProjectsController < Admin::ApplicationController
@project = Project.find_with_namespace(id)
@project || render_404
end
def group
@group ||= project.group
end
def repository
@repository ||= project.repository
end
end
app/controllers/groups_controller.rb
View file @ 4e77b0b5
......@@ -104,7 +104,7 @@ class GroupsController < ApplicationController
# Dont allow unauthorized access to group
def authorize_read_group!
unless projects.present? or can?(current_user, :read_group, @group)
unless @group and (projects.present? or can?(current_user, :read_group, @group))
return render_404
end
end
......
app/controllers/projects/application_controller.rb
View file @ 4e77b0b5
......@@ -23,4 +23,10 @@ class Projects::ApplicationController < ApplicationController
'public_projects'
end
end
def require_branch_head
unless @repository.branch_names.include?(@ref)
redirect_to project_tree_path(@project, @ref), notice: "This action is not allowed unless you are on top of a branch"
end
end
end
app/controllers/projects/base_tree_controller.rb 0 → 100644
View file @ 4e77b0b5
class Projects::BaseTreeController < Projects::ApplicationController
include ExtractsPath
before_filter :authorize_read_project!
before_filter :authorize_code_access!
before_filter :require_non_empty_project
end
app/controllers/projects/blob_controller.rb
View file @ 4e77b0b5
......@@ -7,9 +7,30 @@ class Projects::BlobController < Projects::ApplicationController
before_filter :authorize_code_access!
before_filter :require_non_empty_project
before_filter :blob
def show
@blob = @repository.blob_at(@commit.id, @path)
end
def destroy
result = Files::DeleteContext.new(@project, current_user, params, @ref, @path).execute
if result[:status] == :success
flash[:notice] = "Your changes have been successfully commited"
redirect_to project_tree_path(@project, @ref)
else
flash[:alert] = result[:error]
render :show
end
end
private
def blob
@blob ||= @repository.blob_at(@commit.id, @path)
return not_found! unless @blob
not_found! unless @blob
@blob
end
end
app/controllers/projects/commit_controller.rb
View file @ 4e77b0b5
......@@ -22,6 +22,7 @@ class Projects::CommitController < Projects::ApplicationController
@note = result[:note]
@line_notes = result[:line_notes]
@branches = result[:branches]
@notes_count = result[:notes_count]
@target_type = :commit
@target_id = @commit.id
......
app/controllers/projects/edit_tree_controller.rb
View file @ 4e77b0b5
# Controller for edit a repository's file
class Projects::EditTreeController < Projects::ApplicationController
include ExtractsPath
# Authorize
before_filter :authorize_read_project!
before_filter :authorize_code_access!
before_filter :require_non_empty_project
before_filter :edit_requirements, only: [:show, :update]
class Projects::EditTreeController < Projects::BaseTreeController
before_filter :require_branch_head
before_filter :blob
def show
@last_commit = Gitlab::Git::Commit.last_for_path(@repository, @ref, @path).sha
end
def update
edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, @project, @ref, @path)
updated_successfully = edit_file_action.commit!(
params[:content],
params[:commit_message],
params[:last_commit]
)
result = Files::UpdateContext.new(@project, current_user, params, @ref, @path).execute
if updated_successfully
redirect_to project_blob_path(@project, @id), notice: "Your changes have been successfully commited"
if result[:status] == :success
flash[:notice] = "Your changes have been successfully commited"
redirect_to project_blob_path(@project, @id)
else
flash[:notice] = "Your changes could not be commited, because the file has been changed"
flash[:alert] = result[:error]
render :show
end
end
private
def edit_requirements
@blob = @repository.blob_at(@commit.id, @path)
unless @blob
redirect_to project_blob_path(@project, @id), notice: "You can only edit text files"
end
allowed = if project.protected_branch? @ref
can?(current_user, :push_code_to_protected_branches, project)
else
can?(current_user, :push_code, project)
end
return access_denied! unless allowed
def blob
@blob ||= @repository.blob_at(@commit.id, @path)
end
end
app/controllers/projects/new_tree_controller.rb 0 → 100644
View file @ 4e77b0b5
class Projects::NewTreeController < Projects::BaseTreeController
before_filter :require_branch_head
def show
end
def update
file_path = File.join(@path, File.basename(params[:file_name]))
result = Files::CreateContext.new(@project, current_user, params, @ref, file_path).execute
if result[:status] == :success
flash[:notice] = "Your changes have been successfully commited"
redirect_to project_blob_path(@project, File.join(@ref, file_path))
else
flash[:alert] = result[:error]
render :show
end
end
end
app/controllers/projects/team_members_controller.rb
View file @ 4e77b0b5
class Projects::TeamMembersController < Projects::ApplicationController
# Authorize
before_filter :authorize_admin_project!
before_filter :authorize_admin_project!, except: :leave
layout "project_settings"
......@@ -45,6 +45,15 @@ class Projects::TeamMembersController < Projects::ApplicationController
end
end
def leave
project.users_projects.find_by_user_id(current_user).destroy
respond_to do |format|
format.html { redirect_to :back }
format.js { render nothing: true }
end
end
def apply_import
giver = Project.find(params[:source_project_id])
status = @project.team.import(giver)
......
app/controllers/projects/tree_controller.rb
View file @ 4e77b0b5
# Controller for viewing a repository's file structure
class Projects::TreeController < Projects::ApplicationController
include ExtractsPath
# Authorize
before_filter :authorize_read_project!
before_filter :authorize_code_access!
before_filter :require_non_empty_project
class Projects::TreeController < Projects::BaseTreeController
def show
return not_found! if tree.entries.empty?
......
app/controllers/projects_controller.rb
View file @ 4e77b0b5
......@@ -62,10 +62,6 @@ class ProjectsController < ApplicationController
@events = event_filter.apply_filter(@events)
@events = @events.limit(limit).offset(params[:offset] || 0)
# Ensure project default branch is set if it possible
# Normally it defined on push or during creation
@project.discover_default_branch
respond_to do |format|
format.html do
if @project.empty_repo?
......
app/helpers/application_helper.rb
View file @ 4e77b0b5
......@@ -84,8 +84,8 @@ module ApplicationHelper
repository = @project.repository
options = [
["Branch", repository.branch_names ],
[ "Tag", repository.tag_names ]
["Branches", repository.branch_names],
["Tags", repository.tag_names]
]
# If reference is commit id -
......@@ -126,6 +126,9 @@ module ApplicationHelper
# Skip if user already created appropriate MR
return false if project.merge_requests.where(source_branch: event.branch_name).opened.any?
# Skip if user removed branch right after that
return false unless project.repository.branch_names.include?(event.branch_name)
true
end
......@@ -184,14 +187,6 @@ module ApplicationHelper
Gitlab.config.extra
end
def public_icon
content_tag :i, nil, class: 'icon-globe cblue'
end
def private_icon
content_tag :i, nil, class: 'icon-lock cgreen'
end
def search_placeholder
if @project && @project.persisted?
"Search in this project"
......@@ -208,4 +203,8 @@ module ApplicationHelper
line += "..." if lines.size > 1
line
end
def broadcast_message
BroadcastMessage.current
end
end
app/helpers/commits_helper.rb
View file @ 4e77b0b5
......@@ -94,6 +94,17 @@ module CommitsHelper
crumbs.html_safe
end
# Return Project default branch, if it present in array
# Else - first branch in array (mb last actual branch)
def commit_default_branch(project, branches)
branches.include?(project.default_branch) ? branches.delete(project.default_branch) : branches.pop
end
# Returns the sorted alphabetically links to branches, separated by a comma
def commit_branches_links(project, branches)
branches.sort.map { |branch| link_to(branch, project_tree_path(project, branch)) }.join(", ").html_safe
end
protected
# Private: Returns a link to a person. If the person has a matching user and
......@@ -114,7 +125,9 @@ module CommitsHelper
source_name
end
user = User.where('name like ? or email like ?', source_name, source_email).first
# Prefer email match over name match
user = User.where(email: source_email).first
user ||= User.where(name: source_name).first
options = {
class: "commit-#{options[:source]}-link has_tooltip",
......
app/helpers/events_helper.rb
View file @ 4e77b0b5
......@@ -127,4 +127,10 @@ module EventsHelper
text = truncate(text, length: 150)
sanitize(markdown(text), tags: %w(a img b pre p))
end
def event_commit_title(message)
escape_once(truncate(message.split("\n").first, length: 70))
rescue
"--broken encoding"
end
end
app/helpers/gitlab_markdown_helper.rb
View file @ 4e77b0b5
......@@ -64,7 +64,9 @@ module GitlabMarkdownHelper
# ref - name of the branch or reference, eg. stable
# requested_path - path of request, eg. doc/api/README.md, used in special case when path is pointing to the .md file were the original request is coming from
# wiki - whether the markdown is from wiki or not
def create_relative_links(text, project_path_with_namespace, ref, requested_path, wiki = false)
def create_relative_links(text, project, ref, requested_path, wiki = false)
@path_to_satellite = project.satellite.path
project_path_with_namespace = project.path_with_namespace
paths = extract_paths(text)
paths.each do |file_path|
new_path = rebuild_path(project_path_with_namespace, file_path, requested_path, ref)
......@@ -145,13 +147,18 @@ module GitlabMarkdownHelper
def file_exists?(path)
return false if path.nil? || path.empty?
File.exists?(Rails.root.join(path))
File.exists?(path_on_fs(path))
end
# Check if the path is pointing to a directory(tree) or a file(blob)
# eg. doc/api is directory and doc/README.md is file
def local_path(path)
File.directory?(Rails.root.join(path)) ? "tree" : "blob"
File.directory?(path_on_fs(path)) ? "tree" : "blob"
end
# Path to the file in the satellites repository on the filesystem
def path_on_fs(path)
[@path_to_satellite, path].join("/")
end
# We will assume that if no ref exists we can point to master
......
app/helpers/groups_helper.rb
View file @ 4e77b0b5
......@@ -2,4 +2,23 @@ module GroupsHelper
def remove_user_from_group_message(group, user)
"You are going to remove #{user.name} from #{group.name} Group. Are you sure?"
end
def group_head_title
title = @group.name
title = if current_action?(:issues)
"Issues - " + title
elsif current_action?(:merge_requests)
"Merge requests - " + title
elsif current_action?(:members)
"Members - " + title
elsif current_action?(:edit)
"Settings - " + title
else
title
end
title
end
end
app/helpers/icons_helper.rb 0 → 100644
View file @ 4e77b0b5
module IconsHelper
def boolean_to_icon(value)
if value.to_s == "true"
content_tag :i, nil, class: 'icon-ok cgreen'
else
content_tag :i, nil, class: 'icon-off clgray'
end
end
def public_icon
content_tag :i, nil, class: 'icon-globe cblue'
end
def private_icon
content_tag :i, nil, class: 'icon-lock cgreen'
end
end
app/helpers/namespaces_helper.rb
View file @ 4e77b0b5
module NamespacesHelper
def namespaces_options(selected = :current_user, scope = :default)
groups = current_user.owned_groups.select {|n| n.type == 'Group'}
users = current_user.namespaces.reject {|n| n.type == 'Group'}
groups = current_user.owned_groups
users = [current_user.namespace]
group_opts = ["Groups", groups.sort_by(&:human_name).map {|g| [g.human_name, g.id]} ]
users_opts = [ "Users", users.sort_by(&:human_name).map {|u| [u.human_name, u.id]} ]
......@@ -16,4 +16,13 @@ module NamespacesHelper
grouped_options_for_select(options, selected)
end
def namespace_select_tag(id, opts = {})
css_class = "ajax-namespace-select "
css_class << "multiselect " if opts[:multiple]
css_class << (opts[:class] || '')
value = opts[:selected] || ''
hidden_field_tag(id, value, class: css_class)
end
end
app/helpers/projects_helper.rb
View file @ 4e77b0b5
......@@ -45,7 +45,10 @@ module ProjectsHelper
link_to(simple_sanitize(project.group.name), group_path(project.group)) + " / " + project.name
end
else
project.name
owner = project.namespace.owner
content_tag :span do
link_to(simple_sanitize(owner.name), user_path(owner)) + " / " + project.name
end
end
end
......@@ -80,7 +83,7 @@ module ProjectsHelper
@project.milestones.active.order("due_date, title ASC").all
end
def project_issues_trackers
def project_issues_trackers(current_tracker = nil)
values = Project.issues_tracker.values.map do |tracker_key|
if tracker_key.to_sym == :gitlab
['GitLab', tracker_key]
......@@ -89,7 +92,7 @@ module ProjectsHelper
end
end
options_for_select(values)
options_for_select(values, current_tracker)
end
private
......@@ -140,4 +143,38 @@ module ProjectsHelper
# to calculate repo size - just show 'Unknown'
'unknown'
end
def project_head_title
title = @project.name_with_namespace
title = if current_controller?(:tree)
"#{@project.path}\/#{@path} at #{@ref} - " + title
elsif current_controller?(:issues)
if current_action?(:show)
"Issue ##{@issue.iid} - " + title
else
"Issues - " + title
end
elsif current_controller?(:blob)
"#{@project.path}\/#{@blob.path} at #{@ref} - " + title
elsif current_controller?(:commits)
"Commits at #{@ref} - " + title
elsif current_controller?(:merge_requests)
if current_action?(:show)
"Merge request ##{@merge_request.iid} - " + title
else
"Merge requests - " + title
end
elsif current_controller?(:wikis)
"Wiki - " + title
elsif current_controller?(:network)
"Network graph - " + title
elsif current_controller?(:graphs)
"Graphs - " + title
else
title
end
title
end
end
app/mailers/emails/groups.rb
View file @ 4e77b0b5
......@@ -5,7 +5,7 @@ module Emails
@group = @membership.group
mail(to: @membership.user.email,
subject: subject("access to group was granted"))
subject: subject("Access to group was granted"))
end
end
end
app/mailers/emails/issues.rb
View file @ 4e77b0b5
......@@ -3,14 +3,14 @@ module Emails
def new_issue_email(recipient_id, issue_id)
@issue = Issue.find(issue_id)
@project = @issue.project
mail(to: recipient(recipient_id), subject: subject("new issue ##{@issue.iid}", @issue.title))
mail(to: recipient(recipient_id), subject: subject("New issue ##{@issue.iid}", @issue.title))
end
def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id)
@issue = Issue.find(issue_id)
@previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id
@project = @issue.project
mail(to: recipient(recipient_id), subject: subject("changed issue ##{@issue.iid}", @issue.title))
mail(to: recipient(recipient_id), subject: subject("Changed issue ##{@issue.iid}", @issue.title))
end
def closed_issue_email(recipient_id, issue_id, updated_by_user_id)
......@@ -27,7 +27,7 @@ module Emails
@project = @issue.project
@updated_by = User.find updated_by_user_id
mail(to: recipient(recipient_id),
subject: subject("changed issue ##{@issue.iid}", @issue.title))
subject: subject("Changed issue ##{@issue.iid}", @issue.title))
end
end
end
app/mailers/emails/merge_requests.rb
View file @ 4e77b0b5
......@@ -2,24 +2,24 @@ module Emails
module MergeRequests
def new_merge_request_email(recipient_id, merge_request_id)
@merge_request = MergeRequest.find(merge_request_id)
mail(to: recipient(recipient_id), subject: subject("new merge request !#{@merge_request.iid}", @merge_request.title))
mail(to: recipient(recipient_id), subject: subject("New merge request ##{@merge_request.iid}", @merge_request.title))
end
def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id)
@merge_request = MergeRequest.find(merge_request_id)
@previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id
mail(to: recipient(recipient_id), subject: subject("changed merge request !#{@merge_request.iid}", @merge_request.title))
mail(to: recipient(recipient_id), subject: subject("Changed merge request ##{@merge_request.iid}", @merge_request.title))
end
def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
@merge_request = MergeRequest.find(merge_request_id)
@updated_by = User.find updated_by_user_id
mail(to: recipient(recipient_id), subject: subject("Closed merge request !#{@merge_request.iid}", @merge_request.title))
mail(to: recipient(recipient_id), subject: subject("Closed merge request ##{@merge_request.iid}", @merge_request.title))
end
def merged_merge_request_email(recipient_id, merge_request_id)
@merge_request = MergeRequest.find(merge_request_id)
mail(to: recipient(recipient_id), subject: subject("Accepted merge request !#{@merge_request.iid}", @merge_request.title))
mail(to: recipient(recipient_id), subject: subject("Accepted merge request ##{@merge_request.iid}", @merge_request.title))
end
end
......
app/mailers/emails/notes.rb
View file @ 4e77b0b5
......@@ -4,27 +4,27 @@ module Emails
@note = Note.find(note_id)
@commit = @note.noteable
@project = @note.project
mail(to: recipient(recipient_id), subject: subject("note for commit #{@commit.short_id}", @commit.title))
mail(to: recipient(recipient_id), subject: subject("Note for commit #{@commit.short_id}", @commit.title))
end
def note_issue_email(recipient_id, note_id)
@note = Note.find(note_id)
@issue = @note.noteable
@project = @note.project
mail(to: recipient(recipient_id), subject: subject("note for issue ##{@issue.iid}"))
mail(to: recipient(recipient_id), subject: subject("Note for issue ##{@issue.iid}"))
end
def note_merge_request_email(recipient_id, note_id)
@note = Note.find(note_id)
@merge_request = @note.noteable
@project = @note.project
mail(to: recipient(recipient_id), subject: subject("note for merge request ##{@merge_request.iid}"))
mail(to: recipient(recipient_id), subject: subject("Note for merge request ##{@merge_request.iid}"))
end
def note_wall_email(recipient_id, note_id)
@note = Note.find(note_id)
@project = @note.project
mail(to: recipient(recipient_id), subject: subject("note on wall"))
mail(to: recipient(recipient_id), subject: subject("Note on wall"))
end
end
end
app/mailers/emails/projects.rb
View file @ 4e77b0b5
......@@ -4,14 +4,14 @@ module Emails
@users_project = UsersProject.find user_project_id
@project = @users_project.project
mail(to: @users_project.user.email,
subject: subject("access to project was granted"))
subject: subject("Access to project was granted"))
end
def project_was_moved_email(project_id, user_id)
@user = User.find user_id
@project = Project.find project_id
mail(to: @user.email,
subject: subject("project was moved"))
subject: subject("Project was moved"))
end
end
end
app/models/broadcast_message.rb 0 → 100644
View file @ 4e77b0b5
# == Schema Information
#
# Table name: broadcast_messages
#
# id :integer not null, primary key
# message :text default(""), not null
# starts_at :datetime
# ends_at :datetime
# alert_type :integer
# created_at :datetime not null
# updated_at :datetime not null
#
class BroadcastMessage < ActiveRecord::Base
attr_accessible :alert_type, :ends_at, :message, :starts_at
validates :message, presence: true
validates :starts_at, presence: true
validates :ends_at, presence: true
def self.current
where("ends_at > :now AND starts_at < :now", now: Time.zone.now).last
end
end
app/models/event.rb
View file @ 4e77b0b5
......@@ -168,7 +168,7 @@ class Event < ActiveRecord::Base
end
def valid_push?
data[:ref]
data[:ref] && ref_name.present?
rescue => ex
false
end
......
app/models/flowdock_service.rb
View file @ 4e77b0b5
......@@ -11,6 +11,8 @@
# updated_at :datetime not null
# active :boolean default(FALSE), not null
# project_url :string(255)
# subdomain :string(255)
# room :string(255)
#
require "flowdock-git-hook"
......
app/models/hipchat_service.rb
View file @ 4e77b0b5
......@@ -25,7 +25,7 @@ class HipchatService < Service
end
def description
'Simple web-based real-time group chat'
'Private group chat and IM'
end
def to_param
......@@ -71,5 +71,4 @@ class HipchatService < Service
message
end
end
app/models/issue.rb
View file @ 4e77b0b5
......@@ -21,6 +21,8 @@ class Issue < ActiveRecord::Base
include Issuable
include InternalId
ActsAsTaggableOn.strict_case_match = true
belongs_to :project
validates :project, presence: true
......
app/models/namespace.rb
View file @ 4e77b0b5
......@@ -87,4 +87,8 @@ class Namespace < ActiveRecord::Base
def send_update_instructions
projects.each(&:send_move_instructions)
end
def kind
type == 'Group' ? 'group' : 'user'
end
end
app/models/project.rb
View file @ 4e77b0b5
......@@ -9,7 +9,6 @@
# created_at :datetime not null
# updated_at :datetime not null
# creator_id :integer
# default_branch :string(255)
# issues_enabled :boolean default(TRUE), not null
# wall_enabled :boolean default(TRUE), not null
# merge_requests_enabled :boolean default(TRUE), not null
......@@ -27,8 +26,10 @@
class Project < ActiveRecord::Base
include Gitlab::ShellAdapter
extend Enumerize
ActsAsTaggableOn.strict_case_match = true
attr_accessible :name, :path, :description, :default_branch, :issues_tracker, :label_list,
attr_accessible :name, :path, :description, :issues_tracker, :label_list,
:issues_enabled, :wall_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id,
:wiki_enabled, :public, :import_url, :last_activity_at, as: [:default, :admin]
......@@ -36,6 +37,8 @@ class Project < ActiveRecord::Base
acts_as_taggable_on :labels, :issues_default_labels
attr_accessor :new_default_branch
# Relations
belongs_to :creator, foreign_key: "creator_id", class_name: "User"
belongs_to :group, foreign_key: "namespace_id", conditions: "type = 'Group'"
......@@ -125,7 +128,7 @@ class Project < ActiveRecord::Base
end
def search query
where("projects.name LIKE :query OR projects.path LIKE :query", query: "%#{query}%")
joins(:namespace).where("projects.name LIKE :query OR projects.path LIKE :query OR namespaces.name LIKE :query OR projects.description LIKE :query", query: "%#{query}%")
end
def find_with_namespace(id)
......@@ -146,7 +149,7 @@ class Project < ActiveRecord::Base
end
def repository
@repository ||= Repository.new(path_with_namespace, default_branch)
@repository ||= Repository.new(path_with_namespace)
end
def saved?
......@@ -303,14 +306,6 @@ class Project < ActiveRecord::Base
end
end
def discover_default_branch
# Discover the default branch, but only if it hasn't already been set to
# something else
if repository.exists? && default_branch.nil?
update_attributes(default_branch: self.repository.discover_default_branch)
end
end
def update_merge_requests(oldrev, newrev, ref, user)
return true unless ref =~ /heads/
branch_name = ref.gsub("refs/heads/", "")
......@@ -320,7 +315,7 @@ class Project < ActiveRecord::Base
mrs = self.merge_requests.opened.by_branch(branch_name).all
# Update code for merge requests between project and project fork
mrs += self.fork_merge_requests.opened.by_branch(branch_name).all
mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked }
# Close merge requests
......@@ -450,4 +445,12 @@ class Project < ActiveRecord::Base
order('id DESC').limit(100).
update_all(updated_at: Time.now)
end
def project_member(user)
users_projects.where(user_id: user).first
end
def default_branch
@default_branch ||= repository.root_ref if repository.exists?
end
end
app/models/repository.rb
View file @ 4e77b0b5
......@@ -3,7 +3,7 @@ class Repository
attr_accessor :raw_repository, :path_with_namespace
def initialize(path_with_namespace, default_branch)
def initialize(path_with_namespace, default_branch = nil)
@path_with_namespace = path_with_namespace
@raw_repository = Gitlab::Git::Repository.new(path_to_repo) if path_with_namespace
rescue Gitlab::Git::Repository::NoRepository
......@@ -57,7 +57,7 @@ class Repository
def recent_branches(limit = 20)
branches.sort do |a, b|
a.commit.committed_date <=> b.commit.committed_date
b.commit.committed_date <=> a.commit.committed_date
end[0..limit]
end
......
app/models/user.rb
View file @ 4e77b0b5
......@@ -36,6 +36,11 @@
# notification_level :integer default(1), not null
# password_expires_at :datetime
# created_by_id :integer
# avatar :string(255)
# confirmation_token :string(255)
# confirmed_at :datetime
# confirmation_sent_at :datetime
# unconfirmed_email :string(255)
#
require 'carrierwave/orm/activerecord'
......@@ -69,20 +74,20 @@ class User < ActiveRecord::Base
# Namespace for personal projects
has_one :namespace, dependent: :destroy, foreign_key: :owner_id, class_name: "Namespace", conditions: 'type IS NULL'
# Namespaces (owned groups and own namespace)
has_many :namespaces, foreign_key: :owner_id
# Profile
has_many :keys, dependent: :destroy
# Groups
has_many :own_groups, class_name: "Group", foreign_key: :owner_id
has_many :owned_groups, through: :users_groups, source: :group, conditions: { users_groups: { group_access: UsersGroup::OWNER } }
has_many :users_groups, dependent: :destroy
has_many :groups, through: :users_groups
has_many :owned_groups, through: :users_groups, source: :group, conditions: { users_groups: { group_access: UsersGroup::OWNER } }
# Projects
has_many :groups_projects, through: :groups, source: :projects
has_many :personal_projects, through: :namespace, source: :projects
has_many :projects, through: :users_projects
has_many :created_projects, foreign_key: :creator_id, class_name: 'Project'
has_many :snippets, dependent: :destroy, foreign_key: :author_id, class_name: "Snippet"
has_many :users_projects, dependent: :destroy
has_many :issues, dependent: :destroy, foreign_key: :author_id
......@@ -93,11 +98,6 @@ class User < ActiveRecord::Base
has_many :assigned_issues, dependent: :destroy, foreign_key: :assignee_id, class_name: "Issue"
has_many :assigned_merge_requests, dependent: :destroy, foreign_key: :assignee_id, class_name: "MergeRequest"
has_many :groups_projects, through: :groups, source: :projects
has_many :personal_projects, through: :namespace, source: :projects
has_many :projects, through: :users_projects
has_many :own_projects, foreign_key: :creator_id, class_name: 'Project'
has_many :owned_projects, through: :namespaces, source: :projects
#
# Validations
......@@ -247,7 +247,7 @@ class User < ActiveRecord::Base
# Groups user has access to
def authorized_groups
@authorized_groups ||= begin
group_ids = (groups.pluck(:id) + own_groups.pluck(:id) + authorized_projects.pluck(:namespace_id))
group_ids = (groups.pluck(:id) + authorized_projects.pluck(:namespace_id))
Group.where(id: group_ids).order('namespaces.name ASC')
end
end
......@@ -256,7 +256,7 @@ class User < ActiveRecord::Base
# Projects user has access to
def authorized_projects
@authorized_projects ||= begin
project_ids = owned_projects.pluck(:id)
project_ids = personal_projects.pluck(:id)
project_ids += groups_projects.pluck(:id)
project_ids += projects.pluck(:id)
project_ids += groups.joins(:shared_projects).pluck(:project_id)
......@@ -265,6 +265,12 @@ class User < ActiveRecord::Base
end
end
def owned_projects
@owned_projects ||= begin
Project.where(namespace_id: owned_groups.pluck(:id).push(namespace.id)).joins(:namespace)
end
end
# Team membership in authorized projects
def tm_in_authorized_projects
UsersProject.where(project_id: authorized_projects.map(&:id), user_id: self.id)
......@@ -337,7 +343,7 @@ class User < ActiveRecord::Base
end
def several_namespaces?
namespaces.many? || owned_groups.any?
owned_groups.any?
end
def namespace_id
......@@ -402,4 +408,9 @@ class User < ActiveRecord::Base
self
end
def can_leave_project?(project)
project.namespace != namespace &&
project.project_member(self)
end
end
app/observers/project_observer.rb
View file @ 4e77b0b5
......@@ -30,12 +30,6 @@ class ProjectObserver < BaseObserver
def after_update(project)
project.send_move_instructions if project.namespace_id_changed?
project.rename_repo if project.path_changed?
GitlabShellWorker.perform_async(
:update_repository_head,
project.path_with_namespace,
project.default_branch
) if project.default_branch_changed?
end
def before_destroy(project)
......
app/services/git_push_service.rb
View file @ 4e77b0b5
......@@ -24,7 +24,6 @@ class GitPushService
create_push_event
project.ensure_satellite_exists
project.discover_default_branch
project.repository.expire_cache
if push_to_existing_branch?(ref, oldrev)
......
app/services/project_transfer_service.rb
View file @ 4e77b0b5
......@@ -18,6 +18,10 @@ class ProjectTransferService
raise TransferError.new("Project with same path in target namespace already exists")
end
# Remove old satellite
project.satellite.destroy
# Apply new namespace id
project.namespace = new_namespace
project.save!
......@@ -29,8 +33,8 @@ class ProjectTransferService
# Move wiki repo also if present
gitlab_shell.mv_repository("#{old_path}.wiki", "#{new_path}.wiki")
# create satellite repo
project.ensure_satellite_exists
# Create a new satellite (reload project from DB)
Project.find(project.id).ensure_satellite_exists
# clear project cached events
project.reset_events_cache
......
app/views/admin/background_jobs/show.html.haml
View file @ 4e77b0b5
%h3.page-title Background Jobs
%br
%p.light GitLab use #{link_to "sidekiq", "http://sidekiq.org/"} library for async job processing
%hr
.ui-box
.title Sidekiq running processes
.ui-box-body
- if @sidekiq_processes.empty?
%h4.cred
%i.icon-warning-sign
There are no running sidekiq processes. Please restart GitLab
- else
%table.table
%thead
%th USER
%th
%th PID
%th
%th CPU
%th
%th MEM
%th
%th STATE
%th
%th START
%th
%th COMMAND
%th
- @sidekiq_processes.split("\n").each do |process|
- next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/)
- data = process.gsub!(/\s+/m, '|').strip.split('|')
%tr
- 6.times do
%td= data.shift
%td
%td= data.join(" ")
.clearfix
%p
%i.icon-exclamation-sign
If '[25 of 25 busy]' is shown, restart GitLab with 'sudo service gitlab reload'.
%p
%i.icon-exclamation-sign
If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u #{Settings.gitlab.user} -f sidekiq) and restart GitLab.
.ui-box
%iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}
%h4 Sidekiq running processes
- sidekiq_processes = `ps -eo euser,pid,pcpu,pmem,stat,start,command | grep sidekiq | grep -v grep`
- if sidekiq_processes.empty?
%b There are no running sidekiq processes
%b Please restart GitLab
- else
.ui-box
%table.zebra-striped
%thead
%th USER
%th
%th PID
%th
%th CPU
%th
%th MEM
%th
%th STATE
%th
%th START
%th
%th COMMAND
%th
- sidekiq_processes.split("\n").each do |process|
- next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/)
- data = process.gsub!(/\s+/m, '|').strip.split('|')
%tr
- 6.times do
%td= data.shift
%td
%td= data.join(" ")
%b If '[25 of 25 busy]' is shown, restart GitLab with 'sudo service gitlab reload'.
%br
%b If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u git -f sidekiq) and restart GitLab.
app/views/admin/broadcast_messages/index.html.haml 0 → 100644
View file @ 4e77b0b5
%h3.page-title
Broadcast Messages
%p.light
Broadcast messages are displayed for every user and can be used to notify users about scheduled maintenance, recent upgrades and more.
%hr
= form_for [:admin, @broadcast_message] do |f|
-if @broadcast_message.errors.any?
.alert.alert-error
- @broadcast_message.errors.full_messages.each do |msg|
%p= msg
.control-group
= f.label :message
.controls
= f.text_area :message, class: "input-xxlarge", rows: 2, required: true
.control-group
= f.label :starts_at
.controls.datetime-controls
= f.datetime_select :starts_at
.control-group
= f.label :ends_at
.controls.datetime-controls
= f.datetime_select :ends_at
.form-actions
= f.submit "Add broadcast message", class: "btn btn-create"
-if @broadcast_messages.any?
%ul.bordered-list.broadcast-messages
- @broadcast_messages.each do |broadcast_message|
%li
.pull-right
- if broadcast_message.starts_at
%strong
#{broadcast_message.starts_at.to_s(:short)}
\...
- if broadcast_message.ends_at
%strong
#{broadcast_message.ends_at.to_s(:short)}
&nbsp;
= link_to [:admin, broadcast_message], method: :delete, remote: true, class: 'remove-row btn btn-tiny' do
%i.icon-remove.cred
.message= broadcast_message.message
= paginate @broadcast_messages
app/views/admin/dashboard/index.html.haml
View file @ 4e77b0b5
......@@ -51,6 +51,19 @@
= time_ago_in_words user.created_at
ago
.span4
%h4 Latest groups
%hr
- @groups.each do |group|
%p
= link_to [:admin, group] do
= group.name
%span.light.pull-right
= time_ago_in_words group.created_at
ago
%br
.row
.span4
%h4 Stats
%hr
......@@ -82,3 +95,34 @@
Milestones
%span.light.pull-right
= Milestone.count
.span4
%h4
Features
%hr
%p
Sign up
%span.light.pull-right
= boolean_to_icon gitlab_config.signup_enabled
%p
LDAP
%span.light.pull-right
= boolean_to_icon Gitlab.config.ldap.enabled
%p
Gravatar
%span.light.pull-right
= boolean_to_icon Gitlab.config.gravatar.enabled
%p
OmniAuth
%span.light.pull-right
= boolean_to_icon Gitlab.config.omniauth.enabled
.span4
%h4 Components
%hr
%p
GitLab
%span.pull-right
= Gitlab::VERSION
%p
GitLab Shell
%span.pull-right
= Gitlab::Shell.new.version
app/views/admin/groups/edit.html.haml
View file @ 4e77b0b5
......@@ -6,7 +6,7 @@
%span= @group.errors.full_messages.first
.control-group.group_name_holder
= f.label :name do
Group name is
Group name
.controls
= f.text_field :name, placeholder: "Example Group", class: "input-xxlarge"
......@@ -17,7 +17,7 @@
.control-group.group_name_holder
= f.label :path do
%span.cred Group path is
%span.cred Group path
.controls
= f.text_field :path, placeholder: "example-group", class: "input-xxlarge danger"
%ul.cred
......
app/views/admin/groups/new.html.haml
View file @ 4e77b0b5
......@@ -6,7 +6,7 @@
%span= @group.errors.full_messages.first
.control-group
= f.label :name do
Group name is
Group name
.controls
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
.control-group.group-description-holder
......
app/views/admin/groups/show.html.haml
View file @ 4e77b0b5
......@@ -25,7 +25,7 @@
= @group.description
%li
%span.light Created at:
%span.light Created on:
%strong
= @group.created_at.stamp("March 1, 1999")
......
app/views/admin/projects/show.html.haml
View file @ 4e77b0b5
......@@ -35,7 +35,7 @@
= @project.creator.try(:name) || '(deleted)'
%li
%span.light Created at:
%span.light Created on:
%strong
= @project.created_at.stamp("March 1, 1999")
......@@ -74,6 +74,23 @@
%span.cgreen
%i.icon-lock
Private
.ui-box
.title
Transfer project
.ui-box-body
= form_for @project, url: transfer_admin_project_path(@project), method: :put do |f|
.control-group
= f.label :namespace_id, "Namespace"
.controls
= namespace_select_tag :namespace_id, selected: params[:namespace_id], class: 'input-large'
.control-group
.controls
= f.submit 'Transfer', class: 'btn btn-primary'
.span6
- if @group
.ui-box
......
app/views/dashboard/projects.html.haml
View file @ 4e77b0b5
......@@ -54,15 +54,20 @@
.span9
%ul.bordered-list.my-projects.top-list
- @projects.each do |project|
%li
%li.my-project-row
%h4.project-title
%span.access-icon
- if project.public
= public_icon
- else
= private_icon
= link_to project_path(project), class: dom_class(project) do
%strong= project.name_with_namespace
= project.name_with_namespace
- if project.public
%small.access-icon
= public_icon
Public
- if current_user.can_leave_project?(project)
.pull-right
= link_to leave_project_team_members_path(project), confirm: "Leave project?", method: :delete, remote: true, class: "btn-tiny btn remove-row", title: 'Leave project' do
%i.icon-signout
Leave
- if project.forked_from_project
%small.pull-right
......@@ -81,6 +86,7 @@
%span.light Last activity:
%span.date= project_last_activity(project)
- if @projects.blank?
%li
%h3.nothing_here_message There are no projects here.
......
app/views/devise/confirmations/new.html.erb deleted 100644 → 0
View file @ 6d688217
<h2>Resend confirmation instructions</h2>
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
<%= devise_error_messages! %>
<div><%= f.label :email %><br />
<%= f.email_field :email %></div>
<div><%= f.submit "Resend confirmation instructions" %></div>
<% end %>
<%= render partial: "devise/shared/links" %>
app/views/devise/confirmations/new.html.haml 0 → 100644
View file @ 4e77b0b5
.login-box
%h3.page-title Resend confirmation instructions
= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
= devise_error_messages!
= f.email_field :email, placeholder: 'Email'
%div= f.submit "Resend confirmation instructions", class: 'btn btn-success'
%hr
= link_to "Sign in", new_session_path(resource_name)
app/views/devise/passwords/edit.html.haml
View file @ 4e77b0b5
......@@ -7,5 +7,8 @@
%div
= f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password"
%div
.clearfix.append-bottom-10
= f.submit "Change my password", class: "btn btn-primary"
.pull-right= render partial: "devise/shared/links"
= link_to "Sign in", new_session_path(resource_name), class: "btn pull-right"
%div
= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
app/views/events/_commit.html.haml
View file @ 4e77b0b5
......@@ -2,4 +2,4 @@
.commit-row-title
= link_to commit[:id][0..8], project_commit_path(project, commit[:id]), class: "commit_short_id", alt: ''
&nbsp;
= gfm escape_once(truncate(commit[:message], length: 70)) rescue "--broken encoding"
= gfm event_commit_title(commit[:message])
app/views/groups/edit.html.haml
View file @ 4e77b0b5
......@@ -28,7 +28,7 @@
%span= @group.errors.full_messages.first
.control-group
= f.label :name do
Group name is
Group name
.controls
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
......@@ -90,7 +90,7 @@
.title Remove group
.ui-box-body
%p
Remove of group will cause removing all child projects and resources.
Removing group will cause all child projects and resources to be removed.
%p
%strong Removed group can not be restored!
......
app/views/groups/new.html.haml
View file @ 4e77b0b5
......@@ -4,7 +4,7 @@
%span= @group.errors.full_messages.first
.control-group
= f.label :name do
Group name is
Group name
.controls
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
......@@ -16,11 +16,11 @@
.control-group
.controls
%ul
%li Group is kind of directory for several projects
%li All created groups are private
%li People within a group see only projects they have access to
%li All projects of group will be stored in a group directory
%li You will be able to move existing projects into group
%li A group is a collection of several projects
%li Groups are private by default
%li Members of a group may only view projects they have permission to access
%li Group project URLs are prefixed with the group namespace
%li Existing projects may be moved into a group
.form-actions
= f.submit 'Create group', class: "btn btn-create"
......
app/views/help/index.html.haml
View file @ 4e77b0b5
%h2.page-title
GitLab
%span.light Enterprise Edition
.pull-right
.hero-unit
%h2
GitLab
%span.light Enterprise Edition
%span= Gitlab::VERSION
%small= Gitlab::REVISION
%p.slead
Self Hosted Git Management
%br
Fast, secure and stable solution based on Ruby on Rails.
%p.slead
GitLab is open source software to collaborate on code.
%br
Create projects and repositories, manage access and do code reviews.
%br
Read more about GitLab at #{link_to "gitlab.org", "http://gitlab.org/", target: "_blank"}.
.row
.span4
......
app/views/layouts/_broadcast.html.haml 0 → 100644
View file @ 4e77b0b5
- if broadcast_message.present?
.broadcast-message
%i.icon-bullhorn
= broadcast_message.message
app/views/layouts/application.html.haml
View file @ 4e77b0b5
......@@ -2,6 +2,7 @@
%html{ lang: "en"}
= render "layouts/head", title: "Dashboard"
%body{class: "#{app_theme} application", :'data-page' => body_data_page }
= render "layouts/broadcast"
= render "layouts/head_panel", title: "Dashboard"
= render "layouts/flash"
%nav.main-nav
......
app/views/layouts/group.html.haml
View file @ 4e77b0b5
!!! 5
%html{ lang: "en"}
= render "layouts/head", title: "#{@group.name}"
= render "layouts/head", title: group_head_title
%body{class: "#{app_theme} application", :'data-page' => body_data_page}
= render "layouts/head_panel", title: "group: #{@group.name}"
= render "layouts/flash"
......
app/views/layouts/nav/_admin.html.haml
View file @ 4e77b0b5
......@@ -10,6 +10,8 @@
= link_to "Users", admin_users_path
= nav_link(controller: :logs) do
= link_to "Logs", admin_logs_path
= nav_link(controller: :broadcast_messages) do
= link_to "Messages", admin_broadcast_messages_path
= nav_link(controller: :hooks) do
= link_to "Hooks", admin_hooks_path
= nav_link(controller: :background_jobs) do
......
app/views/layouts/nav/_project.html.haml
View file @ 4e77b0b5
......@@ -4,7 +4,7 @@
%i.icon-home
- if project_nav_tab? :files
= nav_link(controller: %w(tree blob blame edit_tree)) do
= nav_link(controller: %w(tree blob blame edit_tree new_tree)) do
= link_to 'Files', project_tree_path(@project, @ref || @repository.root_ref)
- if project_nav_tab? :commits
......
app/views/layouts/projects.html.haml
View file @ 4e77b0b5
!!! 5
%html{ lang: "en"}
= render "layouts/head", title: @project.name_with_namespace
= render "layouts/head", title: project_head_title
%body{class: "#{app_theme} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
= render "layouts/broadcast"
= render "layouts/head_panel", title: project_title(@project)
= render "layouts/init_auto_complete"
= render "layouts/flash"
......
app/views/notify/_note_message.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/profiles/accounts/show.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/profiles/keys/show.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/profiles/show.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/_clone_panel.html.haml deleted 100644 → 0
View file @ 6d688217
This diff is collapsed.
app/views/projects/_dropdown.html.haml 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/blob/_actions.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/blob/_remove.html.haml 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/blob/show.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/commits/_diffs.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/edit.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/empty.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/fork.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/labels/_label.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/new.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/new_tree/show.html.haml 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/services/_form.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/services/index.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/show.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/projects/tree/_tree.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/search/_global_results.html.haml 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
app/views/search/_project_results.html.haml 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
app/views/search/_result.html.haml deleted 100644 → 0
View file @ 6d688217
This diff is collapsed.
app/views/search/_results.html.haml 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
app/views/search/results/_issue.html.haml 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
app/views/search/results/_merge_request.html.haml 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
app/views/search/results/_project.html.haml 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
app/views/search/show.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/shared/_clone_panel.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/shared/_no_ssh.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/snippets/_blob.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/snippets/_form.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/views/snippets/_snippet.html.haml
View file @ 4e77b0b5
This diff is collapsed.
app/workers/repository_import_worker.rb
View file @ 4e77b0b5
This diff is collapsed.
config/application.rb
View file @ 4e77b0b5
This diff is collapsed.
config/gitlab.yml.example
View file @ 4e77b0b5
This diff is collapsed.
config/initializers/rack_attack.rb.example
View file @ 4e77b0b5
This diff is collapsed.
config/initializers/session_store.rb
View file @ 4e77b0b5
This diff is collapsed.
config/initializers/smtp_settings.rb.sample
View file @ 4e77b0b5
This diff is collapsed.
config/routes.rb
View file @ 4e77b0b5
This diff is collapsed.
db/migrate/20131106151520_remove_default_branch.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
db/migrate/20131112114325_create_broadcast_messages.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
db/schema.rb
View file @ 4e77b0b5
This diff is collapsed.
doc/api/projects.md
View file @ 4e77b0b5
This diff is collapsed.
doc/api/repositories.md
View file @ 4e77b0b5
This diff is collapsed.
doc/install/installation.md
View file @ 4e77b0b5
This diff is collapsed.
doc/install/requirements.md
View file @ 4e77b0b5
This diff is collapsed.
doc/legal/corporate_contributor_license_agreement.md 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
doc/legal/individual_contributor_license_agreement.md 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
doc/release/security.md 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
doc/update/5.1-to-5.4.md 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
doc/update/5.1-to-6.0.md 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
doc/update/6.0-to-6.2.md 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
doc/update/6.2-to-6.3.md 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
doc/update/patch_versions.md 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
features/admin/active_tab.feature
View file @ 4e77b0b5
This diff is collapsed.
features/admin/broadcast_messages.feature 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
features/project/edit_issuetracker.feature 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
features/steps/admin/admin_active_tab.rb
View file @ 4e77b0b5
This diff is collapsed.
features/steps/admin/admin_broadcast_messages.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
features/steps/project/project_issue_tracker.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
features/steps/public/projects_feature.rb
View file @ 4e77b0b5
This diff is collapsed.
features/steps/shared/paths.rb
View file @ 4e77b0b5
This diff is collapsed.
features/steps/shared/project.rb
View file @ 4e77b0b5
This diff is collapsed.
features/steps/snippets/snippets.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/api/api.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/api/deploy_keys.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/api/entities.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/api/files.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
lib/api/helpers.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/api/namespaces.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
lib/api/projects.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/api/services.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
lib/backup/database.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/backup/manager.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/backup/repository.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/backup/uploads.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/gitlab/backend/grack_auth.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/gitlab/backend/shell.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/gitlab/regex.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/gitlab/satellite/files/delete_file_action.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
lib/gitlab/satellite/files/file_action.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
lib/gitlab/satellite/files/new_file_action.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
lib/gitlab/satellite/merge_action.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/gitlab/satellite/satellite.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/redcarpet/render/gitlab_html.rb
View file @ 4e77b0b5
This diff is collapsed.
lib/support/init.d/gitlab
View file @ 4e77b0b5
This diff is collapsed.
lib/tasks/gitlab/check.rake
View file @ 4e77b0b5
This diff is collapsed.
spec/contexts/search_context_spec.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
spec/factories.rb
View file @ 4e77b0b5
This diff is collapsed.
spec/factories/broadcast_messages.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
spec/helpers/notifications_helper_spec.rb
View file @ 4e77b0b5
This diff is collapsed.
spec/helpers/projects_helper_spec.rb
View file @ 4e77b0b5
This diff is collapsed.
spec/mailers/notify_spec.rb
View file @ 4e77b0b5
This diff is collapsed.
spec/models/broadcast_message_spec.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
spec/models/flowdock_service_spec.rb
View file @ 4e77b0b5
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 4e77b0b5
This diff is collapsed.
spec/models/project_spec.rb
View file @ 4e77b0b5
This diff is collapsed.
spec/models/user_spec.rb
View file @ 4e77b0b5
This diff is collapsed.
spec/requests/api/files_spec.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
spec/requests/api/namespaces_spec.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
spec/requests/api/projects_spec.rb
View file @ 4e77b0b5
This diff is collapsed.
spec/requests/api/services_spec.rb 0 → 100644
View file @ 4e77b0b5
This diff is collapsed.
spec/routing/project_routing_spec.rb
View file @ 4e77b0b5
This diff is collapsed.
spec/support/test_env.rb
View file @ 4e77b0b5
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