OSDN Git Service
Dmitriy Zaporozhets [Fri, 21 Sep 2012 11:19:16 +0000 (04:19 -0700)]
Merge pull request #1521 from NARKOZ/api
API for project team members
Nihad Abbasov [Fri, 21 Sep 2012 10:23:17 +0000 (03:23 -0700)]
add API for project team members
Dmitriy Zaporozhets [Fri, 21 Sep 2012 10:22:30 +0000 (13:22 +0300)]
APi for commits. Better api docs
Dmitriy Zaporozhets [Fri, 21 Sep 2012 08:22:53 +0000 (11:22 +0300)]
Improve commits compare. Added tags to autocomplete. Dont look for commits if from & to are empty
randx [Thu, 20 Sep 2012 16:35:56 +0000 (19:35 +0300)]
Merge branch 'api'
randx [Thu, 20 Sep 2012 16:35:45 +0000 (19:35 +0300)]
Merge branch 'api' of https://github.com/NARKOZ/gitlabhq into api
Nihad Abbasov [Thu, 20 Sep 2012 16:11:15 +0000 (22:11 +0600)]
fix broken spec
Nihad Abbasov [Thu, 20 Sep 2012 15:51:26 +0000 (08:51 -0700)]
update help section with session API docs
Nihad Abbasov [Thu, 20 Sep 2012 15:38:08 +0000 (08:38 -0700)]
API: return 401 for invalid session
Nihad Abbasov [Thu, 20 Sep 2012 15:36:43 +0000 (08:36 -0700)]
API: extend UserLogin entity from UserBasic
Dmitriy Zaporozhets [Thu, 20 Sep 2012 14:44:44 +0000 (17:44 +0300)]
I want be able to get token via api. Used for mobile applications
Nihad Abbasov [Thu, 20 Sep 2012 12:38:34 +0000 (18:38 +0600)]
API: expose project id for milestones
Nihad Abbasov [Thu, 20 Sep 2012 12:34:07 +0000 (18:34 +0600)]
API docs minor formatting fix
[ci-skip]
Dmitriy Zaporozhets [Thu, 20 Sep 2012 10:05:07 +0000 (13:05 +0300)]
Let it be v2.9
Dmitriy Zaporozhets [Thu, 20 Sep 2012 10:00:18 +0000 (13:00 +0300)]
Added workaround for github-markup issue with rendering markdown
Dmitriy Zaporozhets [Thu, 20 Sep 2012 08:50:22 +0000 (11:50 +0300)]
Replace sanitize with escape once
randx [Thu, 20 Sep 2012 06:06:12 +0000 (09:06 +0300)]
Sanitize for network graph
Dmitriy Zaporozhets [Thu, 20 Sep 2012 05:45:24 +0000 (22:45 -0700)]
Merge pull request #1512 from tsigo/escape_gfm
Better escaping of text passed into GFM
Robert Speicher [Thu, 20 Sep 2012 00:21:35 +0000 (20:21 -0400)]
Update gfm so escaped text is still parsed for references
Robert Speicher [Thu, 20 Sep 2012 00:21:12 +0000 (20:21 -0400)]
Escape text passed directly to gfm
Robert Speicher [Wed, 19 Sep 2012 23:42:26 +0000 (19:42 -0400)]
Escape text passed to gfm by link_to_gfm
Robert Speicher [Wed, 19 Sep 2012 16:14:42 +0000 (12:14 -0400)]
Simplify is_within matcher
[ci skip]
Dmitriy Zaporozhets [Wed, 19 Sep 2012 06:14:07 +0000 (09:14 +0300)]
polishing UI a bit. Added footer links for dashboard
Dmitriy Zaporozhets [Wed, 19 Sep 2012 05:06:35 +0000 (22:06 -0700)]
Merge pull request #1496 from tsigo/custom_redis
Add initializer for customizing Resque's Redis connection
Robert Speicher [Wed, 19 Sep 2012 01:53:27 +0000 (21:53 -0400)]
Add docs for customizing Redis, add example file
Robert Speicher [Wed, 19 Sep 2012 01:45:09 +0000 (21:45 -0400)]
Add an initializer to allow custom Resque configs
randx [Tue, 18 Sep 2012 18:05:33 +0000 (21:05 +0300)]
Fix ref select search width
randx [Tue, 18 Sep 2012 17:50:34 +0000 (20:50 +0300)]
Gitlab styled tabs. Better ref selector
Dmitriy Zaporozhets [Tue, 18 Sep 2012 06:18:07 +0000 (09:18 +0300)]
Merge branch 'riyad-update-votes-when-adding-notes'
Dmitriy Zaporozhets [Tue, 18 Sep 2012 06:17:55 +0000 (09:17 +0300)]
Notes votes: use icons instead of borders. Removed unnecessary padding
Dmitriy Zaporozhets [Tue, 18 Sep 2012 05:56:54 +0000 (08:56 +0300)]
Merge branch 'update-votes-when-adding-notes' of https://github.com/riyad/gitlabhq into riyad-update-votes-when-adding-notes
Dmitriy Zaporozhets [Tue, 18 Sep 2012 05:54:17 +0000 (08:54 +0300)]
Fix project update. Make slim form only for reversed comments
Dmitriy Zaporozhets [Mon, 17 Sep 2012 20:25:42 +0000 (13:25 -0700)]
Merge pull request #1484 from AlexDenisov/ssh_keys_api_doc_fixes
Small fixes added to SSH Keys API doc.
Alex Denisov [Mon, 17 Sep 2012 20:23:11 +0000 (23:23 +0300)]
Merge branch 'master' into ssh_keys_api_doc_fixes
Dmitriy Zaporozhets [Mon, 17 Sep 2012 18:44:41 +0000 (11:44 -0700)]
Merge pull request #1485 from AlexDenisov/github_contributing_guidelines
CONTRIBUTING.md copied from wiki pages
Alex Denisov [Mon, 17 Sep 2012 18:38:08 +0000 (21:38 +0300)]
Gitlab => GitLab
Alex Denisov [Mon, 17 Sep 2012 17:42:18 +0000 (20:42 +0300)]
CONTRIBUTING.md copied from wiki pages
Alex Denisov [Mon, 17 Sep 2012 17:18:49 +0000 (20:18 +0300)]
Small fixes added
Dmitriy Zaporozhets [Mon, 17 Sep 2012 11:21:28 +0000 (04:21 -0700)]
Merge pull request #1481 from SaitoWu/bugfix/1476
use high level api and compatibility with Passenger
Saito [Mon, 17 Sep 2012 10:36:23 +0000 (18:36 +0800)]
use high level api and compatibility with Passenger
Dmitriy Zaporozhets [Mon, 17 Sep 2012 07:53:30 +0000 (00:53 -0700)]
Merge pull request #1479 from tsigo/ref_switch
Extract ref switcher into a partial
Dmitriy Zaporozhets [Mon, 17 Sep 2012 07:52:33 +0000 (00:52 -0700)]
Merge pull request #1478 from AlexDenisov/ssh_keys_api
SSH Keys API implemented
Alex Denisov [Sun, 16 Sep 2012 19:44:20 +0000 (22:44 +0300)]
Uses attributes_for_keys
Alex Denisov [Sun, 16 Sep 2012 19:37:50 +0000 (22:37 +0300)]
Merge branch 'master' into ssh_keys_api
Dmitriy Zaporozhets [Sun, 16 Sep 2012 19:27:48 +0000 (12:27 -0700)]
Merge pull request #1480 from AlexDenisov/api_attrs_refactoring
API attributes refactoring
Dmitriy Zaporozhets [Sun, 16 Sep 2012 18:15:34 +0000 (11:15 -0700)]
Merge pull request #1477 from tsigo/route_specs
Routing specs and cleanup
Alex Denisov [Sun, 16 Sep 2012 17:08:57 +0000 (20:08 +0300)]
Method name changed
Alex Denisov [Sun, 16 Sep 2012 16:51:04 +0000 (19:51 +0300)]
API attributes refactored
Robert Speicher [Sun, 16 Sep 2012 16:42:52 +0000 (12:42 -0400)]
Move project-related routing specs to their own file
Robert Speicher [Sun, 16 Sep 2012 16:07:57 +0000 (12:07 -0400)]
Extract ref switcher into a partial
Also moves onchange JS to projects.js.coffee
Robert Speicher [Sun, 16 Sep 2012 15:53:36 +0000 (11:53 -0400)]
Remove unused project/_refs partial
Alex Denisov [Sun, 16 Sep 2012 15:21:59 +0000 (18:21 +0300)]
Docs added
Robert Speicher [Sun, 16 Sep 2012 14:56:32 +0000 (10:56 -0400)]
Fix permissions for TeamMembers#index
Alex Denisov [Sun, 16 Sep 2012 14:52:06 +0000 (17:52 +0300)]
SSH Keys API implemented
Robert Speicher [Sun, 16 Sep 2012 14:38:01 +0000 (10:38 -0400)]
Missed a use of team_project_path
Robert Speicher [Sun, 16 Sep 2012 13:21:20 +0000 (09:21 -0400)]
Remove Projects#team action
Uses TeamMembers#index instead, to be more RESTful
Robert Speicher [Fri, 10 Aug 2012 22:51:07 +0000 (18:51 -0400)]
Remove redundant access check for Issues#destroy
We were already calling `authorize_admin_issue!` in a before filter with
the same permission checks, so this deleted check wasn't actually doing
anything.
Robert Speicher [Fri, 10 Aug 2012 22:44:36 +0000 (18:44 -0400)]
Remove non-existent "close" action from authorize_modify_issue filter
Robert Speicher [Sun, 16 Sep 2012 11:44:54 +0000 (07:44 -0400)]
Add an AdminController base class for Admin controllers
Handles stuff that's shared across admin controllers.
Robert Speicher [Sun, 16 Sep 2012 08:21:46 +0000 (04:21 -0400)]
Add routing specs
Robert Speicher [Sun, 16 Sep 2012 11:31:51 +0000 (07:31 -0400)]
Remove unused ProfileController#password action
Robert Speicher [Sun, 16 Sep 2012 11:22:46 +0000 (07:22 -0400)]
1.9 Hash syntax in routes.rb
Also cleans up some alignment and removes unnecessary "to: " arguments
Robert Speicher [Sun, 16 Sep 2012 08:51:26 +0000 (04:51 -0400)]
Limit admin/logs and admin/resque routes to the actions that are used
Robert Speicher [Sun, 16 Sep 2012 08:05:13 +0000 (04:05 -0400)]
Don't instantiate Resque::Server in routes
It still works, and it cleans up the output of `rake routes`.
randx [Sun, 16 Sep 2012 10:39:49 +0000 (13:39 +0300)]
Update installation doc with branch names
Dmitriy Zaporozhets [Sun, 16 Sep 2012 07:35:09 +0000 (00:35 -0700)]
Merge pull request #1471 from PragTob/renameUnicorn.rb
Rename: unicorn.rb.orig --> unicorn.rb.example
Nihad Abbasov [Sat, 15 Sep 2012 20:11:24 +0000 (13:11 -0700)]
Merge pull request #1473 from PragTob/updateDevDoc
Updated development docs
Tobias Pfeiffer [Sat, 15 Sep 2012 19:53:45 +0000 (21:53 +0200)]
The project doesn't use cucumber(anymore?), it uses spinach
Tobias Pfeiffer [Sat, 15 Sep 2012 19:52:01 +0000 (21:52 +0200)]
the rake was missing in fron of the gitlab:test task
Tobias Pfeiffer [Sat, 15 Sep 2012 19:23:41 +0000 (21:23 +0200)]
added the name change to the installation.md - thanks and nice catch to @NARKOZ
Tobias Pfeiffer [Sat, 15 Sep 2012 18:26:08 +0000 (20:26 +0200)]
Renamed unicorn.rb.orig to unicorn.rb.example since this seems to be more in line with the common used naming in the config directory. Plus seeing *.orig files I think of the leftovers of git merges, which left me puzzled for quite some time.
Riyad Preukschas [Sat, 15 Sep 2012 09:55:17 +0000 (11:55 +0200)]
Update votes when creating or refreshing notes
Riyad Preukschas [Sat, 15 Sep 2012 09:54:46 +0000 (11:54 +0200)]
Highlight voting notes for issues and merge requests
randx [Sat, 15 Sep 2012 06:58:34 +0000 (09:58 +0300)]
Merge branch 'riyad-change-notes-order'
randx [Sat, 15 Sep 2012 06:58:16 +0000 (09:58 +0300)]
Init mr comments when naviagate via ajax to diff
randx [Sat, 15 Sep 2012 06:49:21 +0000 (09:49 +0300)]
Fix MR diff comments. Fix wiki comments loading error
randx [Fri, 14 Sep 2012 22:02:58 +0000 (01:02 +0300)]
Merge branch 'change-notes-order' of https://github.com/riyad/gitlabhq into riyad-change-notes-order
randx [Fri, 14 Sep 2012 22:00:59 +0000 (01:00 +0300)]
A bit of test refactoring
Riyad Preukschas [Fri, 14 Sep 2012 15:01:34 +0000 (17:01 +0200)]
Update Notes JS for reversed notes
Riyad Preukschas [Fri, 14 Sep 2012 15:00:48 +0000 (17:00 +0200)]
Add 'notes/reversed_notes_with_form' partial
Riyad Preukschas [Fri, 14 Sep 2012 03:56:12 +0000 (05:56 +0200)]
Rename note.js to notes.js
Riyad Preukschas [Fri, 14 Sep 2012 14:57:08 +0000 (16:57 +0200)]
Extract 'notes/per_line_notes_with_reply' partial
Riyad Preukschas [Fri, 14 Sep 2012 15:02:09 +0000 (17:02 +0200)]
Extract 'notes/per_line_note_link' partial
Riyad Preukschas [Fri, 14 Sep 2012 03:21:58 +0000 (05:21 +0200)]
Rename 'notes/per_line_show' partial to 'notes/per_line_note'
Riyad Preukschas [Fri, 14 Sep 2012 03:19:38 +0000 (05:19 +0200)]
Renamed 'notes/notes_list' partial to 'notes/notes'
Riyad Preukschas [Fri, 14 Sep 2012 03:13:26 +0000 (05:13 +0200)]
Rename 'notes/show' partial to 'notes/note'
Riyad Preukschas [Fri, 14 Sep 2012 03:10:06 +0000 (05:10 +0200)]
Rename 'notes/reply_button' partial to 'notes/per_line_reply_button'
Riyad Preukschas [Fri, 14 Sep 2012 03:08:40 +0000 (05:08 +0200)]
Rename 'notes/form' partial to 'notes/common_form'
Riyad Preukschas [Fri, 14 Sep 2012 03:05:37 +0000 (05:05 +0200)]
Remove 'notes/load' partial
Riyad Preukschas [Fri, 14 Sep 2012 03:00:21 +0000 (05:00 +0200)]
Rename 'notes/create_*' partials
Riyad Preukschas [Fri, 14 Sep 2012 02:59:55 +0000 (04:59 +0200)]
Rename 'notes/notes' partial to 'notes/notes_with_form'
Riyad Preukschas [Thu, 13 Sep 2012 23:32:55 +0000 (01:32 +0200)]
Update JS for adding and removing diff line notes
Riyad Preukschas [Thu, 13 Sep 2012 23:22:09 +0000 (01:22 +0200)]
Update links for inline comments to use data-* attributes
Riyad Preukschas [Thu, 13 Sep 2012 23:21:39 +0000 (01:21 +0200)]
Update diff comments order and rendering
Riyad Preukschas [Fri, 14 Sep 2012 14:52:24 +0000 (16:52 +0200)]
Completely redo loading of notes with JS
Riyad Preukschas [Thu, 13 Sep 2012 17:55:57 +0000 (19:55 +0200)]
Fix markup
Riyad Preukschas [Thu, 13 Sep 2012 13:43:16 +0000 (15:43 +0200)]
Update Note to load notes in the right order
Riyad Preukschas [Thu, 13 Sep 2012 00:12:44 +0000 (02:12 +0200)]
Reorder notes view elements
randx [Fri, 14 Sep 2012 15:58:16 +0000 (18:58 +0300)]
Fixed token feature
randx [Fri, 14 Sep 2012 15:46:40 +0000 (18:46 +0300)]
fix event issue when event for left project + project removed