OSDN Git Service

wvm/gitlab.git
12 years agorefactor each_line detect to detect all diff file
Saito [Thu, 1 Dec 2011 07:59:49 +0000 (15:59 +0800)]
refactor each_line detect to detect all diff file

12 years agofix merge request diff
Dmitriy Zaporozhets [Wed, 30 Nov 2011 23:51:16 +0000 (01:51 +0200)]
fix merge request diff

12 years agoline links for commit diff, css fixed for line diff
Dmitriy Zaporozhets [Wed, 30 Nov 2011 23:51:04 +0000 (01:51 +0200)]
line links for commit diff, css fixed for line diff

12 years agorestyle commit show page pt1
Dmitriy Zaporozhets [Wed, 30 Nov 2011 22:24:28 +0000 (00:24 +0200)]
restyle commit show page pt1

12 years agocontent wider + 20px
Dmitriy Zaporozhets [Wed, 30 Nov 2011 21:52:22 +0000 (23:52 +0200)]
content wider + 20px

12 years agonew team memeber selectbox replaced
Dmitriy Zaporozhets [Wed, 30 Nov 2011 21:41:00 +0000 (23:41 +0200)]
new team memeber selectbox replaced

12 years agosome fixes to black colorscheme
Dmitriy Zaporozhets [Wed, 30 Nov 2011 21:25:39 +0000 (23:25 +0200)]
some fixes to black colorscheme

12 years agofix spelling
Dmitriy Zaporozhets [Wed, 30 Nov 2011 19:24:50 +0000 (21:24 +0200)]
fix spelling

12 years agofixed commit date
Dmitriy Zaporozhets [Wed, 30 Nov 2011 19:23:17 +0000 (21:23 +0200)]
fixed commit date

12 years agofix encode bugs on diff not utf-8 encode's code
Saito [Wed, 30 Nov 2011 07:05:37 +0000 (15:05 +0800)]
fix encode bugs on diff not utf-8 encode's code

12 years agocss fixes
Dmitriy Zaporozhets [Tue, 29 Nov 2011 18:10:48 +0000 (20:10 +0200)]
css fixes

12 years agofixed merge request diff
Dmitriy Zaporozhets [Tue, 29 Nov 2011 18:06:37 +0000 (20:06 +0200)]
fixed merge request diff

12 years agofix issue count
Dmitriy Zaporozhets [Mon, 28 Nov 2011 21:34:24 +0000 (23:34 +0200)]
fix issue count

12 years agoIssue sidebar counter should show count of assigned to you
Dmitriy Zaporozhets [Mon, 28 Nov 2011 21:29:46 +0000 (23:29 +0200)]
Issue sidebar counter should show count of assigned to you

12 years agomerge request model specs
Dmitriy Zaporozhets [Mon, 28 Nov 2011 21:24:08 +0000 (23:24 +0200)]
merge request model specs

12 years agofixed link names
Dmitriy Zaporozhets [Mon, 28 Nov 2011 21:14:43 +0000 (23:14 +0200)]
fixed link names

12 years agoMerge branch 'feature/merge_requests'
Dmitriy Zaporozhets [Mon, 28 Nov 2011 20:43:42 +0000 (22:43 +0200)]
Merge branch 'feature/merge_requests'

12 years agomerge requests v1.0
Dmitriy Zaporozhets [Mon, 28 Nov 2011 20:43:20 +0000 (22:43 +0200)]
merge requests v1.0

12 years agomerge requests - tab styleup
Dmitriy Zaporozhets [Mon, 28 Nov 2011 20:38:11 +0000 (22:38 +0200)]
merge requests - tab styleup

12 years agomerge request: notes, diffs, commits
Dmitriy Zaporozhets [Mon, 28 Nov 2011 20:16:57 +0000 (22:16 +0200)]
merge request: notes, diffs, commits

12 years agotests for merge request creation
Dmitriy Zaporozhets [Mon, 28 Nov 2011 18:50:25 +0000 (20:50 +0200)]
tests for merge request creation

12 years agotests for merge request index/show
Dmitriy Zaporozhets [Mon, 28 Nov 2011 18:42:32 +0000 (20:42 +0200)]
tests for merge request index/show

12 years agomerge request list
Dmitriy Zaporozhets [Mon, 28 Nov 2011 18:30:35 +0000 (20:30 +0200)]
merge request list

12 years agoMerge branch 'chardet'
Saito [Mon, 28 Nov 2011 10:25:53 +0000 (18:25 +0800)]
Merge branch 'chardet'

12 years agofix the issue on github #157.
Saito [Mon, 28 Nov 2011 09:46:41 +0000 (17:46 +0800)]
fix the issue on github #157.

directly force_encoding is wrong,
must detect the file string's encoding.
then force_encoding the string to it's encoding.
last convert it to utf-8.

12 years agoadd rchardet19 to detect string encoding
Saito [Mon, 28 Nov 2011 09:34:11 +0000 (17:34 +0800)]
add rchardet19 to detect string encoding

12 years agomerge request entity
Dmitriy Zaporozhets [Mon, 28 Nov 2011 07:39:43 +0000 (09:39 +0200)]
merge request entity

12 years agoremove save_adn_open_page from specs
Dmitriy Zaporozhets [Sun, 27 Nov 2011 15:39:58 +0000 (17:39 +0200)]
remove save_adn_open_page from specs

12 years agoCommit, network graph refactoring
Dmitriy Zaporozhets [Sun, 27 Nov 2011 15:35:49 +0000 (17:35 +0200)]
Commit, network graph refactoring

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sun, 27 Nov 2011 13:14:25 +0000 (15:14 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agoMerge pull request #154 from michaelklishin/patch-1
Dmitriy Zaporozhets [Sun, 27 Nov 2011 13:14:03 +0000 (05:14 -0800)]
Merge pull request #154 from michaelklishin/patch-1

Do not install ruby-debug on travis-ci.org, it only wastes time

12 years agomargin for notes content
Dmitriy Zaporozhets [Sun, 27 Nov 2011 13:12:48 +0000 (15:12 +0200)]
margin for notes content

12 years agoDo not install ruby-debug on travis-ci.org, it only wastes time
Michael Klishin [Sun, 27 Nov 2011 13:11:47 +0000 (17:11 +0400)]
Do not install ruby-debug on travis-ci.org, it only wastes time

See http://about.travis-ci.org/docs/user/languages/ruby/ (the "Exclude non-essential gems like ruby-debug" section) for reasoning.

12 years agoactivities page caching
Dmitriy Zaporozhets [Sun, 27 Nov 2011 12:53:12 +0000 (14:53 +0200)]
activities page caching

12 years agoactivity events reduced to 20 from 40
Dmitriy Zaporozhets [Sun, 27 Nov 2011 08:37:37 +0000 (10:37 +0200)]
activity events reduced to 20 from 40

12 years agoIssue #263 - dont display ajax loader on commit page if commits < limit
Dmitriy Zaporozhets [Sun, 27 Nov 2011 08:36:28 +0000 (10:36 +0200)]
Issue #263 - dont display ajax loader on commit page if commits < limit

12 years agofixed bg for dark file preview
Dmitriy Zaporozhets [Sat, 26 Nov 2011 19:14:50 +0000 (21:14 +0200)]
fixed bg for dark file preview

12 years agocolorscheme for code view
Dmitriy Zaporozhets [Fri, 25 Nov 2011 23:42:42 +0000 (01:42 +0200)]
colorscheme for code view

12 years agoupdated readme v1.2.2
Dmitriy Zaporozhets [Fri, 25 Nov 2011 22:30:51 +0000 (00:30 +0200)]
updated readme

12 years agoup to 1.2.2
Dmitriy Zaporozhets [Fri, 25 Nov 2011 22:24:44 +0000 (00:24 +0200)]
up to 1.2.2

12 years agosnippets restyle
Dmitriy Zaporozhets [Fri, 25 Nov 2011 22:19:14 +0000 (00:19 +0200)]
snippets restyle

12 years agoremoved icons
Dmitriy Zaporozhets [Fri, 25 Nov 2011 21:57:08 +0000 (23:57 +0200)]
removed icons

12 years agofixed sidebar zero count
Dmitriy Zaporozhets [Fri, 25 Nov 2011 21:44:02 +0000 (23:44 +0200)]
fixed sidebar zero count

12 years agoget rid off modal window for issue create/edit
Dmitriy Zaporozhets [Fri, 25 Nov 2011 21:40:12 +0000 (23:40 +0200)]
get rid off modal window for issue create/edit

12 years agoclickable news feed on dashboard
Dmitriy Zaporozhets [Fri, 25 Nov 2011 20:26:44 +0000 (22:26 +0200)]
clickable news feed on dashboard

12 years agoone config file, git options added
Dmitriy Zaporozhets [Fri, 25 Nov 2011 20:18:36 +0000 (22:18 +0200)]
one config file, git options added

12 years agocleaning side menu
Dmitriy Zaporozhets [Fri, 25 Nov 2011 19:56:05 +0000 (21:56 +0200)]
cleaning side menu

12 years agomail host url to email.yml
Dmitriy Zaporozhets [Fri, 25 Nov 2011 18:50:27 +0000 (20:50 +0200)]
mail host url to email.yml

12 years agoMerge branch 'feature/issue_with_branch'
gitlabhq [Fri, 25 Nov 2011 11:13:15 +0000 (06:13 -0500)]
Merge branch 'feature/issue_with_branch'

12 years agoissues style fixed
gitlabhq [Fri, 25 Nov 2011 10:49:28 +0000 (05:49 -0500)]
issues style fixed

12 years agoIssue show page restyled
gitlabhq [Fri, 25 Nov 2011 10:41:30 +0000 (05:41 -0500)]
Issue show page restyled

12 years agoMerge pull request #146 from maknoll/master
Dmitriy Zaporozhets [Fri, 25 Nov 2011 00:04:34 +0000 (16:04 -0800)]
Merge pull request #146 from maknoll/master

link "GITLAB" logo to root_url instead of '/'

12 years agoFixes issue with logo linking to the server root, instead of the app root.
Martin Knoll [Fri, 25 Nov 2011 00:01:58 +0000 (01:01 +0100)]
Fixes issue with logo linking to the server root, instead of the app root.

If using multiple Rails apps in subfolders, the upper left "GITLAB" button links to '/' and thats kinda wrong.
This fix creates a link to the root_url instead, which works in every case.

12 years agoMerge pull request #142 from shaneog/master
Dmitriy Zaporozhets [Thu, 24 Nov 2011 17:35:55 +0000 (09:35 -0800)]
Merge pull request #142 from shaneog/master

Use HTTPS protocol in Gemfile

12 years agoMerge pull request #144 from nono/patch-1
Dmitriy Zaporozhets [Thu, 24 Nov 2011 17:35:32 +0000 (09:35 -0800)]
Merge pull request #144 from nono/patch-1

Don't install development and test gems in production

12 years agoissue show finished
gitlabhq [Thu, 24 Nov 2011 16:47:27 +0000 (11:47 -0500)]
issue show finished

12 years agoissue message output
gitlabhq [Thu, 24 Nov 2011 15:15:30 +0000 (10:15 -0500)]
issue message output

12 years agoability to attach branch to issue
gitlabhq [Thu, 24 Nov 2011 13:08:20 +0000 (08:08 -0500)]
ability to attach branch to issue

12 years agoDon't install development and test gems in production
Bruno Michel [Thu, 24 Nov 2011 11:51:32 +0000 (12:51 +0100)]
Don't install development and test gems in production

12 years agoremoved activities page cache cause some bugs
Dmitriy Zaporozhets [Wed, 23 Nov 2011 20:12:36 +0000 (22:12 +0200)]
removed activities page cache cause some bugs

12 years agoUse HTTPS Protocol in Gemfile
Shane O'Grady [Wed, 23 Nov 2011 12:27:06 +0000 (12:27 +0000)]
Use HTTPS Protocol in Gemfile

Switch to the https protocol in the Gemfile & Gemfile.lock since the
git protocol is sometimes blocked by firewalls (and is not easily proxied)

12 years agoMerge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Tue, 22 Nov 2011 21:52:15 +0000 (23:52 +0200)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq

12 years ago[#169] – Move email 'from' & 'host' settings to config file
Valery Sizov [Tue, 22 Nov 2011 21:36:14 +0000 (23:36 +0200)]
[#169] – Move email 'from' & 'host' settings to config file

12 years agoMerge branch 'master' of dev.gitlabhq.com:gitlabhq v1.2.1
Dmitriy Zaporozhets [Tue, 22 Nov 2011 21:15:09 +0000 (23:15 +0200)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq

12 years ago[#243] – When user adds first key the add a key message should go away
Valery Sizov [Tue, 22 Nov 2011 20:26:07 +0000 (22:26 +0200)]
[#243] – When user adds first key the add a key message should go away

12 years ago[#187] First time user try access gitosis
Valery Sizov [Tue, 22 Nov 2011 20:11:49 +0000 (22:11 +0200)]
[#187] First time user try access gitosis

12 years agofixd key length
Valery Sizov [Tue, 22 Nov 2011 19:56:22 +0000 (21:56 +0200)]
fixd key length

12 years agolil style fixes v1.2.0
Dmitriy Zaporozhets [Tue, 22 Nov 2011 17:57:25 +0000 (19:57 +0200)]
lil style fixes

12 years ago3 events on dashboard, fixed issue gl#250
Dmitriy Zaporozhets [Tue, 22 Nov 2011 17:54:36 +0000 (19:54 +0200)]
3 events on dashboard, fixed issue gl#250

12 years agofixed min height for menu v1.2.0pre
gitlabhq [Tue, 22 Nov 2011 14:03:27 +0000 (09:03 -0500)]
fixed min height for menu

12 years agofix dashboard test
gitlabhq [Tue, 22 Nov 2011 14:01:53 +0000 (09:01 -0500)]
fix dashboard test

12 years agodashboard replaced [event] by tag
gitlabhq [Tue, 22 Nov 2011 13:33:42 +0000 (08:33 -0500)]
dashboard replaced [event] by tag

12 years ago#222
gitlabhq [Tue, 22 Nov 2011 13:26:53 +0000 (08:26 -0500)]
#222

12 years agorestyled user profile
gitlabhq [Tue, 22 Nov 2011 13:14:23 +0000 (08:14 -0500)]
restyled user profile

12 years agofile name overflow fixed
gitlabhq [Tue, 22 Nov 2011 12:50:47 +0000 (07:50 -0500)]
file name overflow fixed

12 years agofile code view restyled
gitlabhq [Tue, 22 Nov 2011 11:59:20 +0000 (06:59 -0500)]
file code view restyled

12 years agofix specs
Saito [Tue, 22 Nov 2011 07:55:01 +0000 (15:55 +0800)]
fix specs

12 years agobutton common style + flash messages fix
gitlabhq [Mon, 21 Nov 2011 07:26:10 +0000 (02:26 -0500)]
button common style + flash messages fix

12 years agocommit restyle
gitlabhq [Mon, 21 Nov 2011 07:16:10 +0000 (02:16 -0500)]
commit restyle

12 years agoref controller refactored
gitlabhq [Mon, 21 Nov 2011 06:16:10 +0000 (01:16 -0500)]
ref controller refactored

12 years agodecorators & tree model
Dmitriy Zaporozhets [Sun, 20 Nov 2011 20:32:12 +0000 (22:32 +0200)]
decorators & tree model

12 years agofixed flash container
Dmitriy Zaporozhets [Sun, 20 Nov 2011 18:30:00 +0000 (20:30 +0200)]
fixed flash container

12 years agocahngelog updated
Dmitriy Zaporozhets [Sun, 20 Nov 2011 18:16:43 +0000 (20:16 +0200)]
cahngelog updated

12 years agofixed test
Dmitriy Zaporozhets [Sat, 19 Nov 2011 09:22:52 +0000 (11:22 +0200)]
fixed test

12 years agoMerge pull request #131 from randaalex/admin-panel-disign
Dmitriy Zaporozhets [Sat, 19 Nov 2011 09:12:34 +0000 (01:12 -0800)]
Merge pull request #131 from randaalex/admin-panel-disign

The simple update of design admin panel

12 years agochanging admin disign for userss update
Alexander Randa [Fri, 18 Nov 2011 21:33:10 +0000 (00:33 +0300)]
changing admin disign for userss update

12 years agochanging admin disign for projects update
Alexander Randa [Fri, 18 Nov 2011 21:32:26 +0000 (00:32 +0300)]
changing admin disign for projects update

12 years agoadmin button style update
Alexander Randa [Fri, 18 Nov 2011 21:31:06 +0000 (00:31 +0300)]
admin button style update

12 years agochanging admin disign for users finish
Alexander Randa [Fri, 18 Nov 2011 20:55:13 +0000 (23:55 +0300)]
changing admin disign for users finish

12 years agochanging admin disign for projects finish
Alexander Randa [Fri, 18 Nov 2011 20:54:56 +0000 (23:54 +0300)]
changing admin disign for projects finish

12 years agochanget button disign
Alexander Randa [Fri, 18 Nov 2011 20:54:06 +0000 (23:54 +0300)]
changet button disign

12 years agotable header align bugfix
Alexander Randa [Fri, 18 Nov 2011 19:19:55 +0000 (22:19 +0300)]
table header align bugfix

12 years agodisabled empty notice
Alexander Randa [Fri, 18 Nov 2011 19:10:07 +0000 (22:10 +0300)]
disabled empty notice

12 years agoMerge branch 'master' of https://github.com/gitlabhq/gitlabhq into admin-panel-disign
user [Fri, 18 Nov 2011 18:31:56 +0000 (21:31 +0300)]
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq into admin-panel-disign

12 years agorestore the rvmrc
Saito [Fri, 18 Nov 2011 13:34:36 +0000 (21:34 +0800)]
restore the rvmrc

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Saito [Fri, 18 Nov 2011 12:58:25 +0000 (20:58 +0800)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agoMerge branch 'master' of dev.gitlabhq.com:gitlabhq
Saito [Fri, 18 Nov 2011 12:20:24 +0000 (20:20 +0800)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq

12 years agofix diff bug with utf-8
Saito [Fri, 18 Nov 2011 12:16:59 +0000 (20:16 +0800)]
fix diff bug with utf-8

12 years agofix diff bug
Saito [Fri, 18 Nov 2011 11:48:23 +0000 (19:48 +0800)]
fix diff bug

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
gitlabhq [Fri, 18 Nov 2011 09:18:26 +0000 (04:18 -0500)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq