OSDN Git Service

wvm/gitlab.git
11 years agofix missing user2 in api:repositories specs
Dmitriy Zaporozhets [Thu, 23 May 2013 09:26:06 +0000 (12:26 +0300)]
fix missing user2 in api:repositories specs

11 years agosplit repositories and projects api
Dmitriy Zaporozhets [Thu, 23 May 2013 09:23:47 +0000 (12:23 +0300)]
split repositories and projects api

11 years agoUpdate poltergeist and should-matchers
Dmitriy Zaporozhets [Thu, 23 May 2013 08:54:44 +0000 (11:54 +0300)]
Update poltergeist and should-matchers

11 years agoDecorate links on focus
Dmitriy Zaporozhets [Thu, 23 May 2013 08:47:57 +0000 (11:47 +0300)]
Decorate links on focus

11 years agoFix milestones list pagination style
Dmitriy Zaporozhets [Thu, 23 May 2013 08:44:24 +0000 (11:44 +0300)]
Fix milestones list pagination style

11 years agoUpdate bootstrap-sass
Dmitriy Zaporozhets [Thu, 23 May 2013 07:05:07 +0000 (10:05 +0300)]
Update bootstrap-sass

11 years agoUpdate sidekiq & devise
Dmitriy Zaporozhets [Thu, 23 May 2013 06:59:54 +0000 (09:59 +0300)]
Update sidekiq & devise

11 years agoMinor improve for code highlight in wiki
Dmitriy Zaporozhets [Thu, 23 May 2013 06:37:24 +0000 (09:37 +0300)]
Minor improve for code highlight in wiki

11 years agoMerge pull request #4035 from samurailink3/master
Yves Senn [Thu, 23 May 2013 06:25:28 +0000 (23:25 -0700)]
Merge pull request #4035 from samurailink3/master

Fixed typo in Readme.md

11 years agoMerge pull request #4040 from smashwilson/generate-secret
Dmitriy Zaporozhets [Thu, 23 May 2013 06:02:14 +0000 (23:02 -0700)]
Merge pull request #4040 from smashwilson/generate-secret

Security: keep the Rails secret token out of version control.

11 years agoGenerate the Rails secret token on first run.
ash [Wed, 22 May 2013 23:55:48 +0000 (23:55 +0000)]
Generate the Rails secret token on first run.

Store the secret token in a .gitignored file called ".secret", which is
created by the initializer if it doesn't exist.

11 years agoMerge branch 'refactor/services' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 22 May 2013 17:18:48 +0000 (17:18 +0000)]
Merge branch 'refactor/services' of /home/git/repositories/gitlab/gitlabhq

11 years agoFixed typo in Readme.md
Tom Webster [Wed, 22 May 2013 16:08:45 +0000 (13:08 -0300)]
Fixed typo in Readme.md

Fixed 22th -> 22nd

11 years agoFix service tests in spinach
Dmitriy Zaporozhets [Wed, 22 May 2013 15:10:51 +0000 (18:10 +0300)]
Fix service tests in spinach

11 years agoCampfire service added
Dmitriy Zaporozhets [Wed, 22 May 2013 14:59:59 +0000 (17:59 +0300)]
Campfire service added

11 years agoMention methods that should be implemented inside service
Dmitriy Zaporozhets [Wed, 22 May 2013 14:59:43 +0000 (17:59 +0300)]
Mention methods that should be implemented inside service

11 years agoAdd tinder for future campfire integration
Dmitriy Zaporozhets [Wed, 22 May 2013 14:59:15 +0000 (17:59 +0300)]
Add tinder for future campfire integration

11 years agoAdd more fields to project service model
Dmitriy Zaporozhets [Wed, 22 May 2013 14:21:05 +0000 (17:21 +0300)]
Add more fields to project service model

11 years agoMake service code more abstract
Dmitriy Zaporozhets [Wed, 22 May 2013 13:58:44 +0000 (16:58 +0300)]
Make service code more abstract

11 years agoReplace all occurs of {{created_at}} at project wall
Dmitriy Zaporozhets [Wed, 22 May 2013 13:12:30 +0000 (16:12 +0300)]
Replace all occurs of {{created_at}} at project wall

11 years agoUse separate property for project path and project path with namespace inside system...
Dmitriy Zaporozhets [Wed, 22 May 2013 11:06:31 +0000 (14:06 +0300)]
Use separate property for project path and project path with namespace inside system hook

11 years agoFix huge MR exceptions. Fixed link to diff for it
Dmitriy Zaporozhets [Wed, 22 May 2013 11:06:08 +0000 (14:06 +0300)]
Fix huge MR exceptions. Fixed link to diff for it

11 years agoinclude namespace in project path for system hook
Dmitriy Zaporozhets [Wed, 22 May 2013 10:39:00 +0000 (13:39 +0300)]
include namespace in project path for system hook

11 years agohandle broken diffs gracefully
Dmitriy Zaporozhets [Wed, 22 May 2013 06:50:09 +0000 (09:50 +0300)]
handle broken diffs gracefully

11 years agoMerge pull request #4018 from dolphin333/fix_cancel_button_link_on_edit_files_page
Dmitriy Zaporozhets [Wed, 22 May 2013 06:00:52 +0000 (23:00 -0700)]
Merge pull request #4018 from dolphin333/fix_cancel_button_link_on_edit_files_page

Fix cancel button link on edit files page

11 years agoFix cancel button link on edit files page
Dolphin [Tue, 21 May 2013 17:33:54 +0000 (02:33 +0900)]
Fix cancel button link on edit files page

11 years agoReplace 5-1-stable with 5-2-stable in installation docs
Dmitriy Zaporozhets [Mon, 20 May 2013 11:52:06 +0000 (14:52 +0300)]
Replace 5-1-stable with 5-2-stable in installation docs

11 years agoVersion up to 5.2 v5.2.0
Dmitriy Zaporozhets [Mon, 20 May 2013 11:46:39 +0000 (14:46 +0300)]
Version up to 5.2

11 years agoBetter remove project message
Dmitriy Zaporozhets [Mon, 20 May 2013 11:22:18 +0000 (14:22 +0300)]
Better remove project message

11 years agoMerge pull request #3990 from bbodenmiller/patch-gitlab-cap
Dmitriy Zaporozhets [Mon, 20 May 2013 06:25:03 +0000 (23:25 -0700)]
Merge pull request #3990 from bbodenmiller/patch-gitlab-cap

changed Gitlab to GitLab in user facing locations

11 years agochanged Gitlab to GitLab
Ben Bodenmiller [Sun, 19 May 2013 09:13:39 +0000 (02:13 -0700)]
changed Gitlab to GitLab

11 years agoMerge pull request #3972 from Razer6/master
Yves Senn [Sun, 19 May 2013 08:25:09 +0000 (01:25 -0700)]
Merge pull request #3972 from Razer6/master

Fix small typo in install docs, Closes #3723

11 years agoMerge pull request #3983 from bbodenmiller/patch-1
Yves Senn [Sun, 19 May 2013 07:41:40 +0000 (00:41 -0700)]
Merge pull request #3983 from bbodenmiller/patch-1

Typo fixes in cleanup.md

11 years agoMerge pull request #3987 from bbodenmiller/patch-3
Yves Senn [Sun, 19 May 2013 07:40:58 +0000 (00:40 -0700)]
Merge pull request #3987 from bbodenmiller/patch-3

Typo fix in database.md closes 3984

11 years agoMerge pull request #3988 from crazyscience/patch-3
Yves Senn [Sun, 19 May 2013 07:40:02 +0000 (00:40 -0700)]
Merge pull request #3988 from crazyscience/patch-3

Fixed grammatical error.

11 years agoFixed grammatical error.
crazyscience [Sat, 18 May 2013 22:46:48 +0000 (16:46 -0600)]
Fixed grammatical error.

11 years agoTypo fix closes gitlabhq/gitlabhq/3984
Ben Bodenmiller [Sat, 18 May 2013 12:39:33 +0000 (06:39 -0600)]
Typo fix closes gitlabhq/gitlabhq/3984

11 years agoUpdate docs for 5.2
Dmitriy Zaporozhets [Sat, 18 May 2013 06:46:14 +0000 (09:46 +0300)]
Update docs for 5.2

11 years agoGitlab-shell should be 1.4.0 for GitLab 5.2
Dmitriy Zaporozhets [Sat, 18 May 2013 06:44:54 +0000 (09:44 +0300)]
Gitlab-shell should be 1.4.0 for GitLab 5.2

11 years agoTypo fixes
Ben Bodenmiller [Fri, 17 May 2013 22:39:55 +0000 (16:39 -0600)]
Typo fixes

11 years agoFix typo in install docs, closes #3723
Robert Schilling [Thu, 16 May 2013 20:16:41 +0000 (22:16 +0200)]
Fix typo in install docs, closes #3723

11 years agoIts time for 5.2.0.rc1
Dmitriy Zaporozhets [Thu, 16 May 2013 14:32:36 +0000 (17:32 +0300)]
Its time for 5.2.0.rc1

11 years agoMerge pull request #3956 from AlexDenisov/issues_bulk_update
Dmitriy Zaporozhets [Thu, 16 May 2013 12:12:40 +0000 (05:12 -0700)]
Merge pull request #3956 from AlexDenisov/issues_bulk_update

Issues bulk update

11 years agorespect whitespaces in blame view
Dmitriy Zaporozhets [Thu, 16 May 2013 12:09:47 +0000 (15:09 +0300)]
respect whitespaces in blame view

11 years agominor styling for dark themes
Dmitriy Zaporozhets [Thu, 16 May 2013 11:12:21 +0000 (14:12 +0300)]
minor styling for dark themes

11 years agoAdded few tests on Issues::BulkUpdateContext
AlexDenisov [Thu, 16 May 2013 10:32:16 +0000 (10:32 +0000)]
Added few tests on Issues::BulkUpdateContext

11 years agoCleanup bulk issues update a bit
AlexDenisov [Wed, 15 May 2013 14:10:39 +0000 (14:10 +0000)]
Cleanup bulk issues update a bit

11 years agoAdded spec on bulk issues update
AlexDenisov [Wed, 15 May 2013 13:59:15 +0000 (13:59 +0000)]
Added spec on bulk issues update

11 years agoFix skipping of some elements in makrdown
Dmitriy Zaporozhets [Thu, 16 May 2013 09:54:10 +0000 (12:54 +0300)]
Fix skipping of some elements in makrdown

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