OSDN Git Service

wvm/gitlab.git
12 years agoMerge pull request #698 from Sindacious/master
Dmitriy Zaporozhets [Fri, 20 Apr 2012 07:53:20 +0000 (00:53 -0700)]
Merge pull request #698 from Sindacious/master

Display Milestones without a due date as active

12 years agoUse try for commit prev_commit_id detection v2.4.0pre
Dmitriy Zaporozhets [Thu, 19 Apr 2012 20:35:35 +0000 (23:35 +0300)]
Use try for commit prev_commit_id detection

12 years agoFix an issue with MR unavailable if remove source branch
Dmitriy Zaporozhets [Thu, 19 Apr 2012 20:06:45 +0000 (23:06 +0300)]
Fix an issue with MR unavailable if remove source branch

12 years agodisplay milestones that are not marked with a due date as active
James Newton [Thu, 19 Apr 2012 18:24:02 +0000 (13:24 -0500)]
display milestones that are not marked with a due date as active

12 years agoMerge pull request #696 from CodeBlock/patch-1
Dmitriy Zaporozhets [Thu, 19 Apr 2012 11:03:55 +0000 (04:03 -0700)]
Merge pull request #696 from CodeBlock/patch-1

Fix a few grammatical mistakes in profile view.

12 years agoFix a few grammatical mistakes in profile view.
Ricky Elrod [Thu, 19 Apr 2012 11:01:58 +0000 (08:01 -0300)]
Fix a few grammatical mistakes in profile view.

12 years agoMerge pull request #687 from fixe/label-typo
Dmitriy Zaporozhets [Wed, 18 Apr 2012 06:33:15 +0000 (23:33 -0700)]
Merge pull request #687 from fixe/label-typo

Fixed typo in label

12 years agoMerge pull request #686 from fixe/patch-1
Dmitriy Zaporozhets [Wed, 18 Apr 2012 06:32:53 +0000 (23:32 -0700)]
Merge pull request #686 from fixe/patch-1

Fixed typo

12 years agoFixed typo in label
Tiago Ribeiro [Wed, 18 Apr 2012 01:34:14 +0000 (02:34 +0100)]
Fixed typo in label

12 years agoFixed typo
Tiago Ribeiro [Wed, 18 Apr 2012 00:49:02 +0000 (02:49 +0200)]
Fixed typo

12 years agoMR commits suppressed if too many. few icons
Dmitriy Zaporozhets [Tue, 17 Apr 2012 19:08:07 +0000 (22:08 +0300)]
MR commits suppressed if too many. few icons

12 years agoMilestone filter for issues improved
Dmitriy Zaporozhets [Tue, 17 Apr 2012 18:03:01 +0000 (21:03 +0300)]
Milestone filter for issues improved

12 years agofixed app crash on new issue via get
Dmitriy Zaporozhets [Tue, 17 Apr 2012 17:35:27 +0000 (20:35 +0300)]
fixed app crash on new issue via get

12 years ago1. Improved admin -> new project form
Dmitriy Zaporozhets [Tue, 17 Apr 2012 17:27:18 +0000 (20:27 +0300)]
1. Improved admin -> new project form
2. Fixed bug: post-receive file was not added when create project via admin

12 years agoIssues form improved, Show milestone for Issue show
Dmitriy Zaporozhets [Mon, 16 Apr 2012 21:22:59 +0000 (00:22 +0300)]
Issues form improved, Show milestone for Issue show

12 years agoUser blocking improved. Admin area styled
Dmitriy Zaporozhets [Mon, 16 Apr 2012 20:33:03 +0000 (23:33 +0300)]
User blocking improved. Admin area styled

12 years agoCommit header improved. finalize PR 667
Dmitriy Zaporozhets [Sun, 15 Apr 2012 22:10:09 +0000 (01:10 +0300)]
Commit header improved. finalize PR 667

12 years agoMerge branch 'nicer_commit_headers' of https://github.com/arthurschreiber/gitlabhq...
Dmitriy Zaporozhets [Sun, 15 Apr 2012 18:01:35 +0000 (21:01 +0300)]
Merge branch 'nicer_commit_headers' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-nicer_commit_headers

12 years agoChange the design a bit to look more like before.
Arthur Schreiber [Sat, 14 Apr 2012 09:58:43 +0000 (11:58 +0200)]
Change the design a bit to look more like before.

12 years agoMake parent sha links nicer for merge commits.
Arthur Schreiber [Fri, 13 Apr 2012 23:25:01 +0000 (01:25 +0200)]
Make parent sha links nicer for merge commits.

12 years agoNicer commit headers.
Arthur Schreiber [Fri, 13 Apr 2012 22:46:11 +0000 (00:46 +0200)]
Nicer commit headers.

12 years agoremoved old spec
Dmitriy Zaporozhets [Sat, 14 Apr 2012 08:36:53 +0000 (11:36 +0300)]
removed old spec

12 years agoProjects page as dashboard. Old dashboard removed
Dmitriy Zaporozhets [Sat, 14 Apr 2012 08:20:45 +0000 (11:20 +0300)]
Projects page as dashboard. Old dashboard removed

12 years agoSearch improved
Dmitriy Zaporozhets [Sat, 14 Apr 2012 08:16:11 +0000 (11:16 +0300)]
Search improved

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sat, 14 Apr 2012 07:02:04 +0000 (10:02 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agoMerged arthurschreiber:patch-1
Ariejan de Vroom [Fri, 13 Apr 2012 07:28:11 +0000 (09:28 +0200)]
Merged arthurschreiber:patch-1

12 years agoAbility to block user
randx [Fri, 13 Apr 2012 05:12:34 +0000 (08:12 +0300)]
Ability to block user

12 years agoAdd libyaml-dev to the apt-get install string.
Arthur Schreiber [Thu, 12 Apr 2012 16:05:19 +0000 (19:05 +0300)]
Add libyaml-dev to the apt-get install string.

If libyaml headers are not installed, YAML will not be correctly compiled (either not at all, or using Syck instead of Psych).

12 years agorestored dark theme
Dmitriy Zaporozhets [Wed, 11 Apr 2012 21:54:07 +0000 (00:54 +0300)]
restored dark theme

12 years agopreserve for code browse
Dmitriy Zaporozhets [Wed, 11 Apr 2012 20:59:53 +0000 (23:59 +0300)]
preserve for code browse

12 years agofeed few fixes
Dmitriy Zaporozhets [Wed, 11 Apr 2012 20:50:13 +0000 (23:50 +0300)]
feed few fixes

12 years agoMerge pull request #667 from keikubo/master
Dmitriy Zaporozhets [Wed, 11 Apr 2012 20:34:15 +0000 (13:34 -0700)]
Merge pull request #667 from keikubo/master

The indents errors of pre blocks in haml

12 years agobug fixes & bootstrap buttons
Dmitriy Zaporozhets [Wed, 11 Apr 2012 20:32:45 +0000 (23:32 +0300)]
bug fixes & bootstrap buttons

12 years agoRemoved encoding monkey patch
Dmitriy Zaporozhets [Wed, 11 Apr 2012 20:03:56 +0000 (23:03 +0300)]
Removed encoding monkey patch

12 years agobug fix: broken indents fixed in markdown rendered statements
Kei Kubo [Wed, 11 Apr 2012 19:36:52 +0000 (19:36 +0000)]
bug fix: broken indents fixed in markdown rendered statements

12 years agoadded = preserve to some pre statements
Kei Kubo [Wed, 11 Apr 2012 19:13:38 +0000 (19:13 +0000)]
added = preserve to some pre statements

12 years agobug fix: <pre> indent error fixed in projects/empty.html
Kei Kubo [Wed, 11 Apr 2012 17:35:49 +0000 (10:35 -0700)]
bug fix: <pre> indent error fixed in projects/empty.html

12 years agob2 ipad fixed
Dmitriy Zaporozhets [Tue, 10 Apr 2012 18:53:30 +0000 (21:53 +0300)]
b2 ipad fixed

12 years agob2 fixes
Dmitriy Zaporozhets [Tue, 10 Apr 2012 18:39:04 +0000 (21:39 +0300)]
b2 fixes

12 years agobootstrap 2 integration complete.
Dmitriy Zaporozhets [Tue, 10 Apr 2012 17:50:27 +0000 (20:50 +0300)]
bootstrap 2 integration complete.

12 years agoMinor fixes
Dmitriy Zaporozhets [Tue, 10 Apr 2012 17:06:17 +0000 (20:06 +0300)]
Minor fixes

12 years agomigrated to bootstrap 2
randx [Tue, 10 Apr 2012 05:51:08 +0000 (08:51 +0300)]
migrated to bootstrap 2

12 years agofixed tests
Dmitriy Zaporozhets [Sun, 8 Apr 2012 22:29:15 +0000 (01:29 +0300)]
fixed tests

12 years agofirst pack of tests for milestones
Dmitriy Zaporozhets [Sun, 8 Apr 2012 22:01:42 +0000 (01:01 +0300)]
first pack of tests for milestones

12 years agoMilestone basic scaffold
Dmitriy Zaporozhets [Sun, 8 Apr 2012 21:28:58 +0000 (00:28 +0300)]
Milestone basic scaffold

12 years agoDashboard issues/mr pages improved
Dmitriy Zaporozhets [Sat, 7 Apr 2012 21:18:32 +0000 (00:18 +0300)]
Dashboard issues/mr pages improved

12 years agoprojects list on dashboard with commit links
Dmitriy Zaporozhets [Sat, 7 Apr 2012 20:13:18 +0000 (23:13 +0300)]
projects list on dashboard with commit links

12 years agofixed tree hover
Dmitriy Zaporozhets [Sat, 7 Apr 2012 14:30:00 +0000 (17:30 +0300)]
fixed tree hover

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Fri, 6 Apr 2012 22:08:42 +0000 (01:08 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agoMerge pull request #654 from abevoelker/patch-2
Valeriy Sizov [Fri, 6 Apr 2012 18:44:50 +0000 (11:44 -0700)]
Merge pull request #654 from abevoelker/patch-2

Fix install instructions' echo missing -e flag

12 years agoFix install instructions' echo missing -e flag
Abe Voelker [Fri, 6 Apr 2012 16:35:48 +0000 (11:35 -0500)]
Fix install instructions' echo missing -e flag

Needed to expand the \n into a newline. My bad.

12 years agoMerge pull request #653 from dalpo/652-admin_user_path
Dmitriy Zaporozhets [Fri, 6 Apr 2012 10:15:50 +0000 (03:15 -0700)]
Merge pull request #653 from dalpo/652-admin_user_path

admin_user_path correction

12 years agoadmin_user_path correction
Andrea Dal Ponte [Fri, 6 Apr 2012 10:00:13 +0000 (12:00 +0200)]
admin_user_path correction

12 years agotree view pollished
randx [Fri, 6 Apr 2012 05:48:58 +0000 (08:48 +0300)]
tree view pollished

12 years agoincreased image preview size
Dmitriy Zaporozhets [Thu, 5 Apr 2012 22:30:52 +0000 (01:30 +0300)]
increased image preview size

12 years agoFixed devise email_from, reordered initalizers
Dmitriy Zaporozhets [Thu, 5 Apr 2012 22:28:37 +0000 (01:28 +0300)]
Fixed devise email_from, reordered initalizers

12 years agoHandling big commits & big diff
Dmitriy Zaporozhets [Thu, 5 Apr 2012 22:00:15 +0000 (01:00 +0300)]
Handling big commits & big diff

12 years agoFix mysql issue fix broken diff for Merge Request
Dmitriy Zaporozhets [Thu, 5 Apr 2012 21:22:48 +0000 (00:22 +0300)]
Fix mysql issue fix broken diff for Merge Request

12 years agocleanup after prev commit
Dmitriy Zaporozhets [Wed, 4 Apr 2012 22:58:23 +0000 (01:58 +0300)]
cleanup after prev commit

12 years agoBetter encoding handling. Updated grit
Dmitriy Zaporozhets [Wed, 4 Apr 2012 22:51:49 +0000 (01:51 +0300)]
Better encoding handling. Updated grit

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Wed, 4 Apr 2012 17:03:21 +0000 (20:03 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agoMerge pull request #634 from abevoelker/update-init-script
Dmitriy Zaporozhets [Wed, 4 Apr 2012 10:41:20 +0000 (03:41 -0700)]
Merge pull request #634 from abevoelker/update-init-script

Add redis-server init.d dependency - fixes #598

12 years agoFix issues with push 600+ commits. refactored, improved push events
randx [Wed, 4 Apr 2012 04:39:04 +0000 (07:39 +0300)]
Fix issues with push 600+ commits. refactored, improved push events

12 years agorollback to yaml
randx [Tue, 3 Apr 2012 23:59:58 +0000 (02:59 +0300)]
rollback to yaml

12 years agoreverted event data
randx [Tue, 3 Apr 2012 23:59:58 +0000 (02:59 +0300)]
reverted event data

12 years agoMove all serialization to marshall
randx [Tue, 3 Apr 2012 23:49:58 +0000 (02:49 +0300)]
Move all serialization to marshall

12 years agofix compatibility with old events
Dmitriy Zaporozhets [Tue, 3 Apr 2012 23:49:58 +0000 (02:49 +0300)]
fix compatibility with old events

12 years agoGitlabSerialize: cause of invalid yaml in some events we migrate to json serialization
Dmitriy Zaporozhets [Tue, 3 Apr 2012 23:25:33 +0000 (02:25 +0300)]
GitlabSerialize: cause of invalid yaml in some events we migrate to json serialization

12 years agopollished team index
Dmitriy Zaporozhets [Tue, 3 Apr 2012 22:21:31 +0000 (01:21 +0300)]
pollished team index

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 3 Apr 2012 22:03:41 +0000 (01:03 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agogitlab rake tasks refactored
Dmitriy Zaporozhets [Tue, 3 Apr 2012 22:02:54 +0000 (01:02 +0300)]
gitlab rake tasks refactored

12 years agoMerge pull request #639 from denisnovikov/patch/utf8
Dmitriy Zaporozhets [Tue, 3 Apr 2012 17:13:54 +0000 (10:13 -0700)]
Merge pull request #639 from denisnovikov/patch/utf8

Force diff line to UTF-8 encoding - proper fix.

12 years agoForce diff line to UTF-8 encoding - proper fix.
Denis Novikov [Tue, 3 Apr 2012 16:43:07 +0000 (18:43 +0200)]
Force diff line to UTF-8 encoding - proper fix.

12 years agoteam profile restyled
Dmitriy Zaporozhets [Mon, 2 Apr 2012 18:13:44 +0000 (21:13 +0300)]
team profile restyled

12 years agofixed tree view compass
Dmitriy Zaporozhets [Mon, 2 Apr 2012 17:29:39 +0000 (20:29 +0300)]
fixed tree view compass

12 years agoprevent app crash for events without git resources
Dmitriy Zaporozhets [Mon, 2 Apr 2012 16:51:20 +0000 (19:51 +0300)]
prevent app crash for events without git resources

12 years agofixed project spec
Dmitriy Zaporozhets [Mon, 2 Apr 2012 05:50:37 +0000 (08:50 +0300)]
fixed project spec

12 years agoAdd redis-server init.d dependency
Abe Voelker [Sun, 1 Apr 2012 23:57:09 +0000 (18:57 -0500)]
Add redis-server init.d dependency

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sun, 1 Apr 2012 21:25:01 +0000 (00:25 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agoEvents improved & refactored. Dashboard pollished
Dmitriy Zaporozhets [Sun, 1 Apr 2012 21:24:45 +0000 (00:24 +0300)]
Events improved & refactored. Dashboard pollished

12 years agoMerge pull request #631 from abevoelker/move-unicorn-unix-socket
Valeriy Sizov [Sun, 1 Apr 2012 20:51:43 +0000 (13:51 -0700)]
Merge pull request #631 from abevoelker/move-unicorn-unix-socket

Move Unicorn unix socket out of /tmp

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sun, 1 Apr 2012 19:56:31 +0000 (22:56 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agoMove Unicorn unix socket out of /tmp
Abe Voelker [Sun, 1 Apr 2012 19:44:02 +0000 (14:44 -0500)]
Move Unicorn unix socket out of /tmp

12 years agoMerge pull request #629 from abevoelker/patch-1
Valeriy Sizov [Sun, 1 Apr 2012 18:16:38 +0000 (11:16 -0700)]
Merge pull request #629 from abevoelker/patch-1

Fix gl-setup PATH warning when executing gl-system-install.

12 years agoFix gl-setup PATH warning when executing gl-system-install.
Abe Voelker [Sun, 1 Apr 2012 17:58:40 +0000 (12:58 -0500)]
Fix gl-setup PATH warning when executing gl-system-install.

My git user uses bash (so .bash_profile), but I think it should work the same for sh shell.

Full warning message:

                ***** WARNING *****
gl-setup is not in your $PATH.

Since gl-setup MUST be run from the PATH (and not as src/gl-setup or such),
you must fix this before running gl-setup.  The simplest way is to add

    PATH=/home/git/bin:$PATH

to the end of your bashrc or similar file.  You can even simply run that
command manually each time you log in and want to run a gitolite command.

Run /home/git/gitolite/src/gl-system-install -h for a detailed usage message.

12 years agodashboard/projects page project selection ui improved
Dmitriy Zaporozhets [Sat, 31 Mar 2012 21:23:34 +0000 (00:23 +0300)]
dashboard/projects page project selection ui improved

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sat, 31 Mar 2012 12:59:42 +0000 (15:59 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agoEmail link https support
Dmitriy Zaporozhets [Sat, 31 Mar 2012 12:59:06 +0000 (15:59 +0300)]
Email link https support

12 years agoMerge pull request #617 from iamntz/ssh_key_improvements
Dmitriy Zaporozhets [Fri, 30 Mar 2012 16:15:41 +0000 (09:15 -0700)]
Merge pull request #617 from iamntz/ssh_key_improvements

Automagically fills the email on add ssh key page

12 years ago- when you add a new ssh key, the title field automatically fills with the email...
Staicu Ionut [Fri, 30 Mar 2012 15:30:56 +0000 (18:30 +0300)]
- when you add a new ssh key, the title field automatically fills with the email (if is present in the key sting)

12 years agoMerge pull request #614 from jakoch/patch-1
Valeriy Sizov [Fri, 30 Mar 2012 12:15:51 +0000 (05:15 -0700)]
Merge pull request #614 from jakoch/patch-1

added nginx access_log; error_log directives for easier debugging vhost ...

12 years agoadded nginx access_log; error_log directives for easier debugging vhost errors
Jens-André Koch [Fri, 30 Mar 2012 12:12:28 +0000 (15:12 +0300)]
added nginx access_log; error_log directives for easier debugging vhost errors
added proxy_set_header directives to prevent "ssl_error_rx_record_too_long"
added subdomain "gitlab.YOUR_SUBDOMAIN.com" to server_name directive
added "YOUR_SERVER_IP" to listen directive

12 years agoEvent & Wiki models specs
Dmitriy Zaporozhets [Wed, 28 Mar 2012 19:53:45 +0000 (22:53 +0300)]
Event & Wiki models specs

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Wed, 28 Mar 2012 16:31:09 +0000 (19:31 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agoUI improved, .main_box css class for show pages
randx [Wed, 28 Mar 2012 07:46:51 +0000 (10:46 +0300)]
UI improved, .main_box css class for show pages

12 years agoProject model refactored. Modularity gem
randx [Wed, 28 Mar 2012 07:44:51 +0000 (10:44 +0300)]
Project model refactored. Modularity gem

12 years agoAdded info on MySQL; Fixed formatting and language.
Ariejan de Vroom [Wed, 28 Mar 2012 07:07:24 +0000 (10:07 +0300)]
Added info on MySQL; Fixed formatting and language.

12 years agoMerge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Tue, 27 Mar 2012 21:31:22 +0000 (00:31 +0300)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq

12 years agoIssues, Merge Request show page polished. Fixed +n overflow
Dmitriy Zaporozhets [Tue, 27 Mar 2012 21:31:14 +0000 (00:31 +0300)]
Issues, Merge Request show page polished. Fixed +n overflow

12 years agoinstallation guide: change link to script of auto-install
Valery Sizov [Tue, 27 Mar 2012 20:15:09 +0000 (23:15 +0300)]
installation guide: change link to script of auto-install