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

2763 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitriy Zaporozhets 325569acc4 Merge branch 'alexleutgoeb-feature/dashboardfeed' 2012-10-08 14:17:59 +03:00
Dmitriy Zaporozhets bcdb168709 Fix dashboard atom feed routes 2012-10-08 14:17:46 +03:00
Dmitriy Zaporozhets 624abdfc72 Merge branch 'feature/dashboardfeed' of https://github.com/alexleutgoeb/gitlabhq into alexleutgoeb-feature/dashboardfeed 
Conflicts:
	app/decorators/event_decorator.rb
 2012-10-08 13:52:07 +03:00
Marin Jankovski 927d0cc267 Do not allow removal of a project owner user. 2012-10-08 12:41:25 +02:00
Dmitriy Zaporozhets fd2320849f Merge pull request #1650 from NARKOZ/api 
API for project snippets listing
 2012-10-08 02:56:44 -07:00
Nihad Abbasov 61f12da3a5 API: add project snippets listing 2012-10-08 02:13:53 -07:00
Nihad Abbasov ad5b5d1e51 projects API should return info about deleted hook 2012-10-08 01:54:50 -07:00
Nihad Abbasov d47e40929d add API changelog 2012-10-08 01:52:08 -07:00
Dmitriy Zaporozhets 5501955d26 Merge pull request #1636 from dosire/consistent_issue_type_order 
Reversed order of progress indication so that the text matches the progress bar.
 2012-10-07 01:00:38 -07:00
Dmitriy Zaporozhets 1a2cb531c7 Merge pull request #1641 from sodabrew/patch-1 
Tiny fix to the add/edit groups form path field
 2012-10-07 00:49:59 -07:00
Dmitriy Zaporozhets 164cfc048f Merge pull request #1643 from danillonunes/doc-install-fix 
Doc fix: Nginx init script requires sudo
 2012-10-07 00:49:09 -07:00
Danillo Nunes ed5754624e Doc fix: Nginx init script requires sudo 2012-10-06 21:36:20 -03:00
Aaron Stone 7c2e67c660 Tiny fix to the add/edit groups form path field 2012-10-05 23:46:15 -07:00
joseph Borremans 82425cf358 reversed order of progress indication for visual harmony so that text matches the progress bar 2012-10-05 17:48:52 +02:00
Dmitriy Zaporozhets 8c997f319b Merge pull request #1632 from NARKOZ/patch-0 
performance and security fixes
 2012-10-05 07:48:43 -07:00
Nihad Abbasov d2ea858fbf move emoji module to lib 2012-10-05 07:42:23 -07:00
Nihad Abbasov 72395d7f6e no need to add fonts to assets path 2012-10-05 07:23:58 -07:00
Nihad Abbasov 317c928198 improve emoji checking performance 2012-10-05 07:23:58 -07:00
Nihad Abbasov 9e4f3147a0 specify HTTP verbs for match in routes 2012-10-05 07:23:57 -07:00
Dmitriy Zaporozhets 74213534bc Fix tests 2012-10-05 17:01:44 +03:00
Robert Speicher 58dad2b954 Remove leftover ref_extractor_spec file 
Apparently it didn't get removed after the rename to ExtractsPath.
 2012-10-04 14:31:11 -04:00
Robert Speicher 332fc328a3 Revert "Use official Grit 2.5.0" 
This reverts commit 187e192cdf.

[ci skip]
 2012-10-04 14:19:25 -04:00
Robert Speicher 3606a14889 ExtractsPath: Use ref_names instead of branches+tags 2012-10-04 14:13:52 -04:00
Valeriy Sizov e25ddca0c4 Fix bug with branches whose name contains slash 2012-10-04 19:31:31 +03:00
Valeriy Sizov 73d5e51a2d added trace to travis 2012-10-04 13:55:29 +03:00
Valeriy Sizov c6c01e1040 ruby version changed 2012-10-04 13:48:20 +03:00
Valeriy Sizov 76c4e83193 Minore code-style fixes 2012-10-04 13:40:40 +03:00
Valeriy Sizov 810d0903f8 Merge branch 'diff_bug' 2012-10-04 13:29:27 +03:00
Valeriy Sizov bd5334abc2 fix inline diff 2012-10-04 13:28:58 +03:00
Alex Leutgöb 987e351de7 Escape html entities in commit messages 2012-10-04 10:06:17 +02:00
Dmitriy Zaporozhets d88332709c Fixed group issues/mr. Also speedup project list of admin area 2012-10-04 10:51:35 +03:00
Robert Speicher 187e192cdf Use official Grit 2.5.0 2012-10-03 19:39:27 -04:00
Robert Speicher 388d72e6bf Add render_tree helper; simplify (speed up) tree_icon 2012-10-03 19:39:27 -04:00
Robert Speicher a8fad4ff9c Remove locals from tree/submodule_item, use "object" instead 2012-10-03 19:39:27 -04:00
Robert Speicher 37c3474f68 Tree.init() JS is no longer required 2012-10-03 19:39:27 -04:00
Robert Speicher 96b4acf5e7 Remove locals from tree/tree_file and just use "object" instead 2012-10-03 19:39:27 -04:00
Robert Speicher b5328879f5 Rename tree.js to tree.js.coffee 2012-10-03 19:39:27 -04:00
randx c626ec3746 Implement pending dashboard step 2012-10-03 23:46:55 +03:00
randx 4f7bd58307 Bigger fonts for groups box 2012-10-03 19:51:14 +03:00
Dmitriy Zaporozhets f963d37408 Merge pull request #1592 from jouve/devise_layout 
make devise controllers use devise layout
 2012-10-03 07:06:08 -07:00
Dmitriy Zaporozhets 2985697af7 Real fix for removing keys. Closes PR #1616 2012-10-03 15:56:41 +03:00
Valery Sizov 9e80d2d4f7 Merge branch 'feature/groups' of dev.gitlabhq.com:gitlabhq 2012-10-03 12:17:48 +00:00
Dmitriy Zaporozhets c8412bc9ed Dont change params hash. Use dup instead 2012-10-03 15:02:02 +03:00
Dmitriy Zaporozhets ce1b79afa9 SQL Fixes 2012-10-03 14:26:37 +03:00
Dmitriy Zaporozhets 8b76e30656 Spianch test for group dashboard 2012-10-03 13:42:17 +03:00
Valeriy Sizov dc22dd8ade Factories spec refactoring after #1616 2012-10-03 13:33:31 +03:00
Valeriy Sizov b5f9d29f55 Merge pull request #1617 from dosire/reject-ssh-keys-that-break-gitolite 
Reject ssh keys that break gitolite
 2012-10-03 03:18:08 -07:00
Dmitriy Zaporozhets 224fb5770c Added ability to manage groups from admin 2012-10-03 12:49:43 +03:00
Dmitriy Zaporozhets 4cbfe9427b Merge pull request #1613 from tsigo/performance 
Improve performance of Commits#show
 2012-10-03 02:03:32 -07:00
Robert Speicher 5e3be9cda0 Cache the value of safe_message 
Also, just for extra paranoia, only call safe_message once in the
decorator methods

Adds specs to make sure it still works
 2012-10-02 19:00:41 -04:00