Dmitriy Zaporozhets
|
2e9c0e2b47
|
switch to use link_to_member to prevent 500 if user is a project owner but does not have membership and leave comment
|
2013-01-17 22:35:45 +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
|
f9528bfb86
|
a bit of restyling for issues and merge request lists
|
2013-01-08 08:14:05 +03:00 |
|
Dmitriy Zaporozhets
|
de05a598b3
|
Update to rails 3.2.10. Use simplercov in spinach too
|
2013-01-05 13:30:42 +02:00 |
|
Riyad Preukschas
|
b47173da6a
|
Revamped note form options.
|
2012-12-03 22:51:57 +01:00 |
|
Riyad Preukschas
|
4ed8278870
|
Fix a bunch of smaller glitches.
|
2012-12-03 22:51:57 +01:00 |
|
Riyad Preukschas
|
6fc10fa256
|
Unify forms for discussions and main target.
Allows previews and uploads in all forms.
Also fixes #1730
|
2012-12-03 22:51:56 +01:00 |
|
Riyad Preukschas
|
fbd345ea20
|
Make attachments more obvious
|
2012-12-03 22:51:56 +01:00 |
|
Riyad Preukschas
|
140652e9b0
|
Fix common form and note preview
|
2012-12-03 22:51:56 +01:00 |
|
Riyad Preukschas
|
d9b15fc17d
|
Crop and rename the add diff note image
|
2012-12-03 22:51:56 +01:00 |
|
Riyad Preukschas
|
494ae87840
|
Refactor discussion reply
|
2012-12-03 22:51:56 +01:00 |
|
Riyad Preukschas
|
06ea122840
|
Refactor diff notes creation
|
2012-12-03 22:51:56 +01:00 |
|
Riyad Preukschas
|
39834ec640
|
Move diff notes into the actual diff content column
|
2012-12-03 22:51:56 +01:00 |
|
Riyad Preukschas
|
5c2f6d7f05
|
Update notes views to support discussions
|
2012-12-03 22:51:55 +01:00 |
|
Koen Punt
|
81175073a0
|
removed overqualified mixins round-borders-*
|
2012-11-29 12:18:44 +01:00 |
|
Koen Punt
|
b825582eb1
|
replaced redundant -*-border-radius box-shadows and others with corresponding mixins
|
2012-11-29 12:18:44 +01:00 |
|
Koen Punt
|
84de1b71d1
|
Added some uniformity, all css properties and values are separated by a colon and a space :
|
2012-11-29 12:18:44 +01:00 |
|
Staicu Ionut
|
c701507b6c
|
Removed float on emoji
-`remove comment` button will not make the text jump anymore.
|
2012-09-24 10:06:41 +03:00 |
|
Dmitriy Zaporozhets
|
64e76a87aa
|
Notes votes: use icons instead of borders. Removed unnecessary padding
|
2012-09-18 09:17:55 +03:00 |
|
Dmitriy Zaporozhets
|
2aafd7cf4e
|
Merge branch 'update-votes-when-adding-notes' of https://github.com/riyad/gitlabhq into riyad-update-votes-when-adding-notes
|
2012-09-18 08:56:54 +03:00 |
|
Dmitriy Zaporozhets
|
249cb19d96
|
Fix project update. Make slim form only for reversed comments
|
2012-09-18 08:54:17 +03:00 |
|
Riyad Preukschas
|
b8113334a8
|
Highlight voting notes for issues and merge requests
|
2012-09-15 11:54:46 +02:00 |
|
randx
|
9159be3a50
|
Fix MR diff comments. Fix wiki comments loading error
|
2012-09-15 09:49:21 +03:00 |
|
Riyad Preukschas
|
7563abbe49
|
Add 'notes/reversed_notes_with_form' partial
|
2012-09-14 21:41:57 +02:00 |
|
Riyad Preukschas
|
1416401753
|
Fix markup
|
2012-09-14 21:41:56 +02:00 |
|
Riyad Preukschas
|
8b6dba749a
|
Reorder notes view elements
|
2012-09-14 21:41:56 +02:00 |
|
randx
|
beb5e1bd6b
|
Sanitize glm helper
|
2012-09-01 23:35:04 +03:00 |
|
randx
|
4a6596af27
|
Fixed bunch of js bugs with comments. Also added development tips
|
2012-08-30 21:31:55 +03:00 |
|
Dmitriy Zaporozhets
|
cd3d50caf2
|
Changed colors for buttons. Imporved preview area. Added clone panel to empty project
|
2012-08-30 09:27:02 +03:00 |
|
Riyad Preukschas
|
58a581782b
|
Update forms to show consistent link to GFM.
|
2012-08-27 20:55:01 +02:00 |
|
randx
|
7530fa9dec
|
Restored margin for text in notes
|
2012-08-19 00:08:20 +03:00 |
|
randx
|
3f9749dd86
|
Fix branch selector. Few css fixed also
|
2012-08-18 23:53:58 +03:00 |
|
Dmitriy Zaporozhets
|
8ffb6126a9
|
slim comment form
|
2012-08-09 06:36:55 +03:00 |
|
randx
|
6171a4d8eb
|
Fixed dashboard broken messages cause of glm
|
2012-08-03 03:28:02 +03:00 |
|
randx
|
4c1267e09f
|
CSS refactoring. Notes better styled
|
2012-07-29 01:34:51 +03:00 |
|