OSDN Git Service

wvm/gitlab.git
11 years agoReplace page_title with page-title. Correct margin for some blocks/layouts
Dmitriy Zaporozhets [Sat, 13 Jul 2013 05:45:48 +0000 (08:45 +0300)]
Replace page_title with page-title. Correct margin for some blocks/layouts

11 years agoReduce top margin for commit show page box
Dmitriy Zaporozhets [Fri, 12 Jul 2013 18:56:03 +0000 (21:56 +0300)]
Reduce top margin for commit show page box

11 years agoREmove duplicating search on dashboard issues/mr
Dmitriy Zaporozhets [Fri, 12 Jul 2013 18:49:03 +0000 (21:49 +0300)]
REmove duplicating search on dashboard issues/mr

11 years agoFix Help#web_hooks page
Dmitriy Zaporozhets [Fri, 12 Jul 2013 18:23:56 +0000 (21:23 +0300)]
Fix Help#web_hooks page

11 years agoReduce padding for dashboard elements
Dmitriy Zaporozhets [Fri, 12 Jul 2013 16:15:49 +0000 (19:15 +0300)]
Reduce padding for dashboard elements

11 years agoRename Group#people to Group#members
Dmitriy Zaporozhets [Fri, 12 Jul 2013 16:01:39 +0000 (19:01 +0300)]
Rename Group#people to Group#members

11 years agoAdd group button at Profile#groups page
Dmitriy Zaporozhets [Fri, 12 Jul 2013 15:29:39 +0000 (18:29 +0300)]
Add group button at Profile#groups page

11 years agoAbility to leave group from profile area
Dmitriy Zaporozhets [Fri, 12 Jul 2013 15:22:03 +0000 (18:22 +0300)]
Ability to leave group from profile area

11 years agoUpdate schema with snippet content size
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:18:43 +0000 (16:18 +0300)]
Update schema with snippet content size

11 years agoMerge branch '6-0-dev' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:17:25 +0000 (13:17 +0000)]
Merge branch '6-0-dev' of /home/git/repositories/gitlab/gitlabhq

11 years agoMerge branch 'master' into 6-0-dev
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:16:20 +0000 (16:16 +0300)]
Merge branch 'master' into 6-0-dev

Conflicts:
VERSION

11 years ago5.4.0 is rc1
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:12:23 +0000 (16:12 +0300)]
5.4.0 is rc1

11 years agoUpdate CHANGELOG
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:11:45 +0000 (16:11 +0300)]
Update CHANGELOG

11 years agoMerge pull request #4324 from axilleas/initd_script
Dmitriy Zaporozhets [Fri, 12 Jul 2013 12:45:22 +0000 (05:45 -0700)]
Merge pull request #4324 from axilleas/initd_script

Removal of gitlab.socket should be in stop function too. Fix #4313

11 years agoMerge branch 'master' into 6-0-dev
Dmitriy Zaporozhets [Fri, 12 Jul 2013 11:42:35 +0000 (14:42 +0300)]
Merge branch 'master' into 6-0-dev

11 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Fri, 12 Jul 2013 11:40:47 +0000 (14:40 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

11 years agoFix issues 500 if milestone id exists but milestone is not
Dmitriy Zaporozhets [Fri, 12 Jul 2013 11:40:27 +0000 (14:40 +0300)]
Fix issues 500 if milestone id exists but milestone is not

11 years agoMerge pull request #4533 from babatakao/patch-2
Yves Senn [Fri, 12 Jul 2013 09:49:07 +0000 (02:49 -0700)]
Merge pull request #4533 from babatakao/patch-2

Fix typo.

11 years agoRemoval of gitlab.socket should be in stop function too. Fix #4313
Axilleas Pipinellis [Mon, 17 Jun 2013 08:44:33 +0000 (11:44 +0300)]
Removal of gitlab.socket should be in stop function too. Fix #4313

11 years agoFix typo.
Takao Baba [Fri, 12 Jul 2013 08:44:57 +0000 (17:44 +0900)]
Fix typo.

11 years agoMerge pull request #3993 from bke-drewb/3599
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:54:15 +0000 (09:54 -0700)]
Merge pull request #3993 from bke-drewb/3599

Issue 3599: Add snippets_enabled flag to projects for API

11 years agoMerge pull request #4264 from andrewwutw/fix-postgresql-restore
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:52:43 +0000 (09:52 -0700)]
Merge pull request #4264 from andrewwutw/fix-postgresql-restore

Fix PostgreSQL database restoration problem (#4217)

11 years agoMerge pull request #4282 from bke-drewb/3904
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:50:21 +0000 (09:50 -0700)]
Merge pull request #4282 from bke-drewb/3904

Increase snippet content column size.

11 years agoMerge pull request #4297 from jdurand/patch-1
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:39:37 +0000 (09:39 -0700)]
Merge pull request #4297 from jdurand/patch-1

Update api.js.coffee

11 years agoMerge pull request #4353 from dirker/allow-import-via-git-protocol
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:24:19 +0000 (09:24 -0700)]
Merge pull request #4353 from dirker/allow-import-via-git-protocol

project: allow import via git:// url

11 years agoMerge pull request #4398 from Razer6/remove_gitolite_check
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:23:21 +0000 (09:23 -0700)]
Merge pull request #4398 from Razer6/remove_gitolite_check

Remove gitolite repo check for import script

11 years agoMerge pull request #4502 from wuwx/patch-1
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:21:53 +0000 (09:21 -0700)]
Merge pull request #4502 from wuwx/patch-1

fix bug when project named: mediawiki

11 years agoMerge pull request #4528 from akiva/master
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:20:46 +0000 (09:20 -0700)]
Merge pull request #4528 from akiva/master

Allow SSH keys to be of type ecdsa rather than only rsa and dsa (which are slower, older, and weaker)

11 years agoOpen note image attachment in new tab
Dmitriy Zaporozhets [Thu, 11 Jul 2013 06:19:19 +0000 (09:19 +0300)]
Open note image attachment in new tab

11 years agoAllow ecdsa SSH keys
Akiva Levy [Wed, 10 Jul 2013 22:19:52 +0000 (15:19 -0700)]
Allow ecdsa SSH keys

Update app/models/key.rb to permit SSH keys of type ecdsa rather than forcing dsa and rsa algorithms.

11 years agoFix multiple trigger on button attachment
Dmitriy Zaporozhets [Wed, 10 Jul 2013 16:29:54 +0000 (19:29 +0300)]
Fix multiple trigger on button attachment

11 years agoRemove randomly failing test
Dmitriy Zaporozhets [Wed, 10 Jul 2013 16:09:48 +0000 (19:09 +0300)]
Remove randomly failing test

11 years agoRemove randomly failing test
Dmitriy Zaporozhets [Wed, 10 Jul 2013 16:09:48 +0000 (19:09 +0300)]
Remove randomly failing test

11 years agoMerge branch 'master' into 6-0-dev
Dmitriy Zaporozhets [Wed, 10 Jul 2013 11:03:00 +0000 (14:03 +0300)]
Merge branch 'master' into 6-0-dev

Conflicts:
CHANGELOG
VERSION
app/views/admin/teams/projects/new.html.haml
app/views/projects/teams/available.html.haml
doc/install/installation.md

11 years agoMerge pull request #4510 from Razer6/fix_not_found_lexers
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:58:41 +0000 (03:58 -0700)]
Merge pull request #4510 from Razer6/fix_not_found_lexers

Fix Pygments 500 error if lexer not found by name

11 years agoMerge pull request #4511 from yuters/patch-3
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:56:51 +0000 (03:56 -0700)]
Merge pull request #4511 from yuters/patch-3

UI : navbar tooltip position fix when "loading" appears.

11 years agoMerge pull request #4515 from amacarthur/fork-admin
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:54:58 +0000 (03:54 -0700)]
Merge pull request #4515 from amacarthur/fork-admin

Additon of apis for fork administration.

11 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:49:29 +0000 (13:49 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

11 years agoSanitize user attrs on model level
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:48:03 +0000 (13:48 +0300)]
Sanitize user attrs on model level

11 years agoSanitize user attrs on model level
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:48:03 +0000 (13:48 +0300)]
Sanitize user attrs on model level

11 years agoMerge pull request #4519 from kwongius/team-assignment-text
Yves Senn [Tue, 9 Jul 2013 18:21:18 +0000 (11:21 -0700)]
Merge pull request #4519 from kwongius/team-assignment-text

Fix header text for setting greatest team access to a project

11 years agoCleaner dashboard sidebar
Dmitriy Zaporozhets [Tue, 9 Jul 2013 17:52:06 +0000 (20:52 +0300)]
Cleaner dashboard sidebar

11 years agoFix User#can_create_project?
Dmitriy Zaporozhets [Tue, 9 Jul 2013 17:51:49 +0000 (20:51 +0300)]
Fix User#can_create_project?

11 years agoFix header text for setting greatest team access to a project
Kevin Wong [Tue, 9 Jul 2013 16:42:35 +0000 (10:42 -0600)]
Fix header text for setting greatest team access to a project

11 years agoExtend shortcuts list modal. Mention it at help page
Dmitriy Zaporozhets [Tue, 9 Jul 2013 15:34:44 +0000 (18:34 +0300)]
Extend shortcuts list modal. Mention it at help page

11 years agoBetter control placement on project page
Dmitriy Zaporozhets [Tue, 9 Jul 2013 14:44:35 +0000 (17:44 +0300)]
Better control placement on project page

11 years agoMore info (like 10 branches, 5 tags) at project show page
Dmitriy Zaporozhets [Tue, 9 Jul 2013 07:44:47 +0000 (10:44 +0300)]
More info (like 10 branches, 5 tags) at project show page

11 years agoAdditon of apis for fork administration.
Angus MacArthur [Thu, 27 Jun 2013 21:49:26 +0000 (17:49 -0400)]
Additon of apis for fork administration.

Added ability to add and remove the forked from/to relatioinship
between existing repos.

11 years agoMerge branch 'change-to-default-installer' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 8 Jul 2013 17:36:21 +0000 (17:36 +0000)]
Merge branch 'change-to-default-installer' of /home/git/repositories/gitlab/gitlabhq

11 years agoCache MR diffs result. Improve diff output
Dmitriy Zaporozhets [Mon, 8 Jul 2013 17:12:35 +0000 (20:12 +0300)]
Cache MR diffs result. Improve diff output

11 years agoUse default system editor.
Sytse Sijbrandij [Mon, 8 Jul 2013 16:52:10 +0000 (18:52 +0200)]
Use default system editor.

11 years agoFix unicorn init and config
Dmitriy Zaporozhets [Mon, 8 Jul 2013 16:28:59 +0000 (19:28 +0300)]
Fix unicorn init and config

11 years agoinit.d script for unicorn
Dmitriy Zaporozhets [Mon, 8 Jul 2013 15:28:40 +0000 (18:28 +0300)]
init.d script for unicorn

11 years agoDisable threadsafety
Dmitriy Zaporozhets [Mon, 8 Jul 2013 15:24:02 +0000 (18:24 +0300)]
Disable threadsafety

11 years agoMilestone page: reduce truncate length to prevent issue title overflow
Dmitriy Zaporozhets [Mon, 8 Jul 2013 13:05:09 +0000 (16:05 +0300)]
Milestone page: reduce truncate length to prevent issue title overflow

11 years agoAdded new entries to changelog. Version up to 5.4.0.pre
Dmitriy Zaporozhets [Mon, 8 Jul 2013 10:59:56 +0000 (13:59 +0300)]
Added new entries to changelog. Version up to 5.4.0.pre

11 years agoMerge pull request #4508 from Razer6/fix_broken_api_links
Dmitriy Zaporozhets [Mon, 8 Jul 2013 10:22:12 +0000 (03:22 -0700)]
Merge pull request #4508 from Razer6/fix_broken_api_links

Fix broken API links, fixes #4463

11 years agoMerge branch 'master' into 6-0-dev
Dmitriy Zaporozhets [Mon, 8 Jul 2013 06:50:10 +0000 (09:50 +0300)]
Merge branch 'master' into 6-0-dev

Conflicts:
Gemfile
Gemfile.lock

11 years agoAdd suppoort of unicorn and fog gems
Dmitriy Zaporozhets [Mon, 8 Jul 2013 06:47:31 +0000 (09:47 +0300)]
Add suppoort of unicorn and fog gems

11 years agoMerge branch 'rename-support-forum-to-mailing-list' of /home/git/repositories/gitlab...
Dmitriy Zaporozhets [Mon, 8 Jul 2013 06:29:14 +0000 (06:29 +0000)]
Merge branch 'rename-support-forum-to-mailing-list' of /home/git/repositories/gitlab/gitlabhq

11 years agocleanup puma config a bit
Dmitriy Zaporozhets [Mon, 8 Jul 2013 04:55:16 +0000 (07:55 +0300)]
cleanup puma config a bit

11 years agoPuma to 2.3.1
Dmitriy Zaporozhets [Mon, 8 Jul 2013 04:38:19 +0000 (07:38 +0300)]
Puma to 2.3.1

11 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sun, 7 Jul 2013 21:22:21 +0000 (00:22 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

11 years agonavbar tooltip position fix when "loading" appears.
Martin Bastien [Sun, 7 Jul 2013 17:30:29 +0000 (13:30 -0400)]
navbar tooltip position fix when "loading" appears.

11 years agoFix Pygments 500 error if lexer not found by name. Use first alias instead. fixes...
Robert Schilling [Sun, 7 Jul 2013 17:00:07 +0000 (19:00 +0200)]
Fix Pygments 500 error if lexer not found by name. Use first alias instead. fixes #4473, #4451

11 years agoMerge pull request #4509 from bbodenmiller/cont-updates
Yves Senn [Sun, 7 Jul 2013 11:49:28 +0000 (04:49 -0700)]
Merge pull request #4509 from bbodenmiller/cont-updates

minor contributing guide updates

11 years agominor contributing guide updates
Ben Bodenmiller [Sun, 7 Jul 2013 11:46:37 +0000 (04:46 -0700)]
minor contributing guide updates

* issues & pr in English
* appropriate language
* typo & format fix
* not catch all pull request
* update changelog

11 years agoFix broken API links, fixes #4463
Robert Schilling [Sun, 7 Jul 2013 10:35:37 +0000 (12:35 +0200)]
Fix broken API links, fixes #4463

11 years agoRename support forum to mailing list to prevent duplication on community page of...
Sytse Sijbrandij [Sun, 7 Jul 2013 09:30:31 +0000 (11:30 +0200)]
Rename support forum to mailing list to prevent duplication on community page of GitLab.org.

11 years agoMerge pull request #4505 from m4tthumphrey/patch-1
Dmitriy Zaporozhets [Sat, 6 Jul 2013 09:38:04 +0000 (02:38 -0700)]
Merge pull request #4505 from m4tthumphrey/patch-1

Added client list to API doc

11 years agoAdded client list to API doc
Matt Humphrey [Sat, 6 Jul 2013 09:14:06 +0000 (10:14 +0100)]
Added client list to API doc

11 years agoUpdate puma
Dmitriy Zaporozhets [Sat, 6 Jul 2013 09:13:28 +0000 (12:13 +0300)]
Update puma

11 years agodocs to ruby 2.0
Dmitriy Zaporozhets [Sat, 6 Jul 2013 07:59:00 +0000 (10:59 +0300)]
docs to ruby 2.0

11 years agoFix commit pagination
Dmitriy Zaporozhets [Sat, 6 Jul 2013 07:58:33 +0000 (10:58 +0300)]
Fix commit pagination

11 years agofix bug when project named: mediawiki
wuweixin [Sat, 6 Jul 2013 01:31:56 +0000 (09:31 +0800)]
fix bug when project named: mediawiki

mediawiki.wiki.git
mediawiki.git

/.wiki$/ match awiki, so when your project named mediawiki
it will be find project named: "medi"

use /\.wiki$/ fix this bug

11 years agoFix shortcuts popup
Dmitriy Zaporozhets [Fri, 5 Jul 2013 12:19:31 +0000 (15:19 +0300)]
Fix shortcuts popup

11 years agoMinor UI improve for dashboard events
Dmitriy Zaporozhets [Thu, 4 Jul 2013 14:10:34 +0000 (17:10 +0300)]
Minor UI improve for dashboard events

11 years agoDiscover default branch on project creationg
Dmitriy Zaporozhets [Thu, 4 Jul 2013 11:32:02 +0000 (14:32 +0300)]
Discover default branch on project creationg

11 years agoMerge pull request #4476 from tstone2077/master
Yves Senn [Thu, 4 Jul 2013 11:28:53 +0000 (04:28 -0700)]
Merge pull request #4476 from tstone2077/master

Updating documentation to reflect #3836 (resolving #4443)

11 years agoMerge branch 'puma_cluster_recommendation' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 4 Jul 2013 11:08:33 +0000 (11:08 +0000)]
Merge branch 'puma_cluster_recommendation' of /home/git/repositories/gitlab/gitlabhq

11 years agoAdd cluster mode instructions to puma.rb.example
Jacob Vosmaer [Thu, 4 Jul 2013 09:09:19 +0000 (11:09 +0200)]
Add cluster mode instructions to puma.rb.example

11 years agoMerge pull request #4484 from Razer6/add_services_to_blacklist
Dmitriy Zaporozhets [Wed, 3 Jul 2013 19:03:39 +0000 (12:03 -0700)]
Merge pull request #4484 from Razer6/add_services_to_blacklist

Add 'services' to path blacklist

11 years agoMerge pull request #4488 from dekimsey/patch-1
Yves Senn [Wed, 3 Jul 2013 17:43:50 +0000 (10:43 -0700)]
Merge pull request #4488 from dekimsey/patch-1

Fix misspelling in social accounts tip

11 years agoFix misspelling in social accounts tip
dekimsey [Wed, 3 Jul 2013 17:34:23 +0000 (13:34 -0400)]
Fix misspelling in social accounts tip

11 years agogroup filter from dashboard. Design improvements of dashboard
Dmitriy Zaporozhets [Wed, 3 Jul 2013 17:10:27 +0000 (20:10 +0300)]
group filter from dashboard. Design improvements of dashboard

11 years agoAdd 'services' to path blacklist, fixes #4470
Robert Schilling [Wed, 3 Jul 2013 10:57:35 +0000 (12:57 +0200)]
Add 'services' to path blacklist, fixes #4470

11 years agoMerge pull request #4482 from kivlor/patch-1
Yves Senn [Wed, 3 Jul 2013 07:00:14 +0000 (00:00 -0700)]
Merge pull request #4482 from kivlor/patch-1

move 'make config/database.yml readable to git only' instruction

11 years agomove 'make config/database.yml readable to git only' instruction
Andrew Gallagher [Wed, 3 Jul 2013 05:15:50 +0000 (15:15 +1000)]
move 'make config/database.yml readable to git only' instruction

I've moved the instruction in question to the the
'Configure GitLab DB settings'. Can't change permission to a file that doesn't already exist :wink:

11 years agoPrevent tree log crash if commit missing
Dmitriy Zaporozhets [Tue, 2 Jul 2013 11:26:13 +0000 (14:26 +0300)]
Prevent tree log crash if commit missing

11 years agoWork on themes a bit
Dmitriy Zaporozhets [Tue, 2 Jul 2013 11:06:25 +0000 (14:06 +0300)]
Work on themes a bit

11 years agoMerge branch 'master' into 6-0-dev
Dmitriy Zaporozhets [Tue, 2 Jul 2013 08:47:09 +0000 (11:47 +0300)]
Merge branch 'master' into 6-0-dev

Conflicts:
app/views/dashboard/projects.html.haml
app/views/layouts/_head_panel.html.haml
config/routes.rb

11 years agoMerge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 2 Jul 2013 08:43:40 +0000 (08:43 +0000)]
Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq

11 years agoFix header avatar
Dmitriy Zaporozhets [Tue, 2 Jul 2013 08:42:39 +0000 (11:42 +0300)]
Fix header avatar

11 years agoMerge pull request #4440 from jackbot/editable-notes
Dmitriy Zaporozhets [Tue, 2 Jul 2013 08:41:28 +0000 (01:41 -0700)]
Merge pull request #4440 from jackbot/editable-notes

Editable notes

11 years agoWarn that relative URL's are unsupported
Jacob Vosmaer [Tue, 2 Jul 2013 08:27:51 +0000 (10:27 +0200)]
Warn that relative URL's are unsupported

11 years agoUpdating documentation to reflect #3836 (resolving #4443)
GitLab [Tue, 2 Jul 2013 02:14:39 +0000 (21:14 -0500)]
Updating documentation to reflect #3836 (resolving #4443)

11 years agoFix error when reassign issue/merge_request from non-assigned. Fixes #3201
Dmitriy Zaporozhets [Mon, 1 Jul 2013 16:01:19 +0000 (19:01 +0300)]
Fix error when reassign issue/merge_request from non-assigned. Fixes #3201

11 years agoMerge branch 'feature/shortcuts' of /home/git/repositories/gitlab/gitlabhq into 6...
Dmitriy Zaporozhets [Mon, 1 Jul 2013 15:43:35 +0000 (15:43 +0000)]
Merge branch 'feature/shortcuts' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev

11 years agoAdd editable notes feature
Jack Weeden [Tue, 25 Jun 2013 22:46:07 +0000 (23:46 +0100)]
Add editable notes feature

11 years agoChanged 'javascript:;' links to '#'
Jack Weeden [Sun, 30 Jun 2013 16:44:59 +0000 (17:44 +0100)]
Changed 'javascript:;' links to '#'