deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of dev.gitlabhq.com:gitlabhq

Browse source
This commit is contained in:
gitlabhq 2011-11-15 04:09:13 -05:00
commit 12782adf03
66 changed files with 493 additions and 440 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/application.js
View file

@ -10,6 +10,8 @@
//= require jquery.ui.selectmenu //= require jquery.ui.selectmenu
//= require jquery.tagify //= require jquery.tagify
//= require jquery.cookie //= require jquery.cookie
//= require modernizr
//= require chosen
//= require raphael //= require raphael
//= require branch-graph //= require branch-graph
//= require_tree . //= require_tree .
@ -22,8 +24,8 @@ $(function(){
$('select#branch').selectmenu({style:'popup', width:200}); $('select#branch').selectmenu({style:'popup', width:200});
$('select#tag').selectmenu({style:'popup', width:200}); $('select#tag').selectmenu({style:'popup', width:200});
$(".account-box").mouseenter(showMenu); $(".account-box").mouseenter(showMenu);
$(".account-box").mouseleave(resetMenu); $(".account-box").mouseleave(resetMenu);
}); });
@ -32,9 +34,9 @@ function updatePage(data){
} }
function showMenu() { function showMenu() {
$(this).toggleClass('hover'); $(this).toggleClass('hover');
} }
function resetMenu() { function resetMenu() {
$(this).removeClass("hover"); $(this).removeClass("hover");
} }

2
app/assets/javascripts/commits.js
View file

@ -8,8 +8,6 @@ $(document).ready(function(){
}); });
}); });
var CommitsList = { var CommitsList = {
ref:null, ref:null,

3
app/assets/javascripts/note.js
View file

@ -39,7 +39,6 @@ replace:
this.initLoadMore(); this.initLoadMore();
}, },
prepend: prepend:
function(id, html) { function(id, html) {
if(id != this.last_id) { if(id != this.last_id) {
@ -68,8 +67,6 @@ refresh:
dataType: "script"}); dataType: "script"});
}, },
initRefresh: initRefresh:
function() { function() {
// init timer // init timer

1
app/assets/javascripts/projects.js
View file

@ -48,7 +48,6 @@ function taggifyForm(){
source: '/tags.json' source: '/tags.json'
}); });
$('form').submit( function() { $('form').submit( function() {
var tag_field = $('#tag_field') var tag_field = $('#tag_field')
tag_field.val( tag_field.tagify('serialize') ); tag_field.val( tag_field.tagify('serialize') );

1
app/assets/stylesheets/application.css
View file

@ -5,6 +5,7 @@
*= require jquery-ui/jquery-ui *= require jquery-ui/jquery-ui
*= require jquery-ui/jquery.ui.selectmenu *= require jquery-ui/jquery.ui.selectmenu
*= require jquery-ui/jquery.tagify *= require jquery-ui/jquery.tagify
*= require chosen
*= require_self *= require_self
*= require_tree . *= require_tree .
*/ */

1
app/assets/stylesheets/issues.css.scss
View file

@ -45,4 +45,3 @@
} }
.issue:hover .action-links { display:block; } .issue:hover .action-links { display:block; }

1
app/assets/stylesheets/notes.css.scss
View file

@ -14,7 +14,6 @@
} }
} }
/* Note textare */ /* Note textare */
#note_note { #note_note {
height:100px; height:100px;

2
app/assets/stylesheets/projects.css.scss
View file

@ -120,7 +120,6 @@ table.highlighttable pre{
font-size:12px !important; font-size:12px !important;
} }
table.highlighttable .linenodiv pre { table.highlighttable .linenodiv pre {
text-align: right; text-align: right;
padding-right: 4px; padding-right: 4px;
@ -235,7 +234,6 @@ input.ssh_project_url {
} }
} }
#user_projects_limit{ #user_projects_limit{
width: 60px; width: 60px;
} }

449
app/assets/stylesheets/style.scss
View file

@ -60,7 +60,6 @@ input:invalid, textarea:invalid { background-color: #f0dddd; }
table { border-collapse: collapse; border-spacing: 0; } table { border-collapse: collapse; border-spacing: 0; }
td { vertical-align: top; } td { vertical-align: top; }
/* ==|== primary styles ===================================================== /* ==|== primary styles =====================================================
Author: Ricardo Rauch Author: Ricardo Rauch
========================================================================== */ ========================================================================== */
@ -89,13 +88,13 @@ input[type="text"]:focus, input[type="password"]:focus { outline: none; }
input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding: 10px} input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding: 10px}
.form-row{ .form-row{
padding: 0px 0px 10px 0px; padding: 0px 0px 10px 0px;
} }
.form-row label{ .form-row label{
font-weight:bold; font-weight:bold;
display: inline-block; display: inline-block;
padding: 0px 0px 5px 0px; padding: 0px 0px 5px 0px;
} }
/* eo Forms */ /* eo Forms */
@ -103,23 +102,23 @@ input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding:
/* Tables */ /* Tables */
table {width:100%; border: 1px solid #DEE2E3; margin-bottom: 20px} table {width:100%; border: 1px solid #DEE2E3; margin-bottom: 20px}
table thead{ table thead{
-webkit-border-top-left-radius: 5px; -webkit-border-top-left-radius: 5px;
-webkit-border-top-right-radius: 5px; -webkit-border-top-right-radius: 5px;
-moz-border-radius-topleft: 5px; -moz-border-radius-topleft: 5px;
-moz-border-radius-topright: 5px; -moz-border-radius-topright: 5px;
border-top-left-radius: 5px; border-top-left-radius: 5px;
border-top-right-radius: 5px; border-top-right-radius: 5px;
} }
table thead th{ table thead th{
background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8)); background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8); background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8); background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8); background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8);
margin: 0; margin: 0;
font-weight: normal; font-weight: normal;
font-weight: bold; font-weight: bold;
text-align: left; text-align: left;
color: #97A0A5; color: #97A0A5;
} }
td, th{ padding: .9em 1em; vertical-align: middle; } td, th{ padding: .9em 1em; vertical-align: middle; }
@ -127,37 +126,36 @@ table thead .image{width:100px}
table tr:hover, .listed_items tr.odd:hover{background-color:#FFFFCF} table tr:hover, .listed_items tr.odd:hover{background-color:#FFFFCF}
/* eo Tables */ /* eo Tables */
/* Buttons */ /* Buttons */
.grey-button{ .grey-button{
border-radius: 5px; border-radius: 5px;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
padding: 6px 20px; padding: 6px 20px;
border: 1px solid #999; border: 1px solid #999;
color: #666; color: #666;
display: inline-block; display: inline-block;
box-shadow: 0 1px 2px rgba(0,0,0,.3); box-shadow: 0 1px 2px rgba(0,0,0,.3);
background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #f7f7f7), to(#d5d5d5)); background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #f7f7f7), to(#d5d5d5));
background-image: -webkit-linear-gradient(#f7f7f7 7.6%, #d5d5d5); background-image: -webkit-linear-gradient(#f7f7f7 7.6%, #d5d5d5);
background-image: -moz-linear-gradient(#f7f7f7 7.6%, #d5d5d5); background-image: -moz-linear-gradient(#f7f7f7 7.6%, #d5d5d5);
background-image: -o-linear-gradient(#f7f7f7 7.6%, #d5d5d5); background-image: -o-linear-gradient(#f7f7f7 7.6%, #d5d5d5);
} }
a.button, input.button { a.button, input.button {
font-weight: bold; font-weight: bold;
padding: 10px 20px; padding: 10px 20px;
text-align: center; text-align: center;
display: inline-block; display: inline-block;
border-radius: 5px; border-radius: 5px;
color: #578E91; color: #578E91;
font-size: 12px; font-size: 12px;
text-transform: uppercase; text-transform: uppercase;
border: 1px solid #8CE2E6; border: 1px solid #8CE2E6;
background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbf5f6), to(#c5eef0)); background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbf5f6), to(#c5eef0));
background-image: -webkit-linear-gradient(#dbf5f6 79.4%, #c5eef0); background-image: -webkit-linear-gradient(#dbf5f6 79.4%, #c5eef0);
background-image: -moz-linear-gradient(#dbf5f6 79.4%, #c5eef0); background-image: -moz-linear-gradient(#dbf5f6 79.4%, #c5eef0);
background-image: -o-linear-gradient(#dbf5f6 79.4%, #c5eef0); background-image: -o-linear-gradient(#dbf5f6 79.4%, #c5eef0);
} }
input.button{margin-bottom: 1.5em} input.button{margin-bottom: 1.5em}
@ -167,21 +165,21 @@ input.button{margin-bottom: 1.5em}
.button.green {margin-right: 0; } .button.green {margin-right: 0; }
.button.yellow{ .button.yellow{
color: #908054; color: #908054;
border-color: #DDCDA1; border-color: #DDCDA1;
background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #FFEFC3), to(#F3E3B7)); background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #FFEFC3), to(#F3E3B7));
background-image: -webkit-linear-gradient(#FFEFC3 79.4%, #F3E3B7); background-image: -webkit-linear-gradient(#FFEFC3 79.4%, #F3E3B7);
background-image: -moz-linear-gradient(#FFEFC3 79.4%, #F3E3B7); background-image: -moz-linear-gradient(#FFEFC3 79.4%, #F3E3B7);
background-image: -o-linear-gradient(#FFEFC3 79.4%, #F3E3B7); background-image: -o-linear-gradient(#FFEFC3 79.4%, #F3E3B7);
} }
.button.blue{ .button.blue{
color: #417E97; color: #417E97;
border-color: #b2cdec; border-color: #b2cdec;
background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbe8f6), to(#c7daf1)); background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbe8f6), to(#c7daf1));
background-image: -webkit-linear-gradient(#dbe8f6 79.4%, #c7daf1); background-image: -webkit-linear-gradient(#dbe8f6 79.4%, #c7daf1);
background-image: -moz-linear-gradient(#dbe8f6 79.4%, #c7daf1); background-image: -moz-linear-gradient(#dbe8f6 79.4%, #c7daf1);
background-image: -o-linear-gradient(#dbe8f6 79.4%, #c7daf1); background-image: -o-linear-gradient(#dbe8f6 79.4%, #c7daf1);
} }
.button-small{ text-shadow: none; padding: 4px 10px; } .button-small{ text-shadow: none; padding: 4px 10px; }
@ -192,50 +190,49 @@ input.button{margin-bottom: 1.5em}
/* UI Box */ /* UI Box */
.ui-box{border: 1px solid #DEDFE1; float: left; border-radius: 5px} .ui-box{border: 1px solid #DEDFE1; float: left; border-radius: 5px}
.ui-box h3{ .ui-box h3{
background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8)); background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8); background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8); background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8); background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8);
margin: 0; margin: 0;
padding: 1em; padding: 1em;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
font-weight: bold; font-weight: bold;
font-size: 16px; font-size: 16px;
border-bottom: 1px solid #DEDFE1; border-bottom: 1px solid #DEDFE1;
-webkit-border-top-left-radius: 5px; -webkit-border-top-left-radius: 5px;
-webkit-border-top-right-radius: 5px; -webkit-border-top-right-radius: 5px;
-moz-border-radius-topleft: 5px; -moz-border-radius-topleft: 5px;
-moz-border-radius-topright: 5px; -moz-border-radius-topright: 5px;
border-top-left-radius: 5px; border-top-left-radius: 5px;
border-top-right-radius: 5px; border-top-right-radius: 5px;
} }
.ui-box.ui-box-small h3{ .ui-box.ui-box-small h3{
padding: 8px 10px; padding: 8px 10px;
font-size: 12px; font-size: 12px;
} }
.ui-box .data{padding: .5em 1em} .ui-box .data{padding: .5em 1em}
.ui-box .buttons{background-color: #f7f8f9; padding: 1em; .ui-box .buttons{background-color: #f7f8f9; padding: 1em;
-webkit-border-bottom-right-radius: 5px; -webkit-border-bottom-right-radius: 5px;
-webkit-border-bottom-left-radius: 5px; -webkit-border-bottom-left-radius: 5px;
-moz-border-radius-bottomright: 5px; -moz-border-radius-bottomright: 5px;
-moz-border-radius-bottomleft: 5px; -moz-border-radius-bottomleft: 5px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
} }
.ui-box .buttons .button{padding: 8px 9px; font-size: 11px} .ui-box .buttons .button{padding: 8px 9px; font-size: 11px}
.ui-box.hover:hover{box-shadow: 0 0 10px rgba(0,0,0,.1); border: 1px solid #ccc; .ui-box.hover:hover{box-shadow: 0 0 10px rgba(0,0,0,.1); border: 1px solid #ccc;
-webkit-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715); -webkit-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715);
-moz-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715); -moz-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715);
-o-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715); -o-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715);
transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715); transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715);
} }
/* eo UI Box */ /* eo UI Box */
@ -244,62 +241,61 @@ input.button{margin-bottom: 1.5em}
body.login-page{background-color: #f1f1f1; padding-top: 10%} body.login-page{background-color: #f1f1f1; padding-top: 10%}
.login-box{ .login-box{
width: 304px; width: 304px;
position: relative; position: relative;
border-radius: 5px; border-radius: 5px;
margin: auto; margin: auto;
padding: 20px; padding: 20px;
background: white; background: white;
box-shadow: rgba(0, 0, 0, 0.07) 0 1px 0,white 0 2px 0,rgba(0, 0, 0, 0.07) 0 3px 0,white 0 4px 0, rgba(0, 0, 0, 0.07) 0 5px 0; box-shadow: rgba(0, 0, 0, 0.07) 0 1px 0,white 0 2px 0,rgba(0, 0, 0, 0.07) 0 3px 0,white 0 4px 0, rgba(0, 0, 0, 0.07) 0 5px 0;
} }
.login-box .login-logo{ .login-box .login-logo{
margin: 10px 0 30px 0; margin: 10px 0 30px 0;
display: block; display: block;
} }
.login-box input.text{background-color: #f1f1f1; font-size: 16px; border-radius: 0; padding: 14px 10px; width: 280px} .login-box input.text{background-color: #f1f1f1; font-size: 16px; border-radius: 0; padding: 14px 10px; width: 280px}
.login-box input.text.top{ .login-box input.text.top{
-webkit-border-top-left-radius: 5px; -webkit-border-top-left-radius: 5px;
-webkit-border-top-right-radius: 5px; -webkit-border-top-right-radius: 5px;
-moz-border-radius-topleft: 5px; -moz-border-radius-topleft: 5px;
-moz-border-radius-topright: 5px; -moz-border-radius-topright: 5px;
border-top-left-radius: 5px; border-top-left-radius: 5px;
border-top-right-radius: 5px; border-top-right-radius: 5px;
} }
.login-box input.text.bottom{ .login-box input.text.bottom{
-webkit-border-bottom-right-radius: 5px; -webkit-border-bottom-right-radius: 5px;
-webkit-border-bottom-left-radius: 5px; -webkit-border-bottom-left-radius: 5px;
-moz-border-radius-bottomright: 5px; -moz-border-radius-bottomright: 5px;
-moz-border-radius-bottomleft: 5px; -moz-border-radius-bottomleft: 5px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
border-top: 0; border-top: 0;
margin-bottom: 20px; margin-bottom: 20px;
} }
.login-box a.forgot{float: right; padding-top: 6px} .login-box a.forgot{float: right; padding-top: 6px}
/* Icons */ /* Icons */
.directory, .file{ .directory, .file{
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
width: 14px; width: 14px;
} }
.directory{ .directory{
background: url('images.png') no-repeat -73px -26px; background: url('images.png') no-repeat -73px -26px;
height: 11px; height: 11px;
margin-bottom: -1px; margin-bottom: -1px;
} }
.file{ .file{
background: url('images.png') no-repeat -114px -24px; background: url('images.png') no-repeat -114px -24px;
height: 16px; height: 16px;
margin-bottom: -3px; margin-bottom: -3px;
} }
/* eo Icons*/ /* eo Icons*/
@ -315,7 +311,7 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
textarea textarea
{ {
border: 1px solid #FFBBBB; border: 1px solid #FFBBBB;
background: #fff4f6; background: #fff4f6;
} }
} }
/* eo Errors */ /* eo Errors */
@ -324,91 +320,84 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
#container{background-color: white; overflow: hidden; } #container{background-color: white; overflow: hidden; }
body.collapsed #container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)} body.collapsed #container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)}
/* Header */ /* Header */
header{background: #474D57 url('bg-header.png') repeat-x bottom; z-index: 10000; height: 44px; padding: 10px 2% 6px 2%; position: relative} header{background: #474D57 url('bg-header.png') repeat-x bottom; z-index: 10000; height: 44px; padding: 10px 2% 6px 2%; position: relative}
header a{color: white; text-shadow: 0 -1px 0 black} header a{color: white; text-shadow: 0 -1px 0 black}
header a:hover{color: #f1f1f1} header a:hover{color: #f1f1f1}
header h1{ header h1{
width: 65px; width: 65px;
} }
header h1.logo{margin: 0; padding: 0} header h1.logo{margin: 0; padding: 0}
header h1.logo a{ header h1.logo a{
background: url('images.png') no-repeat -3px -7px; background: url('images.png') no-repeat -3px -7px;
width: 65px; width: 65px;
height: 26px; height: 26px;
margin: 5px 0; margin: 5px 0;
padding: 0; padding: 0;
display: block; display: block;
float: left; float: left;
text-indent: -1000em; text-indent: -1000em;
} }
header nav{border-radius: 4px; box-shadow: 0 1px 2px black; width: 294px; margin: auto; header nav{border-radius: 4px; box-shadow: 0 1px 2px black; width: 294px; margin: auto;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595d63), to(#31363e)); background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595d63), to(#31363e));
background-image: -webkit-linear-gradient(#595d63 6.6%, #31363e); background-image: -webkit-linear-gradient(#595d63 6.6%, #31363e);
background-image: -moz-linear-gradient(#595d63 6.6%, #31363e); background-image: -moz-linear-gradient(#595d63 6.6%, #31363e);
background-image: -o-linear-gradient(#595d63 6.6%, #31363e); background-image: -o-linear-gradient(#595d63 6.6%, #31363e);
margin-top: 2px; margin-top: 2px;
height:30px height:30px
} }
header nav a{padding: 8px 12px 8px 34px; display: inline-block; color: #D6DADF; border-right: 1px solid #31363E; position: relative; box-shadow: 1px 0 0 rgba(255,255,255,.1); margin: 0} header nav a{padding: 8px 12px 8px 34px; display: inline-block; color: #D6DADF; border-right: 1px solid #31363E; position: relative; box-shadow: 1px 0 0 rgba(255,255,255,.1); margin: 0}
header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 6px;} header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 6px;}
header nav a:last-child {border: 0; box-shadow: none} header nav a:last-child {border: 0; box-shadow: none}
header nav a:hover, header nav a.current{ header nav a:hover, header nav a.current{
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595d63), to(#2c2f35)); background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595d63), to(#2c2f35));
background-image: -webkit-linear-gradient(#595d63 6.6%, #2c2f35); background-image: -webkit-linear-gradient(#595d63 6.6%, #2c2f35);
background-image: -moz-linear-gradient(#595d63 6.6%, #202227); background-image: -moz-linear-gradient(#595d63 6.6%, #202227);
background-image: -o-linear-gradient(#595d63 6.6%, #202227); background-image: -o-linear-gradient(#595d63 6.6%, #202227);
} }
header nav a:active{ header nav a:active{
box-shadow: 0 1px 4px rgba(0,0,0,.8) inset; box-shadow: 0 1px 4px rgba(0,0,0,.8) inset;
} }
header nav a.dashboard { header nav a.dashboard {
-webkit-border-top-left-radius: 4px; -webkit-border-top-left-radius: 4px;
-webkit-border-bottom-left-radius: 4px; -webkit-border-bottom-left-radius: 4px;
-moz-border-radius-topleft: 4px; -moz-border-radius-topleft: 4px;
-moz-border-radius-bottomleft: 4px; -moz-border-radius-bottomleft: 4px;
border-top-left-radius: 4px; border-top-left-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
} }
header nav a.admin{ header nav a.admin{
-webkit-border-top-right-radius: 4px; -webkit-border-top-right-radius: 4px;
-webkit-border-bottom-right-radius: 4px; -webkit-border-bottom-right-radius: 4px;
-moz-border-radius-topright: 4px; -moz-border-radius-topright: 4px;
-moz-border-radius-bottomright: 4px; -moz-border-radius-bottomright: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
} }
header .search{ display: inline-block; float: right; margin-right: 46px} header .search{ display: inline-block; float: right; margin-right: 46px}
header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 6px;} header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 6px;}
header nav a.dashboard span{background: url('images.png') no-repeat -161px 0;} header nav a.dashboard span{background: url('images.png') no-repeat -161px 0;}
header nav a.admin span{background: url('images.png') no-repeat -184px 0;} header nav a.admin span{background: url('images.png') no-repeat -184px 0;}
header nav a.project span{background: url('images.png') no-repeat -209px -1px; top: 7px} header nav a.project span{background: url('images.png') no-repeat -209px -1px; top: 7px}
header .login-top{float: right; width: 180px; header .login-top{float: right; width: 180px;
background-image: -webkit-gradient(linear, 0 0, 0 62, color-stop(0.032, #464c56), to(#363c45)); background-image: -webkit-gradient(linear, 0 0, 0 62, color-stop(0.032, #464c56), to(#363c45));
background-image: -webkit-linear-gradient(#464c56 3.2%, #363c45); background-image: -webkit-linear-gradient(#464c56 3.2%, #363c45);
background-image: -moz-linear-gradient(#464c56 3.2%, #363c45); background-image: -moz-linear-gradient(#464c56 3.2%, #363c45);
background-image: -o-linear-gradient(#464c56 3.2%, #363c45); background-image: -o-linear-gradient(#464c56 3.2%, #363c45);
padding: 0 10px; padding: 0 10px;
height: 44px; height: 44px;
} }
header .login-top a{display: block;} header .login-top a{display: block;}
header .login-top a.pic{float: left; margin-right: 10px; header .login-top a.pic{float: left; margin-right: 10px;
img{ height: 36px; width: 36px; border: 1px solid black} img{ height: 36px; width: 36px; border: 1px solid black}
} }
header .login-top a.username{margin-bottom: 5px} header .login-top a.username{margin-bottom: 5px}
header .login-top a.logout{color: #ccc} header .login-top a.logout{color: #ccc}
@ -419,12 +408,11 @@ header{margin-bottom: 0; clear: both; }
.page-title a.grey-button{float: right;} .page-title a.grey-button{float: right;}
.right{float: right;} .right{float: right;}
/* Account box */ /* Account box */
header .account-box{position: absolute; right: 0; top: 8px; z-index: 10000; width: 128px; font-size: 11px; float: right; display: block; cursor: pointer;} header .account-box{position: absolute; right: 0; top: 8px; z-index: 10000; width: 128px; font-size: 11px; float: right; display: block; cursor: pointer;}
header .account-box img{ border-radius: 4px; right: 20px; position: absolute; width: 38px; height: 38px; display: block; box-shadow: 0 1px 2px black} header .account-box img{ border-radius: 4px; right: 20px; position: absolute; width: 38px; height: 38px; display: block; box-shadow: 0 1px 2px black}
header .account-box img:after{ header .account-box img:after{
content: " "; content: " ";
display: block; display: block;
position: absolute; position: absolute;
top: 0; top: 0;
@ -432,7 +420,7 @@ header .account-box img:after{
left: 0; left: 0;
bottom: 0; bottom: 0;
float: right; float: right;
border-radius: 5px; border-radius: 5px;
border: 1px solid rgba(255, 255, 255, .1); border: 1px solid rgba(255, 255, 255, .1);
border-bottom: 0; border-bottom: 0;
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, .15)), to(rgba(0, 0, 0, .25))), -webkit-gradient(linear, left top, right bottom, color-stop(0, rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, .1)), color-stop(0.501, rgba(255, 255, 255, 0)), color-stop(1, rgba(255, 255, 255, 0))); background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, .15)), to(rgba(0, 0, 0, .25))), -webkit-gradient(linear, left top, right bottom, color-stop(0, rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, .1)), color-stop(0.501, rgba(255, 255, 255, 0)), color-stop(1, rgba(255, 255, 255, 0)));
@ -462,7 +450,6 @@ header .account-links:before {
z-index:10; z-index:10;
} }
/* Inspired by http://maxvoltar.com/temp/nowplaying/ */ /* Inspired by http://maxvoltar.com/temp/nowplaying/ */
header .account-links{background: white; display: none; z-index: 100000; border-radius: 5px; width: 100px; position: absolute; right: 20px; top: 46px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); } header .account-links{background: white; display: none; z-index: 100000; border-radius: 5px; width: 100px; position: absolute; right: 20px; top: 46px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); }
header .account-links a{color: #666; padding: 6px 10px; display: block; text-shadow: none; border-bottom: 1px solid #eee} header .account-links a{color: #666; padding: 6px 10px; display: block; text-shadow: none; border-bottom: 1px solid #eee}
@ -471,27 +458,27 @@ header .account-links a:hover{
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#39acec), to(#279ada), color-stop(.05, #4cbefe)); background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#39acec), to(#279ada), color-stop(.05, #4cbefe));
background: -moz-linear-gradient(top, #39acec, #4cbefe 5%, #279ada); background: -moz-linear-gradient(top, #39acec, #4cbefe 5%, #279ada);
background: linear-gradient(top, #39acec, #4cbefe 5%, #279ada); background: linear-gradient(top, #39acec, #4cbefe 5%, #279ada);
color: #fff; color: #fff;
text-shadow: #1488c8 0 -1px 0; text-shadow: #1488c8 0 -1px 0;
} }
.account-box.hover .arrow-up{top: 41px; right: 6px; position: absolute} .account-box.hover .arrow-up{top: 41px; right: 6px; position: absolute}
header .account-links a:first-child{ header .account-links a:first-child{
-webkit-border-top-left-radius: 5px; -webkit-border-top-left-radius: 5px;
-webkit-border-top-right-radius: 5px; -webkit-border-top-right-radius: 5px;
-moz-border-radius-topleft: 5px; -moz-border-radius-topleft: 5px;
-moz-border-radius-topright: 5px; -moz-border-radius-topright: 5px;
border-top-left-radius: 5px; border-top-left-radius: 5px;
border-top-right-radius: 5px; border-top-right-radius: 5px;
} }
header .account-links a:last-child{ header .account-links a:last-child{
-webkit-border-bottom-right-radius: 5px; -webkit-border-bottom-right-radius: 5px;
-webkit-border-bottom-left-radius: 5px; -webkit-border-bottom-left-radius: 5px;
-moz-border-radius-bottomright: 5px; -moz-border-radius-bottomright: 5px;
-moz-border-radius-bottomleft: 5px; -moz-border-radius-bottomleft: 5px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
border-bottom: 0; border-bottom: 0;
} }
#no_ssh_key_defined { #no_ssh_key_defined {
@ -509,13 +496,10 @@ input.search-input:focus{ background-color: white; width: 216px;}
input.search-input::-webkit-input-placeholder {color: #666} input.search-input::-webkit-input-placeholder {color: #666}
/* eo Header */ /* eo Header */
h2.icon{position: relative; padding-left: 40px; float: left; } h2.icon{position: relative; padding-left: 40px; float: left; }
/*h2 a{font-weight: normal;}*/ /*h2 a{font-weight: normal;}*/
h2.icon span{background: #E3E5EA url('images.png'); height: 32px; width: 32px; left: 0; top: -5px; border-radius: 4px; display: inline-block; position: absolute} h2.icon span{background: #E3E5EA url('images.png'); height: 32px; width: 32px; left: 0; top: -5px; border-radius: 4px; display: inline-block; position: absolute}
/* Dashboard Page */ /* Dashboard Page */
html, body { height: 100%; } html, body { height: 100%; }
@ -545,25 +529,22 @@ body.dashboard-page .news-feed .project-updates a.project-update span.update-aut
body.dashboard-page .news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;} body.dashboard-page .news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;}
/* eo Dashboard Page */ /* eo Dashboard Page */
.grey-button.right{margin-top: 20px} .grey-button.right{margin-top: 20px}
/* Project Page */ /* Project Page */
body.project-page h2.icon .project-name, body.project-page h2.icon d{border: 1px solid #eee; padding: 5px 30px 5px 10px; border-radius: 5px; position: relative;} body.project-page h2.icon .project-name, body.project-page h2.icon d{border: 1px solid #eee; padding: 5px 30px 5px 10px; border-radius: 5px; position: relative;}
body.project-page h2.icon .project-name i.arrow{float: right; body.project-page h2.icon .project-name i.arrow{float: right;
position: absolute; position: absolute;
right: 10px; right: 10px;
top: 13px; top: 13px;
display: block; display: block;
background: url('images.png') no-repeat -97px -29px; background: url('images.png') no-repeat -97px -29px;
width: 4px; width: 4px;
height: 5px; height: 5px;
} }
body.project-page h2.icon span{ background-position: -78px -68px; }
body.project-page h2.icon span{ background-position: -78px -68px; }
body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; } body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; }
body.project-page .page-title{margin-bottom: 0} body.project-page .page-title{margin-bottom: 0}
body.project-page .project-sidebar {width: 220px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; background-color: #f7f7f7; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; } body.project-page .project-sidebar {width: 220px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; background-color: #f7f7f7; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; }
@ -575,18 +556,17 @@ body.projects-page input.text.git-url {margin:10px 0 0 }
.projects_selector:hover > .project-box{ -moz-box-shadow:0px 0px 10px rgba(0, 0, 0, .1); -webkit-box-shadow:0px 0px 10px rgba(0, 0, 0, .1); box-shadow:0px 0px 10px rgba(0, 0, 0, .1); } .projects_selector:hover > .project-box{ -moz-box-shadow:0px 0px 10px rgba(0, 0, 0, .1); -webkit-box-shadow:0px 0px 10px rgba(0, 0, 0, .1); box-shadow:0px 0px 10px rgba(0, 0, 0, .1); }
body.project-page .project-sidebar aside{width: 219px} body.project-page .project-sidebar aside{width: 219px}
body.project-page .project-sidebar aside a{display: block; position: relative; background: white; padding: 15px 10px; border-bottom: 1px solid #eee} body.project-page .project-sidebar aside a{display: block; position: relative; background: white; padding: 15px 10px; border-bottom: 1px solid #eee}
body.project-page .project-sidebar aside a:first-child{ body.project-page .project-sidebar aside a:first-child{
-webkit-border-top-left-radius: 5px; -webkit-border-top-left-radius: 5px;
-moz-border-radius-topleft: 5px; -moz-border-radius-topleft: 5px;
border-top-left-radius: 5px; border-top-left-radius: 5px;
} }
.project-page .project-sidebar aside a:last-child{ .project-page .project-sidebar aside a:last-child{
-webkit-border-bottom-left-radius: 5px; -webkit-border-bottom-left-radius: 5px;
-moz-border-radius-bottomleft: 5px; -moz-border-radius-bottomleft: 5px;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
} }
body.project-page .project-sidebar aside a:hover{background-color: #eee;} body.project-page .project-sidebar aside a:hover{background-color: #eee;}
body.project-page .project-sidebar aside a span.number{float: right; border-radius: 5px; text-shadow: none; background: rgba(0,0,0,.12); text-align: center; padding: 5px 8px; position: absolute; top: 10px; right: 10px} body.project-page .project-sidebar aside a span.number{float: right; border-radius: 5px; text-shadow: none; background: rgba(0,0,0,.12); text-align: center; padding: 5px 8px; position: absolute; top: 10px; right: 10px}
@ -595,7 +575,7 @@ body.project-page .project-content{ padding: 20px; display: block; margin-left:
body.project-page .project-content h2{ margin-top: 6px} body.project-page .project-content h2{ margin-top: 6px}
body.project-page .project-content .button.right{margin-left: 20px} body.project-page .project-content .button.right{margin-left: 20px}
body.project-page table .commit a{color: #{$blue_link}} body.project-page table .commit a{color: #{$blue_link}}
body.project-page table th, body.project-page table td{ border-bottom: 1px solid #DEE2E3;} body.project-page table th, body.project-page table td{ border-bottom: 1px solid #DEE2E3;}
body.project-page .fixed{position: fixed; } body.project-page .fixed{position: fixed; }
/* New project Page */ /* New project Page */
@ -606,32 +586,31 @@ body.project-page .fixed{position: fixed; }
/* Commit Page */ /* Commit Page */
body.project-page.commits-page .commit-info{float: right;} body.project-page.commits-page .commit-info{float: right;}
body.project-page.commits-page .commit-info data{ body.project-page.commits-page .commit-info data{
padding: 4px 10px; padding: 4px 10px;
font-size: 11px; font-size: 11px;
} }
body.project-page.commits-page .commit-info data.commit-button{ body.project-page.commits-page .commit-info data.commit-button{
background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4)); background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4));
background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4); background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4);
background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4); background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4);
background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4); background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4);
box-shadow: 0 -1px 0 white inset; box-shadow: 0 -1px 0 white inset;
display: block; display: block;
border: 1px solid #eee; border: 1px solid #eee;
border-radius: 5px; border-radius: 5px;
margin-bottom: 2px; margin-bottom: 2px;
position: relative; position: relative;
padding-right: 20px; padding-right: 20px;
} }
body.project-page.commits-page .commit-button i{ body.project-page.commits-page .commit-button i{
background: url('images.png') no-repeat -138px -27px; background: url('images.png') no-repeat -138px -27px;
width: 6px; width: 6px;
height: 9px; height: 9px;
float: right; float: right;
position: absolute; position: absolute;
top: 6px; top: 6px;
right: 5px; right: 5px;
} }
body.project-page.commits-page .commits-date {display: block; width: 100%; margin-bottom: 20px} body.project-page.commits-page .commits-date {display: block; width: 100%; margin-bottom: 20px}
body.project-page.commits-page .commits-date .data {padding: 0} body.project-page.commits-page .commits-date .data {padding: 0}
@ -648,9 +627,6 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{
/* eo Project Page */ /* eo Project Page */
/* Projects Page */ /* Projects Page */
body.projects-page h2.icon span{background-position: -31px -70px;} body.projects-page h2.icon span{background-position: -31px -70px;}
body.projects-page .project-box.ui-box .data .repository {margin-bottom: 20px} body.projects-page .project-box.ui-box .data .repository {margin-bottom: 20px}
@ -659,7 +635,6 @@ body.projects-page .project-box{width: 100%; margin-bottom: 3em}
body.projects-page .browse-code{margin-right: 10px} body.projects-page .browse-code{margin-right: 10px}
/* eo Projects Page */ /* eo Projects Page */
/* ==|== non-semantic helper classes ======================================== */ /* ==|== non-semantic helper classes ======================================== */
.ir { display: block; border: 0; text-indent: -999em; overflow: hidden; background-color: transparent; background-repeat: no-repeat; text-align: left; direction: ltr; } .ir { display: block; border: 0; text-indent: -999em; overflow: hidden; background-color: transparent; background-repeat: no-repeat; text-align: left; direction: ltr; }
.ir br { display: none; } .ir br { display: none; }
@ -671,20 +646,16 @@ body.projects-page .browse-code{margin-right: 10px}
.clearfix:after { clear: both; } .clearfix:after { clear: both; }
.clearfix { zoom: 1; } .clearfix { zoom: 1; }
/* ==|== media queries ====================================================== */ /* ==|== media queries ====================================================== */
@media only screen and (min-width: 480px) { @media only screen and (min-width: 480px) {
} }
@media only screen and (min-width: 768px) { @media only screen and (min-width: 768px) {
} }
/* ==|== print styles ======================================================= */ /* ==|== print styles ======================================================= */
@media print { @media print {

4
app/assets/stylesheets/tags.css.css
View file

@ -1,5 +1,5 @@
.tags-list { .tags-list {
padding : 0px 10px 10px 10px; padding : 0px 10px 10px 10px;
} }
@ -15,7 +15,6 @@
font-size: 14px; font-size: 14px;
} }
.small-tags a{ .small-tags a{
font-size: 9px; font-size: 9px;
@ -29,7 +28,6 @@
font-weight: bold; font-weight: bold;
} }
.medium-tags a{ .medium-tags a{
font-size: 12px; font-size: 12px;

2
app/controllers/commits_controller.rb
View file

@ -10,7 +10,6 @@ class CommitsController < ApplicationController
before_filter :require_non_empty_project before_filter :require_non_empty_project
before_filter :load_refs, :only => :index # load @branch, @tag & @ref before_filter :load_refs, :only => :index # load @branch, @tag & @ref
def index def index
@repo = project.repo @repo = project.repo
limit, offset = (params[:limit] || 20), (params[:offset] || 0) limit, offset = (params[:limit] || 20), (params[:offset] || 0)
@ -24,6 +23,7 @@ class CommitsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
format.js format.js
format.atom { render :layout => false }
end end
end end

3
app/controllers/issues_controller.rb
View file

@ -24,6 +24,7 @@ class IssuesController < ApplicationController
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
format.js format.js
format.atom { render :layout => false }
end end
end end
@ -97,7 +98,7 @@ class IssuesController < ApplicationController
else @project.issues.opened else @project.issues.opened
end end
@issues = @issues.where("title LIKE ? OR content LIKE ?", "%#{terms}%", "%#{terms}%") unless terms.blank? @issues = @issues.where("title LIKE ?", "%#{terms}%") unless terms.blank?
render :partial => 'issues' render :partial => 'issues'
end end

16
app/controllers/tags_controller.rb
View file

@ -1,11 +1,11 @@
class TagsController < ApplicationController class TagsController < ApplicationController
def index def index
@tags = Project.tag_counts.order('count DESC') @tags = Project.tag_counts.order('count DESC')
@tags = @tags.where('name like ?', "%#{params[:term]}%") unless params[:term].blank? @tags = @tags.where('name like ?', "%#{params[:term]}%") unless params[:term].blank?
respond_to do |format| respond_to do |format|
format.html format.html
format.json { render json: @tags.limit(8).map {|t| t.name}} format.json { render json: @tags.limit(8).map {|t| t.name}}
end end
end end
end end

4
app/models/user.rb
View file

@ -1,7 +1,7 @@
class User < ActiveRecord::Base class User < ActiveRecord::Base
# Include default devise modules. Others available are: # Include default devise modules. Others available are:
# :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
devise :database_authenticatable, devise :database_authenticatable, :token_authenticatable,
:recoverable, :rememberable, :trackable, :validatable :recoverable, :rememberable, :trackable, :validatable
# Setup accessible (or protected) attributes for your model # Setup accessible (or protected) attributes for your model
@ -25,6 +25,8 @@ class User < ActiveRecord::Base
:foreign_key => :assignee_id, :foreign_key => :assignee_id,
:dependent => :destroy :dependent => :destroy
before_create :ensure_authentication_token
alias_attribute :private_token, :authentication_token
scope :not_in_project, lambda { |project| where("id not in (:ids)", :ids => project.users.map(&:id) ) } scope :not_in_project, lambda { |project| where("id not in (:ids)", :ids => project.users.map(&:id) ) }
def identifier def identifier

1
app/views/admin/projects/_form.html.haml
View file

@ -19,7 +19,6 @@
%br %br
= f.text_field :path = f.text_field :path
.form-row .form-row
= f.label :tag_list = f.label :tag_list
%br %br

23
app/views/commits/index.atom.builder Normal file
View file

@ -0,0 +1,23 @@
xml.instruct!
xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
xml.title "Recent commits to #{@project.name}:#{@ref}"
xml.link :href => project_commits_url(@project, :atom, :ref => @ref), :rel => "self", :type => "application/atom+xml"
xml.link :href => project_commits_url(@project), :rel => "alternate", :type => "text/html"
xml.id project_commits_url(@project)
xml.updated @commits.first.committed_date.strftime("%Y-%m-%dT%H:%M:%SZ") if @commits.any?
@commits.each do |commit|
xml.entry do
xml.id project_commit_url(@project, :id => commit.id)
xml.link :href => project_commit_url(@project, :id => commit.id)
xml.title truncate(commit.safe_message, :length => 80)
xml.updated commit.committed_date.strftime("%Y-%m-%dT%H:%M:%SZ")
xml.media :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(commit.author_email)
xml.author do |author|
xml.name commit.author_name
xml.email commit.author_email
end
xml.summary commit.safe_message
end
end
end

2
app/views/commits/index.html.haml
View file

@ -20,8 +20,6 @@
.loading{ :style => "display:none;"} .loading{ :style => "display:none;"}
%center= image_tag "ajax-loader.gif" %center= image_tag "ajax-loader.gif"
:javascript :javascript
$(function(){ $(function(){
CommitsList.init("#{@ref}", 20); CommitsList.init("#{@ref}", 20);

23
app/views/issues/index.atom.builder Normal file
View file

@ -0,0 +1,23 @@
xml.instruct!
xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
xml.title "#{@project.name} issues"
xml.link :href => project_issues_url(@project, :atom), :rel => "self", :type => "application/atom+xml"
xml.link :href => project_issues_url(@project), :rel => "alternate", :type => "text/html"
xml.id project_issues_url(@project)
xml.updated @issues.first.created_at.strftime("%Y-%m-%dT%H:%M:%SZ") if @issues.any?
@issues.each do |issue|
xml.entry do
xml.id project_issue_url(@project, issue)
xml.link :href => project_issue_url(@project, issue)
xml.title truncate(issue.title, :length => 80)
xml.updated issue.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
xml.media :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(issue.author_email)
xml.author do |author|
xml.name issue.author_name
xml.email issue.author_email
end
xml.summary issue.title
end
end
end

1
app/views/issues/index.html.haml
View file

@ -31,7 +31,6 @@
var href = $('.issue_search').parent().attr('action'); var href = $('.issue_search').parent().attr('action');
var last_terms = ''; var last_terms = '';
var setIssueFilter = function(form, value){ var setIssueFilter = function(form, value){
$.cookie('issue_filter', value, { expires: 140 }); $.cookie('issue_filter', value, { expires: 140 });
form.submit(); form.submit();

1
app/views/issues/show.html.haml
View file

@ -42,7 +42,6 @@
- else - else
= check_box_tag "closed", 1, @issue.closed, :disabled => true = check_box_tag "closed", 1, @issue.closed, :disabled => true
- if can?(current_user, :write_issue, @issue) - if can?(current_user, :write_issue, @issue)
.clear .clear
%br %br

4
app/views/layouts/project.html.haml
View file

@ -5,6 +5,10 @@
GitLab #{" - #{@project.name}" if @project && !@project.new_record?} GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
= stylesheet_link_tag "application" = stylesheet_link_tag "application"
= javascript_include_tag "application" = javascript_include_tag "application"
- if current_page?(tree_project_path(@project)) || current_page?(project_commits_path(@project))
= auto_discovery_link_tag(:atom, project_commits_url(@project, :atom, :ref => @ref, :private_token => current_user.private_token), :title => "Recent commits to #{@project.name}:#{@ref}")
- if request.path == project_issues_path(@project)
= auto_discovery_link_tag(:atom, project_issues_url(@project, :atom, :private_token => current_user.private_token), :title => "#{@project.name} issues")
= csrf_meta_tags = csrf_meta_tags
= javascript_tag do = javascript_tag do
REQ_URI = "#{request.env["REQUEST_URI"]}"; REQ_URI = "#{request.env["REQUEST_URI"]}";

1
app/views/notes/_load.js.haml
View file

@ -4,7 +4,6 @@
:plain :plain
NoteList.replace(#{@notes.last.id}, #{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}"); NoteList.replace(#{@notes.last.id}, #{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}");
- elsif params[:last_id] - elsif params[:last_id]
:plain :plain
NoteList.prepend(#{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}"); NoteList.prepend(#{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}");

4
app/views/notify/new_issue_email.html.haml
View file

@ -10,9 +10,7 @@
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"} %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%td{:align => "left", :style => "padding: 20px 0 0;"} %td{:align => "left", :style => "padding: 20px 0 0;"}
%h2{:style => "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "} %h2{:style => "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
= link_to project_issue_url(@project, @issue) do = link_to project_issue_url(@project, @issue), :title => @issue.title do
= "Issue ##{@issue.id.to_s}" = "Issue ##{@issue.id.to_s}"
= truncate(@issue.title, :length => 45) = truncate(@issue.title, :length => 45)
%br %br
%cite{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
= @issue.content

1
app/views/projects/_list.html.haml
View file

@ -14,7 +14,6 @@
= project.name = project.name
.small-tags= tag_list project .small-tags= tag_list project
%td= truncate project.url_to_repo %td= truncate project.url_to_repo
%td= project.code %td= project.code
%td= check_box_tag "read", 1, project.readers.include?(current_user), :disabled => :disabled %td= check_box_tag "read", 1, project.readers.include?(current_user), :disabled => :disabled

1
app/views/projects/_refs.html.haml
View file

@ -1,7 +1,6 @@
= form_tag destination, :method => :get, :class => "project-refs-form" do = form_tag destination, :method => :get, :class => "project-refs-form" do
= select_tag "ref", grouped_options_refs, :onchange => "this.form.submit();", :class => "project-refs-select" = select_tag "ref", grouped_options_refs, :onchange => "this.form.submit();", :class => "project-refs-select"
:javascript :javascript
$(function(){ $(function(){
$('.project-refs-select').chosen(); $('.project-refs-select').chosen();

1
app/views/projects/_tree.html.haml
View file

@ -1,4 +1,3 @@
-#%a.right.button{:href => "#"} Download -#%a.right.button{:href => "#"} Download
-#-if can? current_user, :admin_project, @project -#-if can? current_user, :admin_project, @project
%a.right.button.blue{:href => "#"} EDIT %a.right.button.blue{:href => "#"} EDIT

14
app/views/projects/new.html.haml
View file

@ -1,10 +1,10 @@
- content_for(:body_class, "new-project-page") - content_for(:body_class, "new-project-page")
- content_for(:page_title) do - content_for(:page_title) do
.new-project-hodler .new-project-hodler
.container .container
%h2.icon %h2.icon
%span %span
New Project New Project
%div.clear %div.clear
= render 'form' = render 'form'

1
app/views/tags/index.html.haml
View file

@ -4,7 +4,6 @@
%h2 %h2
Tags Tags
.tags-list .tags-list
- @tags.all.each do |tag| - @tags.all.each do |tag|
= link_to "#{tag.name}(#{tag.count})", tag_path(name) = link_to "#{tag.name}(#{tag.count})", tag_path(name)

4
config/initializers/devise.rb
View file

@ -158,11 +158,11 @@ Devise.setup do |config|
# ==> Configuration for :token_authenticatable # ==> Configuration for :token_authenticatable
# Defines name of the authentication token params key # Defines name of the authentication token params key
# config.token_authentication_key = :auth_token config.token_authentication_key = :private_token
# If true, authentication through token does not store user in session and needs # If true, authentication through token does not store user in session and needs
# to be supplied on each request. Useful if you are using the token as API token. # to be supplied on each request. Useful if you are using the token as API token.
# config.stateless_token = false config.stateless_token = true
# ==> Scopes configuration # ==> Scopes configuration
# Turn scoped views on. Before rendering "sessions/new", it will first check for # Turn scoped views on. Before rendering "sessions/new", it will first check for

7
config/routes.rb
View file

@ -3,7 +3,6 @@ Gitlab::Application.routes.draw do
get 'tags'=> 'tags#index' get 'tags'=> 'tags#index'
get 'tags/:tag' => 'projects#index' get 'tags/:tag' => 'projects#index'
namespace :admin do namespace :admin do
resources :users resources :users
resources :projects resources :projects
@ -53,10 +52,8 @@ Gitlab::Application.routes.draw do
resources :team_members resources :team_members
resources :issues do resources :issues do
collection do collection do
post :sort post :sort
end get :search
collection do
get :search
end end
end end
resources :notes, :only => [:create, :destroy] resources :notes, :only => [:create, :destroy]

9
db/migrate/20111111093150_remove_content_from_issues.rb Normal file
View file

@ -0,0 +1,9 @@
class RemoveContentFromIssues < ActiveRecord::Migration
def up
remove_column :issues, :content
end
def down
add_column :issues, :content, :text
end
end

5
db/migrate/20111115063954_add_authentication_token_to_users.rb Normal file
View file

@ -0,0 +1,5 @@
class AddAuthenticationTokenToUsers < ActiveRecord::Migration
def change
add_column :users, :authentication_token, :string
end
end

4
db/schema.rb
View file

@ -11,11 +11,10 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20111101222453) do ActiveRecord::Schema.define(:version => 20111115063954) do
create_table "issues", :force => true do |t| create_table "issues", :force => true do |t|
t.string "title" t.string "title"
t.text "content"
t.integer "assignee_id" t.integer "assignee_id"
t.integer "author_id" t.integer "author_id"
t.integer "project_id" t.integer "project_id"
@ -104,6 +103,7 @@ ActiveRecord::Schema.define(:version => 20111101222453) do
t.string "skype", :default => "", :null => false t.string "skype", :default => "", :null => false
t.string "linkedin", :default => "", :null => false t.string "linkedin", :default => "", :null => false
t.string "twitter", :default => "", :null => false t.string "twitter", :default => "", :null => false
t.string "authentication_token"
end end
add_index "users", ["email"], :name => "index_users_on_email", :unique => true add_index "users", ["email"], :name => "index_users_on_email", :unique => true

5
spec/models/user_spec.rb
View file

@ -19,6 +19,11 @@ describe User do
user.identifier.should == "test_mail.com" user.identifier.should == "test_mail.com"
end end
it "should have authentication token" do
user = Factory(:user)
user.authentication_token.should_not == ""
end
describe "dependent" do describe "dependent" do
before do before do
@user = Factory :user @user = Factory :user

19
spec/requests/commits_spec.rb
View file

@ -25,6 +25,25 @@ describe "Commits" do
page.should have_content(commit.author) page.should have_content(commit.author)
page.should have_content(commit.message) page.should have_content(commit.message)
end end
it "should render atom feed" do
visit project_commits_path(project, :atom)
page.response_headers['Content-Type'].should have_content("application/atom+xml")
page.body.should have_selector("title", :text => "Recent commits to #{project.name}")
page.body.should have_selector("author email", :text => commit.author_email)
page.body.should have_selector("entry summary", :text => commit.message)
end
it "should render atom feed via private token" do
logout
visit project_commits_path(project, :atom, :private_token => @user.private_token)
page.response_headers['Content-Type'].should have_content("application/atom+xml")
page.body.should have_selector("title", :text => "Recent commits to #{project.name}")
page.body.should have_selector("author email", :text => commit.author_email)
page.body.should have_selector("entry summary", :text => commit.message)
end
end end
describe "GET /commits/:id" do describe "GET /commits/:id" do

19
spec/requests/issues_spec.rb
View file

@ -27,6 +27,25 @@ describe "Issues" do
it { should have_content(@issue.project.name) } it { should have_content(@issue.project.name) }
it { should have_content(@issue.assignee.name) } it { should have_content(@issue.assignee.name) }
it "should render atom feed" do
visit project_issues_path(project, :atom)
page.response_headers['Content-Type'].should have_content("application/atom+xml")
page.body.should have_selector("title", :text => "#{project.name} issues")
page.body.should have_selector("author email", :text => @issue.author_email)
page.body.should have_selector("entry summary", :text => @issue.title)
end
it "should render atom feed via private token" do
logout
visit project_issues_path(project, :atom, :private_token => @user.private_token)
page.response_headers['Content-Type'].should have_content("application/atom+xml")
page.body.should have_selector("title", :text => "#{project.name} issues")
page.body.should have_selector("author email", :text => @issue.author_email)
page.body.should have_selector("entry summary", :text => @issue.title)
end
describe "Destroy" do describe "Destroy" do
before do before do
# admin access to remove issue # admin access to remove issue

4
spec/requests/tags_spec.rb
View file

@ -10,7 +10,6 @@ describe "Tags" do
# end # end
# end # end
describe "GET '/tags.json'" do describe "GET '/tags.json'" do
before do before do
@project = Factory :project @project = Factory :project
@ -20,12 +19,9 @@ describe "Tags" do
visit '/tags.json' visit '/tags.json'
end end
it "should contains tags" do it "should contains tags" do
page.should have_content('demo1') page.should have_content('demo1')
end end
end end
end end

0
app/assets/javascripts/chosen.jquery.js → vendor/assets/javascripts/chosen.js vendored
View file

0
app/assets/javascripts/modernizr-2.0.6.min.js → vendor/assets/javascripts/modernizr.js vendored
View file

0
app/assets/stylesheets/chosen.css → vendor/assets/stylesheets/chosen.css vendored
View file