OSDN Git Service

wvm/gitlab.git
11 years agoWorking on dashboard restyle and events refactoring
Dmitriy Zaporozhets [Mon, 24 Sep 2012 09:32:51 +0000 (12:32 +0300)]
Working on dashboard restyle and events refactoring

11 years agoUp to v2.9.1 v2.9.1
Dmitriy Zaporozhets [Mon, 24 Sep 2012 07:45:55 +0000 (10:45 +0300)]
Up to v2.9.1

11 years agoMerge pull request #1528 from tsigo/resque_init
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

11 years agoMinor grammar change
Robert Speicher [Sat, 22 Sep 2012 21:06:19 +0000 (17:06 -0400)]
Minor grammar change

[ci skip]

11 years agoConsolidate all Resque-related initializers into "4_resque"
Robert Speicher [Sat, 22 Sep 2012 15:23:12 +0000 (11:23 -0400)]
Consolidate all Resque-related initializers into "4_resque"

11 years agoRename 4_resque_queues initializer to 4_resque
Robert Speicher [Sat, 22 Sep 2012 15:20:04 +0000 (11:20 -0400)]
Rename 4_resque_queues initializer to 4_resque

11 years agoMerge pull request #1522 from NARKOZ/api v2.9.0
Dmitriy Zaporozhets [Fri, 21 Sep 2012 12:35:45 +0000 (05:35 -0700)]
Merge pull request #1522 from NARKOZ/api

API clean up

11 years agofix links in API README
Nihad Abbasov [Fri, 21 Sep 2012 12:06:36 +0000 (05:06 -0700)]
fix links in API README

11 years agoseparate project repositories API docs
Nihad Abbasov [Fri, 21 Sep 2012 12:03:50 +0000 (05:03 -0700)]
separate project repositories API docs

11 years agoremove commits API section from help
Nihad Abbasov [Fri, 21 Sep 2012 12:00:20 +0000 (05:00 -0700)]
remove commits API section from help

11 years agowhitespace
Nihad Abbasov [Fri, 21 Sep 2012 11:53:13 +0000 (04:53 -0700)]
whitespace

11 years agoAPI: SSH keys belong to user entity
Nihad Abbasov [Fri, 21 Sep 2012 11:49:28 +0000 (04:49 -0700)]
API: SSH keys belong to user entity

11 years agoAPI: commits belong to project repository
Nihad Abbasov [Fri, 21 Sep 2012 11:34:07 +0000 (04:34 -0700)]
API: commits belong to project repository

11 years agoMerge pull request #1521 from NARKOZ/api
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

11 years agoadd API for project team members
Nihad Abbasov [Fri, 21 Sep 2012 10:23:17 +0000 (03:23 -0700)]
add API for project team members

11 years agoAPi for commits. Better api docs
Dmitriy Zaporozhets [Fri, 21 Sep 2012 10:22:30 +0000 (13:22 +0300)]
APi for commits. Better api docs

11 years agoImprove commits compare. Added tags to autocomplete. Dont look for commits if from...
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

11 years agoMerge branch 'api'
randx [Thu, 20 Sep 2012 16:35:56 +0000 (19:35 +0300)]
Merge branch 'api'

11 years agoMerge branch 'api' of https://github.com/NARKOZ/gitlabhq into api
randx [Thu, 20 Sep 2012 16:35:45 +0000 (19:35 +0300)]
Merge branch 'api' of https://github.com/NARKOZ/gitlabhq into api

11 years agofix broken spec
Nihad Abbasov [Thu, 20 Sep 2012 16:11:15 +0000 (22:11 +0600)]
fix broken spec

11 years agoupdate help section with session API docs
Nihad Abbasov [Thu, 20 Sep 2012 15:51:26 +0000 (08:51 -0700)]
update help section with session API docs

11 years agoAPI: return 401 for invalid session
Nihad Abbasov [Thu, 20 Sep 2012 15:38:08 +0000 (08:38 -0700)]
API: return 401 for invalid session

11 years agoAPI: extend UserLogin entity from UserBasic
Nihad Abbasov [Thu, 20 Sep 2012 15:36:43 +0000 (08:36 -0700)]
API: extend UserLogin entity from UserBasic

11 years agoI want be able to get token via api. Used for mobile applications
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

11 years agoAPI: expose project id for milestones
Nihad Abbasov [Thu, 20 Sep 2012 12:38:34 +0000 (18:38 +0600)]
API: expose project id for milestones

11 years agoAPI docs minor formatting fix
Nihad Abbasov [Thu, 20 Sep 2012 12:34:07 +0000 (18:34 +0600)]
API docs minor formatting fix

[ci-skip]

11 years agoLet it be v2.9
Dmitriy Zaporozhets [Thu, 20 Sep 2012 10:05:07 +0000 (13:05 +0300)]
Let it be v2.9

11 years agoAdded workaround for github-markup issue with rendering markdown
Dmitriy Zaporozhets [Thu, 20 Sep 2012 10:00:18 +0000 (13:00 +0300)]
Added workaround for github-markup issue with rendering markdown

11 years agoReplace sanitize with escape once
Dmitriy Zaporozhets [Thu, 20 Sep 2012 08:50:22 +0000 (11:50 +0300)]
Replace sanitize with escape once

11 years agoSanitize for network graph
randx [Thu, 20 Sep 2012 06:06:12 +0000 (09:06 +0300)]
Sanitize for network graph

11 years agoMerge pull request #1512 from tsigo/escape_gfm
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

11 years agoUpdate gfm so escaped text is still parsed for references
Robert Speicher [Thu, 20 Sep 2012 00:21:35 +0000 (20:21 -0400)]
Update gfm so escaped text is still parsed for references

11 years agoEscape text passed directly to gfm
Robert Speicher [Thu, 20 Sep 2012 00:21:12 +0000 (20:21 -0400)]
Escape text passed directly to gfm

11 years agoEscape text passed to gfm by link_to_gfm
Robert Speicher [Wed, 19 Sep 2012 23:42:26 +0000 (19:42 -0400)]
Escape text passed to gfm by link_to_gfm

11 years agoSimplify is_within matcher
Robert Speicher [Wed, 19 Sep 2012 16:14:42 +0000 (12:14 -0400)]
Simplify is_within matcher

[ci skip]

11 years agopolishing UI a bit. Added footer links for dashboard
Dmitriy Zaporozhets [Wed, 19 Sep 2012 06:14:07 +0000 (09:14 +0300)]
polishing UI a bit. Added footer links for dashboard

11 years agoMerge pull request #1496 from tsigo/custom_redis
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

11 years agoAdd docs for customizing Redis, add example file
Robert Speicher [Wed, 19 Sep 2012 01:53:27 +0000 (21:53 -0400)]
Add docs for customizing Redis, add example file

11 years agoAdd an initializer to allow custom Resque configs
Robert Speicher [Wed, 19 Sep 2012 01:45:09 +0000 (21:45 -0400)]
Add an initializer to allow custom Resque configs

11 years agoFix ref select search width
randx [Tue, 18 Sep 2012 18:05:33 +0000 (21:05 +0300)]
Fix ref select search width

11 years agoGitlab styled tabs. Better ref selector
randx [Tue, 18 Sep 2012 17:50:34 +0000 (20:50 +0300)]
Gitlab styled tabs. Better ref selector

11 years agoMerge branch 'riyad-update-votes-when-adding-notes'
Dmitriy Zaporozhets [Tue, 18 Sep 2012 06:18:07 +0000 (09:18 +0300)]
Merge branch 'riyad-update-votes-when-adding-notes'

11 years agoNotes votes: use icons instead of borders. Removed unnecessary padding
Dmitriy Zaporozhets [Tue, 18 Sep 2012 06:17:55 +0000 (09:17 +0300)]
Notes votes: use icons instead of borders. Removed unnecessary padding

11 years agoMerge branch 'update-votes-when-adding-notes' of https://github.com/riyad/gitlabhq...
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

11 years agoFix project update. Make slim form only for reversed comments
Dmitriy Zaporozhets [Tue, 18 Sep 2012 05:54:17 +0000 (08:54 +0300)]
Fix project update. Make slim form only for reversed comments

11 years agoMerge pull request #1484 from AlexDenisov/ssh_keys_api_doc_fixes
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.

11 years agoMerge branch 'master' into ssh_keys_api_doc_fixes
Alex Denisov [Mon, 17 Sep 2012 20:23:11 +0000 (23:23 +0300)]
Merge branch 'master' into ssh_keys_api_doc_fixes

11 years agoMerge pull request #1485 from AlexDenisov/github_contributing_guidelines
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

11 years agoGitlab => GitLab
Alex Denisov [Mon, 17 Sep 2012 18:38:08 +0000 (21:38 +0300)]
Gitlab => GitLab

11 years agoCONTRIBUTING.md copied from wiki pages
Alex Denisov [Mon, 17 Sep 2012 17:42:18 +0000 (20:42 +0300)]
CONTRIBUTING.md copied from wiki pages

11 years agoSmall fixes added
Alex Denisov [Mon, 17 Sep 2012 17:18:49 +0000 (20:18 +0300)]
Small fixes added

11 years agoMerge pull request #1481 from SaitoWu/bugfix/1476
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

11 years agouse 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

11 years agoMerge pull request #1479 from tsigo/ref_switch
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

11 years agoMerge pull request #1478 from AlexDenisov/ssh_keys_api
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

11 years agoUses attributes_for_keys
Alex Denisov [Sun, 16 Sep 2012 19:44:20 +0000 (22:44 +0300)]
Uses attributes_for_keys

11 years agoMerge branch 'master' into ssh_keys_api
Alex Denisov [Sun, 16 Sep 2012 19:37:50 +0000 (22:37 +0300)]
Merge branch 'master' into ssh_keys_api

11 years agoMerge pull request #1480 from AlexDenisov/api_attrs_refactoring
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

11 years agoMerge pull request #1477 from tsigo/route_specs
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

11 years agoMethod name changed
Alex Denisov [Sun, 16 Sep 2012 17:08:57 +0000 (20:08 +0300)]
Method name changed

11 years agoAPI attributes refactored
Alex Denisov [Sun, 16 Sep 2012 16:51:04 +0000 (19:51 +0300)]
API attributes refactored

11 years agoMove project-related routing specs to their own file
Robert Speicher [Sun, 16 Sep 2012 16:42:52 +0000 (12:42 -0400)]
Move project-related routing specs to their own file

11 years agoExtract ref switcher into a partial
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

11 years agoRemove unused project/_refs partial
Robert Speicher [Sun, 16 Sep 2012 15:53:36 +0000 (11:53 -0400)]
Remove unused project/_refs partial

11 years agoDocs added
Alex Denisov [Sun, 16 Sep 2012 15:21:59 +0000 (18:21 +0300)]
Docs added

11 years agoFix permissions for TeamMembers#index
Robert Speicher [Sun, 16 Sep 2012 14:56:32 +0000 (10:56 -0400)]
Fix permissions for TeamMembers#index

11 years agoSSH Keys API implemented
Alex Denisov [Sun, 16 Sep 2012 14:52:06 +0000 (17:52 +0300)]
SSH Keys API implemented

11 years agoMissed a use of team_project_path
Robert Speicher [Sun, 16 Sep 2012 14:38:01 +0000 (10:38 -0400)]
Missed a use of team_project_path

11 years agoRemove Projects#team action
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

11 years agoRemove redundant access check for Issues#destroy
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.

11 years agoRemove non-existent "close" action from authorize_modify_issue filter
Robert Speicher [Fri, 10 Aug 2012 22:44:36 +0000 (18:44 -0400)]
Remove non-existent "close" action from authorize_modify_issue filter

11 years agoAdd an AdminController base class for Admin controllers
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.

11 years agoAdd routing specs
Robert Speicher [Sun, 16 Sep 2012 08:21:46 +0000 (04:21 -0400)]
Add routing specs

11 years agoRemove unused ProfileController#password action
Robert Speicher [Sun, 16 Sep 2012 11:31:51 +0000 (07:31 -0400)]
Remove unused ProfileController#password action

11 years ago1.9 Hash syntax in routes.rb
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

11 years agoLimit admin/logs and admin/resque routes to the actions that are used
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

11 years agoDon't instantiate Resque::Server in routes
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`.

11 years agoUpdate installation doc with branch names
randx [Sun, 16 Sep 2012 10:39:49 +0000 (13:39 +0300)]
Update installation doc with branch names

11 years agoMerge pull request #1471 from PragTob/renameUnicorn.rb
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

11 years agoMerge pull request #1473 from PragTob/updateDevDoc
Nihad Abbasov [Sat, 15 Sep 2012 20:11:24 +0000 (13:11 -0700)]
Merge pull request #1473 from PragTob/updateDevDoc

Updated development docs

11 years agoThe project doesn't use cucumber(anymore?), it uses spinach
Tobias Pfeiffer [Sat, 15 Sep 2012 19:53:45 +0000 (21:53 +0200)]
The project doesn't use cucumber(anymore?), it uses spinach

11 years agothe rake was missing in fron of the gitlab:test task
Tobias Pfeiffer [Sat, 15 Sep 2012 19:52:01 +0000 (21:52 +0200)]
the rake was missing in fron of the gitlab:test task

11 years agoadded the name change to the installation.md - thanks and nice catch to @NARKOZ
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

11 years agoRenamed unicorn.rb.orig to unicorn.rb.example since this seems to be more in line...
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.

11 years agoUpdate votes when creating or refreshing notes
Riyad Preukschas [Sat, 15 Sep 2012 09:55:17 +0000 (11:55 +0200)]
Update votes when creating or refreshing notes

11 years agoHighlight voting notes for issues and merge requests
Riyad Preukschas [Sat, 15 Sep 2012 09:54:46 +0000 (11:54 +0200)]
Highlight voting notes for issues and merge requests

11 years agoMerge branch 'riyad-change-notes-order'
randx [Sat, 15 Sep 2012 06:58:34 +0000 (09:58 +0300)]
Merge branch 'riyad-change-notes-order'

11 years agoInit mr comments when naviagate via ajax to diff
randx [Sat, 15 Sep 2012 06:58:16 +0000 (09:58 +0300)]
Init mr comments when naviagate via ajax to diff

11 years agoFix MR diff comments. Fix wiki comments loading error
randx [Sat, 15 Sep 2012 06:49:21 +0000 (09:49 +0300)]
Fix MR diff comments. Fix wiki comments loading error

11 years agoMerge branch 'change-notes-order' of https://github.com/riyad/gitlabhq into riyad...
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

11 years agoA bit of test refactoring
randx [Fri, 14 Sep 2012 22:00:59 +0000 (01:00 +0300)]
A bit of test refactoring

11 years agoUpdate Notes JS for reversed notes
Riyad Preukschas [Fri, 14 Sep 2012 15:01:34 +0000 (17:01 +0200)]
Update Notes JS for reversed notes

11 years agoAdd 'notes/reversed_notes_with_form' partial
Riyad Preukschas [Fri, 14 Sep 2012 15:00:48 +0000 (17:00 +0200)]
Add 'notes/reversed_notes_with_form' partial

11 years agoRename note.js to notes.js
Riyad Preukschas [Fri, 14 Sep 2012 03:56:12 +0000 (05:56 +0200)]
Rename note.js to notes.js

11 years agoExtract 'notes/per_line_notes_with_reply' partial
Riyad Preukschas [Fri, 14 Sep 2012 14:57:08 +0000 (16:57 +0200)]
Extract 'notes/per_line_notes_with_reply' partial

11 years agoExtract 'notes/per_line_note_link' partial
Riyad Preukschas [Fri, 14 Sep 2012 15:02:09 +0000 (17:02 +0200)]
Extract 'notes/per_line_note_link' partial

11 years agoRename 'notes/per_line_show' partial to 'notes/per_line_note'
Riyad Preukschas [Fri, 14 Sep 2012 03:21:58 +0000 (05:21 +0200)]
Rename 'notes/per_line_show' partial to 'notes/per_line_note'

11 years agoRenamed 'notes/notes_list' partial to 'notes/notes'
Riyad Preukschas [Fri, 14 Sep 2012 03:19:38 +0000 (05:19 +0200)]
Renamed 'notes/notes_list' partial to 'notes/notes'

11 years agoRename 'notes/show' partial to 'notes/note'
Riyad Preukschas [Fri, 14 Sep 2012 03:13:26 +0000 (05:13 +0200)]
Rename 'notes/show' partial to 'notes/note'

11 years agoRename 'notes/reply_button' partial to 'notes/per_line_reply_button'
Riyad Preukschas [Fri, 14 Sep 2012 03:10:06 +0000 (05:10 +0200)]
Rename 'notes/reply_button' partial to 'notes/per_line_reply_button'