OSDN Git Service

wvm/gitlab.git
11 years agoFix errors during backup task. Fix #3785
Axilleas Pipinellis [Tue, 7 May 2013 06:14:03 +0000 (09:14 +0300)]
Fix errors during backup task. Fix #3785

By default there is no public/uploads directory when no attachments
are uploaded. Prompt users to create the uploads directory during
install otherwise the backup task will fail.

Place mysqldump args in single quotes to avoid error if password
contains special characters.

Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
11 years agoMerge pull request #3837 from majjacz/patch-1
Dmitriy Zaporozhets [Mon, 6 May 2013 06:43:12 +0000 (23:43 -0700)]
Merge pull request #3837 from majjacz/patch-1

Changed forgotten unicorn to puma in the init script

11 years agoMerge pull request #3841 from falk/master
Dmitriy Zaporozhets [Mon, 6 May 2013 06:42:42 +0000 (23:42 -0700)]
Merge pull request #3841 from falk/master

Remove 2000 char limit on issue description

11 years agoRemove 2000 char limit on issue description textarea
falk [Sun, 5 May 2013 13:54:22 +0000 (15:54 +0200)]
Remove 2000 char limit on issue description textarea

11 years agoAdd smtp_settings sample
Dmitriy Zaporozhets [Sun, 5 May 2013 09:48:32 +0000 (12:48 +0300)]
Add smtp_settings sample

11 years agoChanged forgotten unicorn to puma in the init script
majjacz [Sat, 4 May 2013 19:39:53 +0000 (21:39 +0200)]
Changed forgotten unicorn to puma in the init script

11 years agoReorder buttons on clone panel of project
Dmitriy Zaporozhets [Fri, 3 May 2013 21:08:49 +0000 (00:08 +0300)]
Reorder buttons on clone panel of project

11 years agoMerge pull request #3829 from amacarthur/ruby2-fork-fix
Dmitriy Zaporozhets [Fri, 3 May 2013 19:56:00 +0000 (12:56 -0700)]
Merge pull request #3829 from amacarthur/ruby2-fork-fix

fork failing when calling initialize_dup

11 years agofork failing when calling initialize_dup
Angus MacArthur [Fri, 3 May 2013 15:59:26 +0000 (11:59 -0400)]
fork failing when calling initialize_dup

initialize_dup has been made private as of ruby 2.0.0. I have
corrected it to call the publicly available dup method

11 years agoMerge pull request #3814 from tsl0922/fix-ace-mode-404
Dmitriy Zaporozhets [Fri, 3 May 2013 10:55:20 +0000 (03:55 -0700)]
Merge pull request #3814 from tsl0922/fix-ace-mode-404

fix ace editor Syntax Highlighter mode load 404

11 years agoMerge pull request #3818 from bbodenmiller/patch-1
Dmitriy Zaporozhets [Fri, 3 May 2013 10:53:26 +0000 (03:53 -0700)]
Merge pull request #3818 from bbodenmiller/patch-1

add proper code/command formatting where missing in CONTRIBUTING.md

11 years agoMerge pull request #3820 from bbodenmiller/patch-3
Dmitriy Zaporozhets [Fri, 3 May 2013 10:51:53 +0000 (03:51 -0700)]
Merge pull request #3820 from bbodenmiller/patch-3

link to RSpec. related to #3810

11 years agoMerge pull request #3817 from gitlabhq/link_to_spinach_in_readm
Dmitriy Zaporozhets [Fri, 3 May 2013 10:51:03 +0000 (03:51 -0700)]
Merge pull request #3817 from gitlabhq/link_to_spinach_in_readm

link to spinach in the README. Closes #3810

11 years agofix ace mode 404
tsl0922 [Fri, 3 May 2013 10:09:57 +0000 (18:09 +0800)]
fix ace mode 404

11 years agolink to RSpec. related to #3810
Ben Bodenmiller [Fri, 3 May 2013 08:03:49 +0000 (01:03 -0700)]
link to RSpec. related to #3810

11 years agoadd proper code/command formatting where missing
Ben Bodenmiller [Fri, 3 May 2013 07:48:14 +0000 (00:48 -0700)]
add proper code/command formatting where missing

11 years agolink to spinach in the README. Closes #3810
Yves Senn [Fri, 3 May 2013 07:14:44 +0000 (10:14 +0300)]
link to spinach in the README. Closes #3810

11 years agoMerge pull request #3801 from holdtotherod/feature/internally-public-projects
Dmitriy Zaporozhets [Fri, 3 May 2013 07:00:48 +0000 (00:00 -0700)]
Merge pull request #3801 from holdtotherod/feature/internally-public-projects

Internally public projects

11 years agoMerge pull request #3597 from amacarthur/fork-pull-request
Dmitriy Zaporozhets [Fri, 3 May 2013 06:41:07 +0000 (23:41 -0700)]
Merge pull request #3597 from amacarthur/fork-pull-request

updated fork feature to use gitlab-shell for v5 of gitlab

11 years agoMerge pull request #3634 from tsl0922/patch-grack-auth
Saito [Fri, 3 May 2013 05:13:43 +0000 (22:13 -0700)]
Merge pull request #3634 from tsl0922/patch-grack-auth

fix http push 401 and 500 with some git clients

11 years agobetter fix for encoding error
tsl0922 [Fri, 3 May 2013 03:31:23 +0000 (11:31 +0800)]
better fix for encoding error

11 years agofix: UTF-8 encoding error
tsl0922 [Sat, 20 Apr 2013 01:18:37 +0000 (09:18 +0800)]
fix: UTF-8 encoding error

11 years agofix http push 401
tsl0922 [Fri, 19 Apr 2013 08:43:54 +0000 (16:43 +0800)]
fix http push 401

11 years agoMade fixes suggested by @randx in pull request
Angus MacArthur [Thu, 2 May 2013 20:27:40 +0000 (16:27 -0400)]
Made fixes suggested by @randx in pull request

See https://github.com/gitlabhq/gitlabhq/pull/3597#discussion-diff-4014638

11 years agoFix bug for repeated fork requests
Angus MacArthur [Thu, 2 May 2013 19:30:13 +0000 (15:30 -0400)]
Fix bug for repeated fork requests

When asking to fork a project and a project with the same name
already exists (likely from a previous fork), the recovery from
the fork failure would inadvertantly delete the repo of the
existing destination project.

11 years agoNon-logged in users see public project names as static text
Stephen Lottermoser [Thu, 2 May 2013 20:25:31 +0000 (13:25 -0700)]
Non-logged in users see public project names as static text

In the public area, project names are shown as static text for
non-logged in users, while logged-in users are given project
names as links they can follow to the project's page.

11 years agoMerge pull request #3645 from lucasuyezu/alphabetically_sorted
Dmitriy Zaporozhets [Thu, 2 May 2013 12:51:33 +0000 (05:51 -0700)]
Merge pull request #3645 from lucasuyezu/alphabetically_sorted

Assignees are now sorted alphabetically.

11 years agoMerge pull request #3704 from former03/feature_bugfix_js_memberadd_realtive_url_root
Dmitriy Zaporozhets [Thu, 2 May 2013 12:35:26 +0000 (05:35 -0700)]
Merge pull request #3704 from former03/feature_bugfix_js_memberadd_realtive_url_root

[BUGFIX] User suggest at team_members/new not working with relative_url_root

11 years agoFix issue with undefined dispather page
Dmitriy Zaporozhets [Thu, 2 May 2013 12:28:07 +0000 (15:28 +0300)]
Fix issue with undefined dispather page

11 years agoMove search autocomplete call to dispatcher
Dmitriy Zaporozhets [Thu, 2 May 2013 11:51:47 +0000 (14:51 +0300)]
Move search autocomplete call to dispatcher

11 years agocoffescript refactoring pt.1
Dmitriy Zaporozhets [Thu, 2 May 2013 11:36:53 +0000 (14:36 +0300)]
coffescript refactoring pt.1

11 years agoFix newlines in how-to-merge. Added steps description. Fixes #3772
Dmitriy Zaporozhets [Thu, 2 May 2013 10:23:50 +0000 (13:23 +0300)]
Fix newlines in how-to-merge. Added steps description. Fixes #3772

11 years agomove more inline js to handle via dispatcher
Dmitriy Zaporozhets [Thu, 2 May 2013 08:46:45 +0000 (11:46 +0300)]
move more inline js to handle via dispatcher

11 years agoRemove on-ready for NoteList event
Dmitriy Zaporozhets [Thu, 2 May 2013 08:23:58 +0000 (11:23 +0300)]
Remove on-ready for NoteList event

11 years agoReplace inline document.ready with dispatcher
Dmitriy Zaporozhets [Thu, 2 May 2013 08:18:29 +0000 (11:18 +0300)]
Replace inline document.ready with dispatcher

11 years agoFix internally public projects tests
Stephen Lottermoser [Thu, 2 May 2013 07:53:54 +0000 (00:53 -0700)]
Fix internally public projects tests

Takes into account 98bea4b1ff and 3b88636d3c.

11 years agoInternally public projects
Stephen Lottermoser [Thu, 2 May 2013 06:52:05 +0000 (23:52 -0700)]
Internally public projects

Public projects listed in the public section will be linked to the
actual project's page. Public projects now give any user Guest
permissions to the project, allowing them to download the code, read
and create issues, and view anything else in the project's pages.

Ample access tests have been added to the project_access_spec to
verify correct permissions and behavior on public projects.
- Visitors to the site who are not logged in still cannot view the
  project's pages.
- Logged-in users visiting a public project where they are not a team
  member can create issues, but not snippets. They can view the projects
  code, issues, merge requests, etc, just as if they were a Guest member
  of the project.
- Since this is a public project, the user is also granted :download_code
  permissions, a permission normally reserved for Reporters, since they
  can clone the repo anyways and browse commits and branches locally.

11 years agofix test
Dmitriy Zaporozhets [Thu, 2 May 2013 05:46:27 +0000 (08:46 +0300)]
fix test

11 years agoMerge pull request #3799 from ciarand/team-admin-placeholder-text
Dmitriy Zaporozhets [Thu, 2 May 2013 05:46:39 +0000 (22:46 -0700)]
Merge pull request #3799 from ciarand/team-admin-placeholder-text

Swapped out placeholder text on teams admin page

11 years agoSwapped out placeholder text on teams admin page
Ciaran Downey [Wed, 1 May 2013 22:09:18 +0000 (15:09 -0700)]
Swapped out placeholder text on teams admin page

Changed "simple Teams description" placeholder subtitle to "allow you
to organize groups of people that have a common focus. Use teams to
simplify the process of assigning roles to groups of people."

11 years agogitlab_git to 1.0.6, return submodule rendering in tree
Dmitriy Zaporozhets [Wed, 1 May 2013 10:39:37 +0000 (13:39 +0300)]
gitlab_git to 1.0.6, return submodule rendering in tree

11 years agoUpdate all gems!
Dmitriy Zaporozhets [Wed, 1 May 2013 10:29:29 +0000 (13:29 +0300)]
Update all gems!

11 years agoInit aws support for file storage
Dmitriy Zaporozhets [Wed, 1 May 2013 09:41:37 +0000 (12:41 +0300)]
Init aws support for file storage

11 years agoMerge branch 'install-link' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 1 May 2013 09:02:59 +0000 (09:02 +0000)]
Merge branch 'install-link' of /home/git/repositories/gitlab/gitlabhq

11 years agoLink to install guide must point to latest release automatically,
Sytse Sijbrandij [Wed, 1 May 2013 07:26:40 +0000 (09:26 +0200)]
Link to install guide must point to latest release automatically,

11 years agoMerge pull request #3786 from sashkab/emoji-fix
Dmitriy Zaporozhets [Tue, 30 Apr 2013 15:21:21 +0000 (08:21 -0700)]
Merge pull request #3786 from sashkab/emoji-fix

Show emoji popup if colon preceding by space or is new line.

11 years agoShow emoji popup if : preceeding by space or is new line.
Aleks Bunin [Tue, 30 Apr 2013 13:29:43 +0000 (09:29 -0400)]
Show emoji popup if : preceeding by space or is new line.

11 years agorequire gitlab-shell v1.4.0
Dmitriy Zaporozhets [Tue, 30 Apr 2013 11:49:35 +0000 (14:49 +0300)]
require gitlab-shell v1.4.0

11 years agoMerge pull request #3692 from szechyjs/master
Dmitriy Zaporozhets [Tue, 30 Apr 2013 11:01:56 +0000 (04:01 -0700)]
Merge pull request #3692 from szechyjs/master

Add monokai highlighting theme

11 years agoUpdate changelog
Dmitriy Zaporozhets [Tue, 30 Apr 2013 10:28:45 +0000 (13:28 +0300)]
Update changelog

11 years agoMerge pull request #3758 from fredowski/master
Dmitriy Zaporozhets [Tue, 30 Apr 2013 10:10:09 +0000 (03:10 -0700)]
Merge pull request #3758 from fredowski/master

Authenticate LDAP users in the grack module - fixed problems - tested code

11 years agoMerge pull request #3652 from brodock/beautifull-diff
Dmitriy Zaporozhets [Tue, 30 Apr 2013 08:50:15 +0000 (01:50 -0700)]
Merge pull request #3652 from brodock/beautifull-diff

Diff with better colors and some spacing on the corners

11 years agoMerge pull request #3688 from amacarthur/rake-fix
Dmitriy Zaporozhets [Tue, 30 Apr 2013 08:47:53 +0000 (01:47 -0700)]
Merge pull request #3688 from amacarthur/rake-fix

fixed broken gitlab version determination during backup

11 years agoMerge pull request #3784 from senny/upgrade_guide_cleanup
Dmitriy Zaporozhets [Tue, 30 Apr 2013 08:00:36 +0000 (01:00 -0700)]
Merge pull request #3784 from senny/upgrade_guide_cleanup

Upgrade guide cleanup

11 years agoadd missing title to upgrade guide
Yves Senn [Tue, 30 Apr 2013 07:52:25 +0000 (09:52 +0200)]
add missing title to upgrade guide

11 years agolink directly to the folder with upgrade guides
Yves Senn [Tue, 30 Apr 2013 07:51:48 +0000 (09:51 +0200)]
link directly to the folder with upgrade guides

11 years agoMerge pull request #3783 from senny/move_update_instructions_to_repo
Dmitriy Zaporozhets [Tue, 30 Apr 2013 07:32:11 +0000 (00:32 -0700)]
Merge pull request #3783 from senny/move_update_instructions_to_repo

move the update guides from the wiki into the repo

11 years agomove the update guides from the wiki into the repo
Yves Senn [Tue, 30 Apr 2013 07:29:30 +0000 (09:29 +0200)]
move the update guides from the wiki into the repo

11 years agoLDAP authentication in grack - check ldap conf before call / added comment
Friedrich Beckmann [Mon, 29 Apr 2013 20:26:03 +0000 (22:26 +0200)]
LDAP authentication in grack - check ldap conf before call / added comment

11 years agoMerge pull request #3771 from senny/move-4-2-to-5-0-from-wiki-to-repo
Dmitriy Zaporozhets [Mon, 29 Apr 2013 13:21:02 +0000 (06:21 -0700)]
Merge pull request #3771 from senny/move-4-2-to-5-0-from-wiki-to-repo

move the update instructions for 4.2 to 5.0 from the Wiki into the Repo

11 years agomove the update instructions for 4.2 to 5.0 from the Wiki into the Repo.
Yves Senn [Mon, 29 Apr 2013 12:52:06 +0000 (14:52 +0200)]
move the update instructions for 4.2 to 5.0 from the Wiki into the Repo.

11 years agoMake turbolinks loading more user-friendly
Dmitriy Zaporozhets [Mon, 29 Apr 2013 11:36:40 +0000 (14:36 +0300)]
Make turbolinks loading more user-friendly

11 years agoRemove unused code pt.2
Dmitriy Zaporozhets [Mon, 29 Apr 2013 10:54:12 +0000 (13:54 +0300)]
Remove unused code pt.2

11 years agoRemove unused code
Dmitriy Zaporozhets [Mon, 29 Apr 2013 10:50:23 +0000 (13:50 +0300)]
Remove unused code

11 years agoFix loading commit history for tree view
Dmitriy Zaporozhets [Mon, 29 Apr 2013 10:18:08 +0000 (13:18 +0300)]
Fix loading commit history for tree view

11 years agoRemove tree history & ajax slider
Dmitriy Zaporozhets [Mon, 29 Apr 2013 10:14:55 +0000 (13:14 +0300)]
Remove tree history & ajax slider

11 years agoMerge pull request #3766 from axilleas/docs
Dmitriy Zaporozhets [Mon, 29 Apr 2013 09:42:22 +0000 (02:42 -0700)]
Merge pull request #3766 from axilleas/docs

Instructions update: install postfix separately, new privilege to mysql users, sockets dir. Fixes #3639

11 years agoMerge pull request #3765 from axilleas/typo
Dmitriy Zaporozhets [Mon, 29 Apr 2013 09:38:59 +0000 (02:38 -0700)]
Merge pull request #3765 from axilleas/typo

Fixed typo in app/views/deploy_keys/index.html.haml

11 years agoMerge branch 'feature/turbolinks' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 29 Apr 2013 09:27:38 +0000 (09:27 +0000)]
Merge branch 'feature/turbolinks' of /home/git/repositories/gitlab/gitlabhq

11 years agoAdd turbolinks to application
Dmitriy Zaporozhets [Mon, 29 Apr 2013 07:10:45 +0000 (10:10 +0300)]
Add turbolinks to application

11 years agofix wrong class name
Dmitriy Zaporozhets [Mon, 29 Apr 2013 06:49:25 +0000 (09:49 +0300)]
fix wrong class name

11 years agoRefactor post-receive worker
Dmitriy Zaporozhets [Mon, 29 Apr 2013 06:43:18 +0000 (09:43 +0300)]
Refactor post-receive worker

11 years agoProvide a path to repo archive. gitlab_git up to 1.0.5
Dmitriy Zaporozhets [Mon, 29 Apr 2013 06:15:18 +0000 (09:15 +0300)]
Provide a path to repo archive. gitlab_git up to 1.0.5

11 years agogitlab_git up to 1.0.4
Dmitriy Zaporozhets [Sun, 28 Apr 2013 20:10:10 +0000 (23:10 +0300)]
gitlab_git up to 1.0.4

11 years agoCache repo size inside repo model
Dmitriy Zaporozhets [Sun, 28 Apr 2013 20:04:56 +0000 (23:04 +0300)]
Cache repo size inside repo model

11 years agoMerge branch 'feature/move_gitlab_git' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 28 Apr 2013 18:52:51 +0000 (18:52 +0000)]
Merge branch 'feature/move_gitlab_git' of /home/git/repositories/gitlab/gitlabhq

11 years agoUpdate gitlab_git to 1.0.3
Dmitriy Zaporozhets [Sun, 28 Apr 2013 18:27:49 +0000 (21:27 +0300)]
Update gitlab_git to 1.0.3

11 years agoUse gitlab_git gem
Dmitriy Zaporozhets [Sun, 28 Apr 2013 18:03:27 +0000 (21:03 +0300)]
Use gitlab_git gem

11 years agoVersion up to 5.2.0.pre
Dmitriy Zaporozhets [Sun, 28 Apr 2013 17:56:42 +0000 (20:56 +0300)]
Version up to 5.2.0.pre

11 years agoInstall postfix separately, new update instructions. Fixes #3639
Axilleas Pipinellis [Sun, 28 Apr 2013 16:11:40 +0000 (19:11 +0300)]
Install postfix separately, new update instructions. Fixes #3639

11 years agoRemoved extra "for"
Axilleas Pipinellis [Sun, 28 Apr 2013 15:42:11 +0000 (18:42 +0300)]
Removed extra "for"

11 years agoLDAP Authentification with grack for https push - fixed password check
Friedrich Beckmann [Sat, 27 Apr 2013 20:20:26 +0000 (22:20 +0200)]
LDAP Authentification with grack for https push - fixed password check

11 years agouse github version instead of local one
Dmitriy Zaporozhets [Sat, 27 Apr 2013 21:04:03 +0000 (00:04 +0300)]
use github version instead of local one

11 years agoMove Gitlab::Git out of gitlab core
Dmitriy Zaporozhets [Sat, 27 Apr 2013 20:50:17 +0000 (23:50 +0300)]
Move Gitlab::Git out of gitlab core

11 years agoRemove ambiguous condition
Dmitriy Zaporozhets [Fri, 26 Apr 2013 19:19:56 +0000 (22:19 +0300)]
Remove ambiguous condition

11 years agoAdd link to quickly add new team member from project panel
Dmitriy Zaporozhets [Fri, 26 Apr 2013 19:19:12 +0000 (22:19 +0300)]
Add link to quickly add new team member from project panel

11 years agoRestyle clone panel on project show page
Dmitriy Zaporozhets [Fri, 26 Apr 2013 19:12:43 +0000 (22:12 +0300)]
Restyle clone panel on project show page

11 years agoShow project access level right to clone panel
Dmitriy Zaporozhets [Fri, 26 Apr 2013 17:59:29 +0000 (20:59 +0300)]
Show project access level right to clone panel

11 years agoMerge pull request #3749 from greg0ire/update-docs
Dmitriy Zaporozhets [Fri, 26 Apr 2013 17:20:04 +0000 (10:20 -0700)]
Merge pull request #3749 from greg0ire/update-docs

Handle several RDBMS

11 years agoRespect feature settings submitted via api
Dmitriy Zaporozhets [Fri, 26 Apr 2013 13:25:46 +0000 (16:25 +0300)]
Respect feature settings submitted via api

11 years agoMerge branch 'requirements-after-puma' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 26 Apr 2013 13:11:49 +0000 (13:11 +0000)]
Merge branch 'requirements-after-puma' of /home/git/repositories/gitlab/gitlabhq

11 years agoUpdate memory requirements after puma.
Sytse Sijbrandij [Fri, 26 Apr 2013 12:49:50 +0000 (14:49 +0200)]
Update memory requirements after puma.

11 years agoHandle several RDBMS
Grégoire Paris [Fri, 26 Apr 2013 09:25:04 +0000 (12:25 +0300)]
Handle several RDBMS

11 years agoChange text_field to :login from :email in line with 9d92433a7c83432657faf4c02839bba1...
David Greaves [Mon, 1 Apr 2013 16:51:05 +0000 (17:51 +0100)]
Change text_field to :login from :email in line with 9d92433a7c83432657faf4c02839bba1ba6f22ac to allow login as admin or non-ldap user when ldap is enabled
Also change haml style in line with that commit

11 years agoMerge pull request #3707 from Undev/default_project_settings
Dmitriy Zaporozhets [Fri, 26 Apr 2013 08:19:48 +0000 (01:19 -0700)]
Merge pull request #3707 from Undev/default_project_settings

Default settings for project features

11 years agoWall and snippets were disabled by default
Andrew8xx8 [Fri, 26 Apr 2013 08:02:00 +0000 (12:02 +0400)]
Wall and snippets were disabled by default

11 years agoNo unicorn config. Use higher version of gitlab-she;;
Dmitriy Zaporozhets [Fri, 26 Apr 2013 08:01:52 +0000 (11:01 +0300)]
No unicorn config. Use higher version of gitlab-she;;

11 years agoMerge pull request #3731 from coldfrontlabs/master
Dmitriy Zaporozhets [Fri, 26 Apr 2013 07:07:48 +0000 (00:07 -0700)]
Merge pull request #3731 from coldfrontlabs/master

Fix typo in Project API documentation for deleting hooks

11 years agoMerge pull request #3741 from hiroponz/improve-performance-of-network-graph
Dmitriy Zaporozhets [Fri, 26 Apr 2013 07:05:39 +0000 (00:05 -0700)]
Merge pull request #3741 from hiroponz/improve-performance-of-network-graph

Improve performance of network graph

11 years agoDraging network graph is replaced by vertical scrolling.
Sato Hiroyuki [Thu, 25 Apr 2013 22:10:09 +0000 (22:10 +0000)]
Draging network graph is replaced by vertical scrolling.