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

2729 commits

This branch
This branch
All branches
Author SHA1 Message Date
Riyad Preukschas eb92813757 Move emoji auto-complete helper to ApplicationHelper 2012-10-10 00:53:42 +02:00
Robert Speicher 702133c0e2 Remove unused history_path instance variable 2012-10-09 18:39:03 -04:00
Robert Speicher cda5e66d7c Use History.js for better Tree browsing 
Closes #1578
 2012-10-09 18:38:59 -04:00
Riyad Preukschas 682f62fd4a Mark all GFM capable inputs 2012-10-09 23:06:33 +02:00
randx 679d0d6d76 Context refactoring. Move Issues list, Search logic to context 2012-10-09 22:09:46 +03:00
randx 63fe042d97 project.issues_labels method 2012-10-09 20:39:06 +03:00
Dmitriy Zaporozhets fa325ce977 Merge pull request #1597 from riyad/add-completion-for-all-emoji 
Improve completion of emoji and team members
 2012-10-09 07:21:18 -07:00
Riyad Preukschas 37e579ce10 Redo the auto-completion JS for notes 2012-10-09 14:48:35 +02:00
Riyad Preukschas 3adfbe3e81 Mark inputs for notes with GFM capabilities 2012-10-09 14:48:20 +02:00
Riyad Preukschas bbd92e57cb Add emoji_for_completion helper 2012-10-09 14:47:42 +02:00
Valeriy Sizov a54a90188b remove unnecessary task 2012-10-09 14:59:58 +03:00
Dmitriy Zaporozhets 41e53eb980 Annotated 2012-10-09 11:14:17 +03:00
Valeriy Sizov dc33f71b18 Merge pull request #1656 from zzet/refactoring 
Refactoring
 2012-10-09 01:17:38 -07:00
randx c348284fed Reduce count of projects on dashboard to 20 2012-10-09 10:01:07 +03:00
randx ce1b742b1e Group: new link on dashboard if admin. Fixed people count 2012-10-09 09:46:20 +03:00
Dmitriy Zaporozhets 26045d7a2c Merge pull request #1596 from riyad/fix-messages-for-deleted-things 
Fix messages for deleted things on dashboard
 2012-10-08 22:27:25 -07:00
Andrey Kumanyaev a4cd738686 tests fix 2012-10-09 04:10:16 +04:00
Andrey Kumanyaev df7c52489a simple refactoring 2012-10-09 04:10:04 +04:00
Valeriy Sizov a635b9da97 Revert "Do not allow removal of a project owner user." 
This reverts commit 927d0cc267.
 2012-10-08 15:57:30 +03:00
Valeriy Sizov fc3c0592db Merge pull request #1651 from dosire/user_can_be_removed_if_its_not_a_project_owner 
Do not allow removal of a project owner user.
 2012-10-08 05:42:47 -07:00
Valeriy Sizov a9cce9358a Merge pull request #1627 from tsigo/tree_performance 
Tree performance improvements
 2012-10-08 05:36:31 -07:00
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