OSDN Git Service
Valeriy Sizov [Fri, 12 Oct 2012 10:08:14 +0000 (03:08 -0700)]
Merge pull request #1682 from riyad/improve-search-suggestions
Improve (static) suggestions in global search field
Valeriy Sizov [Fri, 12 Oct 2012 09:23:53 +0000 (02:23 -0700)]
Merge pull request #1685 from jozefvaclavik/master
Hooks API (List one hook & edit)
jozefvaclavik [Fri, 12 Oct 2012 08:30:39 +0000 (11:30 +0300)]
Update spec/requests/api/projects_spec.rb
Fixed mistake with updating project hook
Dmitriy Zaporozhets [Fri, 12 Oct 2012 08:11:02 +0000 (01:11 -0700)]
Merge pull request #1680 from robbkidd/reduce_note_observer_complexity
Reduce complexity: replace case statement with method lookup.
jozefvaclavik [Fri, 12 Oct 2012 08:00:59 +0000 (11:00 +0300)]
Update projects_spec.rb for Hook list and edit
Also (I think) I found few mistakes with snippets requests.
jozefvaclavik [Fri, 12 Oct 2012 07:38:15 +0000 (10:38 +0300)]
Update doc/api/projects.md for hooks API
Added documentation for getting project hook and editing project hook.
jozefvaclavik [Fri, 12 Oct 2012 07:31:57 +0000 (10:31 +0300)]
Update CHANGELOG for updated hooks API
jozefvaclavik [Fri, 12 Oct 2012 07:30:09 +0000 (10:30 +0300)]
Update lib/api/projects.rb
Added methods for listing one project hook and editing hooks.
GET /project/:id/hooks/:hook_id
PUT /project/:id/hooks/:hook_id
Riyad Preukschas [Thu, 11 Oct 2012 23:02:28 +0000 (01:02 +0200)]
Improve search suggestions
Robb Kidd [Thu, 11 Oct 2012 17:27:58 +0000 (13:27 -0400)]
Reduce complexity: replace case statement with method lookup.
Dmitriy Zaporozhets [Thu, 11 Oct 2012 16:35:21 +0000 (09:35 -0700)]
Merge pull request #1675 from robbkidd/separate_mr_observer
Separate observing of Note and MergeRequests
Robb Kidd [Thu, 11 Oct 2012 15:05:13 +0000 (11:05 -0400)]
Clean up indenting in new observer.
Valeriy Sizov [Thu, 11 Oct 2012 13:55:11 +0000 (16:55 +0300)]
Fix starting gitlab after reboot server
Valeriy Sizov [Thu, 11 Oct 2012 10:21:08 +0000 (03:21 -0700)]
Merge pull request #1672 from tsigo/milestone_closed_issues
Milestone "All Issues" filter
Robb Kidd [Tue, 9 Oct 2012 22:25:29 +0000 (18:25 -0400)]
Separate observing of Note and MergeRequests
* Move is_assigned? and is_being_xx? methods to IssueCommonality
This is behavior merge requests have in common with issues. Moved
methods to IssueCommonality role. Put specs directly into
merge_request_spec because setup differs for issues and MRs
specifically in the "closed" factory to use.
* Add MergeRequestObserver. Parallels IssueObserver in almost every way.
Ripe for refactoring.
* Rename MailerObserver to NoteObserver
With merge request observing moved out of MailerObserver, all that
was left was Note logic. Renamed to NoteObserver, added tests and
updated application config for new observer names. Refactored
NoteObserver to use the note's author and not rely on current_user.
* Set current_user for MergeRequestObserver
IssueObserver and MergeRequestObserver are the only observers that
need a reference to the current_user that they cannot look up on
the objects they are observing.
Robert Speicher [Wed, 10 Oct 2012 17:06:54 +0000 (13:06 -0400)]
Add Feature for milestone issue filter
Closes #1167
Robert Speicher [Wed, 10 Oct 2012 17:06:34 +0000 (13:06 -0400)]
Move 'closed' attribute to the row instead of the cell
Robert Speicher [Tue, 4 Sep 2012 08:18:30 +0000 (04:18 -0400)]
Remove unused li classes from milestone issue filter
Robert Speicher [Tue, 4 Sep 2012 08:13:56 +0000 (04:13 -0400)]
Add toggle to show closed issues on Milestones#show
Progress on #1167
Dmitriy Zaporozhets [Wed, 10 Oct 2012 14:17:23 +0000 (17:17 +0300)]
hardware requirements
Dmitriy Zaporozhets [Wed, 10 Oct 2012 12:45:19 +0000 (15:45 +0300)]
Updated installation docs with better db origanisation
Dmitriy Zaporozhets [Wed, 10 Oct 2012 11:47:43 +0000 (04:47 -0700)]
Merge pull request #1630 from riyad/show-commit-notes-with-mr-notes
Mix commit notes with merge request notes on MR show page
Dmitriy Zaporozhets [Wed, 10 Oct 2012 11:47:05 +0000 (04:47 -0700)]
Merge pull request #1666 from zzet/feature/postgres
Postgresql
Riyad Preukschas [Wed, 10 Oct 2012 10:14:48 +0000 (12:14 +0200)]
Add links to the note source if the note is mixed in
Riyad Preukschas [Wed, 10 Oct 2012 10:09:45 +0000 (12:09 +0200)]
Fix vote counting to only count main target notes (not mixed in ones)
Riyad Preukschas [Wed, 10 Oct 2012 10:06:30 +0000 (12:06 +0200)]
Make notes for merge requests include commit notes and add helpers
Andrey Kumanyaev [Tue, 9 Oct 2012 23:41:44 +0000 (03:41 +0400)]
travis
Andrey Kumanyaev [Tue, 9 Oct 2012 23:41:33 +0000 (03:41 +0400)]
update doc
Andrey Kumanyaev [Tue, 9 Oct 2012 23:41:14 +0000 (03:41 +0400)]
patch rails to ignore text limit
Dmitriy Zaporozhets [Wed, 10 Oct 2012 08:45:39 +0000 (01:45 -0700)]
Merge pull request #1629 from riyad/show-notes-indicator-for-commits-and-merge-requests
Show numer of notes for commits and merge requests
Dmitriy Zaporozhets [Wed, 10 Oct 2012 08:45:03 +0000 (01:45 -0700)]
Merge pull request #1664 from riyad/auto-complete-everywhere
Cleanup auto-completion and add it to all GFM inputs
Dmitriy Zaporozhets [Wed, 10 Oct 2012 08:44:25 +0000 (01:44 -0700)]
Merge pull request #1665 from tsigo/history_js
Fix forward/back while browsing Tree hierarchy
Andrey Kumanyaev [Tue, 9 Oct 2012 23:31:51 +0000 (03:31 +0400)]
add support use string FK with integer PK
Andrey Kumanyaev [Tue, 9 Oct 2012 23:15:26 +0000 (03:15 +0400)]
add default postgres config
Andrey Kumanyaev [Tue, 9 Oct 2012 23:14:58 +0000 (03:14 +0400)]
add pg gem
Riyad Preukschas [Thu, 4 Oct 2012 22:25:40 +0000 (00:25 +0200)]
Make MRs also count and display its commits' notes
Riyad Preukschas [Thu, 4 Oct 2012 21:02:37 +0000 (23:02 +0200)]
Add notes count to commits in lists.
Riyad Preukschas [Tue, 9 Oct 2012 21:54:14 +0000 (23:54 +0200)]
Fix auto-completion for forms that are inserted with JS
Riyad Preukschas [Tue, 9 Oct 2012 22:16:52 +0000 (00:16 +0200)]
Extract and split GFM auto-completion setup JS
* static initialization and setup moved to assets
* per request initialization moved to layout partial
Riyad Preukschas [Tue, 9 Oct 2012 22:53:42 +0000 (00:53 +0200)]
Move emoji auto-complete helper to ApplicationHelper
Robert Speicher [Tue, 9 Oct 2012 22:33:22 +0000 (18:33 -0400)]
Remove unused history_path instance variable
Robert Speicher [Wed, 3 Oct 2012 23:12:51 +0000 (19:12 -0400)]
Use History.js for better Tree browsing
Closes #1578
Riyad Preukschas [Tue, 9 Oct 2012 21:06:33 +0000 (23:06 +0200)]
Mark all GFM capable inputs
randx [Tue, 9 Oct 2012 19:09:46 +0000 (22:09 +0300)]
Context refactoring. Move Issues list, Search logic to context
randx [Tue, 9 Oct 2012 17:39:06 +0000 (20:39 +0300)]
project.issues_labels method
Dmitriy Zaporozhets [Tue, 9 Oct 2012 14:21:18 +0000 (07:21 -0700)]
Merge pull request #1597 from riyad/add-completion-for-all-emoji
Improve completion of emoji and team members
Riyad Preukschas [Tue, 9 Oct 2012 12:48:35 +0000 (14:48 +0200)]
Redo the auto-completion JS for notes
Riyad Preukschas [Tue, 9 Oct 2012 12:48:20 +0000 (14:48 +0200)]
Mark inputs for notes with GFM capabilities
Riyad Preukschas [Tue, 9 Oct 2012 12:47:42 +0000 (14:47 +0200)]
Add emoji_for_completion helper
Valeriy Sizov [Tue, 9 Oct 2012 11:59:58 +0000 (14:59 +0300)]
remove unnecessary task
Dmitriy Zaporozhets [Tue, 9 Oct 2012 08:14:17 +0000 (11:14 +0300)]
Annotated
Valeriy Sizov [Tue, 9 Oct 2012 08:17:38 +0000 (01:17 -0700)]
Merge pull request #1656 from zzet/refactoring
Refactoring
randx [Tue, 9 Oct 2012 07:01:07 +0000 (10:01 +0300)]
Reduce count of projects on dashboard to 20
randx [Tue, 9 Oct 2012 06:46:20 +0000 (09:46 +0300)]
Group: new link on dashboard if admin. Fixed people count
Dmitriy Zaporozhets [Tue, 9 Oct 2012 05:27:25 +0000 (22:27 -0700)]
Merge pull request #1596 from riyad/fix-messages-for-deleted-things
Fix messages for deleted things on dashboard
Andrey Kumanyaev [Tue, 9 Oct 2012 00:10:16 +0000 (04:10 +0400)]
tests fix
Andrey Kumanyaev [Tue, 9 Oct 2012 00:10:04 +0000 (04:10 +0400)]
simple refactoring
Valeriy Sizov [Mon, 8 Oct 2012 12:57:30 +0000 (15:57 +0300)]
Revert "Do not allow removal of a project owner user."
This reverts commit
927d0cc2674d21f470a29e7a10577707172f13c6.
Valeriy Sizov [Mon, 8 Oct 2012 12:42:47 +0000 (05:42 -0700)]
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.
Valeriy Sizov [Mon, 8 Oct 2012 12:36:31 +0000 (05:36 -0700)]
Merge pull request #1627 from tsigo/tree_performance
Tree performance improvements
Dmitriy Zaporozhets [Mon, 8 Oct 2012 11:17:59 +0000 (14:17 +0300)]
Merge branch 'alexleutgoeb-feature/dashboardfeed'
Dmitriy Zaporozhets [Mon, 8 Oct 2012 11:17:46 +0000 (14:17 +0300)]
Fix dashboard atom feed routes
Dmitriy Zaporozhets [Mon, 8 Oct 2012 10:52:07 +0000 (13:52 +0300)]
Merge branch 'feature/dashboardfeed' of https://github.com/alexleutgoeb/gitlabhq into alexleutgoeb-feature/dashboardfeed
Conflicts:
app/decorators/event_decorator.rb
Marin Jankovski [Mon, 8 Oct 2012 10:41:25 +0000 (12:41 +0200)]
Do not allow removal of a project owner user.
Dmitriy Zaporozhets [Mon, 8 Oct 2012 09:56:44 +0000 (02:56 -0700)]
Merge pull request #1650 from NARKOZ/api
API for project snippets listing
Nihad Abbasov [Mon, 8 Oct 2012 09:13:53 +0000 (02:13 -0700)]
API: add project snippets listing
Nihad Abbasov [Mon, 8 Oct 2012 08:54:36 +0000 (01:54 -0700)]
projects API should return info about deleted hook
Nihad Abbasov [Mon, 8 Oct 2012 08:52:08 +0000 (01:52 -0700)]
add API changelog
Dmitriy Zaporozhets [Sun, 7 Oct 2012 08:00:38 +0000 (01:00 -0700)]
Merge pull request #1636 from dosire/consistent_issue_type_order
Reversed order of progress indication so that the text matches the progress bar.
Dmitriy Zaporozhets [Sun, 7 Oct 2012 07:49:59 +0000 (00:49 -0700)]
Merge pull request #1641 from sodabrew/patch-1
Tiny fix to the add/edit groups form path field
Dmitriy Zaporozhets [Sun, 7 Oct 2012 07:49:09 +0000 (00:49 -0700)]
Merge pull request #1643 from danillonunes/doc-install-fix
Doc fix: Nginx init script requires sudo
Danillo Nunes [Sun, 7 Oct 2012 00:36:20 +0000 (21:36 -0300)]
Doc fix: Nginx init script requires sudo
Aaron Stone [Sat, 6 Oct 2012 06:46:15 +0000 (23:46 -0700)]
Tiny fix to the add/edit groups form path field
joseph Borremans [Fri, 5 Oct 2012 15:48:52 +0000 (17:48 +0200)]
reversed order of progress indication for visual harmony so that text matches the progress bar
Dmitriy Zaporozhets [Fri, 5 Oct 2012 14:48:43 +0000 (07:48 -0700)]
Merge pull request #1632 from NARKOZ/patch-0
performance and security fixes
Nihad Abbasov [Fri, 5 Oct 2012 14:42:23 +0000 (07:42 -0700)]
move emoji module to lib
Nihad Abbasov [Fri, 5 Oct 2012 14:22:21 +0000 (07:22 -0700)]
no need to add fonts to assets path
Nihad Abbasov [Fri, 5 Oct 2012 14:13:21 +0000 (07:13 -0700)]
improve emoji checking performance
Nihad Abbasov [Fri, 5 Oct 2012 12:22:01 +0000 (05:22 -0700)]
specify HTTP verbs for match in routes
Dmitriy Zaporozhets [Fri, 5 Oct 2012 14:01:44 +0000 (17:01 +0300)]
Fix tests
Robert Speicher [Thu, 4 Oct 2012 18:30:31 +0000 (14:30 -0400)]
Remove leftover ref_extractor_spec file
Apparently it didn't get removed after the rename to ExtractsPath.
Robert Speicher [Thu, 4 Oct 2012 18:19:17 +0000 (14:19 -0400)]
Revert "Use official Grit 2.5.0"
This reverts commit
187e192cdf4470fa07a62aa0720c586b6dde2bde.
[ci skip]
Robert Speicher [Thu, 4 Oct 2012 18:13:52 +0000 (14:13 -0400)]
ExtractsPath: Use ref_names instead of branches+tags
Valeriy Sizov [Thu, 4 Oct 2012 16:31:31 +0000 (19:31 +0300)]
Fix bug with branches whose name contains slash
Valeriy Sizov [Thu, 4 Oct 2012 10:55:29 +0000 (13:55 +0300)]
added trace to travis
Valeriy Sizov [Thu, 4 Oct 2012 10:48:20 +0000 (13:48 +0300)]
ruby version changed
Valeriy Sizov [Thu, 4 Oct 2012 10:40:40 +0000 (13:40 +0300)]
Minore code-style fixes
Valeriy Sizov [Thu, 4 Oct 2012 10:29:27 +0000 (13:29 +0300)]
Merge branch 'diff_bug'
Valeriy Sizov [Thu, 4 Oct 2012 10:28:58 +0000 (13:28 +0300)]
fix inline diff
Alex Leutgöb [Thu, 4 Oct 2012 08:06:17 +0000 (10:06 +0200)]
Escape html entities in commit messages
Dmitriy Zaporozhets [Thu, 4 Oct 2012 07:51:35 +0000 (10:51 +0300)]
Fixed group issues/mr. Also speedup project list of admin area
Robert Speicher [Wed, 3 Oct 2012 23:11:39 +0000 (19:11 -0400)]
Use official Grit 2.5.0
Robert Speicher [Wed, 3 Oct 2012 22:40:56 +0000 (18:40 -0400)]
Add render_tree helper; simplify (speed up) tree_icon
Robert Speicher [Wed, 3 Oct 2012 22:30:27 +0000 (18:30 -0400)]
Remove locals from tree/submodule_item, use "object" instead
Robert Speicher [Wed, 3 Oct 2012 22:29:15 +0000 (18:29 -0400)]
Tree.init() JS is no longer required
Robert Speicher [Wed, 3 Oct 2012 22:28:50 +0000 (18:28 -0400)]
Remove locals from tree/tree_file and just use "object" instead
Robert Speicher [Wed, 3 Oct 2012 21:01:16 +0000 (17:01 -0400)]
Rename tree.js to tree.js.coffee
randx [Wed, 3 Oct 2012 20:46:55 +0000 (23:46 +0300)]
Implement pending dashboard step
randx [Wed, 3 Oct 2012 16:51:14 +0000 (19:51 +0300)]
Bigger fonts for groups box
Dmitriy Zaporozhets [Wed, 3 Oct 2012 14:06:08 +0000 (07:06 -0700)]
Merge pull request #1592 from jouve/devise_layout
make devise controllers use devise layout