deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3663 commits 6 branches 43 tags 25 MiB
Commit graph

3663 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitriy Zaporozhets 560b1ac5f3 Merge branch 'riyad-update-votes-when-adding-notes' 2012-09-18 09:18:07 +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
Dmitriy Zaporozhets 7cce2b1506 Merge pull request #1484 from AlexDenisov/ssh_keys_api_doc_fixes 
Small fixes added to SSH Keys API doc.
 2012-09-17 13:25:42 -07:00
Alex Denisov 1905a9e3e4 Merge branch 'master' into ssh_keys_api_doc_fixes 2012-09-17 23:23:11 +03:00
Dmitriy Zaporozhets c561ddf3eb Merge pull request #1485 from AlexDenisov/github_contributing_guidelines 
CONTRIBUTING.md copied from wiki pages
 2012-09-17 11:44:41 -07:00
Alex Denisov aeb87d8f1d Gitlab => GitLab 2012-09-17 21:38:08 +03:00
Alex Denisov 0358c2ebdb CONTRIBUTING.md copied from wiki pages 2012-09-17 20:42:18 +03:00
Alex Denisov 9c0f6e8714 Small fixes added 2012-09-17 20:18:49 +03:00
Dmitriy Zaporozhets b1b8f9a27b Merge pull request #1481 from SaitoWu/bugfix/1476 
use high level api and compatibility with Passenger
 2012-09-17 04:21:28 -07:00
Saito aaa916f15c use high level api and compatibility with Passenger 2012-09-17 18:36:23 +08:00
Dmitriy Zaporozhets b5442eb564 Merge pull request #1479 from tsigo/ref_switch 
Extract ref switcher into a partial
 2012-09-17 00:53:30 -07:00
Dmitriy Zaporozhets 7c7e9b13e7 Merge pull request #1478 from AlexDenisov/ssh_keys_api 
SSH Keys API implemented
 2012-09-17 00:52:33 -07:00
Alex Denisov c83af0dfe7 Uses attributes_for_keys 2012-09-16 22:44:20 +03:00
Alex Denisov b6c6a5b159 Merge branch 'master' into ssh_keys_api 2012-09-16 22:37:50 +03:00
Dmitriy Zaporozhets eed1b52f18 Merge pull request #1480 from AlexDenisov/api_attrs_refactoring 
API attributes refactoring
 2012-09-16 12:27:48 -07:00
Dmitriy Zaporozhets 26fb55c670 Merge pull request #1477 from tsigo/route_specs 
Routing specs and cleanup
 2012-09-16 11:15:34 -07:00
Alex Denisov b896880eb4 Method name changed 2012-09-16 20:08:57 +03:00
Alex Denisov 549c4c2202 API attributes refactored 2012-09-16 19:51:04 +03:00
Robert Speicher f4b14494ef Move project-related routing specs to their own file 2012-09-16 12:42:52 -04:00
Robert Speicher 465e40d3a6 Extract ref switcher into a partial 
Also moves onchange JS to projects.js.coffee
 2012-09-16 12:07:57 -04:00
Robert Speicher 4247ccd340 Remove unused project/_refs partial 2012-09-16 11:53:36 -04:00
Alex Denisov 87d40fd276 Docs added 2012-09-16 18:21:59 +03:00
Robert Speicher b24346fa2b Fix permissions for TeamMembers#index 2012-09-16 10:56:32 -04:00
Alex Denisov c23eb40829 SSH Keys API implemented 2012-09-16 17:52:06 +03:00
Robert Speicher 02b24cefc7 Missed a use of team_project_path 2012-09-16 10:38:01 -04:00
Robert Speicher 95bd93fe1a Remove Projects#team action 
Uses TeamMembers#index instead, to be more RESTful
 2012-09-16 10:07:06 -04:00
Robert Speicher 8cfb197dfc 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.
 2012-09-16 10:06:29 -04:00
Robert Speicher a0893b4d58 Remove non-existent "close" action from authorize_modify_issue filter 2012-09-16 10:06:29 -04:00
Robert Speicher 925183ed7a Add an AdminController base class for Admin controllers 
Handles stuff that's shared across admin controllers.
 2012-09-16 10:06:29 -04:00
Robert Speicher 83f24de352 Add routing specs 2012-09-16 10:06:21 -04:00
Robert Speicher 89069dc5f7 Remove unused ProfileController#password action 2012-09-16 07:38:14 -04:00
Robert Speicher d7eb797024 1.9 Hash syntax in routes.rb 
Also cleans up some alignment and removes unnecessary "to: " arguments
 2012-09-16 07:38:14 -04:00
Robert Speicher 94f91146f1 Limit admin/logs and admin/resque routes to the actions that are used 2012-09-16 07:38:14 -04:00
Robert Speicher 4f4c401f77 Don't instantiate Resque::Server in routes 
It still works, and it cleans up the output of `rake routes`.
 2012-09-16 07:38:14 -04:00
randx caef9ed112 Update installation doc with branch names 2012-09-16 13:39:49 +03:00
Dmitriy Zaporozhets dcb17ead95 Merge pull request #1471 from PragTob/renameUnicorn.rb 
Rename: unicorn.rb.orig --> unicorn.rb.example
 2012-09-16 00:35:09 -07:00
Nihad Abbasov 98c731333d Merge pull request #1473 from PragTob/updateDevDoc 
Updated development docs
 2012-09-15 13:11:24 -07:00
Tobias Pfeiffer 9c117f2636 The project doesn't use cucumber(anymore?), it uses spinach 2012-09-15 21:53:45 +02:00
Tobias Pfeiffer 296e322bfc the rake was missing in fron of the gitlab:test task 2012-09-15 21:52:01 +02:00
Tobias Pfeiffer fa529c789c added the name change to the installation.md - thanks and nice catch to @NARKOZ 2012-09-15 21:23:41 +02:00
Tobias Pfeiffer 74cfab692f 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. 2012-09-15 20:26:08 +02:00
Riyad Preukschas 6aebb76b5d Update votes when creating or refreshing notes 2012-09-15 11:55:17 +02:00
Riyad Preukschas b8113334a8 Highlight voting notes for issues and merge requests 2012-09-15 11:54:46 +02:00
randx 0546b9c65f Merge branch 'riyad-change-notes-order' 2012-09-15 09:58:34 +03:00
randx 348def0344 Init mr comments when naviagate via ajax to diff 2012-09-15 09:58:16 +03:00
randx 9159be3a50 Fix MR diff comments. Fix wiki comments loading error 2012-09-15 09:49:21 +03:00
randx caeb65b189 Merge branch 'change-notes-order' of https://github.com/riyad/gitlabhq into riyad-change-notes-order 2012-09-15 01:02:58 +03:00
randx a82977c648 A bit of test refactoring 2012-09-15 01:00:59 +03:00