OSDN Git Service

wvm/gitlab.git
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

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