OSDN Git Service

wvm/gitlab.git
11 years agoadd deploy recipe extracted from staging server
Dmitriy Zaporozhets [Thu, 16 May 2013 09:45:30 +0000 (12:45 +0300)]
add deploy recipe extracted from staging server

11 years agoMerge pull request #3961 from bbodenmiller/patch-1
Dmitriy Zaporozhets [Thu, 16 May 2013 09:21:09 +0000 (02:21 -0700)]
Merge pull request #3961 from bbodenmiller/patch-1

A little change on wording for new-user email

11 years agoMerge pull request #3909 from bbodenmiller/patch-5
Dmitriy Zaporozhets [Thu, 16 May 2013 09:18:44 +0000 (02:18 -0700)]
Merge pull request #3909 from bbodenmiller/patch-5

better wording encouraging usage of latest stable release in GitLab Maintenance Policy

11 years agoDont parse gfm-extractions as commit. Increase gfm rendering speed. Especially for...
Dmitriy Zaporozhets [Thu, 16 May 2013 09:15:42 +0000 (12:15 +0300)]
Dont parse gfm-extractions as commit. Increase gfm rendering speed. Especially for a lot of code snippets

11 years agoA little change on wording for new-user email
Ben Bodenmiller [Thu, 16 May 2013 07:49:57 +0000 (01:49 -0600)]
A little change on wording for new-user email

adds missing wording missed in https://github.com/gitlabhq/gitlabhq/commit/58d6176bc35fb45427df75b9762df6bb0d3b3a98 and https://github.com/gitlabhq/gitlabhq/pull/3902

11 years agobetter wording encouraging usage of latest stable release in GitLab Maintenance Policy
Ben Bodenmiller [Sat, 11 May 2013 05:26:21 +0000 (23:26 -0600)]
better wording encouraging usage of latest stable release in GitLab Maintenance Policy

11 years agoMerge pull request #3940 from frlan/patch-3
Dmitriy Zaporozhets [Thu, 16 May 2013 07:10:22 +0000 (00:10 -0700)]
Merge pull request #3940 from frlan/patch-3

Update README.md

11 years agoMerge pull request #3942 from bke-drewb/issue3941
Dmitriy Zaporozhets [Thu, 16 May 2013 07:05:24 +0000 (00:05 -0700)]
Merge pull request #3942 from bke-drewb/issue3941

Issue 3941: Code preview dark doesn't display correctly with long lines

11 years agoFiles controller handle redirect to remote storage. Added config block to carrierwave...
Dmitriy Zaporozhets [Wed, 15 May 2013 19:35:59 +0000 (22:35 +0300)]
Files controller handle redirect to remote storage. Added config block to carrierwave init

11 years agoMerge branch 'housekeeping-in-root-dir' of /home/git/repositories/gitlab/gitlabhq
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

11 years agoMerge branch 'dependencies-in-readme' 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

11 years agoRemove roadmap.
Sytse Sijbrandij [Wed, 15 May 2013 15:44:12 +0000 (17:44 +0200)]
Remove roadmap.

11 years agoMove maintenance policy to help section.
Sytse Sijbrandij [Wed, 15 May 2013 15:42:45 +0000 (17:42 +0200)]
Move maintenance policy to help section.

11 years agoExplain yellow out-of-date button that sounds scary when read without context.
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.

11 years agoLets cache branch_names, tag_names for repo
Dmitriy Zaporozhets [Wed, 15 May 2013 12:22:34 +0000 (15:22 +0300)]
Lets cache branch_names, tag_names for repo

11 years agoAdd background color to pre, too.
Drew Blessing [Wed, 15 May 2013 11:37:16 +0000 (06:37 -0500)]
Add background color to pre, too.

11 years agoMerge pull request #3950 from bbodenmiller/patch-4
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

11 years agofixes #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

11 years agostyle counters on navbar. minor ui changes
Dmitriy Zaporozhets [Tue, 14 May 2013 19:45:28 +0000 (22:45 +0300)]
style counters on navbar. minor ui changes

11 years agoEnable HAML ugly mode by default for all environments
Dmitriy Zaporozhets [Tue, 14 May 2013 19:17:46 +0000 (22:17 +0300)]
Enable HAML ugly mode by default for all environments

11 years agoIssue 3941: Code preview dark doesn't display correctly with long lines
Drew Blessing [Tue, 14 May 2013 18:44:16 +0000 (13:44 -0500)]
Issue 3941: Code preview dark doesn't display correctly with long lines

Assigning the background color to the pre tag did not work correctly. Moved background color to the highlight class which fixes the problem.

11 years agoremove preserve for blob since its fails in production
Dmitriy Zaporozhets [Tue, 14 May 2013 17:46:17 +0000 (20:46 +0300)]
remove preserve for blob since its fails in production

11 years agoFix paginate of blobs, fixed preserve in dev mode for blob results
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

11 years agoSearch for blobs by default inside project. Added pagination for blobs search
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

11 years agoRefactor API classes. So api classes like Gitlab::Issues become API::Issues
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

11 years agoUpdate README.md
Frank Lanitz [Tue, 14 May 2013 12:25:17 +0000 (15:25 +0300)]
Update README.md

Adding PostgreSQL to README as an alternative requirement

11 years agoMerge pull request #3935 from hiroponz/fix-bubble-padding
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.

11 years agoMerge pull request #3936 from hiroponz/fix-git-bin-path-in-git-version-check
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.

11 years agoFix bulk issue status update
Dmitriy Zaporozhets [Tue, 14 May 2013 11:34:34 +0000 (14:34 +0300)]
Fix bulk issue status update

11 years agoConfig setting should be used in git version check.
Sato Hiroyuki [Tue, 14 May 2013 10:55:08 +0000 (19:55 +0900)]
Config setting should be used in git version check.

11 years agoFix bubble padding.
Sato Hiroyuki [Tue, 14 May 2013 10:34:05 +0000 (19:34 +0900)]
Fix bubble padding.

fix #3823

11 years agoShow gitlab-ci status on project dashboard
Dmitriy Zaporozhets [Tue, 14 May 2013 10:31:29 +0000 (13:31 +0300)]
Show gitlab-ci status on project dashboard

11 years ago5.2 in beta1
Dmitriy Zaporozhets [Tue, 14 May 2013 10:12:05 +0000 (13:12 +0300)]
5.2 in beta1

11 years agogitlab_git up to 1.2.1
Dmitriy Zaporozhets [Tue, 14 May 2013 10:07:39 +0000 (13:07 +0300)]
gitlab_git up to 1.2.1

11 years agorender errors if any on new project page
Dmitriy Zaporozhets [Tue, 14 May 2013 09:56:03 +0000 (12:56 +0300)]
render errors if any on new project page

11 years agoImprove user expirience while create/edit project settings
Dmitriy Zaporozhets [Tue, 14 May 2013 09:46:41 +0000 (12:46 +0300)]
Improve user expirience while create/edit project settings

11 years agoInclude code search in CHANGELOG
Dmitriy Zaporozhets [Mon, 13 May 2013 20:10:09 +0000 (23:10 +0300)]
Include code search in CHANGELOG

11 years agoRemove grit fork reference from Gemfile. Use gitlab-gollum-lib gem
Dmitriy Zaporozhets [Mon, 13 May 2013 19:54:23 +0000 (22:54 +0300)]
Remove grit fork reference from Gemfile. Use gitlab-gollum-lib gem

11 years agoAdd simple search to projects in public area
Dmitriy Zaporozhets [Mon, 13 May 2013 18:18:08 +0000 (21:18 +0300)]
Add simple search to projects in public area

11 years agoadd link to project issues from dashboard issues
Dmitriy Zaporozhets [Mon, 13 May 2013 18:06:48 +0000 (21:06 +0300)]
add link to project issues from dashboard issues

11 years agoMerge pull request #3858 from abalkin/issue-3857
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.

11 years agoMerge pull request #3897 from LyleE/puma-config-environment-fix
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

11 years agoMerge pull request #3903 from frlan/master
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

11 years agoMerge pull request #3591 from hiroponz/show-only-selected-branch
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

11 years agoMerge pull request #3902 from frlan/patch-2
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

11 years agoMerge pull request #3879 from bbodenmiller/patch-4
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

11 years agoAdd test for "Show only selected tag"
Sato Hiroyuki [Sun, 14 Apr 2013 09:15:35 +0000 (09:15 +0000)]
Add test for "Show only selected tag"

11 years agoAdd "Show only selected branch" checkbox
Sato Hiroyuki [Sun, 14 Apr 2013 01:52:43 +0000 (01:52 +0000)]
Add "Show only selected branch" checkbox

11 years agoEnable to filter graph by ref
Sato Hiroyuki [Fri, 12 Apr 2013 08:49:11 +0000 (17:49 +0900)]
Enable to filter graph by ref

11 years agoSet @options in assing_ref_vars
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.

11 years agoRefactor: remove dup code
Sato Hiroyuki [Sun, 14 Apr 2013 12:08:16 +0000 (12:08 +0000)]
Refactor: remove dup code

11 years agoMerge pull request #3863 from crazyscience/patch-4
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

11 years agoMerge pull request #3921 from bbodenmiller/patch-8
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

11 years agoMerge pull request #3920 from bbodenmiller/patch-7
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

11 years agoMerge pull request #3912 from bbodenmiller/patch-6
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

11 years agoMerge pull request #3894 from axilleas/gitconfig-fix
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

11 years agoMerge pull request #3918 from joeandaverde/unsanitized
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

11 years agoMerge pull request #3911 from babatakao/migrate_note_linecode
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.

11 years agoMore strict validation for SSH Key content
Dmitriy Zaporozhets [Mon, 13 May 2013 08:59:30 +0000 (11:59 +0300)]
More strict validation for SSH Key content

11 years agoupdate links to be relative paths and add CONTRIBUTING.md link
Ben Bodenmiller [Mon, 13 May 2013 07:48:08 +0000 (01:48 -0600)]
update links to be relative paths and add CONTRIBUTING.md link

11 years agofixed fact about memory usage
Ben Bodenmiller [Mon, 13 May 2013 07:34:46 +0000 (01:34 -0600)]
fixed fact about memory usage

11 years agoSystem calls were using unsanitized user input
Joe Andaverde [Sun, 12 May 2013 14:10:34 +0000 (09:10 -0500)]
System calls were using unsanitized user input

11 years agofixed capitalization and added Google Analytics
Ben Bodenmiller [Sat, 11 May 2013 08:27:54 +0000 (02:27 -0600)]
fixed capitalization and added Google Analytics

11 years agoMigrate notes.line_code format.
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.

11 years agoAdding a short hint to *:80 for default listen address on nginx example config
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

11 years agoA little change on wording for new-user email
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.

11 years agoincluded more details on searching for issues related to pull request
Ben Bodenmiller [Wed, 8 May 2013 07:40:25 +0000 (00:40 -0700)]
included more details on searching for issues related to pull request

11 years agoFixed puma.rb environment setting, no need to specify 'production' in daemon options now
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

11 years agoConfigure git global settings
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>
11 years agomade some ui enhancement for search page
Dmitriy Zaporozhets [Thu, 9 May 2013 08:46:32 +0000 (11:46 +0300)]
made some ui enhancement for search page

11 years agoMove files search to gitlab_git
Dmitriy Zaporozhets [Thu, 9 May 2013 08:27:14 +0000 (11:27 +0300)]
Move files search to gitlab_git

11 years agoMove blob_snippet to gitlab_git gem
Dmitriy Zaporozhets [Thu, 9 May 2013 08:04:05 +0000 (11:04 +0300)]
Move blob_snippet to gitlab_git gem

11 years agoFix monokai highlight line css
Dmitriy Zaporozhets [Thu, 9 May 2013 08:03:15 +0000 (11:03 +0300)]
Fix monokai highlight line css

11 years agoUpdate gitlab_git and restore travis.yml
Dmitriy Zaporozhets [Thu, 9 May 2013 08:02:48 +0000 (11:02 +0300)]
Update gitlab_git and restore travis.yml

11 years agoFix missing div container for nice css styling
Javier Castro [Sun, 5 May 2013 13:27:31 +0000 (10:27 -0300)]
Fix missing div container for nice css styling

11 years agoImplemented code search feature
Javier Castro [Sun, 14 Apr 2013 17:07:11 +0000 (14:07 -0300)]
Implemented code search feature

11 years agoMerge pull request #3893 from rezigned/feature/update-init.d
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

11 years agoUpdate 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.

11 years agoSave backup time as is. Fixes #3857.
Lev Abalkin [Wed, 8 May 2013 20:39:31 +0000 (16:39 -0400)]
Save backup time as is. Fixes #3857.

11 years agoFix last tree breadcrumbs for blob
Dmitriy Zaporozhets [Wed, 8 May 2013 18:27:43 +0000 (21:27 +0300)]
Fix last tree breadcrumbs for blob

11 years agoMerge pull request #3687 from hiroponz/fix-not-using-git-bin-path
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.

11 years agoMerge pull request #3880 from hiroponz/fix-check-git-version
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.

11 years agoAdd custom sing-in text & google analytics
Dmitriy Zaporozhets [Wed, 8 May 2013 18:03:36 +0000 (21:03 +0300)]
Add custom sing-in text & google analytics

11 years agoAdd extra config for some advanced customization
Dmitriy Zaporozhets [Wed, 8 May 2013 18:03:14 +0000 (21:03 +0300)]
Add extra config for some advanced customization

11 years agoAdmin.user page: sort projects, add better confirm message for leaving team
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

11 years agoFix project labels scope
Dmitriy Zaporozhets [Wed, 8 May 2013 17:06:12 +0000 (20:06 +0300)]
Fix project labels scope

11 years agoDont show fork button in personal projects. Point to fork if already forked project
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

11 years agoMerge branch 'enhancement/issue_filter_dropdown' of /home/git/repositories/gitlab...
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

11 years agoUpdate CHANGELOG
Dmitriy Zaporozhets [Wed, 8 May 2013 11:26:42 +0000 (14:26 +0300)]
Update CHANGELOG

11 years agoMerge pull request #3834 from ichord/gfm-autocomp
Dmitriy Zaporozhets [Wed, 8 May 2013 11:18:16 +0000 (04:18 -0700)]
Merge pull request #3834 from ichord/gfm-autocomp

improve gfm autocomplete

11 years agobring more usability to issues filtering. Block issues area on loading filtered results
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

11 years agoAdd Gitlab::VersionInfo class to fix and simplify version check.
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.

11 years agoinit filter links
Dmitriy Zaporozhets [Wed, 8 May 2013 07:06:48 +0000 (10:06 +0300)]
init filter links

11 years agoreplace selectboxes with filters
Dmitriy Zaporozhets [Wed, 8 May 2013 07:00:19 +0000 (10:00 +0300)]
replace selectboxes with filters

11 years agoMerge pull request #3862 from crazyscience/patch-3
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

11 years agoMerge pull request #3877 from mikehaertl/3793-puma-relative-url
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

11 years agoFixes #3793: 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

11 years agoMerge pull request #3874 from axilleas/installation-fix
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

11 years agoSetting the working directory before git operations
crazyscience [Tue, 7 May 2013 02:12:02 +0000 (19:12 -0700)]
Setting the working directory before git operations

11 years agoBump charlock_holmes to 0.9.6.4
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>