OSDN Git Service
Dmitriy Zaporozhets [Wed, 15 May 2013 15:56:31 +0000 (15:56 +0000)]
Merge branch 'housekeeping-in-root-dir' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 15 May 2013 15:56:10 +0000 (15:56 +0000)]
Merge branch 'dependencies-in-readme' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Wed, 15 May 2013 15:44:12 +0000 (17:44 +0200)]
Remove roadmap.
Sytse Sijbrandij [Wed, 15 May 2013 15:42:45 +0000 (17:42 +0200)]
Move maintenance policy to help section.
Sytse Sijbrandij [Wed, 15 May 2013 15:35:00 +0000 (17:35 +0200)]
Explain yellow out-of-date button that sounds scary when read without context.
Dmitriy Zaporozhets [Wed, 15 May 2013 12:22:34 +0000 (15:22 +0300)]
Lets cache branch_names, tag_names for repo
Dmitriy Zaporozhets [Wed, 15 May 2013 10:57:19 +0000 (03:57 -0700)]
Merge pull request #3950 from bbodenmiller/patch-4
fixes #3115 and adds support for gif bmp & tiff images
Ben Bodenmiller [Wed, 15 May 2013 06:41:33 +0000 (00:41 -0600)]
fixes #3115 and adds support for gif bmp & tiff images
when showing image preview check via lowercased extension and adds support for gif bmp & tiff images
Dmitriy Zaporozhets [Tue, 14 May 2013 19:45:28 +0000 (22:45 +0300)]
style counters on navbar. minor ui changes
Dmitriy Zaporozhets [Tue, 14 May 2013 19:17:46 +0000 (22:17 +0300)]
Enable HAML ugly mode by default for all environments
Dmitriy Zaporozhets [Tue, 14 May 2013 17:46:17 +0000 (20:46 +0300)]
remove preserve for blob since its fails in production
Dmitriy Zaporozhets [Tue, 14 May 2013 17:25:16 +0000 (20:25 +0300)]
Fix paginate of blobs, fixed preserve in dev mode for blob results
Dmitriy Zaporozhets [Tue, 14 May 2013 17:11:48 +0000 (20:11 +0300)]
Search for blobs by default inside project. Added pagination for blobs search
Dmitriy Zaporozhets [Tue, 14 May 2013 12:33:31 +0000 (15:33 +0300)]
Refactor API classes. So api classes like Gitlab::Issues become API::Issues
Dmitriy Zaporozhets [Tue, 14 May 2013 11:37:35 +0000 (04:37 -0700)]
Merge pull request #3935 from hiroponz/fix-bubble-padding
Fix bubble padding.
Dmitriy Zaporozhets [Tue, 14 May 2013 11:37:14 +0000 (04:37 -0700)]
Merge pull request #3936 from hiroponz/fix-git-bin-path-in-git-version-check
Config setting should be used in git version check.
Dmitriy Zaporozhets [Tue, 14 May 2013 11:34:34 +0000 (14:34 +0300)]
Fix bulk issue status update
Sato Hiroyuki [Tue, 14 May 2013 10:55:08 +0000 (19:55 +0900)]
Config setting should be used in git version check.
Sato Hiroyuki [Tue, 14 May 2013 10:34:05 +0000 (19:34 +0900)]
Fix bubble padding.
fix #3823
Dmitriy Zaporozhets [Tue, 14 May 2013 10:31:29 +0000 (13:31 +0300)]
Show gitlab-ci status on project dashboard
Dmitriy Zaporozhets [Tue, 14 May 2013 10:12:05 +0000 (13:12 +0300)]
5.2 in beta1
Dmitriy Zaporozhets [Tue, 14 May 2013 10:07:39 +0000 (13:07 +0300)]
gitlab_git up to 1.2.1
Dmitriy Zaporozhets [Tue, 14 May 2013 09:56:03 +0000 (12:56 +0300)]
render errors if any on new project page
Dmitriy Zaporozhets [Tue, 14 May 2013 09:46:41 +0000 (12:46 +0300)]
Improve user expirience while create/edit project settings
Dmitriy Zaporozhets [Mon, 13 May 2013 20:10:09 +0000 (23:10 +0300)]
Include code search in CHANGELOG
Dmitriy Zaporozhets [Mon, 13 May 2013 19:54:23 +0000 (22:54 +0300)]
Remove grit fork reference from Gemfile. Use gitlab-gollum-lib gem
Dmitriy Zaporozhets [Mon, 13 May 2013 18:18:08 +0000 (21:18 +0300)]
Add simple search to projects in public area
Dmitriy Zaporozhets [Mon, 13 May 2013 18:06:48 +0000 (21:06 +0300)]
add link to project issues from dashboard issues
Dmitriy Zaporozhets [Mon, 13 May 2013 16:11:54 +0000 (09:11 -0700)]
Merge pull request #3858 from abalkin/issue-3857
Save backup time as is. Fixes #3857.
Dmitriy Zaporozhets [Mon, 13 May 2013 16:10:22 +0000 (09:10 -0700)]
Merge pull request #3897 from LyleE/puma-config-environment-fix
Fixed puma.rb environment setting
Dmitriy Zaporozhets [Mon, 13 May 2013 15:59:23 +0000 (08:59 -0700)]
Merge pull request #3903 from frlan/master
A small update of nginx example config to prevent users from issues while nginx not listen on localhost
Dmitriy Zaporozhets [Mon, 13 May 2013 11:31:27 +0000 (04:31 -0700)]
Merge pull request #3591 from hiroponz/show-only-selected-branch
Show only selected branch
Dmitriy Zaporozhets [Mon, 13 May 2013 11:30:33 +0000 (04:30 -0700)]
Merge pull request #3902 from frlan/patch-2
A little change on wording for new-user email
Dmitriy Zaporozhets [Mon, 13 May 2013 10:10:10 +0000 (03:10 -0700)]
Merge pull request #3879 from bbodenmiller/patch-4
included more details on searching for issues related to pull request
Sato Hiroyuki [Sun, 14 Apr 2013 09:15:35 +0000 (09:15 +0000)]
Add test for "Show only selected tag"
Sato Hiroyuki [Sun, 14 Apr 2013 01:52:43 +0000 (01:52 +0000)]
Add "Show only selected branch" checkbox
Sato Hiroyuki [Fri, 12 Apr 2013 08:49:11 +0000 (17:49 +0900)]
Enable to filter graph by ref
Sato Hiroyuki [Sun, 14 Apr 2013 12:09:47 +0000 (12:09 +0000)]
Set @options in assing_ref_vars
@options enable to keep params when switching ref.
Sato Hiroyuki [Sun, 14 Apr 2013 12:08:16 +0000 (12:08 +0000)]
Refactor: remove dup code
Dmitriy Zaporozhets [Mon, 13 May 2013 09:28:46 +0000 (02:28 -0700)]
Merge pull request #3863 from crazyscience/patch-4
Fixed a nginx configuration
Dmitriy Zaporozhets [Mon, 13 May 2013 09:19:02 +0000 (02:19 -0700)]
Merge pull request #3921 from bbodenmiller/patch-8
update links to be relative paths and add CONTRIBUTING.md link
Dmitriy Zaporozhets [Mon, 13 May 2013 09:18:48 +0000 (02:18 -0700)]
Merge pull request #3920 from bbodenmiller/patch-7
fixed fact about memory usage
Dmitriy Zaporozhets [Mon, 13 May 2013 09:18:34 +0000 (02:18 -0700)]
Merge pull request #3912 from bbodenmiller/patch-6
fixed capitalization and added Google Analytics
Dmitriy Zaporozhets [Mon, 13 May 2013 09:13:18 +0000 (02:13 -0700)]
Merge pull request #3894 from axilleas/gitconfig-fix
Configure git global settings in installation docs
Dmitriy Zaporozhets [Mon, 13 May 2013 09:08:00 +0000 (02:08 -0700)]
Merge pull request #3918 from joeandaverde/unsanitized
System calls to gitlab-shell were using unsanitized user input
Dmitriy Zaporozhets [Mon, 13 May 2013 09:06:33 +0000 (02:06 -0700)]
Merge pull request #3911 from babatakao/migrate_note_linecode
Migrate notes.line_code format.
Dmitriy Zaporozhets [Mon, 13 May 2013 08:59:30 +0000 (11:59 +0300)]
More strict validation for SSH Key content
Ben Bodenmiller [Mon, 13 May 2013 07:48:08 +0000 (01:48 -0600)]
update links to be relative paths and add CONTRIBUTING.md link
Ben Bodenmiller [Mon, 13 May 2013 07:34:46 +0000 (01:34 -0600)]
fixed fact about memory usage
Joe Andaverde [Sun, 12 May 2013 14:10:34 +0000 (09:10 -0500)]
System calls were using unsanitized user input
Ben Bodenmiller [Sat, 11 May 2013 08:27:54 +0000 (02:27 -0600)]
fixed capitalization and added Google Analytics
baba [Sat, 11 May 2013 07:53:07 +0000 (16:53 +0900)]
Migrate notes.line_code format.
Since version 4.1, notes.line_code means:
{SHA1 hash of file path}_{old line}_{new line}
but the older version means:
{file index of the commit}_{old line}_{new line}
This rake task migrate the above differences.
Frank Lanitz [Fri, 10 May 2013 15:45:02 +0000 (17:45 +0200)]
Adding a short hint to *:80 for default listen address on nginx example config
Based on posting https://github.com/gitlabhq/gitlabhq/issues/3384#issuecomment-
15457287 I was able to solved an issue here. Pointing out *:80 might could prevent others for struggeling here
Frank Lanitz [Fri, 10 May 2013 09:18:19 +0000 (12:18 +0300)]
A little change on wording for new-user email
Just a little change of wording for new-user email which looks better in my eyes.
Ben Bodenmiller [Wed, 8 May 2013 07:40:25 +0000 (00:40 -0700)]
included more details on searching for issues related to pull request
Lyle Entwistle [Thu, 9 May 2013 16:41:00 +0000 (17:41 +0100)]
Fixed puma.rb environment setting, no need to specify 'production' in daemon options now
Axilleas Pipinellis [Thu, 9 May 2013 12:37:39 +0000 (15:37 +0300)]
Configure git global settings
Setting Git's global user.name and user.email are missing from
instructions, causing check.rake to fail at this step.
Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
Dmitriy Zaporozhets [Thu, 9 May 2013 08:46:32 +0000 (11:46 +0300)]
made some ui enhancement for search page
Dmitriy Zaporozhets [Thu, 9 May 2013 08:27:14 +0000 (11:27 +0300)]
Move files search to gitlab_git
Dmitriy Zaporozhets [Thu, 9 May 2013 08:04:05 +0000 (11:04 +0300)]
Move blob_snippet to gitlab_git gem
Dmitriy Zaporozhets [Thu, 9 May 2013 08:03:15 +0000 (11:03 +0300)]
Fix monokai highlight line css
Dmitriy Zaporozhets [Thu, 9 May 2013 08:02:48 +0000 (11:02 +0300)]
Update gitlab_git and restore travis.yml
Javier Castro [Sun, 5 May 2013 13:27:31 +0000 (10:27 -0300)]
Fix missing div container for nice css styling
Javier Castro [Sun, 14 Apr 2013 17:07:11 +0000 (14:07 -0300)]
Implemented code search feature
Dmitriy Zaporozhets [Thu, 9 May 2013 06:51:54 +0000 (23:51 -0700)]
Merge pull request #3893 from rezigned/feature/update-init.d
Update init.d script
rezigned [Thu, 9 May 2013 05:37:56 +0000 (12:37 +0700)]
Update init.d script
The original init.d script uses a fixed username (e.g. git). Which is not flexible
when we using other user. So, I've updated it to use $APP_USER variable
instead and wrap it in a function to reduce repetitive codes.
Lev Abalkin [Wed, 8 May 2013 20:39:31 +0000 (16:39 -0400)]
Save backup time as is. Fixes #3857.
Dmitriy Zaporozhets [Wed, 8 May 2013 18:27:43 +0000 (21:27 +0300)]
Fix last tree breadcrumbs for blob
Dmitriy Zaporozhets [Wed, 8 May 2013 18:17:48 +0000 (11:17 -0700)]
Merge pull request #3687 from hiroponz/fix-not-using-git-bin-path
Fix not using git.bin_path in config.
Dmitriy Zaporozhets [Wed, 8 May 2013 18:12:42 +0000 (11:12 -0700)]
Merge pull request #3880 from hiroponz/fix-check-git-version
Add Gitlab::VersionInfo class to fix and simplify version check.
Dmitriy Zaporozhets [Wed, 8 May 2013 18:03:36 +0000 (21:03 +0300)]
Add custom sing-in text & google analytics
Dmitriy Zaporozhets [Wed, 8 May 2013 18:03:14 +0000 (21:03 +0300)]
Add extra config for some advanced customization
Dmitriy Zaporozhets [Wed, 8 May 2013 17:11:49 +0000 (20:11 +0300)]
Admin.user page: sort projects, add better confirm message for leaving team
Dmitriy Zaporozhets [Wed, 8 May 2013 17:06:12 +0000 (20:06 +0300)]
Fix project labels scope
Dmitriy Zaporozhets [Wed, 8 May 2013 16:40:31 +0000 (19:40 +0300)]
Dont show fork button in personal projects. Point to fork if already forked project
Dmitriy Zaporozhets [Wed, 8 May 2013 11:27:19 +0000 (11:27 +0000)]
Merge branch 'enhancement/issue_filter_dropdown' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 8 May 2013 11:26:42 +0000 (14:26 +0300)]
Update CHANGELOG
Dmitriy Zaporozhets [Wed, 8 May 2013 11:18:16 +0000 (04:18 -0700)]
Merge pull request #3834 from ichord/gfm-autocomp
improve gfm autocomplete
Dmitriy Zaporozhets [Wed, 8 May 2013 10:43:21 +0000 (13:43 +0300)]
bring more usability to issues filtering. Block issues area on loading filtered results
Sato Hiroyuki [Wed, 8 May 2013 05:19:51 +0000 (14:19 +0900)]
Add Gitlab::VersionInfo class to fix and simplify version check.
It returns "yes" if required version is "1.7.10" and current version is "1.6.10",
because the patch version of current version equals to that of required version.
Dmitriy Zaporozhets [Wed, 8 May 2013 07:06:48 +0000 (10:06 +0300)]
init filter links
Dmitriy Zaporozhets [Wed, 8 May 2013 07:00:19 +0000 (10:00 +0300)]
replace selectboxes with filters
Dmitriy Zaporozhets [Wed, 8 May 2013 06:18:39 +0000 (23:18 -0700)]
Merge pull request #3862 from crazyscience/patch-3
Setting the working directory before git operations
Dmitriy Zaporozhets [Wed, 8 May 2013 06:17:32 +0000 (23:17 -0700)]
Merge pull request #3877 from mikehaertl/3793-puma-relative-url
Puma configuration for relative base URL
Michael Härtl [Wed, 8 May 2013 06:09:23 +0000 (08:09 +0200)]
Fixes #3793: Puma configuration for relative base URL
Dmitriy Zaporozhets [Wed, 8 May 2013 05:52:45 +0000 (22:52 -0700)]
Merge pull request #3874 from axilleas/installation-fix
Bump charlock_holmes to 0.9.6.4
crazyscience [Tue, 7 May 2013 02:12:02 +0000 (19:12 -0700)]
Setting the working directory before git operations
Axilleas Pipinellis [Tue, 7 May 2013 19:49:54 +0000 (22:49 +0300)]
Bump charlock_holmes to 0.9.6.4
Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
Dmitriy Zaporozhets [Tue, 7 May 2013 18:28:16 +0000 (21:28 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 7 May 2013 18:26:46 +0000 (18:26 +0000)]
Merge branch 'feature/labels_set' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 7 May 2013 16:46:35 +0000 (19:46 +0300)]
fix api delete hook test
Dmitriy Zaporozhets [Tue, 7 May 2013 16:26:41 +0000 (19:26 +0300)]
Include default labels in issues autocomplete etc. Show colored labels on issues show page
Dmitriy Zaporozhets [Tue, 7 May 2013 14:57:59 +0000 (17:57 +0300)]
add Gitlab::Label class and different color labels for default labels set
Dmitriy Zaporozhets [Tue, 7 May 2013 14:57:29 +0000 (17:57 +0300)]
Add generate action to labels controller which allow creation of default labels set for project
Dmitriy Zaporozhets [Tue, 7 May 2013 14:55:02 +0000 (07:55 -0700)]
Merge pull request #3871 from axilleas/backup-fix
Fix errors during backup task. Fix #3785
Dmitriy Zaporozhets [Tue, 7 May 2013 13:59:03 +0000 (06:59 -0700)]
Merge pull request #3275 from Undev/feature/code_cleanup_remove_old_hashes
Code cleanup: Replace old hashes and remove trailing spaces
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>
Dmitriy Zaporozhets [Tue, 7 May 2013 11:32:12 +0000 (04:32 -0700)]
Merge pull request #3868 from hiroponz/fix_check_git_version
Fix check git version.
Dmitriy Zaporozhets [Tue, 7 May 2013 11:31:08 +0000 (04:31 -0700)]
Merge pull request #3866 from senny/maintenance_guidelines
maintenance policy
Dmitriy Zaporozhets [Tue, 7 May 2013 11:30:48 +0000 (04:30 -0700)]
Merge pull request #3852 from axilleas/minitest-fix
Add minitest to Gemfile. Fix #3826