Skip to content

G
gitlab-ce
Commit 4537623d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Merge branch 'master' into karlhungus-mr-on-fork 

Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb
parents c7e490eb 1a83fea7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1319 additions and 858 deletions
.gitignore
View file @ 4537623d
......@@ -30,3 +30,5 @@ vendor/bundle/*
rails_best_practices_output.html
doc/code/*
.secret
*.log
public/uploads.*
CONTRIBUTING.md
View file @ 4537623d
......@@ -2,6 +2,12 @@
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)
If you want to know how the GitLab team handles contributions have a look at [the GitLab contributing process](PROCESS.md).
## 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 @ 4537623d
......@@ -23,7 +23,7 @@ gem 'omniauth-github'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
gem 'gitlab_git', '~> 1.4.1'
gem "gitlab_git", "~> 2.0.0.pre"
# Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
......
Gemfile.lock
View file @ 4537623d
......@@ -176,7 +176,7 @@ GEM
gitlab-pygments.rb (0.3.2)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
gitlab_git (1.4.1)
gitlab_git (2.0.0.pre)
activesupport (~> 3.2.13)
github-linguist (~> 2.3.4)
gitlab-grit (~> 2.6.0)
......@@ -275,7 +275,7 @@ GEM
minitest (4.7.4)
modernizr (2.6.2)
sprockets (~> 2.0)
multi_json (1.7.7)
multi_json (1.7.8)
multi_xml (0.5.4)
multipart-post (1.2.0)
mysql2 (0.3.11)
......@@ -568,7 +568,7 @@ DEPENDENCIES
gitlab-gollum-lib (~> 1.0.1)
gitlab-grack (~> 1.0.1)
gitlab-pygments.rb (~> 0.3.2)
gitlab_git (~> 1.4.1)
gitlab_git (~> 2.0.0.pre)
gitlab_meta (= 6.0)
gitlab_omniauth-ldap (= 1.0.3)
gon
......
PROCESS.md 0 → 100644
View file @ 4537623d
# GitLab Contributing Process
## Purpose of describing the contributing process
Below we describe the contributing process for two reasons. Contributors know what to expect from maintainers (initial, response within xx days, friendly treatment, etc). And maintainers know what to expect from contributors (use latest version, confirm the issue is addressed, friendly treatment, etc).
## How we handle issues
The priority should be mentioning people that can help and assigning workflow labels. Workflow labels are purposely not very detailed since that would be hard to keep updated as you would need to reevaluate them after every comment. We optionally use functional labels on demand when want to group related issues to get an overview (for example all issues related to RVM, to tackle them in one go) and to add details to the issue.
If an issue is complex and needs the attention of a specific person, assignment is a good option but assigning issues might discourage other people from contributing to that issue. We need all the contributions we can get so this should never be discouraged. Also, an assigned person might not have time for a few weeks, so others should feel free to takeover.
Priority (from high to low):
1. Mentioning people (very important)
2. Workflow labels
3. Functional labels (less important)
4. Assigning issues (optional)
## Workflow labels
- _Awaiting feedback_: Feedback pending from the reporter
- _Awaiting confirmation of fix_: The issue should already be solved in **master** (generally you can avoid this workflow item and just close the issue right away)
- _Attached PR_: There is a PR attached and the discussion should happen there
- We need to let issues stay in sync with the PR's. We can do this with a "Closing #XXXX" or "Fixes #XXXX" comment in the PR. We can't close the issue when there is a pull request because sometimes a PR is not good and we just close the PR, then the issue must stay.
- _Awaiting developer action/feedback_: Issue needs to be fixed or clarified by a developer
## Functional labels
These labels describe what development specialities are involved such as: PostgreSQL, UX, LDAP.
## Label colors
- Light orange `#fef2c0`: workflow labels for issue team members (awaiting feedback, awaiting confirmation of fix)
- Bright orange `#eb6420`: workflow labels for core team members (attached PR, awaiting developer action/feedback)
- Light blue `#82C5FF`: functional labels
- Green labels `#009800`: issues that can generally be ignored. For example, issues given the following labels normally can be closed immediately:
- Feature request (see copy & paste response: [Feature requests](#feature-requests))
- Support (see copy & paste response: [Support requests and configuration questions](#support-requests-and-configuration-questions)
## Common actions
### Issue team
- Looks for issues without workflow labels and triages issue
- Monitors pull requests
- Closes invalid issues and pull requests with a comment (duplicates, [feature requests](#feature-requests), [fixed in newer version](#issue-fixed-in-newer-version), [issue report for old version](#issue-report-for-old-version), not a problem in GitLab, etc.)
- Assigns appropriate [labels](#how-we-handle-issues)
- Asks for feedback from issue reporter/pull request initiator ([invalid issue reports](#improperly-formatted-issue), [format code](#code-format), etc.)
- Asks for feedback from the relevant developer(s) based on the [list of members and their specialities](http://gitlab.org/team/)
- Monitors all issues/pull requests for feedback (but especially ones commented on since automatically watching them):
- Assigns issues to developers if they indicate they are fixing it
- Assigns pull requests to developers if they indicate they will take care of merge
- Closes issues with no feedback from the reporter for two weeks
- Closes stale pull requests
### Development team
- Responds to issues and pull requests the issue team mentions them in
- Monitors for new issues in _Awaiting developer action/feedback_ with no developer activity (once a week)
- Monitors for new pull requests (at least once a week)
- Manages their work queue by looking at issues and pull requests assigned to them
- Close fixed issues (via commit messages or manually)
- Codes [new features](http://feedback.gitlab.com/forums/176466-general/filters/top)!
- Response guidelines
- Be kind to people trying to contribute. Be aware that people can be a non-native or a native English speaker, they might not understand thing or they might be very sensitive to how your word things. Use emoji to express your feelings (hearth, star, smile, etc.). Some good tips about giving feedback to pull requests is in the [Thoughtbot code review guide](https://github.com/thoughtbot/guides/tree/master/code-review).
## Copy & paste responses
### Improperly formatted issue
Thanks for the issue report. Please reformat your issue to conform to the issue tracker guidelines found in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
### Feature requests
Thanks for your interest in GitLab. We don't use the GitHub issue tracker for feature requests. Please use http://feedback.gitlab.com/ for this purpose or create a pull request implementing this feature. Have a look at the \[contribution guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) for more information.
### Issue report for old version
Thanks for the issue report but we only support issues for the latest stable version of GitLab. I'm closing this issue but if you still experience this problem in the latest stable version, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
### Support requests and configuration questions
Thanks for your interest in GitLab. We don't use the GitHub issue tracker for support requests and configuration questions. Please use the \[support forum\]\(https://groups.google.com/forum/#!forum/gitlabhq), \[Stack Overflow\]\(http://stackoverflow.com/questions/tagged/gitlab), the unofficial #gitlab IRC channel on Freenode or the http://www.gitlab.com paid services for this purpose. Have a look at the \[contribution guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) for more information.
### Code format
Please use ``` to format console output, logs, and code as it's very hard to read otherwise.
### Issue fixed in newer version
Thanks for the issue report. This issue has already been fixed in newer versions of GitLab. Due to the size of this project and our limited resources we are only able to support the latest stable release as outlined in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker). In order to get this bug fix and enjoy many new features please \[upgrade\]\(http://blog.gitlab.org/). If you still experience issues at that time please open a new issue following our issue tracker guidelines found in the \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
### Improperly formatted pull request
Thanks for your interest in improving the GitLab codebase! Please update your pull request according to the \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#pull-request-guidelines).
### Inactivity close of an issue
It's been at least 2 weeks (and a new release) since we heard from you. I'm closing this issue but if you still experience this problem, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
### Inactivity close of a pull request
This pull request has been closed because a request for more information has not been reacted to for more than 2 weeks. If you respond and conform to the pull request guidelines in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#pull-requests) we will reopen this pull request.
README.md
View file @ 4537623d
......@@ -147,6 +147,8 @@ or start each component separately
* [Mailing list](https://groups.google.com/forum/#!forum/gitlabhq) and [Stack Overflow](http://stackoverflow.com/questions/tagged/gitlab) are the best places to ask questions. For example you can use it if you have questions about: permission denied errors, invisible repos, can't clone/pull/push or with web hooks that don't fire. Please search for similar issues before posting your own, there's a good chance somebody else had the same issue you have now and has resolved it. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there to a fix.
* [Unofficial #gitlab IRC on Freenode](http://www.freenode.net/) is another way to get in touch with other GitLab users who may be able to help you.
* [Feedback and suggestions forum](http://feedback.gitlab.com) is the place to propose and discuss new features for GitLab.
* [Contributing guide](https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) describes how to submit pull requests and issues. Pull requests and issues not in line with the guidelines in this document will be closed.
......
app/assets/javascripts/behaviors/toggler_behavior.coffee
View file @ 4537623d
......@@ -11,3 +11,7 @@ $ ->
container = $(".js-toggle-visibility-container")
container.toggleClass("hide")
e.preventDefault()
$("body").on "click", ".js-toggle-button", (e) ->
$(@).closest(".js-toggle-container").find(".js-toggle-content").toggle()
e.preventDefault()
app/assets/javascripts/branch-graph.js.coffee
View file @ 4537623d
......@@ -62,22 +62,22 @@ class BranchGraph
cuday = 0
cumonth = ""
r.rect(0, 0, 26, @barHeight).attr fill: "#222"
r.rect(26, 0, 20, @barHeight).attr fill: "#444"
r.rect(0, 0, 40, @barHeight).attr fill: "#222"
r.rect(40, 0, 30, @barHeight).attr fill: "#444"
for day, mm in @days
if cuday isnt day[0]
# Dates
r.text(36, @offsetY + @unitTime * mm, day[0])
r.text(55, @offsetY + @unitTime * mm, day[0])
.attr(
font: "12px Monaco, monospace"
fill: "#DDD"
fill: "#BBB"
)
cuday = day[0]
if cumonth isnt day[1]
# Months
r.text(13, @offsetY + @unitTime * mm, day[1])
r.text(20, @offsetY + @unitTime * mm, day[1])
.attr(
font: "12px Monaco, monospace"
fill: "#EEE"
......
app/assets/javascripts/dispatcher.js.coffee
View file @ 4537623d
......@@ -39,7 +39,9 @@ class Dispatcher
switch path.first()
when 'admin' then new Admin()
when 'wikis' then new Wikis()
when 'projects'
new Wikis() if path[1] == 'wikis'
initSearch: ->
autocomplete_json = $('.search-autocomplete-json').data('autocomplete-opts')
......
app/assets/javascripts/extensions/jquery.js.coffee
View file @ 4537623d
......@@ -7,3 +7,7 @@ $.fn.enableButton = ->
$(@).removeAttr('disabled').
removeClass('disabled')
$.fn.disableButton = ->
$(@).attr('disabled', 'disabled').
addClass('disabled')
app/assets/javascripts/gfm_auto_complete.js.coffee
View file @ 4537623d
......@@ -44,7 +44,7 @@ GitLab.GfmAutoComplete =
tpl: @Issues.template
callbacks:
before_save: (issues) ->
$.map issues, (i) -> id: i.id, title: i.title, search: "#{i.id} #{i.title}"
$.map issues, (i) -> id: i.id, title: sanitize(i.title), search: "#{i.id} #{i.title}"
input.one "focus", =>
$.getJSON(@dataSource).done (data) ->
......
app/assets/javascripts/main.js.coffee
View file @ 4537623d
......@@ -119,7 +119,7 @@ $ ->
# Commit show suppressed diff
$(".supp_diff_link").bind "click", ->
$(".content").on "click", ".supp_diff_link", ->
$(@).next('table').show()
$(@).remove()
......
app/assets/javascripts/merge_requests.js.coffee
View file @ 4537623d
......@@ -22,12 +22,7 @@ class MergeRequest
this.$('.show-all-commits').on 'click', =>
this.showAllCommits()
modal = $('#modal_merge_info').modal modal: true, show:false
$('.how_to_merge_link').bind "click", ->
modal.show()
$('.modal-header .close').bind "click", ->
modal.hide()
modal = $('#modal_merge_info').modal(show: false)
# Local jQuery finder
$: (selector) ->
......
app/assets/javascripts/notes.js
View file @ 4537623d
......@@ -227,10 +227,11 @@ var NoteList = {
// Show the attachment delete link
note.find(".js-note-attachment-delete").show();
GitLab.GfmAutoComplete.setup();
var form = note.find(".note-edit-form");
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);
......
app/assets/javascripts/wikis.js.coffee
View file @ 4537623d
class Wikis
constructor: ->
modal = $('#modal-new-wiki').modal({modal: true, show:false})
$('.add-new-wiki').bind "click", ->
modal.show()
$('.build-new-wiki').bind "click", ->
field = $('#new_wiki_path')
slug = field.val()
......@@ -13,7 +8,5 @@ class Wikis
if(slug.length > 0)
location.href = path + "/" + slug
$('.modal-header .close').bind "click", ->
modal.hide()
@Wikis = Wikis
app/assets/stylesheets/common.scss
View file @ 4537623d
......@@ -81,33 +81,6 @@ span.update-author {
font-weight: normal;
}
form {
@extend .form-horizontal;
.actions {
@extend .form-actions;
}
.clearfix {
@extend .control-group;
}
.input {
@extend .controls;
}
label {
@extend .control-label;
}
.xlarge {
@extend .input-xlarge;
}
.xxlarge {
@extend .input-xxlarge;
}
}
.field_with_errors {
display: inline;
}
......@@ -121,15 +94,6 @@ ul.breadcrumb {
}
a {
color: #474D57;
font-weight: bold;
font-size: 14px;
}
}
input[type=text] {
&.large_text {
padding: 6px;
font-size: 16px;
}
}
......
app/assets/stylesheets/gitlab_bootstrap.scss
View file @ 4537623d
......@@ -2,11 +2,49 @@
$baseFontSize: 13px !default;
$baseLineHeight: 18px !default;
// BOOTSTRAP
@import "bootstrap";
/**
* BOOTSTRAP
*/
@import "bootstrap/variables";
@import "bootstrap/mixins";
@import "bootstrap/reset";
@import "bootstrap/scaffolding";
@import "bootstrap/grid";
@import "bootstrap/layouts";
@import "bootstrap/type";
@import "bootstrap/code";
@import "bootstrap/forms";
@import "bootstrap/tables";
@import "bootstrap/sprites";
@import "bootstrap/dropdowns";
@import "bootstrap/wells";
@import "bootstrap/component-animations";
@import "bootstrap/close";
@import "bootstrap/button-groups";
@import "bootstrap/alerts";
@import "bootstrap/navs";
@import "bootstrap/navbar";
@import "bootstrap/breadcrumbs";
@import "bootstrap/pagination";
@import "bootstrap/pager";
@import "bootstrap/modals";
@import "bootstrap/tooltip";
@import "bootstrap/popovers";
@import "bootstrap/thumbnails";
@import "bootstrap/media";
@import "bootstrap/labels-badges";
@import "bootstrap/progress-bars";
@import "bootstrap/accordion";
@import "bootstrap/carousel";
@import "bootstrap/hero-unit";
@import "bootstrap/utilities";
@import "bootstrap/responsive-utilities";
@import "bootstrap/responsive-1200px-min";
/**
* Font icons
*
*/
@import "font-awesome";
/**
......@@ -26,3 +64,4 @@ $baseLineHeight: 18px !default;
@import "gitlab_bootstrap/files.scss";
@import "gitlab_bootstrap/tables.scss";
@import "gitlab_bootstrap/lists.scss";
@import "gitlab_bootstrap/forms.scss";
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
View file @ 4537623d
......@@ -10,15 +10,34 @@
*
*/
.ui-box {
background: #F9F9F9;
background: #FFF;
margin-bottom: 20px;
border: 1px solid #CCC;
word-wrap: break-word;
@include solid-shade;
&.small-box {
margin-bottom: 10px;
.title {
font-size: 13px;
line-height: 30px;
a {
color: #666;
&:hover {
text-decoration: underline;
}
}
}
}
&.ui-box-show {
margin:20px 0;
background: #FFF;
.control-group {
margin-bottom: 0;
}
}
&.ui-box-danger {
......@@ -71,10 +90,6 @@
border-top: 1px solid #eee;
}
&.white {
background: #fff;
}
ul {
margin: 0;
}
......@@ -102,6 +117,8 @@
.btn {
vertical-align: middle;
padding: 4px 12px;
@include box-shadow(0 0px 1px 1px #f2f2f2);
}
.nav-pills {
......
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
View file @ 4537623d
.btn {
display: inline-block;
padding: 6px 12px;
margin-bottom: 0;
font-size: 13px;
line-height: $baseLineHeight;
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;
border-color: #BBB;
text-decoration: none;
&.hover,
&:hover {
color: $style_color;
background: #f1f1f1;
@include linear-gradient(#fAfAfA, #f1f1f1);
border-color: #AAA;
color: #333;
text-decoration: none;
@include linear-gradient(#fAfAfA, #f1f1f1);
}
&.btn-primary {
background: #2a79A3;
@include linear-gradient(#47A7b7, #2585b5);
border-color: #2A79A3;
color: #fff;
text-shadow: 0 1px 1px #268;
&:hover {
background: $primary_color;
color: #fff;
&.focus,
&:focus {
text-decoration: none;
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
}
&.disabled {
color: #fff;
background: $primary_color;
}
&.active,
&:active {
background-image: none;
outline: 0;
text-decoration: none;
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
}
&.btn-info {
background: #5aB9C3;
border-color: $primary_color;
color: #fff;
text-shadow: 0 1px 1px #268;
&:hover {
background: $primary_color;
color: #fff;
&.disabled,
&[disabled] {
cursor: default;
background-image: none;
@include opacity(65);
@include box-shadow(none);
}
&.disabled {
color: #fff;
background: $primary_color;
&.btn-primary {
color: #FFF;
border-color: #189;
text-shadow: 0 1px 1px #189;
@include linear-gradient(#4AC, #289);
&.hover,
&:hover,
&.disabled,
&[disabled] {
color: #FFF;
background: #389;
}
}
&.btn-success {
&:hover {
background: #51a351;
color: #FFF;
border-color: #1A1;
text-shadow: 0 1px 1px #FFF;
text-shadow: 0 1px 1px #181;
@include linear-gradient(#62C452, #51a351);
&.hover,
&:hover,
&.disabled,
&[disabled] {
color: #FFF;
background: #2A2;
}
}
&.disabled {
color: #fff;
background: #2b2;
&.btn-danger {
color: #FFF;
text-shadow: 0 1px 1px #811;
border-color: #BD362F;
@include linear-gradient(#EE5F5B, #BD362F);
&.hover,
&:hover,
&.disabled,
&[disabled] {
color: #FFF;
background: #A22;
}
}
&.btn-new {
@extend .btn-success;
}
&.btn-create {
@extend .wide;
@extend .btn-success;
......@@ -67,12 +111,6 @@
&.btn-close,
&.btn-remove {
@extend .btn-danger;
border-color: #BD362F;
&:hover {
color: #fff;
background: #EE4E49;
}
}
&.btn-cancel {
......@@ -84,13 +122,9 @@
padding-right: 20px;
}
&.small {
@extend .btn-small;
}
&.active {
border-color: #aaa;
background-color: #ccc;
&.btn-small {
padding: 2px 10px;
font-size: 12px;
}
&.btn-tiny {
......@@ -104,9 +138,4 @@
margin-right: 7px;
float: left;
}
&.padded {
margin-right: 3px;
padding: 4px 10px 4px;
}
}
app/assets/stylesheets/gitlab_bootstrap/common.scss
View file @ 4537623d
......@@ -48,7 +48,13 @@
line-height: 36px;
}
p.slead { color: #456; font-size: 16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; }
.slead {
color: #666;
font-size: 14px;
margin-bottom: 12px;
font-weight: normal;
line-height: 24px;
}
/** FORMS **/
input[type='search'].search-text-input {
......@@ -66,7 +72,7 @@ input[type='text'].danger {
text-shadow: 0 1px 1px #fff
}
fieldset legend { font-size: 17px; }
fieldset legend { font-size: 15px; }
.tab-content {
overflow: visible;
......@@ -90,3 +96,11 @@ pre.well-pre {
border-radius: 0;
color: #555;
}
.input-append .btn.active, .input-prepend .btn.active {
background: #CCC;
border-color: #BBB;
text-shadow: 0 1px 1px #fff;
font-weight: bold;
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
}
app/assets/stylesheets/gitlab_bootstrap/files.scss
View file @ 4537623d
......@@ -3,18 +3,18 @@
*
*/
.file-holder {
border: 1px solid #BBB;
border: 1px solid #CCC;
margin-bottom: 1em;
@include solid-shade;
.file-title {
border-bottom: 1px solid #bbb;
@include bg-dark-gray-gradient;
text-shadow: 0 1px 1px #fff;
margin: 0;
font-weight: normal;
font-weight: bold;
text-align: left;
color: #666;
color: $style_color;
padding: 9px 10px;
height: 18px;
......
app/assets/stylesheets/gitlab_bootstrap/forms.scss 0 → 100644
View file @ 4537623d
form {
@extend .form-horizontal;
label {
@extend .control-label;
}
}
input {
&.input-xpadding {
padding: 6px 10px;
}
}
.control-group {
.control-label {
padding-top: 6px;
}
.controls {
input, textarea {
padding: 6px 10px;
}
input[type="radio"], input[type="checkbox"] {
margin-top: 6px;
}
}
}
app/assets/stylesheets/gitlab_bootstrap/lists.scss
View file @ 4537623d
......@@ -6,7 +6,6 @@
margin: 0;
list-style: none;
li {
background-color: #FFF;
padding: 10px;
min-height: 20px;
border-bottom: 1px solid #eee;
......@@ -84,4 +83,13 @@ ul.bordered-list {
a { color: #777; }
}
}
&.top-list {
li:first-child {
padding-top: 0;
h4, h5 {
margin-top: 0;
}
}
}
}
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
View file @ 4537623d
......@@ -90,7 +90,6 @@
@mixin page-title {
color: $style_color;
font-size: 20px;
font-weight: normal;
line-height: 1.5;
margin-top: 0px;
margin-bottom: 15px;
......
app/assets/stylesheets/gitlab_bootstrap/nav.scss
View file @ 4537623d
......@@ -10,6 +10,7 @@
> li > a {
@include border-radius(0);
}
&.nav-stacked {
> li > a {
border-left: 4px solid #EEE;
......@@ -30,6 +31,12 @@
}
}
}
&.nav-pills-small {
> li > a {
padding: 8px 12px;
}
}
}
.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
......
app/assets/stylesheets/gitlab_bootstrap/tables.scss
View file @ 4537623d
table {
@extend .table;
@extend .table-striped;
@include solid-shade;
border: 1px solid #bbb;
border: 1px solid #CCC;
width: 100%;
&.low {
......@@ -20,7 +19,7 @@ table {
th {
font-weight: bold;
vertical-align: middle;
border-bottom: 1px solid #bbb;
border-bottom: 1px solid #CCC;
text-shadow: 0 1px 1px #fff;
@include bg-dark-gray-gradient;
......@@ -46,11 +45,11 @@ table {
}
&:first-child {
border-left: 1px solid #bbb;
border-left: 1px solid #CCC;
}
&:last-child {
border-right: 1px solid #bbb;
border-right: 1px solid #CCC;
}
}
......
app/assets/stylesheets/gitlab_bootstrap/typography.scss
View file @ 4537623d
......@@ -2,6 +2,10 @@
* Headers
*
*/
h1, h2, h3, h4, h5, h6 {
font-weight: 500;
line-height: 1.1;
}
h1.page-title {
@include page-title;
......@@ -48,13 +52,6 @@ a {
text-decoration: underline;
}
&.btn {
color: $style_color;
&:hover {
color: $style_color;
}
}
&.dark {
color: $style_color;
}
......
app/assets/stylesheets/sections/commits.scss
View file @ 4537623d
......@@ -421,8 +421,8 @@
.commits-compare-switch{
background: url("switch_icon.png") no-repeat center center;
width: 16px;
height: 18px;
width: 22px;
height: 22px;
text-indent: -9999px;
float: left;
margin-right: 9px;
......@@ -471,3 +471,7 @@ li.commit {
}
}
}
.commit-breadcrumb {
padding: 0;
}
app/assets/stylesheets/sections/issues.scss
View file @ 4537623d
......@@ -44,7 +44,7 @@ input.check_all_issues {
margin: 0;
margin-right: 10px;
position: relative;
top: 8px;
top: 10px;
height: 22px;
}
......@@ -52,6 +52,10 @@ input.check_all_issues {
.title {
height: 40px;
}
form {
margin: 0;
}
}
.btn.close_issue {
......@@ -88,14 +92,11 @@ input.check_all_issues {
}
.update_selected_issues {
position: relative;
top:5px;
margin-left: 4px;
float: left;
}
.update_issues_text {
padding: 3px;
padding: 5px;
line-height: 28px;
float: left;
color: #479;
......
app/assets/stylesheets/sections/nav.scss
View file @ 4537623d
......@@ -7,7 +7,7 @@
ul {
margin: auto;
height: 42px;
height: 40px;
overflow: hidden;
.count {
font-weight: normal;
......@@ -74,7 +74,7 @@
text-align: center;
font-weight: normal;
height: 38px;
line-height: 36px;
line-height: 34px;
color: #777;
text-shadow: 0 1px 1px white;
padding: 0 10px;
......
app/assets/stylesheets/sections/projects.scss
View file @ 4537623d
.new_project,
.edit_project {
.project_name_holder {
input,
label {
font-size: 16px;
line-height: 20px;
padding: 8px;
}
.btn {
padding: 6px 10px;
margin-left: 10px;
margin-bottom: 8px;
}
}
.adv_settings {
h6 { margin-left: 40px; }
}
fieldset.features {
.control-label {
font-weight: bold;
......@@ -30,6 +13,10 @@
padding: 4px 7px;
border: 1px solid #CCC;
margin-bottom: 20px;
.btn {
padding: 4px 12px;
}
}
.project_clone_holder {
......@@ -114,7 +101,7 @@ ul.nav.nav-projects-tabs {
.public-clone {
background: #333;
color: #f5f5f5;
padding: 5px 10px;
padding: 6px 10px;
margin: 1px;
font-weight: normal;
}
......
app/assets/stylesheets/sections/tree.scss
View file @ 4537623d
......@@ -104,6 +104,8 @@
}
.tree-btn-group {
top: 2px;
.btn {
margin-right: 0px;
padding: 2px 10px;
......
app/assets/stylesheets/themes/ui_mars.scss
View file @ 4537623d
......@@ -31,8 +31,4 @@
border-left: 1px solid #666;
}
}
.main-nav {
box-shadow: 0 -1px 0 white inset;
}
}
app/contexts/filter_context.rb
View file @ 4537623d
......@@ -11,8 +11,8 @@ class FilterContext
end
def apply_filter items
if params[:project_id]
items = items.by_project(params[:project_id])
if params[:project_id].present?
items = items.where(project_id: params[:project_id])
end
if params[:search].present?
......
app/contexts/merge_requests_load_context.rb
View file @ 4537623d
......@@ -2,7 +2,7 @@
# based on filtering passed via params for @project
class MergeRequestsLoadContext < BaseContext
def execute
type = params[:f]
type = params[:status]
merge_requests = project.merge_requests
......
app/contexts/search_context.rb
View file @ 4537623d
......@@ -11,7 +11,7 @@ class SearchContext
return result unless query.present?
projects = Project.where(id: project_ids)
result[:projects] = projects.search(query).limit(10)
result[:projects] = projects.search(query).limit(20)
# Search inside singe project
project = projects.first if projects.length == 1
......@@ -19,8 +19,8 @@ class SearchContext
if params[:search_code].present?
result[:blobs] = project.repository.search_files(query, params[:repository_ref]) unless project.empty_repo?
else
result[:merge_requests] = MergeRequest.in_projects(project_ids).search(query).limit(10)
result[:issues] = Issue.where(project_id: project_ids).search(query).limit(10)
result[:merge_requests] = MergeRequest.in_projects(project_ids).search(query).limit(20)
result[:issues] = Issue.where(project_id: project_ids).search(query).limit(20)
result[:wiki_pages] = []
end
result
......
app/controllers/profiles/groups_controller.rb
View file @ 4537623d
......@@ -2,7 +2,7 @@ class Profiles::GroupsController < ApplicationController
layout "profile"
def index
@groups = current_user.authorized_groups.page(params[:page]).per(20)
@user_groups = current_user.users_groups.page(params[:page]).per(20)
end
def leave
......
app/controllers/projects/branches_controller.rb
View file @ 4537623d
......@@ -11,6 +11,10 @@ class Projects::BranchesController < Projects::ApplicationController
@branches = Kaminari.paginate_array(@repository.branches).page(params[:page]).per(30)
end
def recent
@branches = @repository.recent_branches
end
def create
@repository.add_branch(params[:branch_name], params[:ref])
......
app/controllers/projects/edit_tree_controller.rb
View file @ 4537623d
......@@ -10,7 +10,7 @@ class Projects::EditTreeController < Projects::ApplicationController
before_filter :edit_requirements, only: [:show, :update]
def show
@last_commit = @project.repository.last_commit_for(@ref, @path).sha
@last_commit = Gitlab::Git::Commit.last_for_path(@project.repository, @ref, @path).sha
end
def update
......
app/controllers/projects/repositories_controller.rb
View file @ 4537623d
......@@ -4,10 +4,6 @@ class Projects::RepositoriesController < Projects::ApplicationController
before_filter :authorize_code_access!
before_filter :require_non_empty_project
def show
@activities = @repository.commits_with_refs(20)
end
def stats
@stats = Gitlab::Git::Stats.new(@repository.raw, @repository.root_ref)
@graph = @stats.graph
......
app/controllers/users_groups_controller.rb
View file @ 4537623d
......@@ -13,7 +13,8 @@ class UsersGroupsController < ApplicationController
end
def update
# TODO: implement
@member = @group.users_groups.find(params[:id])
@member.update_attributes(params[:users_group])
end
def destroy
......
app/helpers/commits_helper.rb
View file @ 4537623d
......@@ -15,62 +15,10 @@ module CommitsHelper
commit_person_link(commit, options.merge(source: :committer))
end
def identification_type(line)
if line[0] == "+"
"new"
elsif line[0] == "-"
"old"
else
nil
end
end
def build_line_anchor(diff, line_new, line_old)
"#{hexdigest(diff.new_path)}_#{line_old}_#{line_new}"
end
def each_diff_line(diff, index)
diff_arr = diff.diff.lines.to_a
line_old = 1
line_new = 1
type = nil
lines_arr = ::Gitlab::InlineDiff.processing diff_arr
lines_arr.each do |line|
next if line.match(/^\-\-\- \/dev\/null/)
next if line.match(/^\+\+\+ \/dev\/null/)
next if line.match(/^\-\-\- a/)
next if line.match(/^\+\+\+ b/)
full_line = html_escape(line.gsub(/\n/, ''))
full_line = ::Gitlab::InlineDiff.replace_markers full_line
if line.match(/^@@ -/)
type = "match"
line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0
next if line_old == 1 && line_new == 1 #top of file
yield(full_line, type, nil, nil, nil)
next
else
type = identification_type(line)
line_code = build_line_anchor(diff, line_new, line_old)
Gitlab::DiffParser.new(diff).each do |full_line, type, line_code, line_new, line_old|
yield(full_line, type, line_code, line_new, line_old)
end
if line[0] == "+"
line_new += 1
elsif line[0] == "-"
line_old += 1
else
line_new += 1
line_old += 1
end
end
end
def each_diff_line_near(diff, index, expected_line_code)
......
app/helpers/dashboard_helper.rb
View file @ 4537623d
module DashboardHelper
def dashboard_filter_path(entity, options={})
def filter_path(entity, options={})
exist_opts = {
status: params[:status],
project_id: params[:project_id],
......@@ -7,12 +7,9 @@ module DashboardHelper
options = exist_opts.merge(options)
case entity
when 'issue' then
issues_dashboard_path(options)
when 'merge_request'
merge_requests_dashboard_path(options)
end
path = request.path
path << "?#{options.to_param}"
path
end
def entities_per_project project, entity
......
app/helpers/groups_helper.rb
View file @ 4537623d
module GroupsHelper
def group_filter_path(entity, options={})
exist_opts = {
status: params[:status],
project_id: params[:project_id],
}
options = exist_opts.merge(options)
case entity
when 'issue' then
issues_group_path(@group, options)
when 'merge_request'
merge_requests_group_path(@group, options)
end
end
def remove_user_from_group_message(group, user)
"You are going to remove #{user.name} from #{group.name} Group. Are you sure?"
end
......
app/helpers/notifications_helper.rb
View file @ 4537623d
module NotificationsHelper
def notification_icon(notification)
if notification.disabled?
content_tag :i, nil, class: 'icon-circle cred'
elsif notification.participating?
content_tag :i, nil, class: 'icon-circle cblue'
elsif notification.watch?
content_tag :i, nil, class: 'icon-circle cgreen'
else
content_tag :i, nil, class: 'icon-circle-blank cblue'
end
end
end
app/helpers/tree_helper.rb
View file @ 4537623d
......@@ -39,12 +39,12 @@ module TreeHelper
#
# Returns boolean
def markup?(filename)
filename.end_with?(*%w(.textile .rdoc .org .creole
filename.downcase.end_with?(*%w(.textile .rdoc .org .creole
.mediawiki .rst .asciidoc .pod))
end
def gitlab_markdown?(filename)
filename.end_with?(*%w(.mdown .md .markdown))
filename.downcase.end_with?(*%w(.mdown .md .markdown))
end
def plain_text_readme? filename
......@@ -57,6 +57,8 @@ module TreeHelper
end
def allowed_tree_edit?
return false unless @repository.branch_names.include?(@ref)
if @project.protected_branch? @ref
can?(current_user, :push_code_to_protected_branches, @project)
else
......
app/models/deprecated/user_team.rb
View file @ 4537623d
# Will be removed in 6.1 with tables
#
# == Schema Information
#
# Table name: user_teams
......
app/models/deprecated/user_team_project_relationship.rb
View file @ 4537623d
# Will be removed in 6.1 with tables
#
# == Schema Information
#
# Table name: user_team_project_relationships
......
app/models/deprecated/user_team_user_relationship.rb
View file @ 4537623d
# Will be removed in 6.1 with tables
#
# == Schema Information
#
# Table name: user_team_user_relationships
......
app/models/merge_request.rb
View file @ 4537623d
......@@ -149,11 +149,12 @@ class MergeRequest < ActiveRecord::Base
end
def unmerged_diffs
if for_fork?
diffs = Gitlab::Satellite::MergeAction.new(author, self).diffs_between_satellite
diffs = if for_fork?
Gitlab::Satellite::MergeAction.new(author, self).diffs_between_satellite
else
diffs = target_project.repository.diffs_between(source_branch, target_branch)
Gitlab::Git::Diff.between(project.repository, source_branch, target_branch)
end
diffs ||= []
diffs
end
......
app/models/note.rb
View file @ 4537623d
......@@ -50,6 +50,9 @@ class Note < ActiveRecord::Base
scope :inc_author_project, ->{ includes(:project, :author) }
scope :inc_author, ->{ includes(:author) }
serialize :st_diff
before_create :set_diff, if: ->(n) { n.line_code.present? }
def self.create_status_change_note(noteable, project, author, status)
create({
noteable: noteable,
......@@ -67,14 +70,31 @@ class Note < ActiveRecord::Base
nil
end
def diff
if noteable.diffs.present?
noteable.diffs.select do |d|
if d.new_path
Digest::SHA1.hexdigest(d.new_path) == diff_file_index
def find_diff
return nil unless noteable && noteable.diffs.present?
@diff ||= noteable.diffs.find do |d|
Digest::SHA1.hexdigest(d.new_path) == diff_file_index if d.new_path
end
end.first
end
def set_diff
# First lets find notes with same diff
# before iterating over all mr diffs
diff = Note.where(noteable_id: self.noteable_id, noteable_type: self.noteable_type, line_code: self.line_code).last.try(:diff)
diff ||= find_diff
self.st_diff = diff.to_hash if diff
end
def diff
@diff ||= Gitlab::Git::Diff.new(st_diff) if st_diff.respond_to?(:map)
end
def active?
# TODO: determine if discussion is outdated
# according to recent MR diff or not
true
end
def diff_file_index
......@@ -82,13 +102,29 @@ class Note < ActiveRecord::Base
end
def diff_file_name
diff.new_path
diff.new_path if diff
end
def diff_old_line
line_code.split('_')[1].to_i
end
def diff_new_line
line_code.split('_')[2].to_i
end
def diff_line
return @diff_line if @diff_line
if diff
Gitlab::DiffParser.new(diff).each do |full_line, type, line_code, line_new, line_old|
@diff_line = full_line if line_code == self.line_code
end
end
@diff_line
end
def discussion_id
@discussion_id ||= [:discussion, noteable_type.try(:underscore), noteable_id || commit_id, line_code].join("-").to_sym
end
......
app/models/repository.rb
View file @ 4537623d
......@@ -18,19 +18,25 @@ class Repository
end
def commit(id = nil)
commit = raw_repository.commit(id)
commit = Gitlab::Git::Commit.find(raw_repository, id)
commit = Commit.new(commit) if commit
commit
end
def commits(ref, path = nil, limit = nil, offset = nil)
commits = raw_repository.commits(ref, path, limit, offset)
commits = Gitlab::Git::Commit.where(
repo: raw_repository,
ref: ref,
path: path,
limit: limit,
offset: offset,
)
commits = Commit.decorate(commits) if commits.present?
commits
end
def commits_between(target, source)
commits = raw_repository.commits_between(target, source)
def commits_between(from, to)
commits = Gitlab::Git::Commit.between(raw_repository, from, to)
commits = Commit.decorate(commits) if commits.present?
commits
end
......@@ -43,6 +49,12 @@ class Repository
tags.find { |tag| tag.name == name }
end
def recent_branches(limit = 20)
branches.sort do |a, b|
a.commit.committed_date <=> b.commit.committed_date
end[0..limit]
end
def add_branch(branch_name, ref)
Rails.cache.delete(cache_key(:branch_names))
......
app/services/notification_service.rb
View file @ 4537623d
......@@ -102,19 +102,22 @@ class NotificationService
# ignore wall messages
return true unless note.noteable_type.present?
# ignore gitlab service messages
return true if note.note =~ /\A_Status changed to closed_/
opts = { noteable_type: note.noteable_type, project_id: note.project_id }
if note.commit_id.present?
opts.merge!(commit_id: note.commit_id)
recipients = [note.commit_author]
else
opts.merge!(noteable_id: note.noteable_id)
end
target = note.noteable
if target.respond_to?(:participants)
recipients = target.participants
else
recipients = []
end
recipients = note.mentioned_users
end
# Get users who left comment in thread
......
app/views/admin/groups/edit.html.haml
View file @ 4537623d
......@@ -4,22 +4,22 @@
- if @group.errors.any?
.alert.alert-error
%span= @group.errors.full_messages.first
.clearfix.group_name_holder
.control-group.group_name_holder
= f.label :name do
Group name is
.input
= f.text_field :name, placeholder: "Example Group", class: "xxlarge"
.controls
= f.text_field :name, placeholder: "Example Group", class: "input-xxlarge"
.clearfix.group-description-holder
.control-group.group-description-holder
= f.label :description, "Details"
.input
= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
.controls
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
.clearfix.group_name_holder
.control-group.group_name_holder
= f.label :path do
%span.cred Group path is
.input
= f.text_field :path, placeholder: "example-group", class: "xxlarge danger"
.controls
= f.text_field :path, placeholder: "example-group", class: "input-xxlarge danger"
%ul.cred
%li Changing group path can have unintended side effects.
%li Renaming group path will rename directory for all related projects
......
app/views/admin/groups/index.html.haml
View file @ 4537623d
......@@ -4,7 +4,7 @@
allows you to keep projects organized.
Use groups for uniting related projects.
= link_to 'New Group', new_admin_group_path, class: "btn btn-small pull-right"
= link_to 'New Group', new_admin_group_path, class: "btn btn-new pull-right"
%br
= form_tag admin_groups_path, method: :get, class: 'form-inline' do
= text_field_tag :name, params[:name], class: "span6"
......
app/views/admin/groups/new.html.haml
View file @ 4537623d
......@@ -4,15 +4,15 @@
- if @group.errors.any?
.alert.alert-error
%span= @group.errors.full_messages.first
.clearfix
.control-group
= f.label :name do
Group name is
.input
= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
.clearfix.group-description-holder
.controls
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
.control-group.group-description-holder
= f.label :description, "Details"
.input
= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
.controls
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
.form-actions
= f.submit 'Create group', class: "btn btn-create"
......
app/views/admin/hooks/index.html.haml
View file @ 4537623d
......@@ -10,10 +10,10 @@
.alert.alert-error
- @hook.errors.full_messages.each do |msg|
%p= msg
.clearfix
.control-group
= f.label :url, "URL:"
.input
= f.text_field :url, class: "text_field xxlarge"
.controls
= f.text_field :url, class: "text_field input-xxlarge input-xpadding"
&nbsp;
= f.submit "Add System Hook", class: "btn btn-create"
%hr
......
app/views/admin/projects/index.html.haml
View file @ 4537623d
......@@ -38,7 +38,7 @@
.title
Projects (#{@projects.total_count})
.pull-right
= link_to 'New Project', new_project_path, class: "btn btn-small btn-primary wide"
= link_to 'New Project', new_project_path, class: "btn btn-new"
%ul.well-list
- @projects.each do |project|
%li
......
app/views/admin/users/_form.html.haml
View file @ 4537623d
......@@ -8,28 +8,28 @@
%fieldset
%legend Account
.clearfix
.control-group
= f.label :name
.input
.controls
= f.text_field :name, required: true, autocomplete: "off"
%span.help-inline * required
.clearfix
.control-group
= f.label :username
.input
.controls
= f.text_field :username, required: true, autocomplete: "off"
%span.help-inline * required
.clearfix
.control-group
= f.label :email
.input
.controls
= f.text_field :email, required: true, autocomplete: "off"
%span.help-inline * required
- if @user.new_record?
%fieldset
%legend Password
.clearfix
.control-group
= f.label :password
.input
.controls
%strong
A temporary password will be generated and sent to user.
%br
......@@ -37,33 +37,33 @@
- else
%fieldset
%legend Password
.clearfix
.control-group
= f.label :password
.input= f.password_field :password, disabled: f.object.force_random_password
.clearfix
.controls= f.password_field :password, disabled: f.object.force_random_password
.control-group
= f.label :password_confirmation
.input= f.password_field :password_confirmation, disabled: f.object.force_random_password
.controls= f.password_field :password_confirmation, disabled: f.object.force_random_password
%fieldset
%legend Access
.row
.span8
.clearfix
.control-group
= f.label :projects_limit
.input= f.number_field :projects_limit
.controls= f.number_field :projects_limit
.clearfix
.control-group
= f.label :can_create_group
.input= f.check_box :can_create_group
.controls= f.check_box :can_create_group
.clearfix
.control-group
= f.label :can_create_team
.input= f.check_box :can_create_team
.controls= f.check_box :can_create_team
.clearfix
.control-group
= f.label :admin do
%strong.cred Administrator
.input= f.check_box :admin
.controls= f.check_box :admin
.span4
- unless @user.new_record?
.alert.alert-error
......@@ -75,17 +75,17 @@
= link_to 'Block User', block_admin_user_path(@user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove"
%fieldset
%legend Profile
.clearfix
.control-group
= f.label :skype
.input= f.text_field :skype
.clearfix
.controls= f.text_field :skype
.control-group
= f.label :linkedin
.input= f.text_field :linkedin
.clearfix
.controls= f.text_field :linkedin
.control-group
= f.label :twitter
.input= f.text_field :twitter
.controls= f.text_field :twitter
.actions
.form-actions
- if @user.new_record?
= f.submit 'Create user', class: "btn btn-create"
= link_to 'Cancel', admin_users_path, class: "btn btn-cancel"
......
app/views/admin/users/index.html.haml
View file @ 4537623d
......@@ -30,7 +30,7 @@
.title
Users (#{@users.total_count})
.pull-right
= link_to 'New User', new_admin_user_path, class: "btn btn-small wide btn-primary"
= link_to 'New User', new_admin_user_path, class: "btn btn-new"
%ul.well-list
- @users.each do |user|
%li
......
app/views/dashboard/issues.html.haml
View file @ 4537623d
%h3.page-title
Issues
%span.light
&ndash;
Assigned to you
Issues assigned to me
%span.pull-right #{@issues.total_count} issues
%p.light
For all issues you should visit project issues page. Or you can use search panel to find specific issue
%hr
.row
.span3
= render 'filter', entity: 'issue'
= render 'shared/filter', entity: 'issue'
.span9
- if @issues.any?
- @issues.group_by(&:project).each do |group|
%div.ui-box
- project = group[0]
.title
= link_to_project project
&nbsp;
%i.icon-angle-right
&nbsp;
= link_to 'issues', project_issues_path(project)
%ul.well-list.issues-list
- group[1].each do |issue|
= render 'projects/issues/issue', issue: issue
%hr
= paginate @issues, theme: "gitlab"
- else
%p.nothing_here_message Nothing to show here
= render 'shared/issues'
app/views/dashboard/merge_requests.html.haml
View file @ 4537623d
%h3.page-title
Merge Requests
%span.light
&ndash;
Authored by or assigned to you
%span.pull-right #{@merge_requests.total_count} merge requests
%p.light
Only merge requests authored or assigned to you are listed here.
%hr
.row
.span3
= render 'filter', entity: 'merge_request'
= render 'shared/filter', entity: 'merge_request'
.span9
= render 'shared/merge_requests'
app/views/dashboard/projects.html.haml
View file @ 4537623d
%h3.page-title My Projects
%p.light
All projects you have access to are listed here. Public projects are not included here unless you have membership in it
%hr
.row
.span3
%ul.nav.nav-pills.nav-stacked
......@@ -32,7 +36,7 @@
= label.name
.span9
%ul.bordered-list.my-projects
%ul.bordered-list.my-projects.top-list
- @projects.each do |project|
%li
%h4.project-title
......
app/views/groups/_new_group_member.html.haml
View file @ 4537623d
= form_for @users_group, url: group_users_groups_path(@group) do |f|
%fieldset
%legend= "New Group member(s) for #{@group.name}"
%legend
New member(s) for
%strong #{@group.name}
group
%h6 1. Choose users you want in the group
.clearfix
%p 1. Choose users you want in the group
.control-group
= f.label :user_ids, "People"
.input= users_select_tag(:user_ids, multiple: true, class: 'input-large')
.controls= users_select_tag(:user_ids, multiple: true, class: 'input-large')
%h6 2. Set access level for them
.clearfix
%p 2. Set access level for them
.control-group
= f.label :group_access, "Group Access"
.input= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
.controls= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
.form-actions
= f.submit 'Add users into group', class: "btn btn-create"
......
app/views/groups/edit.html.haml
View file @ 4537623d
......@@ -20,22 +20,22 @@
.ui-box
.title
%strong= @group.name
Group Settings:
group settings:
%div.form-holder
= form_for @group do |f|
- if @group.errors.any?
.alert.alert-error
%span= @group.errors.full_messages.first
.clearfix
.control-group
= f.label :name do
Group name is
.input
= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
.controls
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
.clearfix.group-description-holder
.control-group.group-description-holder
= f.label :description, "Details"
.input
= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
.controls
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
.form-actions
= f.submit 'Save group', class: "btn btn-save"
......@@ -44,7 +44,7 @@
.ui-box
.title
%strong= @group.name
Projects:
projects:
- if can? current_user, :manage_group, @group
%span.pull-right
= link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny" do
......@@ -85,4 +85,4 @@
%p
%strong Removed group can not be restored!
= link_to 'Remove Group', @group, confirm: 'Removed group can not be restored! Are you sure?', method: :delete, class: "btn btn-remove btn-small"
= link_to 'Remove Group', @group, confirm: 'Removed group can not be restored! Are you sure?', method: :delete, class: "btn btn-remove"
app/views/groups/issues.html.haml
View file @ 4537623d
......@@ -6,18 +6,6 @@
%hr
.row
.span3
= render 'filter', entity: 'issue'
= render 'shared/filter', entity: 'issue'
.span9
- if @issues.any?
- @issues.group_by(&:project).each do |group|
%div.ui-box
- project = group[0]
.title
= link_to_project project
%ul.well-list.issues-list
- group[1].each do |issue|
= render 'projects/issues/issue', issue: issue
%hr
= paginate @issues, theme: "gitlab"
- else
%p.nothing_here_message Nothing to show here
= render 'shared/issues'
app/views/groups/members.html.haml
View file @ 4537623d
%h3.page-title
Group members
%p.light
Members of group have access to all group projects.
%hr
- can_manage_group = current_user.can? :manage_group, @group
.row
.span6
- if can_manage_group
= render "new_group_member"
- else
.light-well
%h4.nothing_here_message
Only group owners can manage group members
.span6
.ui-box
.ui-box
.title
%strong #{@group.name}
Group Members
group members
%small
(#{@members.count})
%ul.well-list
- @members.each do |member|
= render 'users_groups/users_group', member: member, show_controls: can_manage_group
%p.light
Group members get access to all projects in this group
- if can_manage_group
= render "new_group_member"
app/views/groups/merge_requests.html.haml
View file @ 4537623d
......@@ -6,6 +6,6 @@
%hr
.row
.span3
= render 'filter', entity: 'merge_request'
= render 'shared/filter', entity: 'merge_request'
.span9
= render 'shared/merge_requests'
app/views/groups/new.html.haml
View file @ 4537623d
......@@ -2,19 +2,19 @@
- if @group.errors.any?
.alert.alert-error
%span= @group.errors.full_messages.first
.clearfix
.control-group
= f.label :name do
Group name is
.input
= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
.controls
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
.clearfix.group-description-holder
.control-group.group-description-holder
= f.label :description, "Details"
.input
= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
.controls
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
.clearfix
.input
.control-group
.controls
%ul
%li Group is kind of directory for several projects
%li All created groups are private
......
app/views/help/index.html.haml
View file @ 4537623d
......@@ -8,8 +8,6 @@
%br
Fast, secure and stable solution based on Ruby on Rails.
%br
.row
.span4
.ui-box
......
app/views/notify/new_user_email.html.haml
View file @ 4537623d
......@@ -4,7 +4,7 @@
- if Gitlab.config.gitlab.signup_enabled
Your account has been created successfully.
- else
The Administrator created an account for you. Now you are a member of company GitLab application.
The Administrator created an account for you. Now you are a member of the company GitLab application.
%p
login..........................................
%code= @user['email']
......
app/views/notify/new_user_email.text.erb
View file @ 4537623d
Hi <%= @user.name %>!
The Administrator created an account for you. Now you are a member of company GitLab application.
The Administrator created an account for you. Now you are a member of the company GitLab application.
login.................. <%= @user.email %>
<% if @user.created_by_id %>
......
app/views/profiles/account.html.haml
View file @ 4537623d
%h3.page-title
Account settings
%p.light
You can change password, username, private token here.
- if current_user.ldap_user?
Some options are unavailable for LDAP accounts
%hr
- unless current_user.ldap_user?
- if Gitlab.config.omniauth.enabled
%fieldset
......@@ -20,15 +27,15 @@
- @user.errors.full_messages.each do |msg|
%li= msg
.clearfix
.control-group
= f.label :password
.input= f.password_field :password, required: true
.clearfix
.controls= f.password_field :password, required: true
.control-group
= f.label :password_confirmation
.input
.controls
= f.password_field :password_confirmation, required: true
.clearfix
.input
.control-group
.controls
= f.submit 'Save password', class: "btn btn-save"
......@@ -47,7 +54,7 @@
It can be used for atom feed or API
%p.cgray
- if current_user.private_token
= text_field_tag "token", current_user.private_token, class: "xxlarge large_text"
= text_field_tag "token", current_user.private_token, class: "input-xxlarge large_text input-xpadding"
= f.submit 'Reset', confirm: "Are you sure?", class: "btn btn-primary btn-build-token"
- else
%span You don`t have one yet. Click generate to fix it.
......@@ -63,7 +70,7 @@
= form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
.padded
= f.label :username
.input
.controls
= f.text_field :username, required: true
&nbsp;
%span.loading-gif.hide= image_tag "ajax_loader.gif"
......@@ -76,7 +83,7 @@
%ul.cred
%li It will change web url for personal projects.
%li It will change the git path to repositories for personal projects.
.input
.controls
= f.submit 'Save username', class: "btn btn-save"
- if gitlab_config.signup_enabled
......
app/views/profiles/design.html.haml
View file @ 4537623d
%h3.page-title
My appearance settings
%p.light
Appearance settings saved to your profile and available across all devices
%hr
= form_for @user, url: profile_path, remote: true, method: :put do |f|
%fieldset.application-theme
%legend
......
app/views/profiles/groups/index.html.haml
View file @ 4537623d
.ui-box
.title
%strong Groups
(#{@groups.count})
%h3.page-title
Group membership
- if current_user.can_create_group?
%span.pull-right
= link_to new_group_path, class: "btn btn-small btn-primary" do
= link_to new_group_path, class: "btn btn-new" do
%i.icon-plus
New Group
%p.light
Members of group have access to all group projects.
%hr
.ui-box
.title
%strong Groups
(#{@user_groups.count})
%ul.well-list
- @groups.each do |group|
- @user_groups.each do |user_group|
- group = user_group.group
%li
.pull-right
- if can?(current_user, :manage_group, group)
......@@ -23,4 +29,7 @@
= link_to group, class: 'group-name' do
= group.name
= paginate @groups
as #{user_group.human_access}
= paginate @user_groups
app/views/profiles/history.html.haml
View file @ 4537623d
%h3.page-title
Account history
%p.light
You can see all events authored by your account here
%hr
.profile_history
= render @events
%hr
......
app/views/profiles/keys/_form.html.haml
View file @ 4537623d
......@@ -6,18 +6,18 @@
- @key.errors.full_messages.each do |msg|
%li= msg
.clearfix
.control-group
= f.label :title
.input= f.text_field :title
.clearfix
.controls= f.text_field :title, class: "input-xlarge"
.control-group
= f.label :key
.input
.controls
%p.light
Paste your public key here. Read more about how generate it #{link_to "here", help_ssh_path}
= f.text_area :key, class: [:xxlarge, :thin_area]
= f.text_area :key, class: "input-xxlarge thin_area"
.actions
.form-actions
= f.submit 'Add key', class: "btn btn-create"
= link_to "Cancel", profile_keys_path, class: "btn btn-cancel"
app/views/profiles/keys/index.html.haml
View file @ 4537623d
%h3.page-title
My SSH keys
.pull-right
= link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
%p.light
SSH key allows you to establish a secure connection between your computer and GitLab
%p.light
%br
Before you can add ssh key you need to
= link_to "generate it", help_ssh_path
%hr
.ui-box
.title
SSH Keys (#{@keys.count})
.pull-right
= link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary"
%ul.well-list#keys-table
= render @keys
- if @keys.blank?
......
app/views/profiles/notifications/_settings.html.haml
View file @ 4537623d
......@@ -2,6 +2,8 @@
.row
.span4
%span
= notification_icon(notification)
- if membership.kind_of? UsersGroup
= link_to membership.group.name, membership.group
- else
......
app/views/profiles/notifications/show.html.haml
View file @ 4537623d
%h3.page-title Setup your notification level
%h3.page-title
Notifications settings
%p.light
Application use email specified in your profile for notifications
%hr
.alert.alert-info
%p
%i.icon-circle.cred
%strong Disabled
&ndash; You will not get any notifications via email
%p.light
%p
%i.icon-circle.cblue
%strong Participating
&ndash; You will receive only notifications from related resources(ex. from assigned issue or your commit)
%p.light
%p
%i.icon-circle.cgreen
%strong Watch
&ndash; You will receive all notifications from projects in which you participate
%hr
.row
.span4
%h5 Global setting
%h4
= notification_icon(@notification)
Global setting
.span7
= form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
= hidden_field_tag :notification_type, 'global'
......@@ -30,20 +38,21 @@
= radio_button_tag :notification_level, Notification::N_WATCH, @notification.watch?, class: 'trigger-submit'
%span Watch
%hr
%br
= link_to '#', class: 'js-toggle-visibility-link' do
%h6.btn.btn-tiny
%span.btn.btn-tiny
%i.icon-chevron-down
%span Advanced notifications settings
.js-toggle-visibility-container.hide
%h5 Groups:
%ul.well-list
%hr
%h4 Groups:
%ul.bordered-list
- @users_groups.each do |users_group|
- notification = Notification.new(users_group)
= render 'settings', type: 'group', membership: users_group, notification: notification
%h5 Projects:
%ul.well-list
%h4 Projects:
%ul.bordered-list
- @users_projects.each do |users_project|
- notification = Notification.new(users_project)
= render 'settings', type: 'project', membership: users_project, notification: notification
......
app/views/profiles/passwords/new.html.haml
View file @ 4537623d
......@@ -10,13 +10,13 @@
- @user.errors.full_messages.each do |msg|
%li= msg
.clearfix
.control-group
= f.label :password
.input= f.password_field :password, required: true
.clearfix
.controls= f.password_field :password, required: true
.control-group
= f.label :password_confirmation
.input
.controls
= f.password_field :password_confirmation, required: true
.clearfix
.input
.control-group
.controls
= f.submit 'Set new password', class: "btn btn-create"
app/views/profiles/show.html.haml
View file @ 4537623d
......@@ -87,4 +87,4 @@
= link_to "Add Public Key", new_profile_key_path, class: "btn btn-small"
.form-actions
= f.submit 'Save', class: "btn btn-save"
= f.submit 'Save changes', class: "btn btn-save"
app/views/projects/blame/_head.html.haml deleted 100644 → 0
View file @ c7e490eb
%div.tree-ref-holder
= render 'shared/ref_switcher', destination: 'tree', path: params[:path]
app/views/projects/blame/show.html.haml
View file @ 4537623d
= render "head"
%h3.page-title Blame view
#tree-holder.tree-holder
%ul.breadcrumb
%li
%i.icon-angle-right
= link_to project_tree_path(@project, @ref) do
= @project.name
- tree_breadcrumbs(@tree, 6) do |link|
\/
%li= link
.clear
.file-holder
.file-title
%i.icon-file
%span.file_name
= @blob.name
= @path
%small= number_to_human_size @blob.size
%span.options= render "projects/blob/actions"
.file-content.blame
......
app/views/projects/blob/_actions.html.haml
View file @ 4537623d
.btn-group.tree-btn-group
-# only show edit link for text files
- if @blob.text?
= link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit?
= link_to "raw", project_raw_path(@project, @id), class: "btn btn-tiny", target: "_blank"
= link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-small", disabled: !allowed_tree_edit?
= link_to "raw", project_raw_path(@project, @id), class: "btn btn-small", target: "_blank"
-# only show normal/blame view links for text files
- if @blob.text?
- if current_page? project_blame_path(@project, @id)
= link_to "normal view", project_blob_path(@project, @id), class: "btn btn-tiny"
= link_to "normal view", project_blob_path(@project, @id), class: "btn btn-small"
- else
= link_to "blame", project_blame_path(@project, @id), class: "btn btn-tiny" unless @blob.empty?
= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny"
= link_to "blame", project_blame_path(@project, @id), class: "btn btn-small" unless @blob.empty?
= link_to "history", project_commits_path(@project, @id), class: "btn btn-small"
app/views/projects/repositories/_filter.html.haml → app/views/projects/branches/_filter.html.haml
View file @ 4537623d
%ul.nav.nav-pills.nav-stacked
= nav_link(path: 'repositories#show') do
= link_to 'Recent', project_repository_path(@project)
= nav_link(path: 'branches#recent') do
= link_to 'Recent', recent_project_branches_path(@project)
= nav_link(path: 'protected_branches#index') do
= link_to project_protected_branches_path(@project) do
Protected
......
app/views/projects/branches/index.html.haml
View file @ 4537623d
= render "projects/commits/head"
.row
.span3
= render "projects/repositories/filter"
= render "filter"
.span9
- unless @branches.empty?
%ul.bordered-list
......
app/views/projects/repositories/show.html.haml → app/views/projects/branches/recent.html.haml
View file @ 4537623d
......@@ -4,6 +4,5 @@
= render "filter"
.span9
%ul.bordered-list
- @activities.each do |update|
= render "projects/branches/branch", branch: update.head
- @branches.each do |branch|
= render "projects/branches/branch", branch: branch
app/views/projects/commits/_head.html.haml
View file @ 4537623d
......@@ -7,7 +7,7 @@
= link_to 'Compare', project_compare_index_path(@project)
= nav_link(html_options: {class: branches_tab_class}) do
= link_to project_repository_path(@project) do
= link_to recent_project_branches_path(@project) do
Branches
%span.badge= @repository.branches.length
......
app/views/projects/commits/_text_file.html.haml
View file @ 4537623d
......@@ -3,7 +3,7 @@
%a.supp_diff_link Diff suppressed. Click to show
%table.text-file{class: "#{'hide' if too_big}"}
- each_diff_line(diff, index) do |line, type, line_code, line_new, line_old|
- each_diff_line(diff, index) do |line, type, line_code, line_new, line_old, raw_line|
%tr.line_holder{ id: line_code, class: "#{type}" }
- if type == "match"
%td.old_line= "..."
......@@ -20,4 +20,4 @@
- if @reply_allowed
- comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at)
- unless comments.empty?
= render "projects/notes/diff_notes_with_reply", notes: comments
= render "projects/notes/diff_notes_with_reply", notes: comments, line: line
app/views/projects/commits/show.html.haml
View file @ 4537623d
= render "head"
- if @path.present?
%ul.breadcrumb
%ul.breadcrumb.commit-breadcrumb
%li.light
History for
= commits_breadcrumbs
......
app/views/projects/compare/_form.html.haml
View file @ 4537623d
......@@ -14,9 +14,9 @@
.pull-left
- if params[:to] && params[:from]
= link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
= text_field_tag :from, params[:from], placeholder: "master", class: "xlarge"
= text_field_tag :from, params[:from], placeholder: "master", class: "input-xlarge input-xpadding"
= "..."
= text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
= text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "input-xlarge input-xpadding"
.pull-left
&nbsp;
= submit_tag "Compare", class: "btn btn-create commits-compare-btn"
......
app/views/projects/create.js.haml
View file @ 4537623d
......@@ -4,5 +4,6 @@
- else
:plain
$(".project-edit-errors").html("#{escape_javascript(render('errors'))}");
$('.project-submit').enable();
$('.save-project-loader').hide();
$('.project-edit-container').show();
app/views/projects/deploy_keys/_form.html.haml
View file @ 4537623d
......@@ -6,18 +6,18 @@
- @key.errors.full_messages.each do |msg|
%li= msg
.clearfix
.control-group
= f.label :title
.input= f.text_field :title
.clearfix
.controls= f.text_field :title, class: 'input-xlarge'
.control-group
= f.label :key
.input
= f.text_area :key, class: [:xxlarge, :thin_area]
%p.hint
.controls
%p.light
Paste a machine public key here. Read more about how generate it
= link_to "here", help_ssh_path
= f.text_area :key, class: "input-xxlarge thin_area"
.actions
.form-actions
= f.submit 'Create', class: "btn-create btn"
= link_to "Cancel", project_deploy_keys_path(@project), class: "btn btn-cancel"
app/views/projects/deploy_keys/index.html.haml
View file @ 4537623d
%p.slead
Deploy keys allow read-only access to repository. They can be used for CI, staging or production servers
%h3.page-title
Deploy keys allow read-only access to repository
%p
You can create a deploy key or add existing one
= link_to new_project_deploy_key_path(@project), class: "btn btn-primary pull-right", title: "New Deploy Key" do
= link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do
%i.icon-plus
New Deploy Key
%p.light
They can be used for CI, staging or production servers.
You can create a deploy key or add existing one
%hr.clearfix
.row
.span5.enabled-keys
%h5.cgreen
Enabled deploy keys
%small for this project
%h5
%strong.cgreen Enabled deploy keys
for this project
%ul.bordered-list
= render @enabled_keys
- if @enabled_keys.blank?
......@@ -21,10 +23,10 @@
%p.nothing_here_message Create #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add existing one
.span5.available-keys
%h5
Available deploy keys
%small from projects you are able to manage
%strong Deploy keys
from projects available for you
%ul.bordered-list
= render @available_keys
- if @available_keys.blank?
.light-well
%p.nothing_here_message All deploy keys created in projects you own will be displayed here
%p.nothing_here_message All deploy keys created in projects you participate will be displayed here
app/views/projects/edit.html.haml
View file @ 4537623d
......@@ -4,28 +4,28 @@
.ui-box.white
.title
%strong= @project.name
Project Settings:
project settings:
.form-holder
= form_for(@project, remote: true) do |f|
%fieldset
.clearfix.project_name_holder
.control-group.project_name_holder
= f.label :name do
Project name is
.input
.controls
= f.text_field :name, placeholder: "Example Project", class: "span5"
.clearfix
.control-group
= f.label :description do
Project description
%span.light (optional)
.input
.controls
= f.text_area :description, placeholder: "awesome project", class: "span5", rows: 3, maxlength: 250
- unless @project.empty_repo?
.clearfix
- if @project.repository.exists? && @project.repository.branch_names.any?
.control-group
= f.label :default_branch, "Default Branch"
.input= f.select(:default_branch, @repository.branch_names, {}, {class: 'chosen'})
.controls= f.select(:default_branch, @repository.branch_names, {}, {class: 'chosen'})
- if can?(current_user, :change_public_mode, @project)
......@@ -66,11 +66,11 @@
- if Project.issues_tracker.values.count > 1
.control-group
= f.label :issues_tracker, "Issues tracker", class: 'control-label'
.input= f.select(:issues_tracker, Project.issues_tracker.values, {}, { disabled: !@project.issues_enabled })
.controls= f.select(:issues_tracker, Project.issues_tracker.values, {}, { disabled: !@project.issues_enabled })
.clearfix
.control-group
= f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'
.input= f.text_field :issues_tracker_id, disabled: !@project.can_have_issues_tracker_id?
.controls= f.text_field :issues_tracker_id, disabled: !@project.can_have_issues_tracker_id?
.control-group
= f.label :merge_requests_enabled, "Merge Requests", class: 'control-label'
......@@ -98,7 +98,7 @@
.form-actions
= f.submit 'Save', class: "btn btn-save"
= f.submit 'Save changes', class: "btn btn-save"
- if can?(current_user, :change_namespace, @project)
.ui-box.ui-box-danger
......@@ -110,7 +110,7 @@
= f.label :namespace_id do
%span Namespace
.controls
.clearfix
.control-group
= f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'}
%ul
%li Be careful. Changing project namespace can have unintended side effects
......@@ -130,7 +130,7 @@
= f.label :path do
%span Path
.controls
.clearfix
.control-group
= f.text_field :path
%ul
%li Be careful. Rename of project repo can have unintended side effects
......
app/views/projects/edit_tree/show.html.haml
View file @ 4537623d
%h3.page-title Edit mode
.file-editor
= form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do
.file-holder
......
app/views/projects/hooks/index.html.haml
View file @ 4537623d
......@@ -11,10 +11,10 @@
.alert.alert-error
- @hook.errors.full_messages.each do |msg|
%p= msg
.clearfix
.control-group
= f.label :url, "URL:"
.input
= f.text_field :url, class: "text_field xxlarge"
.controls
= f.text_field :url, class: "text_field input-xxlarge input-xpadding", placeholder: 'http://example.com/trigger-ci.json'
&nbsp;
= f.submit "Add Web Hook", class: "btn btn-create"
%hr
......
app/views/projects/issues/_filter.html.haml
View file @ 4537623d
......@@ -18,6 +18,9 @@
All
%fieldset
%hr
= link_to "Reset", project_issues_path(@project), class: 'btn pull-right'
- if %w(status milestone_id assignee_id label_name).select { |k| params[k].present? }.any?
= link_to project_issues_path(@project), class: 'cgray pull-right' do
%i.icon-remove
Clear filter
app/views/projects/issues/_form.html.haml
View file @ 4537623d
......@@ -8,18 +8,18 @@
%br
.ui-box.ui-box-show
.ui-box-head
.clearfix
.control-group
= f.label :title do
%strong= "Subject *"
.input
= f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input", autofocus: true, required: true
.controls
= f.text_field :title, maxlength: 255, class: "input-xxlarge js-gfm-input", autofocus: true, required: true
.ui-box-body
.clearfix
.control-group
.issue_assignee.pull-left
= f.label :assignee_id do
%i.icon-user
Assign to
.input
.controls
.pull-left
= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select a user" }, {class: 'chosen'})
.pull-right
......@@ -29,25 +29,25 @@
= f.label :milestone_id do
%i.icon-time
Milestone
.input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
.controls= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
.ui-box-bottom
.clearfix
.control-group
= f.label :label_list do
%i.icon-tag
Labels
.input
= f.text_field :label_list, maxlength: 2000, class: "xxlarge"
.controls
= f.text_field :label_list, maxlength: 2000, class: "input-xxlarge"
%p.hint Separate labels with commas.
.clearfix
.control-group
= f.label :description, "Details"
.input
= f.text_area :description, class: "xxlarge js-gfm-input", rows: 14
.controls
= f.text_area :description, class: "input-xxlarge js-gfm-input", rows: 14
%p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
.actions
.form-actions
- if @issue.new_record?
= f.submit 'Submit new issue', class: "btn btn-create"
-else
......
app/views/projects/issues/index.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/projects/network/_head.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/projects/new.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/projects/notes/_note.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/projects/snippets/_form.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/projects/wikis/_form.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/projects/wikis/_nav.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/projects/wikis/_new.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/public/projects/index.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/search/show.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/shared/_issues.html.haml 0 → 100644
View file @ 4537623d
This diff is collapsed.
app/views/shared/_merge_requests.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/snippets/_form.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/snippets/index.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/snippets/show.html.haml
View file @ 4537623d
This diff is collapsed.
app/views/users_groups/update.js.haml 0 → 100644
View file @ 4537623d
This diff is collapsed.
config/routes.rb
View file @ 4537623d
This diff is collapsed.
db/migrate/20130804151314_add_st_diff_to_note.rb 0 → 100644
View file @ 4537623d
This diff is collapsed.
db/schema.rb
View file @ 4537623d
This diff is collapsed.
doc/api/README.md
View file @ 4537623d
This diff is collapsed.
doc/install/installation.md
View file @ 4537623d
This diff is collapsed.
doc/update/5.4-to-6.0.md
View file @ 4537623d
This diff is collapsed.
features/steps/profile/profile.rb
View file @ 4537623d
This diff is collapsed.
features/steps/project/project.rb
View file @ 4537623d
This diff is collapsed.
features/steps/project/project_wiki.rb
View file @ 4537623d
This diff is collapsed.
lib/api/internal.rb
View file @ 4537623d
This diff is collapsed.
lib/backup/manager.rb 0 → 100644
View file @ 4537623d
This diff is collapsed.
lib/extracts_path.rb
View file @ 4537623d
This diff is collapsed.
lib/gitlab/blacklist.rb
View file @ 4537623d
This diff is collapsed.
lib/gitlab/diff_parser.rb 0 → 100644
View file @ 4537623d
This diff is collapsed.
lib/gitlab/markdown.rb
View file @ 4537623d
This diff is collapsed.
lib/gitlab/satellite/edit_file_action.rb
View file @ 4537623d
This diff is collapsed.
lib/tasks/gitlab/backup.rake
View file @ 4537623d
This diff is collapsed.
lib/tasks/migrate/migrate_inline_notes.rake 0 → 100644
View file @ 4537623d
This diff is collapsed.
lib/tasks/migrate/migrate_keys.rake
View file @ 4537623d
This diff is collapsed.
spec/controllers/commit_controller_spec.rb
View file @ 4537623d
This diff is collapsed.
spec/requests/api/internal_spec.rb
View file @ 4537623d
This diff is collapsed.
spec/services/notification_service_spec.rb
View file @ 4537623d
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