Dmitriy Zaporozhets
|
8016a7bd33
|
fix 1145
|
2013-01-25 14:18:23 +02:00 |
|
|
Dmitriy Zaporozhets
|
f598cc7897
|
change logic on line_code
|
2013-01-15 11:12:17 +02:00 |
|
Riyad Preukschas
|
3022786948
|
Merge commit 'master' into discussions
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
|
2013-01-15 00:52:25 +01:00 |
|
|
Dmitriy Zaporozhets
|
5a214ee6f1
|
Remove unused methods
|
2013-01-05 13:11:15 +02:00 |
|
|
Dmitriy Zaporozhets
|
e16cebac3e
|
Fixed styles, ProjectHook specs etc
|
2013-01-05 00:35:38 +02:00 |
|
|
Dmitriy Zaporozhets
|
c6298678f5
|
use ui-box as for all
|
2013-01-04 23:35:31 +02:00 |
|
|
Dmitriy Zaporozhets
|
39ba934c0a
|
REpostiry, Team models
|
2013-01-03 21:09:18 +02:00 |
|
|
Dmitriy Zaporozhets
|
c8ba5c2d58
|
Fix routing issues when navigating over tree, commits etc
|
2012-12-25 06:14:05 +03:00 |
|
|
Riyad Preukschas
|
db2c15369c
|
Merge branch 'master' into discussions
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
|
2012-12-23 01:03:57 +01:00 |
|
|
Dmitriy Zaporozhets
|
8826077471
|
Refactor css lists. Use well-list class
|
2012-12-18 06:14:05 +03:00 |
|
|
Riyad Preukschas
|
39834ec640
|
Move diff notes into the actual diff content column
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
4d2278e7c6
|
Rename commits/text_file partial to text_diff
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
3bc507e5c5
|
Rename diff note partials
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
9b919939a3
|
Fix parameter passing and wording for per line notes
|
2012-12-03 22:51:55 +01:00 |
|
Johannes Schleifenbaum
|
0323610b72
|
commit diff - check if prev_commit is not nil
|
2012-12-01 19:31:39 +01:00 |
|
|
Riyad Preukschas
|
79a4ed15ce
|
Change "Get Patch" buttons to dropdowns orffering patches and diffs
|
2012-11-25 00:36:19 +01:00 |
|
|
Dmitriy Zaporozhets
|
942c410119
|
Implemented bootstrap 2.2.1.1. Restyled header panel
|
2012-11-20 23:05:15 +02:00 |
|
Koen Punt
|
3ac1f9459a
|
Optimized commit diff views, now showing file size and file mode changes
Replaced commit status images (diff_file_*.png) with fontawesome icons
|
2012-11-18 17:41:41 +01:00 |
|
|
Dmitriy Zaporozhets
|
3c7806c3f2
|
Improve lists. Remove unneccessary padding
|
2012-11-11 00:08:42 +02:00 |
|
|
randx
|
1c5b2a5153
|
Stats page
|
2012-11-10 23:08:47 +02:00 |
|
Robert Speicher
|
e60185699b
|
Add 'breadcrumbs' helper for Commit breadcrumb links
Closes #1731
|
2012-11-01 17:58:13 -04:00 |
|
Dmitriy Zaporozhets
|
404040d7ae
|
Fix invalid template path for huge commit
|
2012-10-30 13:35:57 +02:00 |
|
|
Riyad Preukschas
|
3d0197246e
|
Use #author_link for blame, commits and tree
|
2012-10-27 18:27:47 +02:00 |
|
|
Dmitriy Zaporozhets
|
6d0dcb6614
|
Reduce max commit diff size. Added Commit::DIFF_SAFE_SIZE
|
2012-10-25 12:16:14 +03:00 |
|
|
Riyad Preukschas
|
81ee69381d
|
Add links to the note source if the note is mixed in
|
2012-10-10 12:14:48 +02:00 |
|
|
Riyad Preukschas
|
77bde9a0e4
|
Add notes count to commits in lists.
|
2012-10-10 01:31:36 +02:00 |
|
|
Robert Speicher
|
38ca52f33b
|
Use branches.length and tags.length instead of [whatever]_count
|
2012-10-02 18:56:57 -04:00 |
|
|
Dmitriy Zaporozhets
|
a79eb84289
|
commit show page styled a bit
|
2012-09-28 16:05:54 +03:00 |
|
|
Dmitriy Zaporozhets
|
a8870e87e4
|
Fix blame markup & breadcrubs for commits
|
2012-09-27 11:58:41 +03:00 |
|
|
Dmitriy Zaporozhets
|
beb324c1c6
|
Fixed updir method. Fixed breadcrumbs for commits
|
2012-09-27 09:49:00 +03:00 |
|
|
Robert Speicher
|
36f68140d1
|
Replace various "active tab" checks with nav_link
Also remove now-unused tab_class helper
|
2012-09-26 16:38:28 -04:00 |
|
|
Robert Speicher
|
275db3c522
|
Fix paths in commits/_head
|
2012-09-26 16:32:25 -04:00 |
|
|
Robert Speicher
|
b462a13387
|
Compare views and cleanup
- Remove compare/_head and just use commits/_head since they're identical
- Add index view; extract the form into a partial
|
2012-09-26 16:32:24 -04:00 |
|
|
Robert Speicher
|
545dc7e47d
|
Fix atom feed links
|
2012-09-26 16:32:23 -04:00 |
|
|
Robert Speicher
|
1048917232
|
Update usages of project_commit[s] route helpers
|
2012-09-26 16:32:23 -04:00 |
|
|
Robert Speicher
|
3574826920
|
Use Commits#show instead of Commits#index
Takes tree-ish + path as ID
|
2012-09-26 16:32:22 -04:00 |
|
|
Robert Speicher
|
169f16fb32
|
Remove Commits#compare, add CompareController
|
2012-09-26 16:32:22 -04:00 |
|
|
Robert Speicher
|
576cec6c67
|
Add BlobController, remove Refs#blob
|
2012-09-26 16:32:22 -04:00 |
|
|
Robert Speicher
|
79a02df92e
|
Update usages of tree_file_project_ref_path to project_tree_path
|
2012-09-26 16:32:21 -04:00 |
|
|
Robert Speicher
|
b389247c02
|
Use Commit#show instead of Commits#show to view a single commit
Commits#show (plural) is going to be for showing commit history on a
specific path.
|
2012-09-26 16:32:21 -04:00 |
|
|
Dmitriy Zaporozhets
|
4cc169d3ca
|
Improve commits compare. Added tags to autocomplete. Dont look for commits if from & to are empty
|
2012-09-21 11:22:53 +03:00 |
|
|
Robert Speicher
|
496f88afe1
|
Escape text passed to gfm by link_to_gfm
|
2012-09-19 19:42:26 -04:00 |
|
|
Robert Speicher
|
465e40d3a6
|
Extract ref switcher into a partial
Also moves onchange JS to projects.js.coffee
|
2012-09-16 12:07:57 -04:00 |
|
|
Riyad Preukschas
|
e1ca155c95
|
Extract 'notes/per_line_notes_with_reply' partial
|
2012-09-14 21:41:57 +02:00 |
|
|
Riyad Preukschas
|
a3dbd99068
|
Extract 'notes/per_line_note_link' partial
|
2012-09-14 21:41:57 +02:00 |
|
|
Riyad Preukschas
|
c6d71b7b8e
|
Rename 'notes/per_line_show' partial to 'notes/per_line_note'
|
2012-09-14 21:41:57 +02:00 |
|
|
Riyad Preukschas
|
29c71f2fb9
|
Rename 'notes/reply_button' partial to 'notes/per_line_reply_button'
|
2012-09-14 21:41:57 +02:00 |
|
|
Riyad Preukschas
|
61eb650db0
|
Rename 'notes/notes' partial to 'notes/notes_with_form'
|
2012-09-14 21:41:56 +02:00 |
|
|
Riyad Preukschas
|
653f7ec4fb
|
Update links for inline comments to use data-* attributes
|
2012-09-14 21:41:56 +02:00 |
|
|
Riyad Preukschas
|
20e009a40a
|
Update diff comments order and rendering
|
2012-09-14 21:41:56 +02:00 |
|