OSDN Git Service
Alex Denisov [Wed, 26 Sep 2012 13:14:47 +0000 (16:14 +0300)]
Merge branch 'master' into fix_project_access_notification
Dmitriy Zaporozhets [Wed, 26 Sep 2012 12:45:16 +0000 (05:45 -0700)]
Merge pull request #1561 from dosire/mass_assignment
Protect users projects_limit from mass assignment.
Dmitriy Zaporozhets [Wed, 26 Sep 2012 11:21:32 +0000 (04:21 -0700)]
Merge pull request #1560 from NARKOZ/refactoring
cleanup rake tasks
Marin Jankovski [Wed, 26 Sep 2012 11:20:44 +0000 (13:20 +0200)]
Protect users projects_limit from mass assignment.
Nihad Abbasov [Wed, 26 Sep 2012 11:18:10 +0000 (04:18 -0700)]
cleanup rake tasks
Nihad Abbasov [Tue, 25 Sep 2012 21:05:26 +0000 (14:05 -0700)]
Merge pull request #1553 from jouve/simplify_controllers1
remove duplicate before_filter
Cyril [Tue, 25 Sep 2012 20:32:20 +0000 (22:32 +0200)]
remove duplicate before_filter
Dmitriy Zaporozhets [Tue, 25 Sep 2012 19:44:03 +0000 (12:44 -0700)]
Merge pull request #1534 from iamntz/emoji_alignment
Removed float on emoji
Dmitriy Zaporozhets [Tue, 25 Sep 2012 17:12:32 +0000 (10:12 -0700)]
Merge pull request #1551 from NARKOZ/front-end
add auto-completion for +1, -1 emoji
Nihad Abbasov [Tue, 25 Sep 2012 11:56:21 +0000 (04:56 -0700)]
add auto-completion for +1, -1 emoji
Dmitriy Zaporozhets [Tue, 25 Sep 2012 10:14:20 +0000 (13:14 +0300)]
Pollished push event
Nihad Abbasov [Mon, 24 Sep 2012 16:05:09 +0000 (09:05 -0700)]
Merge pull request #1501 from caleywoods/master
Update timeout comment in unicorn example config.
Dmitriy Zaporozhets [Mon, 24 Sep 2012 13:02:34 +0000 (06:02 -0700)]
Merge pull request #1539 from NARKOZ/front-end
auto-complete for mentions in notes
Dmitriy Zaporozhets [Mon, 24 Sep 2012 10:33:51 +0000 (13:33 +0300)]
Colored labels for events
Dmitriy Zaporozhets [Mon, 24 Sep 2012 09:32:51 +0000 (12:32 +0300)]
Working on dashboard restyle and events refactoring
Dmitriy Zaporozhets [Mon, 24 Sep 2012 07:45:55 +0000 (10:45 +0300)]
Up to v2.9.1
Staicu Ionut [Mon, 24 Sep 2012 07:06:41 +0000 (10:06 +0300)]
Removed float on emoji
-`remove comment` button will not make the text jump anymore.
Nihad Abbasov [Sun, 23 Sep 2012 16:52:01 +0000 (09:52 -0700)]
auto complete team member mentions
Nihad Abbasov [Sun, 23 Sep 2012 15:53:48 +0000 (08:53 -0700)]
install jquery-atwho-rails
Dmitriy Zaporozhets [Sun, 23 Sep 2012 09:29:13 +0000 (02:29 -0700)]
Merge pull request #1528 from tsigo/resque_init
Consolidate Resque-related initializers
Robert Speicher [Sat, 22 Sep 2012 21:06:19 +0000 (17:06 -0400)]
Minor grammar change
[ci skip]
Robert Speicher [Sat, 22 Sep 2012 15:23:12 +0000 (11:23 -0400)]
Consolidate all Resque-related initializers into "4_resque"
Robert Speicher [Sat, 22 Sep 2012 15:20:04 +0000 (11:20 -0400)]
Rename 4_resque_queues initializer to 4_resque
Dmitriy Zaporozhets [Fri, 21 Sep 2012 12:35:45 +0000 (05:35 -0700)]
Merge pull request #1522 from NARKOZ/api
API clean up
Nihad Abbasov [Fri, 21 Sep 2012 12:06:36 +0000 (05:06 -0700)]
fix links in API README
Nihad Abbasov [Fri, 21 Sep 2012 12:03:50 +0000 (05:03 -0700)]
separate project repositories API docs
Nihad Abbasov [Fri, 21 Sep 2012 12:00:20 +0000 (05:00 -0700)]
remove commits API section from help
Nihad Abbasov [Fri, 21 Sep 2012 11:53:13 +0000 (04:53 -0700)]
whitespace
Nihad Abbasov [Fri, 21 Sep 2012 11:49:28 +0000 (04:49 -0700)]
API: SSH keys belong to user entity
Nihad Abbasov [Fri, 21 Sep 2012 11:34:07 +0000 (04:34 -0700)]
API: commits belong to project repository
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
Alex Denisov [Thu, 20 Sep 2012 07:25:29 +0000 (10:25 +0300)]
master merged
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]
Caley Woods [Wed, 19 Sep 2012 15:27:27 +0000 (10:27 -0500)]
Update comment in example unicorn config
The timeout was changed to 30 and the comment wasn't updated. Also I've seen several reports of this timeout not being long enough for quite a few people. It resulted in me getting a 502 bad gateway from nginx until I upped it. Perhaps could back to the default 60 would be better? I changed mine to 300, running on an AWS micro instance.
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