OSDN Git Service

wvm/gitlab.git
11 years agoAdd font-awesome-sass-rails gem
Riyad Preukschas [Tue, 16 Oct 2012 18:27:44 +0000 (20:27 +0200)]
Add font-awesome-sass-rails gem

11 years agoMerge pull request #1704 from riyad/small-file-edit-fixes
Valeriy Sizov [Tue, 16 Oct 2012 11:03:38 +0000 (04:03 -0700)]
Merge pull request #1704 from riyad/small-file-edit-fixes

Small fixes for editing files

11 years agoOnly allow editing text files
Riyad Preukschas [Mon, 15 Oct 2012 19:47:38 +0000 (21:47 +0200)]
Only allow editing text files

11 years agoImprove flash messages in tree#update
Riyad Preukschas [Tue, 16 Oct 2012 10:45:30 +0000 (12:45 +0200)]
Improve flash messages in tree#update

11 years agotree.readme method added
randx [Tue, 16 Oct 2012 06:48:55 +0000 (09:48 +0300)]
tree.readme method added

11 years agoFix plain text readme
randx [Tue, 16 Oct 2012 06:43:22 +0000 (09:43 +0300)]
Fix plain text readme

11 years agoMerge pull request #1706 from riyad/refactor-tree-views-and-improve-consistency
Dmitriy Zaporozhets [Tue, 16 Oct 2012 06:33:49 +0000 (23:33 -0700)]
Merge pull request #1706 from riyad/refactor-tree-views-and-improve-consistency

Refactor tree views and improve consistency

11 years agoMerge pull request #1707 from riyad/remove-labels-from-mr-form
Dmitriy Zaporozhets [Tue, 16 Oct 2012 06:23:36 +0000 (23:23 -0700)]
Merge pull request #1707 from riyad/remove-labels-from-mr-form

Remove redundant branch labels from MR form

11 years agoMake history link for trees look like action links for blobs
Riyad Preukschas [Mon, 15 Oct 2012 22:57:15 +0000 (00:57 +0200)]
Make history link for trees look like action links for blobs

11 years agoRemove redundant branch labels from MR form
Riyad Preukschas [Mon, 15 Oct 2012 22:46:48 +0000 (00:46 +0200)]
Remove redundant branch labels from MR form

Fixes #1525

11 years agoRemove #history_path and #mb_size from TreeDecorator
Riyad Preukschas [Mon, 15 Oct 2012 20:54:49 +0000 (22:54 +0200)]
Remove #history_path and #mb_size from TreeDecorator

11 years agoFix offered links in tree/blob_actions partial
Riyad Preukschas [Mon, 15 Oct 2012 21:42:08 +0000 (23:42 +0200)]
Fix offered links in tree/blob_actions partial

11 years agoUse tree/blob_actions partial for blame view and fix file name encoding
Riyad Preukschas [Mon, 15 Oct 2012 21:40:56 +0000 (23:40 +0200)]
Use tree/blob_actions partial for blame view and fix file name encoding

11 years agoUse shorthand as in TreeController#edit
Riyad Preukschas [Mon, 15 Oct 2012 19:23:35 +0000 (21:23 +0200)]
Use shorthand as in TreeController#edit

11 years agoDisplay more accurate file size in tree/blob/download partial
Riyad Preukschas [Mon, 15 Oct 2012 19:04:54 +0000 (21:04 +0200)]
Display more accurate file size in tree/blob/download partial

11 years agoDisplay file size instead of mode in tree/blob partial
Riyad Preukschas [Mon, 15 Oct 2012 19:04:26 +0000 (21:04 +0200)]
Display file size instead of mode in tree/blob partial

11 years agoExtract out tree/blob/* partials
Riyad Preukschas [Mon, 15 Oct 2012 18:56:58 +0000 (20:56 +0200)]
Extract out tree/blob/* partials

11 years agoExtract tree/readme partial
Riyad Preukschas [Mon, 15 Oct 2012 18:51:03 +0000 (20:51 +0200)]
Extract tree/readme partial

11 years agoExtract tree/blob_actions partial
Riyad Preukschas [Mon, 15 Oct 2012 20:08:00 +0000 (22:08 +0200)]
Extract tree/blob_actions partial

11 years agoRename tree/tree_file partial to tree/blob
Riyad Preukschas [Mon, 15 Oct 2012 21:38:35 +0000 (23:38 +0200)]
Rename tree/tree_file partial to tree/blob

11 years agoMerge pull request #1692 from riyad/saner-note-methods
Dmitriy Zaporozhets [Mon, 15 Oct 2012 17:11:00 +0000 (10:11 -0700)]
Merge pull request #1692 from riyad/saner-note-methods

Small Note code cleanup

11 years agoMerge branch 'web_editor'
randx [Mon, 15 Oct 2012 16:52:10 +0000 (19:52 +0300)]
Merge branch 'web_editor'

11 years agoMinor improve to UI and code formatting of gitlab web editor
randx [Mon, 15 Oct 2012 16:51:11 +0000 (19:51 +0300)]
Minor improve to UI and code formatting of gitlab web editor

11 years agoMerge pull request #1697 from riyad/fix-wiki-comment-notification
Valeriy Sizov [Sun, 14 Oct 2012 15:25:27 +0000 (08:25 -0700)]
Merge pull request #1697 from riyad/fix-wiki-comment-notification

Fix link to wiki page in wiki comment notification

11 years agoFix link to wiki page in wiki comment notification
Riyad Preukschas [Sun, 14 Oct 2012 15:12:38 +0000 (17:12 +0200)]
Fix link to wiki page in wiki comment notification

11 years agoMerge pull request #1693 from SaitoWu/features/mr
Dmitriy Zaporozhets [Sun, 14 Oct 2012 15:11:25 +0000 (08:11 -0700)]
Merge pull request #1693 from SaitoWu/features/mr

Improve development experience.

11 years agoMerge pull request #1694 from robbkidd/fix_notification_of_wall_notes
Riyad Preukschas [Sat, 13 Oct 2012 19:21:56 +0000 (12:21 -0700)]
Merge pull request #1694 from robbkidd/fix_notification_of_wall_notes

Fix notification for notes on a wall. (regression)

11 years agoFix notification for notes on a wall.
Robb Kidd [Sat, 13 Oct 2012 18:37:36 +0000 (14:37 -0400)]
Fix notification for notes on a wall.

The fact that Notes on Walls have a noteable_type value of "nil" got
lost in the refactoring of the observer.

11 years agoadd rails-dev-tweaks for development env speed
Saito [Sat, 13 Oct 2012 16:13:28 +0000 (00:13 +0800)]
add rails-dev-tweaks for development env speed

11 years agodisable annoying rails assets log messages
Saito [Sat, 13 Oct 2012 16:02:01 +0000 (00:02 +0800)]
disable annoying rails assets log messages

11 years agoMake Note methods saner
Riyad Preukschas [Sat, 13 Oct 2012 14:23:12 +0000 (16:23 +0200)]
Make Note methods saner

11 years agoWebEditor: minor spinach fixes
Valeriy Sizov [Fri, 12 Oct 2012 17:27:50 +0000 (20:27 +0300)]
WebEditor: minor spinach fixes

11 years agofix install manual after merge #1666
Valeriy Sizov [Fri, 12 Oct 2012 17:12:35 +0000 (20:12 +0300)]
fix install manual after merge #1666

11 years agoWebEditor: commit message is required now
Valeriy Sizov [Fri, 12 Oct 2012 16:59:42 +0000 (19:59 +0300)]
WebEditor: commit message is required now

11 years agoWebEditor: spinach
Valeriy Sizov [Fri, 12 Oct 2012 16:56:06 +0000 (19:56 +0300)]
WebEditor: spinach

11 years agoWebEditor: base implementation
Valeriy Sizov [Fri, 12 Oct 2012 14:14:52 +0000 (17:14 +0300)]
WebEditor: base implementation

11 years agoWebEditor: Check if save is possible
Valeriy Sizov [Fri, 12 Oct 2012 11:06:12 +0000 (14:06 +0300)]
WebEditor: Check if save is possible

11 years agoWebEditor: sceleton
Valeriy Sizov [Thu, 11 Oct 2012 21:15:24 +0000 (00:15 +0300)]
WebEditor: sceleton

11 years agoDesign improved
Dmitriy Zaporozhets [Wed, 10 Oct 2012 09:41:15 +0000 (12:41 +0300)]
Design improved

11 years agoWebEditor: integrated editor
Valeriy Sizov [Tue, 9 Oct 2012 17:11:49 +0000 (20:11 +0300)]
WebEditor: integrated editor

11 years agominor code style fixing
Valeriy Sizov [Mon, 8 Oct 2012 15:54:51 +0000 (18:54 +0300)]
minor code style fixing

11 years agoWebEditor: base form
Valeriy Sizov [Mon, 8 Oct 2012 15:43:54 +0000 (18:43 +0300)]
WebEditor: base form

11 years agoMerge pull request #1683 from riyad/fix-events-for-deleted-things-again
Dmitriy Zaporozhets [Fri, 12 Oct 2012 11:56:16 +0000 (04:56 -0700)]
Merge pull request #1683 from riyad/fix-events-for-deleted-things-again

Fix displaying events for deleted things on the dashboard (again)

11 years agoFix displaying events for deleted things
Riyad Preukschas [Fri, 12 Oct 2012 11:37:44 +0000 (13:37 +0200)]
Fix displaying events for deleted things

11 years agoMerge pull request #1682 from riyad/improve-search-suggestions
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

11 years agoMerge pull request #1685 from jozefvaclavik/master
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)

11 years agoUpdate spec/requests/api/projects_spec.rb
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

11 years agoMerge pull request #1680 from robbkidd/reduce_note_observer_complexity
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.

11 years agoUpdate projects_spec.rb for Hook list and edit
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.

11 years agoUpdate doc/api/projects.md for hooks API
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.

11 years agoUpdate CHANGELOG for updated hooks API
jozefvaclavik [Fri, 12 Oct 2012 07:31:57 +0000 (10:31 +0300)]
Update CHANGELOG for updated hooks API

11 years agoUpdate lib/api/projects.rb
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

11 years agoImprove search suggestions
Riyad Preukschas [Thu, 11 Oct 2012 23:02:28 +0000 (01:02 +0200)]
Improve search suggestions

11 years agoReduce complexity: replace case statement with method lookup.
Robb Kidd [Thu, 11 Oct 2012 17:27:58 +0000 (13:27 -0400)]
Reduce complexity: replace case statement with method lookup.

11 years agoMerge pull request #1675 from robbkidd/separate_mr_observer
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

11 years agoClean up indenting in new observer.
Robb Kidd [Thu, 11 Oct 2012 15:05:13 +0000 (11:05 -0400)]
Clean up indenting in new observer.

11 years agoFix starting gitlab after reboot server
Valeriy Sizov [Thu, 11 Oct 2012 13:55:11 +0000 (16:55 +0300)]
Fix starting gitlab after reboot server

11 years agoMerge pull request #1672 from tsigo/milestone_closed_issues
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

11 years agoSeparate observing of Note and MergeRequests
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.

11 years agoAdd Feature for milestone issue filter
Robert Speicher [Wed, 10 Oct 2012 17:06:54 +0000 (13:06 -0400)]
Add Feature for milestone issue filter

Closes #1167

11 years agoMove 'closed' attribute to the row instead of the cell
Robert Speicher [Wed, 10 Oct 2012 17:06:34 +0000 (13:06 -0400)]
Move 'closed' attribute to the row instead of the cell

11 years agoRemove unused li classes from milestone issue filter
Robert Speicher [Tue, 4 Sep 2012 08:18:30 +0000 (04:18 -0400)]
Remove unused li classes from milestone issue filter

11 years agoAdd toggle to show closed issues on Milestones#show
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

11 years agohardware requirements
Dmitriy Zaporozhets [Wed, 10 Oct 2012 14:17:23 +0000 (17:17 +0300)]
hardware requirements

11 years agoUpdated installation docs with better db origanisation
Dmitriy Zaporozhets [Wed, 10 Oct 2012 12:45:19 +0000 (15:45 +0300)]
Updated installation docs with better db origanisation

11 years agoMerge pull request #1630 from riyad/show-commit-notes-with-mr-notes
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

11 years agoMerge pull request #1666 from zzet/feature/postgres
Dmitriy Zaporozhets [Wed, 10 Oct 2012 11:47:05 +0000 (04:47 -0700)]
Merge pull request #1666 from zzet/feature/postgres

Postgresql

11 years agoAdd links to the note source if the note is mixed in
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

11 years agoFix vote counting to only count main target notes (not mixed in ones)
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)

11 years agoMake notes for merge requests include commit notes and add helpers
Riyad Preukschas [Wed, 10 Oct 2012 10:06:30 +0000 (12:06 +0200)]
Make notes for merge requests include commit notes and add helpers

11 years agotravis
Andrey Kumanyaev [Tue, 9 Oct 2012 23:41:44 +0000 (03:41 +0400)]
travis

11 years agoupdate doc
Andrey Kumanyaev [Tue, 9 Oct 2012 23:41:33 +0000 (03:41 +0400)]
update doc

11 years agopatch rails to ignore text limit
Andrey Kumanyaev [Tue, 9 Oct 2012 23:41:14 +0000 (03:41 +0400)]
patch rails to ignore text limit

11 years agoMerge pull request #1629 from riyad/show-notes-indicator-for-commits-and-merge-requests
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

11 years agoMerge pull request #1664 from riyad/auto-complete-everywhere
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

11 years agoMerge pull request #1665 from tsigo/history_js
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

11 years agoadd support use string FK with integer PK
Andrey Kumanyaev [Tue, 9 Oct 2012 23:31:51 +0000 (03:31 +0400)]
add support use string FK with integer PK

11 years agoadd default postgres config
Andrey Kumanyaev [Tue, 9 Oct 2012 23:15:26 +0000 (03:15 +0400)]
add default postgres config

11 years agoadd pg gem
Andrey Kumanyaev [Tue, 9 Oct 2012 23:14:58 +0000 (03:14 +0400)]
add pg gem

11 years agoMake MRs also count and display its commits' notes
Riyad Preukschas [Thu, 4 Oct 2012 22:25:40 +0000 (00:25 +0200)]
Make MRs also count and display its commits' notes

11 years agoAdd notes count to commits in lists.
Riyad Preukschas [Thu, 4 Oct 2012 21:02:37 +0000 (23:02 +0200)]
Add notes count to commits in lists.

11 years agoFix auto-completion for forms that are inserted with JS
Riyad Preukschas [Tue, 9 Oct 2012 21:54:14 +0000 (23:54 +0200)]
Fix auto-completion for forms that are inserted with JS

11 years agoExtract and split GFM auto-completion setup 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

11 years agoMove emoji auto-complete helper to ApplicationHelper
Riyad Preukschas [Tue, 9 Oct 2012 22:53:42 +0000 (00:53 +0200)]
Move emoji auto-complete helper to ApplicationHelper

11 years agoRemove unused history_path instance variable
Robert Speicher [Tue, 9 Oct 2012 22:33:22 +0000 (18:33 -0400)]
Remove unused history_path instance variable

11 years agoUse History.js for better Tree browsing
Robert Speicher [Wed, 3 Oct 2012 23:12:51 +0000 (19:12 -0400)]
Use History.js for better Tree browsing

Closes #1578

11 years agoMark all GFM capable inputs
Riyad Preukschas [Tue, 9 Oct 2012 21:06:33 +0000 (23:06 +0200)]
Mark all GFM capable inputs

11 years agoContext refactoring. Move Issues list, Search logic to context
randx [Tue, 9 Oct 2012 19:09:46 +0000 (22:09 +0300)]
Context refactoring. Move Issues list, Search logic to context

11 years agoproject.issues_labels method
randx [Tue, 9 Oct 2012 17:39:06 +0000 (20:39 +0300)]
project.issues_labels method

11 years agoMerge pull request #1597 from riyad/add-completion-for-all-emoji
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

11 years agoRedo the auto-completion JS for notes
Riyad Preukschas [Tue, 9 Oct 2012 12:48:35 +0000 (14:48 +0200)]
Redo the auto-completion JS for notes

11 years agoMark inputs for notes with GFM capabilities
Riyad Preukschas [Tue, 9 Oct 2012 12:48:20 +0000 (14:48 +0200)]
Mark inputs for notes with GFM capabilities

11 years agoAdd emoji_for_completion helper
Riyad Preukschas [Tue, 9 Oct 2012 12:47:42 +0000 (14:47 +0200)]
Add emoji_for_completion helper

11 years agoremove unnecessary task
Valeriy Sizov [Tue, 9 Oct 2012 11:59:58 +0000 (14:59 +0300)]
remove unnecessary task

11 years agoAnnotated
Dmitriy Zaporozhets [Tue, 9 Oct 2012 08:14:17 +0000 (11:14 +0300)]
Annotated

11 years agoMerge pull request #1656 from zzet/refactoring
Valeriy Sizov [Tue, 9 Oct 2012 08:17:38 +0000 (01:17 -0700)]
Merge pull request #1656 from zzet/refactoring

Refactoring

11 years agoReduce count of projects on dashboard to 20
randx [Tue, 9 Oct 2012 07:01:07 +0000 (10:01 +0300)]
Reduce count of projects on dashboard to 20

11 years agoGroup: new link on dashboard if admin. Fixed people count
randx [Tue, 9 Oct 2012 06:46:20 +0000 (09:46 +0300)]
Group: new link on dashboard if admin. Fixed people count

11 years agoMerge pull request #1596 from riyad/fix-messages-for-deleted-things
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

11 years agotests fix
Andrey Kumanyaev [Tue, 9 Oct 2012 00:10:16 +0000 (04:10 +0400)]
tests fix