Commit graph

3146 commits

Author SHA1 Message Date
Riyad Preukschas fb0279f311 Fix vote counting to only count main target notes (not mixed in ones) 2012-10-10 12:09:45 +02:00
Riyad Preukschas 3f72af9994 Make notes for merge requests include commit notes and add helpers 2012-10-10 12:06:30 +02:00
Andrey Kumanyaev 8402bca735 travis 2012-10-10 13:48:30 +04:00
Andrey Kumanyaev 92ac42a27c update doc 2012-10-10 13:48:14 +04:00
Andrey Kumanyaev 75e6eb59ec patch rails to ignore text limit 2012-10-10 13:17:48 +04:00
Dmitriy Zaporozhets dda852a0d5 Merge pull request #1629 from riyad/show-notes-indicator-for-commits-and-merge-requests
Show numer of notes for commits and merge requests
2012-10-10 01:45:39 -07:00
Dmitriy Zaporozhets 60b4c88e3a Merge pull request #1664 from riyad/auto-complete-everywhere
Cleanup auto-completion and add it to all GFM inputs
2012-10-10 01:45:03 -07:00
Dmitriy Zaporozhets a100c57831 Merge pull request #1665 from tsigo/history_js
Fix forward/back while browsing Tree hierarchy
2012-10-10 01:44:25 -07:00
Andrey Kumanyaev 4eb7d82ae7 add support use string FK with integer PK 2012-10-10 03:58:34 +04:00
Andrey Kumanyaev 3e1d52f4b7 add default postgres config 2012-10-10 03:58:34 +04:00
Andrey Kumanyaev 41afd3bf16 add pg gem 2012-10-10 03:58:34 +04:00
Riyad Preukschas 6dc8c0eac2 Make MRs also count and display its commits' notes 2012-10-10 01:31:36 +02:00
Riyad Preukschas 77bde9a0e4 Add notes count to commits in lists. 2012-10-10 01:31:36 +02:00
Riyad Preukschas 4d843d2ce1 Fix auto-completion for forms that are inserted with JS 2012-10-10 00:53:57 +02:00
Riyad Preukschas e4aa5a5c8f Extract and split GFM auto-completion setup JS
* static initialization and setup moved to assets
* per request initialization moved to layout partial
2012-10-10 00:53:55 +02:00
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
Andrey Kumanyaev 03836cc591 fix resque start 2012-10-09 00:19:07 +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