Sato Hiroyuki
784aa266bd
Refactor: grouping parent and their space by including array.
2013-03-07 15:19:42 +09:00
Sato Hiroyuki
2f7f46b256
Refactor: replace "render :json = graph.to_json" to view template(show.json.erb).
...
Because model shouldn't know about view logic.
2013-03-07 15:19:32 +09:00
Dmitriy Zaporozhets
a99ad3d355
tree_heleper: concat html only if present. Avoid nil exception
2013-03-05 17:15:20 +02:00
Dmitriy Zaporozhets
c2ba868c9b
Merge pull request #2954 from cabeca/fix-image-url-emoji
...
Fix image url for emoji.
2013-03-05 05:52:01 -08:00
Dmitriy Zaporozhets
115454f3ed
created-by-me filter for issues inside project. Fixed global project.issues order
2013-02-28 17:46:28 +02:00
Andrew8xx8
b6d0f2852d
Issues link from project page follows on remote bug tracker if it selected now
2013-02-28 16:11:14 +04:00
Andrew8xx8
16c720fd96
Issues helper improved
2013-02-28 16:11:13 +04:00
Andrew8xx8
68a7ecdaaf
Project issue tracker functions refactored
2013-02-28 16:10:00 +04:00
Andrew8xx8
e6d2e56961
Issue tracker field added to projects
2013-02-28 16:10:00 +04:00
Dmitriy Zaporozhets
0cc95ef2f5
Merge pull request #2889 from kennytm/master
...
Show only ≤16 lines of codes in a discussion in a MR (issue #2860 ).
2013-02-26 00:32:02 -08:00
Dmitriy Zaporozhets
db8baf2895
Since search_autocomplete_source rendered with raw all human input should be sanitized to prevent XSS
2013-02-25 22:12:11 +02:00
Dmitriy Zaporozhets
155703c613
Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine
...
Conflicts:
app/models/issue.rb
app/models/merge_request.rb
2013-02-19 11:01:19 +02:00
Dmitriy Zaporozhets
52028dcd2d
Merge pull request #3013 from crystax/master
...
Sort groups alphabetically on dashboard page
2013-02-19 00:51:08 -08:00
Dmitriy Zaporozhets
bfc359ca61
Fix project filter for MR on dashboard
2013-02-19 09:43:41 +02:00
Dmitry Moskalchuk
f7ae1bce25
Syntax fix of sorting groups/users
2013-02-19 11:13:19 +04:00
Dmitriy Zaporozhets
a29db26cc9
Refactor and restyle team page for project
2013-02-18 21:10:49 +02:00
Andrew8xx8
1644117a1a
Issue uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
b45e9aefd3
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
Dmitriy Zaporozhets
020078663e
Prevent xss attack over group name. Added regex validation for group and team name
2013-02-18 09:28:18 +02:00
Miguel Cabeça
157b038661
Include Riyad Preukschas suggestions.
2013-02-17 13:02:22 +00:00
Dmitry Moskalchuk
a9c1b85e08
Sort groups/namespaces by human name
2013-02-16 19:40:33 +04:00
Miguel Cabeça
f6957f7658
Fix image url for emoji.
2013-02-11 12:22:06 +00:00
KennyTM~
e565be241f
Show only ≤16 lines of code in a discussion (fix issue #2860 ).
2013-02-03 03:33:42 +08:00
Dmitriy Zaporozhets
560985b0f6
Fixed link_to_member
2013-01-30 17:07:44 +02:00
Dmitriy Zaporozhets
f72dc7f779
dont escape images inside links for gfm. Fixes #2701
2013-01-29 11:00:56 +02:00
Dmitriy Zaporozhets
e0b5e26035
Merge pull request #2153 from koenpunt/commit-diff-views
...
Added swipe view for image diff
2013-01-27 11:41:23 -08:00
Koen Punt
e33debc214
Updated commit diff view with some minor visual modifications
...
Prepared diff view for multiple view modes
Converted commits.js to coffeescript
image info in separate coffeescript file
Added swipe view mode
Added onion skin viewMode
2013-01-27 18:27:32 +01:00
Dmitriy Zaporozhets
070f49fdc5
Make group name a link at header
2013-01-27 13:12:30 +02:00
Dmitriy Zaporozhets
6b01196fb2
Dashboard to resource
2013-01-27 12:56:20 +02:00
Dmitriy Zaporozhets
6350b32a3d
Fix security issues with teams
2013-01-25 15:51:45 +02:00
Dmitriy Zaporozhets
aa1f1eb680
Merge pull request #2746 from gitlabhq/features/teams
...
New feature: Teams
2013-01-25 00:46:20 -08:00
Dmitriy Zaporozhets
ac8247b46d
Improved search. added filters
2013-01-25 10:07:21 +02:00
Andrey Kumanyaev
d721863382
Fix little bugs
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
31d84d71d3
assign team to project from project page in public section
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
f87b76a805
refactoring user team in public section
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
f6f414ce3b
refactoring project team members controller (corresponding mental model)
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
b7470440ff
Move team project management to own controller
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
cca9935970
save generated files
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
a987f1469e
commit user team helper
2013-01-24 22:31:24 +02:00
Dmitriy Zaporozhets
f6c482c06f
User can create group
2013-01-24 17:47:09 +02:00
Dmitriy Zaporozhets
70690e1971
base implementation
2013-01-22 19:05:01 +02:00
Riyad Preukschas
8a5b770c36
Reorder help routes
2013-01-19 15:26:23 +01:00
Riyad Preukschas
8db80f1f6d
Rename help#public_area to help#public_access
2013-01-19 15:24:51 +01:00
GitLab
232d61d598
Refactor project creation. Added logout link to profile page
2013-01-17 17:35:57 +02:00
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
Riyad Preukschas
16b5417842
Use image Urls for Emoji in GFM
...
Fixes #2617
2013-01-16 22:39:45 +01:00
Dmitriy Zaporozhets
08426d336d
Merge pull request #2538 from jouve/app_helper
...
clean application_helper a bit
2013-01-16 04:59:29 -08:00
Dmitriy Zaporozhets
f598cc7897
change logic on line_code
2013-01-15 11:12:17 +02:00
Riyad Preukschas
bda7fe38d0
Merge branch 'master' into discussions
2013-01-15 00:53:00 +01: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
