Commit bcfcd243 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 4f0bfdb5 2f962a40
......@@ -4,4 +4,4 @@ Array.prototype.first = function() {
Array.prototype.last = function() {
return this[this.length-1];
}
\ No newline at end of file
}
......@@ -14,4 +14,4 @@ $ ->
$('.js-group-avatar-input').bind "change", ->
form = $(this).closest("form")
filename = $(this).val().replace(/^.*[\\\/]/, '')
form.find(".js-avatar-filename").text(filename)
\ No newline at end of file
form.find(".js-avatar-filename").text(filename)
......@@ -182,4 +182,4 @@ $(document).ready ->
$(".div-dropzone").click()
return
return
\ No newline at end of file
return
......@@ -27,4 +27,4 @@ $ ->
filename = $(this).val().replace(/^.*[\\\/]/, '')
form.find(".js-avatar-filename").text(filename)
$('.profile-groups-avatars').tooltip("placement": "top")
\ No newline at end of file
$('.profile-groups-avatars').tooltip("placement": "top")
......@@ -10,4 +10,4 @@
.container
.content= yield
= yield :embedded_scripts
\ No newline at end of file
= yield :embedded_scripts
......@@ -14,4 +14,4 @@
.container
.content= yield
= yield :embedded_scripts
\ No newline at end of file
= yield :embedded_scripts
......@@ -34,4 +34,4 @@
%span zip
= link_to archive_project_repository_path(@project, ref: ref, format: 'tar.gz'), class: 'btn', rel: 'nofollow' do
%i.icon-download-alt
%span tar.gz
\ No newline at end of file
%span tar.gz
- groups.each do |group|
= link_to group, class: 'profile-groups-avatars', :title => group.name do
= image_tag group_icon(group.path)
\ No newline at end of file
= image_tag group_icon(group.path)
......@@ -7,4 +7,4 @@ class FixNamespaces < ActiveRecord::Migration
def down
end
end
\ No newline at end of file
end
......@@ -11,4 +11,4 @@ Feature: Project Browse Commits User Lookup
Scenario: I browse another commit from list
Given I click on another commit link
Then I see other commit info
\ No newline at end of file
Then I see other commit info
......@@ -15,4 +15,4 @@ Feature: Project Issue Tracker
When I visit edit project "Shop" page
And change the issue tracker to "Redmine"
And I save project
Then I the project should have "Redmine" as issue tracker
\ No newline at end of file
Then I the project should have "Redmine" as issue tracker
......@@ -34,4 +34,4 @@ class ProjectArchived < Spinach::FeatureSteps
click_link "Unarchive"
end
end
\ No newline at end of file
end
......@@ -55,4 +55,4 @@ class ProjectMultiselectBlob < Spinach::FeatureSteps
step 'I click on "Gemfile.lock" file in repo' do
click_link "Gemfile.lock"
end
end
\ No newline at end of file
end
......@@ -11,4 +11,4 @@ namespace :gitlab do
system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd) or raise("#{cmd} failed!")
end
end
end
\ No newline at end of file
end
......@@ -30,4 +30,4 @@ describe ApplicationController do
controller.send(:check_password_expiration)
end
end
end
\ No newline at end of file
end
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
\ No newline at end of file
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
......@@ -14,4 +14,4 @@ describe("StatGraph", function () {
})
})
});
\ No newline at end of file
});
......@@ -3,4 +3,4 @@ module ValidCommitWithAltEmail
MESSAGE = "fixed notes logic"
AUTHOR_FULL_NAME = "Dmitriy Zaporozhets"
AUTHOR_EMAIL = "dzaporozhets@sphereconsultinginc.com"
end
\ No newline at end of file
end
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