OSDN Git Service

wvm/gitlab.git
12 years agoFix ldap blank password
Dmitriy Zaporozhets [Tue, 26 Jun 2012 07:55:25 +0000 (10:55 +0300)]
Fix ldap blank password

12 years agoFix IssueObserver current_user assign. Refactored observers
randx [Sun, 24 Jun 2012 07:01:42 +0000 (10:01 +0300)]
Fix IssueObserver current_user assign. Refactored observers

12 years agoMerge branch 'separate_user_and_issue_observer_from_mail_observer' of https://github...
randx [Sun, 24 Jun 2012 06:33:22 +0000 (09:33 +0300)]
Merge branch 'separate_user_and_issue_observer_from_mail_observer' of https://github.com/robbkidd/gitlabhq into robbkidd-separate_user_and_issue_observer_from_mail_observer

12 years agoDiff refactoring
Valeriy Sizov [Sat, 23 Jun 2012 22:14:45 +0000 (01:14 +0300)]
Diff refactoring

12 years agosmall clean of CommitDecorator
Valeriy Sizov [Sat, 23 Jun 2012 21:55:23 +0000 (00:55 +0300)]
small clean of CommitDecorator

12 years agoupdate doc
Valeriy Sizov [Sat, 23 Jun 2012 10:16:21 +0000 (13:16 +0300)]
update doc

12 years agoUpdate master
Valeriy Sizov [Sat, 23 Jun 2012 10:09:06 +0000 (13:09 +0300)]
Update master

12 years agoUp to 2.6.2 v2.6.2
randx [Fri, 22 Jun 2012 20:50:58 +0000 (23:50 +0300)]
Up to 2.6.2

12 years agoForce resque protection
randx [Fri, 22 Jun 2012 20:46:57 +0000 (23:46 +0300)]
Force resque protection

12 years agoFixed network graph keyboard nav
randx [Fri, 22 Jun 2012 20:29:31 +0000 (23:29 +0300)]
Fixed network graph keyboard nav

12 years agoUp to 2.6.1 v2.6.1
randx [Fri, 22 Jun 2012 19:49:03 +0000 (22:49 +0300)]
Up to 2.6.1

12 years agoFix project redirect after destroy
randx [Fri, 22 Jun 2012 19:39:03 +0000 (22:39 +0300)]
Fix project redirect after destroy

12 years agoMerge pull request #961 from NARKOZ/load_assets_group
Dmitriy Zaporozhets [Fri, 22 Jun 2012 10:11:23 +0000 (03:11 -0700)]
Merge pull request #961 from NARKOZ/load_assets_group

load assets group to allow lazy compilation in production

12 years agoload assets group to allow lazy compilation in production
Nihad Abbasov [Fri, 22 Jun 2012 10:09:36 +0000 (03:09 -0700)]
load assets group to allow lazy compilation in production

12 years agoMerge pull request #959 from NARKOZ/raphael-js
Dmitriy Zaporozhets [Fri, 22 Jun 2012 09:15:36 +0000 (02:15 -0700)]
Merge pull request #959 from NARKOZ/raphael-js

Downgrade Raphael.js

12 years agomove assets gems to assets group
Nihad Abbasov [Fri, 22 Jun 2012 09:00:09 +0000 (02:00 -0700)]
move assets gems to assets group

12 years agodowngrade raphael js to 1.5.2
Nihad Abbasov [Fri, 22 Jun 2012 08:57:05 +0000 (01:57 -0700)]
downgrade raphael js to 1.5.2

12 years agoUp to 2.6 v2.6.0
randx [Thu, 21 Jun 2012 17:25:23 +0000 (20:25 +0300)]
Up to 2.6

12 years agoadmin area -> search for users
randx [Thu, 21 Jun 2012 16:05:09 +0000 (19:05 +0300)]
admin area -> search for users

12 years agoadmin area -> search for projecs
randx [Thu, 21 Jun 2012 15:54:57 +0000 (18:54 +0300)]
admin area -> search for projecs

12 years agoPushed widget improved
randx [Thu, 21 Jun 2012 15:41:22 +0000 (18:41 +0300)]
Pushed widget improved

12 years agoresque auth example
randx [Thu, 21 Jun 2012 14:23:51 +0000 (17:23 +0300)]
resque auth example

12 years agoFew minor css improvements
randx [Thu, 21 Jun 2012 14:23:25 +0000 (17:23 +0300)]
Few minor css improvements

12 years agoBackgrounds for Issues
randx [Thu, 21 Jun 2012 13:43:40 +0000 (16:43 +0300)]
Backgrounds for Issues

12 years agoIssues & MR legend
Dmitriy Zaporozhets [Thu, 21 Jun 2012 05:29:53 +0000 (08:29 +0300)]
Issues & MR legend

12 years agolets comment browse feature
randx [Thu, 21 Jun 2012 06:58:05 +0000 (09:58 +0300)]
lets comment browse feature

12 years agoProtect IssueObserver#send_reassigned_email method.
Robb Kidd [Thu, 21 Jun 2012 01:23:05 +0000 (21:23 -0400)]
Protect IssueObserver#send_reassigned_email method.

12 years agoremove double negative
Zevs [Wed, 20 Jun 2012 21:21:13 +0000 (00:21 +0300)]
remove double negative

12 years agoMerge pull request #952 from gitlabhq/remove_link_to_function
Dmitriy Zaporozhets [Wed, 20 Jun 2012 20:09:33 +0000 (13:09 -0700)]
Merge pull request #952 from gitlabhq/remove_link_to_function

Get rid of deprecated link_to_function

12 years agomissed ;
randx [Wed, 20 Jun 2012 20:08:10 +0000 (23:08 +0300)]
missed ;

12 years agoGet rid of deprecated link_to_function
randx [Wed, 20 Jun 2012 18:29:55 +0000 (21:29 +0300)]
Get rid of deprecated link_to_function

12 years agoRemove :issue from MailerObserver; handled by IssueObserver now.
Robb Kidd [Wed, 20 Jun 2012 17:48:34 +0000 (13:48 -0400)]
Remove :issue from MailerObserver; handled by IssueObserver now.

:issue snuck back in during rebasing.

12 years agoRemove upvotes method from Issue.
Robb Kidd [Wed, 20 Jun 2012 17:18:29 +0000 (13:18 -0400)]
Remove upvotes method from Issue.

Must have snuck in during one of the multiple rebases while observers were
being refactored.

12 years agoExtract observation of User to a UserObserver
Robb Kidd [Wed, 20 Jun 2012 16:29:10 +0000 (12:29 -0400)]
Extract observation of User to a UserObserver

12 years agoDeliver issue mails.
Robb Kidd [Fri, 15 Jun 2012 20:23:28 +0000 (16:23 -0400)]
Deliver issue mails.

It helps to actually deliver messages.

12 years agoDisable observers in specs. Enable only when observer is under test.
Robb Kidd [Tue, 12 Jun 2012 18:27:03 +0000 (14:27 -0400)]
Disable observers in specs. Enable only when observer is under test.

Used the built-in observer enable/disable feature in ActiveModel[1].
ActiveRecord::Base includes ActiveModel::Observing which provides this
behavior.

Simple wraps to enable the observer under test were added to the specs
for: ActivityObserver, IssueObserver, Admin::Users and Issues.

The spec for Project.last_activity was refactored to separate the tests
for #last_activity and #last_activity_date. Each had doubles added to
isolate the spec from the hidden dependency on the ActivityObserver
action to create an Event for the project when an Issue is created. This
ActivityObserver behavior is already tested by its spec.

[1] http://api.rubyonrails.org/classes/ActiveModel/ObserverArray.html

12 years agoAdd resque_spec to test queuing mail.
Robb Kidd [Mon, 21 May 2012 20:05:12 +0000 (16:05 -0400)]
Add resque_spec to test queuing mail.

12 years agoMake IssueObserver handle issus, not MailerObserver
Robb Kidd [Mon, 21 May 2012 17:30:53 +0000 (13:30 -0400)]
Make IssueObserver handle issus, not MailerObserver

12 years agoAdd method for an issue to know whether it is being closed
Robb Kidd [Sun, 20 May 2012 19:06:13 +0000 (15:06 -0400)]
Add method for an issue to know whether it is being closed

Update IssueObserver to create a Note on the issue its being closed.

12 years agoAdd method to Note to create notes about status changes.
Robb Kidd [Sun, 20 May 2012 18:35:03 +0000 (14:35 -0400)]
Add method to Note to create notes about status changes.

12 years agoUpdate IssueObserver to send reassigned emails when an issue is reassigned.
Robb Kidd [Sun, 20 May 2012 18:25:34 +0000 (14:25 -0400)]
Update IssueObserver to send reassigned emails when an issue is reassigned.

12 years agoAdd new utility method for an issue to know whether it is being reassigned
Robb Kidd [Sun, 20 May 2012 18:15:13 +0000 (14:15 -0400)]
Add new utility method for an issue to know whether it is being reassigned

12 years agoNew IssueObserver class and spec.
Robb Kidd [Thu, 17 May 2012 21:23:34 +0000 (17:23 -0400)]
New IssueObserver class and spec.

Handles emails for new issues and reassigned issues.
Need to add creating a Note on Issue close.

12 years agoRevert "Handle Commit "show suppressed diff" link with a doc-ready event handler."
Zevs [Wed, 20 Jun 2012 18:01:27 +0000 (21:01 +0300)]
Revert "Handle Commit "show suppressed diff" link with a doc-ready event handler."

This reverts commit ef1598b4afa94b21db7f38755182a701d03ae44a.

12 years agoRevert "Handle MR "show all commits" link with a doc-ready event handler."
Zevs [Wed, 20 Jun 2012 18:01:00 +0000 (21:01 +0300)]
Revert "Handle MR "show all commits" link with a doc-ready event handler."

This reverts commit 5b1ede628065ecfdf95552322328b5bb7613753a.

12 years agoRevert "Invert "unless .empty?" to "if .present?"; unless-else is evil."
Zevs [Wed, 20 Jun 2012 18:00:34 +0000 (21:00 +0300)]
Revert "Invert "unless .empty?" to "if .present?"; unless-else is evil."

This reverts commit 7484bcfff7fc8e132d94701b3af47f521ce117c5.

12 years agoMerge pull request #951 from robbkidd/remove_link_to_function
Valeriy Sizov [Wed, 20 Jun 2012 17:43:32 +0000 (10:43 -0700)]
Merge pull request #951 from robbkidd/remove_link_to_function

Replace calls to deprecated link_to_function with doc-ready functions.

12 years agoHande error with huge commits
randx [Wed, 20 Jun 2012 17:08:18 +0000 (20:08 +0300)]
Hande error with huge commits

12 years agoMerge pull request #950 from netdata/Create_link_from_keys_count
Dmitriy Zaporozhets [Wed, 20 Jun 2012 15:29:05 +0000 (08:29 -0700)]
Merge pull request #950 from netdata/Create_link_from_keys_count

make a hyperlink from the counted keys

12 years agomake a hyperlink from the counted keys
Wouter D'Haeseleer [Wed, 20 Jun 2012 15:16:56 +0000 (17:16 +0200)]
make a hyperlink from the counted keys

Refs Ticket #948

12 years agoHandle Commit "show suppressed diff" link with a doc-ready event handler.
Robb Kidd [Wed, 20 Jun 2012 15:11:17 +0000 (11:11 -0400)]
Handle Commit "show suppressed diff" link with a doc-ready event handler.

Replaces link_to_function use which was deprecated in Rails v3.2.4.
https://github.com/rails/rails/commit/9dc57fe9c

Still absent is a graceful degrade for no-JS.

12 years agoUpdate pygments version
Dmitriy Zaporozhets [Wed, 20 Jun 2012 10:45:26 +0000 (13:45 +0300)]
Update pygments version

12 years agoMerge pull request #947 from netdata/Update_gemfile_for_latest_grit
Dmitriy Zaporozhets [Wed, 20 Jun 2012 09:35:02 +0000 (02:35 -0700)]
Merge pull request #947 from netdata/Update_gemfile_for_latest_grit

Update to the latest grit

12 years agoUpdate Gemfile.lock as well
Wouter D'Haeseleer [Wed, 20 Jun 2012 09:14:41 +0000 (11:14 +0200)]
Update Gemfile.lock as well

12 years agoUpdate to the latst grit
Wouter D'Haeseleer [Tue, 19 Jun 2012 20:24:07 +0000 (22:24 +0200)]
Update to the latst grit

The latest grit includes a patch for performance improvements.

12 years agoMerge pull request #942 from veprbl/network_graph_fix
Dmitriy Zaporozhets [Tue, 19 Jun 2012 13:55:26 +0000 (06:55 -0700)]
Merge pull request #942 from veprbl/network_graph_fix

Network graph fix (#909)

12 years agonetwork graph: fixed minor visual artefacts
Dmitry Kalinkin [Tue, 19 Jun 2012 12:15:13 +0000 (16:15 +0400)]
network graph: fixed minor visual artefacts

12 years agonetwork graph: use same color for all branch
Dmitry Kalinkin [Tue, 19 Jun 2012 11:55:59 +0000 (15:55 +0400)]
network graph: use same color for all branch

12 years agonetwork graph: change lines to be more github-like (removes some ambiguousness in...
Dmitry Kalinkin [Tue, 19 Jun 2012 11:51:54 +0000 (15:51 +0400)]
network graph: change lines to be more github-like (removes some ambiguousness in graph presentation)

12 years agosmall refactoring for branch-graph.js
Dmitry Kalinkin [Fri, 15 Jun 2012 14:38:30 +0000 (18:38 +0400)]
small refactoring for branch-graph.js

12 years ago#909 fix network graph json generation
Dmitry Kalinkin [Fri, 15 Jun 2012 14:37:59 +0000 (18:37 +0400)]
#909 fix network graph json generation

12 years agoMerge pull request #940 from anoldguy/master
Dmitriy Zaporozhets [Tue, 19 Jun 2012 11:01:52 +0000 (04:01 -0700)]
Merge pull request #940 from anoldguy/master

Update Fonts to include good Windows Default monospaced font, too.

12 years agoIncluded good default font for Windows.
Nathan Anderson [Tue, 19 Jun 2012 10:56:09 +0000 (07:56 -0300)]
Included good default font for Windows.

12 years agoIncluded good default for Windows and standardized <pre> font families
Nathan Anderson [Tue, 19 Jun 2012 10:55:01 +0000 (07:55 -0300)]
Included good default for Windows and standardized <pre> font families

12 years agoBetter fonts for code
Dmitriy Zaporozhets [Tue, 19 Jun 2012 10:48:39 +0000 (13:48 +0300)]
Better fonts for code

12 years agoMerge pull request #937 from jdamick/master
Valeriy Sizov [Tue, 19 Jun 2012 08:40:01 +0000 (01:40 -0700)]
Merge pull request #937 from jdamick/master

Modified the login screen for primarily LDAP authentication

12 years agoHandle MR "show all commits" link with a doc-ready event handler.
Robb Kidd [Mon, 18 Jun 2012 22:36:25 +0000 (18:36 -0400)]
Handle MR "show all commits" link with a doc-ready event handler.

Replaces link_to_function use which was deprecated in Rails v3.2.4.
https://github.com/rails/rails/commit/9dc57fe9c

Still absent is a graceful degrade for no-JS.

12 years agoInvert "unless .empty?" to "if .present?"; unless-else is evil.
Robb Kidd [Mon, 18 Jun 2012 21:52:16 +0000 (17:52 -0400)]
Invert "unless .empty?" to "if .present?"; unless-else is evil.

12 years agoAssignee filter for issues
randx [Mon, 18 Jun 2012 17:50:06 +0000 (20:50 +0300)]
Assignee filter for issues

12 years agoRefactor code themes
randx [Mon, 18 Jun 2012 17:18:14 +0000 (20:18 +0300)]
Refactor code themes

12 years agoCucumber features: Team, SSH keys
randx [Mon, 18 Jun 2012 16:34:09 +0000 (19:34 +0300)]
Cucumber features: Team, SSH keys

12 years agoremoved dead code from the form
jdamick [Mon, 18 Jun 2012 15:51:17 +0000 (11:51 -0400)]
removed dead code from the form

12 years agoMerge branch 'master' of github.com:jdamick/gitlabhq
jdamick [Mon, 18 Jun 2012 15:48:18 +0000 (11:48 -0400)]
Merge branch 'master' of github.com:jdamick/gitlabhq

12 years agomoved the ldap login to its own partial and cleaned up the forms a little bit
jdamick [Mon, 18 Jun 2012 15:40:14 +0000 (11:40 -0400)]
moved the ldap login to its own partial and cleaned up the forms a little bit

12 years agocustomizing the user login screen for primarily ldap authentication
jdamick [Fri, 15 Jun 2012 21:07:53 +0000 (17:07 -0400)]
customizing the user login screen for primarily ldap authentication

12 years agomoved the ldap login to its own partial and cleaned up the forms a little bit
jdamick [Mon, 18 Jun 2012 15:40:14 +0000 (11:40 -0400)]
moved the ldap login to its own partial and cleaned up the forms a little bit

12 years agoTest only 1.9.3 on travis
randx [Sun, 17 Jun 2012 20:05:33 +0000 (23:05 +0300)]
Test only 1.9.3 on travis

12 years agoInstall charlock for travis
randx [Sun, 17 Jun 2012 19:53:40 +0000 (22:53 +0300)]
Install charlock for travis

12 years agoImprove gitlab encode method
randx [Sun, 17 Jun 2012 19:00:13 +0000 (22:00 +0300)]
Improve gitlab encode method

12 years agono pending cucumber for travis
randx [Sun, 17 Jun 2012 16:19:01 +0000 (19:19 +0300)]
no pending cucumber for travis

12 years agoLets change how cucumber run on travis
randx [Sun, 17 Jun 2012 15:40:00 +0000 (18:40 +0300)]
Lets change how cucumber run on travis

12 years agoFix travis
randx [Sun, 17 Jun 2012 15:33:13 +0000 (18:33 +0300)]
Fix travis

12 years agoMerge pull request #932 from gitlabhq/cucumber
Dmitriy Zaporozhets [Sat, 16 Jun 2012 10:46:14 +0000 (03:46 -0700)]
Merge pull request #932 from gitlabhq/cucumber

Cucumber

12 years agoKeep network graph pending
randx [Sat, 16 Jun 2012 10:45:51 +0000 (13:45 +0300)]
Keep network graph pending

12 years agofixed type
randx [Sat, 16 Jun 2012 10:31:21 +0000 (13:31 +0300)]
fixed type

12 years agofix ci run
randx [Sat, 16 Jun 2012 10:20:17 +0000 (13:20 +0300)]
fix ci run

12 years agoCucumber -> Network graph feature
randx [Sat, 16 Jun 2012 10:03:20 +0000 (13:03 +0300)]
Cucumber -> Network graph feature

12 years agoCucumber -> Dashboard features
randx [Sat, 16 Jun 2012 09:50:14 +0000 (12:50 +0300)]
Cucumber -> Dashboard features

12 years agocustomizing the user login screen for primarily ldap authentication
jdamick [Fri, 15 Jun 2012 21:07:53 +0000 (17:07 -0400)]
customizing the user login screen for primarily ldap authentication

12 years agotravis updated
randx [Fri, 15 Jun 2012 16:01:39 +0000 (19:01 +0300)]
travis updated

12 years agoMerge pull request #931 from goshakkk/comments-anchors
Dmitriy Zaporozhets [Fri, 15 Jun 2012 15:54:55 +0000 (08:54 -0700)]
Merge pull request #931 from goshakkk/comments-anchors

Add HTML anchors for comments

12 years agoAdd HTML anchors for comments #929
Gosha Arinich [Fri, 15 Jun 2012 15:53:00 +0000 (18:53 +0300)]
Add HTML anchors for comments #929

12 years agoMerge pull request #930 from benphelps/patch-1
Valeriy Sizov [Fri, 15 Jun 2012 06:37:07 +0000 (23:37 -0700)]
Merge pull request #930 from benphelps/patch-1

Fix typo in wiki page last edited message.

12 years agoCucumber:
Dmitriy Zaporozhets [Fri, 15 Jun 2012 04:15:28 +0000 (07:15 +0300)]
Cucumber:
* Profile
* Browse code
* Sceleton for main features
* Wiki
* Commits

12 years agoChange "in" to "ago" in last edited message.
Ben Phelps [Fri, 15 Jun 2012 01:51:01 +0000 (20:51 -0500)]
Change "in" to "ago" in last edited message.

12 years agomailObserver quickfix
Dmitriy Zaporozhets [Thu, 14 Jun 2012 09:45:22 +0000 (12:45 +0300)]
mailObserver quickfix

12 years agorefactored mail observer
Dmitriy Zaporozhets [Thu, 14 Jun 2012 05:24:10 +0000 (08:24 +0300)]
refactored mail observer

12 years agoFew css fixes for dark theme
Dmitriy Zaporozhets [Thu, 14 Jun 2012 07:43:35 +0000 (10:43 +0300)]
Few css fixes for dark theme

12 years agoCSS refactoring
randx [Wed, 13 Jun 2012 17:02:30 +0000 (20:02 +0300)]
CSS refactoring

12 years agoMerge pull request #923 from NARKOZ/refactoring-2
Dmitriy Zaporozhets [Wed, 13 Jun 2012 12:44:58 +0000 (05:44 -0700)]
Merge pull request #923 from NARKOZ/refactoring-2

Minor cleanup