Please enable JavaScript to use RhodeCode Enterprise
##// END OF EJS Templates
marcink
- Mon, 26 Nov 2012 19:14:40
Show More
rhodecode/controllers/feed.py
0
0
-1
@@
-180,4
+180,3
b' class FeedController(BaseRepoController)'
180
region_invalidate ( _get_feed_from_cache , None , key )
180
region_invalidate ( _get_feed_from_cache , None , key )
181
CacheInvalidation . set_valid ( inv . cache_key )
181
CacheInvalidation . set_valid ( inv . cache_key )
182
return _get_feed_from_cache ( key )
182
return _get_feed_from_cache ( key )
183
rhodecode/lib/diffs.py
0
+1
-1
@@
-765,4
+765,4
b' def differ(org_repo, org_ref, other_repo'
765
node2 = org_repo [ org_ref ] . node (),
765
node2 = org_repo [ org_ref ] . node (),
766
opts = opts ))
766
opts = opts ))
767
767
768
return ''
No newline at end of file
768
return ''
rhodecode/lib/ext_json.py
0
+1
-1
@@
-119,4
+119,4
b' if simplejson:'
119
elif stdlibjson :
119
elif stdlibjson :
120
json = _json
120
json = _json
121
else :
121
else :
122
raise ImportError ( 'Could not find any json modules' )
No newline at end of file
122
raise ImportError ( 'Could not find any json modules' )
rhodecode/templates/admin/repos/repo_edit.html
0
+1
-1
@@
-204,7
+204,7
b''
204
</ tr >
204
</ tr >
205
%for cache in c.repo_info.cache_keys:
205
%for cache in c.repo_info.cache_keys:
206
< tr >
206
< tr >
207
< td > ${cache.prefix or '-'} </ td >
207
< td > ${cache.prefix or '-'} </ td >
208
< td > ${cache.cache_key} </ td >
208
< td > ${cache.cache_key} </ td >
209
< td > ${h.bool2icon(cache.cache_active)} </ td >
209
< td > ${h.bool2icon(cache.cache_active)} </ td >
210
</ tr >
210
</ tr >
rhodecode/templates/admin/users_groups/users_group_edit.html
0
+1
-1
@@
-161,7
+161,7
b''
161
</ ul >
161
</ ul >
162
%else:
162
%else:
163
< span class = "empty_data" > ${_('No members yet')} </ span >
163
< span class = "empty_data" > ${_('No members yet')} </ span >
164
%endif
164
%endif
165
</ div >
165
</ div >
166
</ div >
166
</ div >
167
167
rhodecode/templates/changelog/changelog.html
0
+2
-2
@@
-161,7
+161,7
b''
161
if ( checked_checkboxes . length > 0 ){
161
if ( checked_checkboxes . length > 0 ){
162
// modify open pull request to show we have selected cs
162
// modify open pull request to show we have selected cs
163
YUD . get ( 'open_new_pr' ). innerHTML = _TM [ 'Open new pull request for selected changesets' ];
163
YUD . get ( 'open_new_pr' ). innerHTML = _TM [ 'Open new pull request for selected changesets' ];
164
164
165
} else {
165
} else {
166
YUD . get ( 'open_new_pr' ). innerHTML = _TM [ 'Open new pull request' ];
166
YUD . get ( 'open_new_pr' ). innerHTML = _TM [ 'Open new pull request' ];
167
}
167
}
@@
-204,7
+204,7
b''
204
YUD . setStyle ( 'rev_range_clear' , 'display' , '' );
204
YUD . setStyle ( 'rev_range_clear' , 'display' , '' );
205
205
206
YUD . get ( 'open_new_pr' ). href += '?rev_start={0}&rev_end={1}' . format ( rev_start , rev_end );
206
YUD . get ( 'open_new_pr' ). href += '?rev_start={0}&rev_end={1}' . format ( rev_start , rev_end );
207
207
208
}
208
}
209
else {
209
else {
210
YUD . setStyle ( 'rev_range_container' , 'display' , 'none' );
210
YUD . setStyle ( 'rev_range_container' , 'display' , 'none' );
rhodecode/templates/compare/compare_diff.html
0
+3
-3
@@
-39,13
+39,13
b''
39
39
40
## FILES
40
## FILES
41
< div style = "font-size:1.1em;font-weight: bold;clear:both;padding-top:10px" >
41
< div style = "font-size:1.1em;font-weight: bold;clear:both;padding-top:10px" >
42
42
43
% if c.limited_diff:
43
% if c.limited_diff:
44
${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}
44
${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}
45
% else:
45
% else:
46
${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:
46
${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:
47
%endif
47
%endif
48
48
49
</ div >
49
</ div >
50
< div class = "cs_files" >
50
< div class = "cs_files" >
51
%if not c.files:
51
%if not c.files:
@@
-60,7
+60,7
b''
60
</ div >
60
</ div >
61
% if c.limited_diff:
61
% if c.limited_diff:
62
< h5 > ${_('Changeset was too big and was cut off...')} </ h5 >
62
< h5 > ${_('Changeset was too big and was cut off...')} </ h5 >
63
% endif
63
% endif
64
</ div >
64
</ div >
65
</ div >
65
</ div >
66
66
rhodecode/templates/files/files.html
0
+1
-1
@@
-91,7
+91,7
b' var callbacks = function(State){'
91
ypjax_links ();
91
ypjax_links ();
92
tooltip_activate ();
92
tooltip_activate ();
93
fileBrowserListeners ( State . url , State . data . node_list_url , State . data . url_base );
93
fileBrowserListeners ( State . url , State . data . node_list_url , State . data . url_base );
94
94
95
if ( YUD . get ( 'hlcode' )){
95
if ( YUD . get ( 'hlcode' )){
96
YUE . on ( 'hlcode' , 'mouseup' , getSelectionLink );
96
YUE . on ( 'hlcode' , 'mouseup' , getSelectionLink );
97
}
97
}
rhodecode/templates/files/files_history_box.html
0
+1
-1
@@
-22,4
+22,4
b''
22
</ div >
22
</ div >
23
< div style = "clear:both" ></ div >
23
< div style = "clear:both" ></ div >
24
</ dd >
24
</ dd >
25
</ dl >
No newline at end of file
25
</ dl >
rhodecode/templates/files/files_source.html
0
+2
-2
@@
-106,8
+106,8
b' YUE.onDOMReady(function(){'
106
ypjax ( _url , 'node_history' , function ( o ){
106
ypjax ( _url , 'node_history' , function ( o ){
107
tooltip_activate ();
107
tooltip_activate ();
108
})
108
})
109
});
109
});
110
110
111
});
111
});
112
112
113
</ script >
113
</ script >
rhodecode/templates/pullrequests/pullrequest.html
0
+1
-1
@@
-23,7
+23,7
b''
23
< div style = "float:left;padding:0px 30px 30px 30px" >
23
< div style = "float:left;padding:0px 30px 30px 30px" >
24
< input type = "hidden" name = "rev_start" value = "${request.GET.get('rev_start')}" />
24
< input type = "hidden" name = "rev_start" value = "${request.GET.get('rev_start')}" />
25
< input type = "hidden" name = "rev_end" value = "${request.GET.get('rev_end')}" />
25
< input type = "hidden" name = "rev_end" value = "${request.GET.get('rev_end')}" />
26
26
27
##ORG
27
##ORG
28
< div style = "float:left" >
28
< div style = "float:left" >
29
< div class = "fork_user" >
29
< div class = "fork_user" >
rhodecode/templates/pullrequests/pullrequest_show.html
0
+4
-4
@@
-68,16
+68,16
b''
68
##CS
68
##CS
69
< div style = "font-size:1.1em;font-weight: bold;clear:both;padding-top:10px" > ${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)} </ div >
69
< div style = "font-size:1.1em;font-weight: bold;clear:both;padding-top:10px" > ${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)} </ div >
70
< %include file="/compare/compare_cs.html" />
70
< %include file="/compare/compare_cs.html" />
71
71
72
## FILES
72
## FILES
73
< div style = "font-size:1.1em;font-weight: bold;clear:both;padding-top:10px" >
73
< div style = "font-size:1.1em;font-weight: bold;clear:both;padding-top:10px" >
74
74
75
% if c.limited_diff:
75
% if c.limited_diff:
76
${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}
76
${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}
77
% else:
77
% else:
78
${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:
78
${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:
79
%endif
79
%endif
80
80
81
</ div >
81
</ div >
82
< div class = "cs_files" >
82
< div class = "cs_files" >
83
%if not c.files:
83
%if not c.files:
@@
-92,7
+92,7
b''
92
</ div >
92
</ div >
93
% if c.limited_diff:
93
% if c.limited_diff:
94
< h5 > ${_('Changeset was too big and was cut off...')} </ h5 >
94
< h5 > ${_('Changeset was too big and was cut off...')} </ h5 >
95
% endif
95
% endif
96
</ div >
96
</ div >
97
</ div >
97
</ div >
98
## REVIEWERS
98
## REVIEWERS
rhodecode/templates/tags/tags.html
0
+2
-2
rhodecode/templates/tags/tags_data.html
0
+1
-1
rhodecode/tests/functional/test_compare.py
0
+1
-1
@@
-113,7
+113,7
b' class TestCompareController(TestControll'
113
finally :
113
finally :
114
RepoModel () . delete ( r2_id )
114
RepoModel () . delete ( r2_id )
115
RepoModel () . delete ( r1_id )
115
RepoModel () . delete ( r1_id )
116
116
117
117
118
def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg ( self ):
118
def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg ( self ):
119
self . log_user ()
119
self . log_user ()
Site-wide shortcuts
/
Use quick search box
g h
Goto home page
g g
Goto my private gists page
g G
Goto my public gists page
g 0-9
Goto bookmarked items from 0-9
n r
New repository page
n g
New gist page
Repositories
g s
Goto summary page
g c
Goto changelog page
g f
Goto files page
g F
Goto files page with file search activated
g p
Goto pull requests page
g o
Goto repository settings
g O
Goto repository access permissions settings
t s
Toggle sidebar on some pages