OSDN Git Service

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

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

12 years agoMerge pull request #585 from patthoyts/pt/omniauth-config
Valeriy Sizov [Tue, 27 Mar 2012 20:13:07 +0000 (13:13 -0700)]
Merge pull request #585 from patthoyts/pt/omniauth-config

Move OmniAuth configuration details into a non-revision controlled file.

12 years agoadded script for auto install
Valery Sizov [Tue, 27 Mar 2012 20:11:14 +0000 (23:11 +0300)]
added script for auto install

12 years agoMerge pull request #586 from patthoyts/pt/ldap-auth-fix
Valeriy Sizov [Tue, 27 Mar 2012 20:09:06 +0000 (13:09 -0700)]
Merge pull request #586 from patthoyts/pt/ldap-auth-fix

Ensure LDAP provided email is always compared case-insensitively.

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Valery Sizov [Tue, 27 Mar 2012 20:04:45 +0000 (23:04 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agofixed yellow background in markdown documents
Valery Sizov [Tue, 27 Mar 2012 20:04:21 +0000 (23:04 +0300)]
fixed yellow background in markdown documents

12 years agoOnly load MySQL2Adapter connection fix is MySQL2 is available.
Ariejan de Vroom [Tue, 27 Mar 2012 13:59:25 +0000 (16:59 +0300)]
Only load MySQL2Adapter connection fix is MySQL2 is available.
Useful for Sqlite or Postgres installations.

12 years agoMerge pull request #603 from yvmarques/patch-1
Ariejan de Vroom [Tue, 27 Mar 2012 13:46:27 +0000 (06:46 -0700)]
Merge pull request #603 from yvmarques/patch-1

Changed for mysql2 adapter

12 years agoChanged for mysql2 adapter
Yvan [Tue, 27 Mar 2012 13:42:23 +0000 (16:42 +0300)]
Changed for mysql2 adapter

12 years agoAdded fix for "MySQL has gone away" errors with Resque workers.
Ariejan de Vroom [Tue, 27 Mar 2012 13:17:23 +0000 (15:17 +0200)]
Added fix for "MySQL has gone away" errors with Resque workers.

12 years agoProject show page polished
Dmitriy Zaporozhets [Mon, 26 Mar 2012 20:11:15 +0000 (23:11 +0300)]
Project show page polished

12 years agoBetter commit show page
Dmitriy Zaporozhets [Mon, 26 Mar 2012 19:41:56 +0000 (22:41 +0300)]
Better commit show page

12 years agoJs refactoring and ajax animation replaced
Dmitriy Zaporozhets [Mon, 26 Mar 2012 18:41:58 +0000 (21:41 +0300)]
Js refactoring and ajax animation replaced

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 26 Mar 2012 17:30:06 +0000 (20:30 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agoMerge pull request #595 from goshakkk/texting-fixes
Dmitriy Zaporozhets [Mon, 26 Mar 2012 09:25:40 +0000 (02:25 -0700)]
Merge pull request #595 from goshakkk/texting-fixes

Texting issues fix

12 years agothere should be no space after '(' and before ')'
Gosha Arinich [Mon, 26 Mar 2012 09:11:02 +0000 (12:11 +0300)]
there should be no space after '(' and before ')'

12 years agofix image width for markdown
randx [Mon, 26 Mar 2012 04:40:51 +0000 (07:40 +0300)]
fix image width for markdown

12 years agoFixed specs. Some css fixes
Dmitriy Zaporozhets [Sun, 25 Mar 2012 16:44:29 +0000 (19:44 +0300)]
Fixed specs. Some css fixes

12 years agoPreparing 591 for merge. Restyled issues & merge requests. Fixed issue edit.
Dmitriy Zaporozhets [Sun, 25 Mar 2012 16:05:24 +0000 (19:05 +0300)]
Preparing 591 for merge. Restyled issues & merge requests. Fixed issue edit.

12 years agoMerge branch 'master' of https://github.com/dubcanada/gitlabhq into dubcanada-master
Dmitriy Zaporozhets [Sun, 25 Mar 2012 14:04:07 +0000 (17:04 +0300)]
Merge branch 'master' of https://github.com/dubcanada/gitlabhq into dubcanada-master

12 years agoMerge pull request #592 from paularmstrong/bug/install-doc
Dmitriy Zaporozhets [Sun, 25 Mar 2012 09:02:16 +0000 (02:02 -0700)]
Merge pull request #592 from paularmstrong/bug/install-doc

Fix installation instructions for running gitlab_status

12 years agoFix instructions for running gitlab_status
Paul Armstrong [Sat, 24 Mar 2012 23:07:21 +0000 (16:07 -0700)]
Fix instructions for running gitlab_status

When running `rake gitlab_status` to check if it's safe to continue on installation in step 4, you need to use `RAILS_ENV=production` or else you will receive an error about "permission denied for user root@localhost..."

12 years agoForgot others for border radius
Steven Verbeek [Sat, 24 Mar 2012 21:31:01 +0000 (18:31 -0300)]
Forgot others for border radius

12 years agoChanged Note to Comment
Steven Verbeek [Sat, 24 Mar 2012 21:19:26 +0000 (18:19 -0300)]
Changed Note to Comment

12 years agoFixed icon, added helper
Steven Verbeek [Sat, 24 Mar 2012 17:42:45 +0000 (14:42 -0300)]
Fixed icon, added helper

12 years agoRemoved thumbs.db
Steven Verbeek [Sat, 24 Mar 2012 17:38:10 +0000 (14:38 -0300)]
Removed thumbs.db

12 years agoFixed line ending issues on windows.
Steven Verbeek [Sat, 24 Mar 2012 17:36:14 +0000 (14:36 -0300)]
Fixed line ending issues on windows.

12 years agoFixed line ending issues on windows.
Steven Verbeek [Sat, 24 Mar 2012 17:01:38 +0000 (14:01 -0300)]
Fixed line ending issues on windows.

12 years agoStarted note attachment changes, and text changes
Steven Verbeek [Sat, 24 Mar 2012 16:57:01 +0000 (13:57 -0300)]
Started note attachment changes, and text changes

12 years agoStarted note attachment changes, and text changes
Steven Verbeek [Sat, 24 Mar 2012 16:53:16 +0000 (13:53 -0300)]
Started note attachment changes, and text changes

12 years agoStarted note attachment changes, and text changes
Steven Verbeek [Sat, 24 Mar 2012 16:40:21 +0000 (13:40 -0300)]
Started note attachment changes, and text changes

12 years agoStarted note attachment changes, and text changes
Steven Verbeek [Sat, 24 Mar 2012 16:30:04 +0000 (13:30 -0300)]
Started note attachment changes, and text changes

12 years agoStarted note attachment changes, and text changes
Steven Verbeek [Sat, 24 Mar 2012 16:26:25 +0000 (13:26 -0300)]
Started note attachment changes, and text changes

12 years agoStarted note attachment changes, and text changes
Steven Verbeek [Sat, 24 Mar 2012 16:19:20 +0000 (13:19 -0300)]
Started note attachment changes, and text changes

12 years agoStarted note attachment changes, and text changes
Steven Verbeek [Sat, 24 Mar 2012 16:08:42 +0000 (13:08 -0300)]
Started note attachment changes, and text changes

12 years agoMerge pull request #588 from tvlooy/patch-2
Ariejan de Vroom [Sat, 24 Mar 2012 09:44:03 +0000 (02:44 -0700)]
Merge pull request #588 from tvlooy/patch-2

See https://github.com/gitlabhq/gitlabhq/issues/572

12 years agoSee https://github.com/gitlabhq/gitlabhq/issues/572
Tom Van Looy [Sat, 24 Mar 2012 07:38:32 +0000 (08:38 +0100)]
See https://github.com/gitlabhq/gitlabhq/issues/572

12 years agomerging upstream changes
Steven Verbeek [Sat, 24 Mar 2012 03:36:54 +0000 (00:36 -0300)]
merging upstream changes

12 years agoImproved profile & team member show
Dmitriy Zaporozhets [Fri, 23 Mar 2012 23:01:36 +0000 (01:01 +0200)]
Improved profile & team member show

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Fri, 23 Mar 2012 21:01:14 +0000 (23:01 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

Conflicts:
resque.sh

12 years agoImproved resque.sh
Dmitriy Zaporozhets [Fri, 23 Mar 2012 21:00:05 +0000 (23:00 +0200)]
Improved resque.sh

12 years agoMove OmniAuth configuration details into a non-revision controlled file.
Pat Thoyts [Wed, 7 Mar 2012 11:16:52 +0000 (11:16 +0000)]
Move OmniAuth configuration details into a non-revision controlled file.

Provide an omniauth.rb.sample file to avoid encouraging end-users to commit
their provider access details (passwords or api tokens) into their git
repositories.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
12 years agoEnsure LDAP provided email is always compared case-insensitively.
Pat Thoyts [Fri, 24 Feb 2012 14:35:44 +0000 (14:35 +0000)]
Ensure LDAP provided email is always compared case-insensitively.

LDAP databases may store email addresses in mixed case so
ensure we only work with a lower case version to avoid missing
a valid account after LDAP login.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
12 years agoMerge pull request #582 from arenard/patch-1
Ariejan de Vroom [Fri, 23 Mar 2012 10:20:49 +0000 (03:20 -0700)]
Merge pull request #582 from arenard/patch-1

Use of -p option of mkdir command to avoid message telling tmp/pids directory already exists...

12 years agoUse of -p option of mkdir command to avoid message telling tmp/pids directory already...
arenard [Fri, 23 Mar 2012 10:18:18 +0000 (11:18 +0100)]
Use of -p option of mkdir command to avoid message telling tmp/pids directory already exists at every GitLab (re)start. It ensures that all directories on the path exists so it can create tmp directory if its not there for some reason.

12 years agoMerge pull request #576 from sxua/master
Ariejan de Vroom [Fri, 23 Mar 2012 08:00:52 +0000 (01:00 -0700)]
Merge pull request #576 from sxua/master

Need to replace If statement with try_files in nginx.conf

12 years agobetter MR list, dashboard pollished v2.3.1
Dmitriy Zaporozhets [Thu, 22 Mar 2012 20:57:04 +0000 (22:57 +0200)]
better MR list, dashboard  pollished

12 years agoRemove button for empty repo. Last push on dashboard. Better notes count indicator...
Dmitriy Zaporozhets [Thu, 22 Mar 2012 20:28:02 +0000 (22:28 +0200)]
Remove button for empty repo. Last push on dashboard. Better notes count indicator for issues

12 years agoFix issues search
Dmitriy Zaporozhets [Thu, 22 Mar 2012 18:09:47 +0000 (20:09 +0200)]
Fix issues search

12 years agoFix form label for ssl requests
Dmitriy Zaporozhets [Thu, 22 Mar 2012 18:02:38 +0000 (20:02 +0200)]
Fix form label for ssl requests

12 years agoreplace if statement with try_files in nginx.conf
Olexandr Skrypnyk [Thu, 22 Mar 2012 13:34:16 +0000 (15:34 +0200)]
replace if statement with try_files in nginx.conf

http://wiki.nginx.org/IfIsEvil

12 years agoPagination for Merge Requests. Fixed for issues
randx [Wed, 21 Mar 2012 22:09:57 +0000 (00:09 +0200)]
Pagination for Merge Requests. Fixed for issues

12 years agoIssues pagination
randx [Wed, 21 Mar 2012 22:09:56 +0000 (00:09 +0200)]
Issues pagination

12 years agoFix db seeds for dev
randx [Wed, 21 Mar 2012 22:09:55 +0000 (00:09 +0200)]
Fix db seeds for dev

12 years agoCHANGELOG, VERSION updated to 2.3
randx [Wed, 21 Mar 2012 22:09:54 +0000 (00:09 +0200)]
CHANGELOG, VERSION updated to 2.3

12 years agodesign improve of form of key
Valery Sizov [Wed, 21 Mar 2012 22:09:53 +0000 (00:09 +0200)]
design improve of form of key

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Valery Sizov [Wed, 21 Mar 2012 22:00:13 +0000 (00:00 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agoimprove how to merge tips
Valery Sizov [Wed, 21 Mar 2012 21:59:12 +0000 (23:59 +0200)]
improve how to merge tips

12 years agoMerge pull request #572 from tvlooy/patch-1
Ariejan de Vroom [Wed, 21 Mar 2012 13:01:33 +0000 (06:01 -0700)]
Merge pull request #572 from tvlooy/patch-1

$ wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz

12 years ago$ wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz
Tom Van Looy [Wed, 21 Mar 2012 12:53:38 +0000 (13:53 +0100)]
$ wget ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz
--2012-03-21 13:52:34--  http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz
Resolving ftp.ruby-lang.org... 221.186.184.68
Connecting to ftp.ruby-lang.org|221.186.184.68|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: unspecified [application/x-tar]
Saving to: `ruby-1.9.2-p290.tar.gz'

    [               <=>                     ] 54,691,840  3.37M/s   in 18s

2012-03-21 13:52:53 (2.85 MB/s) - `ruby-1.9.2-p290.tar.gz' saved [54691840]

[tom.vanlooy@itr232l ~/Desktop]
$ file ruby-1.9.2-p290.tar.gz
ruby-1.9.2-p290.tar.gz: POSIX tar archive (GNU)

12 years agomerging upstream changes
Steven Verbeek [Wed, 21 Mar 2012 03:21:34 +0000 (00:21 -0300)]
merging upstream changes

12 years agoPush events polished v2.3.0
Dmitriy Zaporozhets [Tue, 20 Mar 2012 21:59:35 +0000 (23:59 +0200)]
Push events polished

12 years agomerging upstream changes
Steven Verbeek [Tue, 20 Mar 2012 00:57:29 +0000 (21:57 -0300)]
merging upstream changes

12 years agoFixed tab indent.
Steven Verbeek [Tue, 20 Mar 2012 00:43:25 +0000 (21:43 -0300)]
Fixed tab indent.

12 years agoAdded badge, made the issue list smaller height wise, and moved # NOTES over to ...
Steven Verbeek [Tue, 20 Mar 2012 00:32:08 +0000 (21:32 -0300)]
Added badge, made the issue list smaller height wise, and moved # NOTES over to # comments

12 years agoMerged activities & projects pages v2.3.0pre
Dmitriy Zaporozhets [Mon, 19 Mar 2012 22:05:35 +0000 (00:05 +0200)]
Merged activities & projects pages

12 years agoActivities page added. Dashboard few specs. Preparing for 2.3
Dmitriy Zaporozhets [Mon, 19 Mar 2012 20:52:16 +0000 (22:52 +0200)]
Activities page added. Dashboard few specs. Preparing for 2.3

12 years agoSmall fix.
Steven Verbeek [Sat, 17 Mar 2012 16:13:42 +0000 (13:13 -0300)]
Small fix.

12 years agoFixed code in issue details, changed form description to details.
Steven Verbeek [Sat, 17 Mar 2012 16:02:48 +0000 (13:02 -0300)]
Fixed code in issue details, changed form description to details.

12 years agoFix for readme code being yellow in code blocks (left it yellow outside code blocks)
Steven Verbeek [Sat, 17 Mar 2012 15:49:23 +0000 (12:49 -0300)]
Fix for readme code being yellow in code blocks (left it yellow outside code blocks)

12 years agoFixed row messed up. Started on overall look.
Steven Verbeek [Sat, 17 Mar 2012 06:31:38 +0000 (03:31 -0300)]
Fixed row messed up. Started on overall look.

12 years agoFixed HR
Steven Verbeek [Sat, 17 Mar 2012 05:48:22 +0000 (02:48 -0300)]
Fixed HR

12 years agoFixed css issues with issues :)
Steven Verbeek [Sat, 17 Mar 2012 05:46:47 +0000 (02:46 -0300)]
Fixed css issues with issues :)

12 years agoAdded markdown is enabled.
Steven Verbeek [Sat, 17 Mar 2012 05:24:51 +0000 (02:24 -0300)]
Added markdown is enabled.

12 years agoRe-added back to issues list, but moved it above title. Added css to move issue meta...
Steven Verbeek [Sat, 17 Mar 2012 05:22:12 +0000 (02:22 -0300)]
Re-added back to issues list, but moved it above title. Added css to move issue meta data around.

12 years agoMoved OPEN and removed back link (you can easily click on issues to get to the same...
Steven Verbeek [Sat, 17 Mar 2012 05:17:04 +0000 (02:17 -0300)]
Moved OPEN and removed back link (you can easily click on issues to get to the same spot)

12 years agoFixed markdown.
Steven Verbeek [Sat, 17 Mar 2012 05:13:36 +0000 (02:13 -0300)]
Fixed markdown.

12 years agoMarkdown for issue description, added issue title
Steven Verbeek [Sat, 17 Mar 2012 05:09:16 +0000 (02:09 -0300)]
Markdown for issue description, added issue title