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

3237 commits

This branch
This branch
All branches
Author SHA1 Message Date
randx
d12579aa43 Merge branch 'api' of https://github.com/NARKOZ/gitlabhq into api 2012-09-20 19:35:45 +03:00
Nihad Abbasov
a605943d76 fix broken spec 2012-09-20 22:11:15 +06:00
Nihad Abbasov
81aeac46d6 update help section with session API docs 2012-09-20 08:51:26 -07:00
Nihad Abbasov
b08d33f6a9 API: return 401 for invalid session 2012-09-20 08:38:08 -07:00
Nihad Abbasov
3dd940d4cb API: extend UserLogin entity from UserBasic 2012-09-20 08:36:43 -07:00
Dmitriy Zaporozhets
9aafe77e70 I want be able to get token via api. Used for mobile applications 2012-09-20 17:45:07 +03:00
Nihad Abbasov
37817cc31d API: expose project id for milestones 2012-09-20 18:38:34 +06:00
Nihad Abbasov
4e1f1e1422 API docs minor formatting fix 
[ci-skip]
 2012-09-20 18:34:07 +06:00
Dmitriy Zaporozhets
f33e1e480e Let it be v2.9 2012-09-20 13:05:07 +03:00
Dmitriy Zaporozhets
0e524aaea1 Added workaround for github-markup issue with rendering markdown 2012-09-20 13:00:18 +03:00
Dmitriy Zaporozhets
ed899a2f4b Replace sanitize with escape once 2012-09-20 11:50:22 +03:00
Alex Denisov
e6ce47291b master merged 2012-09-20 10:25:29 +03:00
randx
6104942438 Sanitize for network graph 2012-09-20 09:06:12 +03:00
Dmitriy Zaporozhets
ae1d9fb46a Merge pull request #1512 from tsigo/escape_gfm 
Better escaping of text passed into GFM
 2012-09-19 22:45:24 -07:00
Robert Speicher
345c4d2a77 Update gfm so escaped text is still parsed for references 2012-09-19 20:21:35 -04:00
Robert Speicher
ba72c6f683 Escape text passed directly to gfm 2012-09-19 20:21:12 -04:00
Robert Speicher
496f88afe1 Escape text passed to gfm by link_to_gfm 2012-09-19 19:42:26 -04:00
Robert Speicher
01974185a1 Simplify is_within matcher 
[ci skip]
 2012-09-19 12:14:42 -04:00
Caley Woods
e3b149fae6 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.
 2012-09-19 10:27:27 -05:00
Dmitriy Zaporozhets
bf625b7c92 polishing UI a bit. Added footer links for dashboard 2012-09-19 09:14:07 +03:00
Dmitriy Zaporozhets
6d8d32c244 Merge pull request #1496 from tsigo/custom_redis 
Add initializer for customizing Resque's Redis connection
 2012-09-18 22:06:35 -07:00
Robert Speicher
259ca982da Add docs for customizing Redis, add example file 2012-09-18 21:53:27 -04:00
Robert Speicher
bfed07ee20 Add an initializer to allow custom Resque configs 2012-09-18 21:45:09 -04:00
randx
4ecf23d2ad Fix ref select search width 2012-09-18 21:05:33 +03:00
randx
aaec545a67 Gitlab styled tabs. Better ref selector 2012-09-18 20:50:34 +03:00
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