OSDN Git Service

wvm/gitlab.git
10 years agoFix caching when using remote redis server
Robin Gloster [Tue, 13 Aug 2013 22:02:27 +0000 (00:02 +0200)]
Fix caching when using remote redis server

10 years agoUpdate gitlab_git to 2.0.1
Dmitriy Zaporozhets [Tue, 13 Aug 2013 13:57:47 +0000 (16:57 +0300)]
Update gitlab_git to 2.0.1

10 years agoUse gitlab_git v2.0.0
Dmitriy Zaporozhets [Tue, 13 Aug 2013 13:26:59 +0000 (16:26 +0300)]
Use gitlab_git v2.0.0

10 years agoImprove repository graph
Dmitriy Zaporozhets [Tue, 13 Aug 2013 13:26:48 +0000 (16:26 +0300)]
Improve repository graph

10 years agoAllow project name, path etc start with number. Fixed specs
Dmitriy Zaporozhets [Tue, 13 Aug 2013 09:24:10 +0000 (12:24 +0300)]
Allow project name, path etc start with number. Fixed specs

10 years agoValidate project limit only when create project
Dmitriy Zaporozhets [Tue, 13 Aug 2013 09:04:11 +0000 (12:04 +0300)]
Validate project limit only when create project

10 years agoIncrease commit title limit at Commit#show so it does not truncate most of Merge...
Dmitriy Zaporozhets [Mon, 12 Aug 2013 19:28:31 +0000 (22:28 +0300)]
Increase commit title limit at Commit#show so it does not truncate most of Merge messages

10 years agoPrevent 500 on project home page if project has extremely huge number of commits
Dmitriy Zaporozhets [Mon, 12 Aug 2013 19:23:01 +0000 (22:23 +0300)]
Prevent 500 on project home page if project has extremely huge number of commits

10 years agoImprove Commit#show page UI
Dmitriy Zaporozhets [Mon, 12 Aug 2013 19:22:31 +0000 (22:22 +0300)]
Improve Commit#show page UI

10 years agoMinor UI fix for commit description
Dmitriy Zaporozhets [Mon, 12 Aug 2013 17:59:06 +0000 (20:59 +0300)]
Minor UI fix for commit description

10 years agoReload page during repo import
Dmitriy Zaporozhets [Mon, 12 Aug 2013 16:28:10 +0000 (19:28 +0300)]
Reload page during repo import

10 years agoRepository import during project creation often return timeout for medium and large...
Dmitriy Zaporozhets [Mon, 12 Aug 2013 15:21:47 +0000 (18:21 +0300)]
Repository import during project creation often return timeout for medium and large repos.
So lets do it async. First create project, then import repo and create
satellite with Sidekiq

10 years agoMinor UI improvements
Dmitriy Zaporozhets [Mon, 12 Aug 2013 14:21:57 +0000 (17:21 +0300)]
Minor UI improvements

10 years agoMinor UI fixes for login page
Dmitriy Zaporozhets [Mon, 12 Aug 2013 09:38:30 +0000 (12:38 +0300)]
Minor UI fixes for login page

10 years agoMinor UI improvements
Dmitriy Zaporozhets [Mon, 12 Aug 2013 09:08:52 +0000 (12:08 +0300)]
Minor UI improvements

10 years agohide no-ssh message if notice or alert present
Dmitriy Zaporozhets [Sat, 10 Aug 2013 18:20:03 +0000 (21:20 +0300)]
hide no-ssh message if notice or alert present

10 years agoMore readable notice/alert messages
Dmitriy Zaporozhets [Sat, 10 Aug 2013 18:10:24 +0000 (21:10 +0300)]
More readable notice/alert messages

10 years agoRemove unnecessary margin for issue/mr title
Dmitriy Zaporozhets [Sat, 10 Aug 2013 17:54:17 +0000 (20:54 +0300)]
Remove unnecessary margin for issue/mr title

10 years agoMerge branch 'focus-of-gitlab-recipes' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 10 Aug 2013 17:30:47 +0000 (17:30 +0000)]
Merge branch 'focus-of-gitlab-recipes' of /home/git/repositories/gitlab/gitlabhq

10 years agoRemove unused files
Dmitriy Zaporozhets [Sat, 10 Aug 2013 17:26:58 +0000 (20:26 +0300)]
Remove unused files

10 years agoRewrite issues/mr filtering logic
Dmitriy Zaporozhets [Sat, 10 Aug 2013 17:25:53 +0000 (20:25 +0300)]
Rewrite issues/mr filtering logic

10 years agoMention gitlab recipes correctly, small updates to update section.
Sytse Sijbrandij [Sat, 10 Aug 2013 16:56:15 +0000 (18:56 +0200)]
Mention gitlab recipes correctly, small updates to update section.

10 years agoFix checkall issues checkbox position for FF
Dmitriy Zaporozhets [Sat, 10 Aug 2013 16:37:31 +0000 (19:37 +0300)]
Fix checkall issues checkbox position for FF

10 years agoFix issues update title selectboxes with zero width
Dmitriy Zaporozhets [Sat, 10 Aug 2013 16:30:27 +0000 (19:30 +0300)]
Fix issues update title selectboxes with zero width

10 years agoDifferent search placeholder depdends on area
Dmitriy Zaporozhets [Sat, 10 Aug 2013 16:12:25 +0000 (19:12 +0300)]
Different search placeholder depdends on area

10 years agoMerge branch 'fix-sidekiq-stuck-workers' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 10 Aug 2013 14:47:08 +0000 (14:47 +0000)]
Merge branch 'fix-sidekiq-stuck-workers' of /home/git/repositories/gitlab/gitlabhq

10 years agoFix for Resque forking might cause stuck workers for the threaded Sidekiq.
Sytse Sijbrandij [Sat, 10 Aug 2013 14:20:33 +0000 (16:20 +0200)]
Fix for Resque forking might cause stuck workers for the threaded Sidekiq.

10 years agoMerge pull request #4749 from tdm00/update-install-doc-link-to-master
Dmitriy Zaporozhets [Sat, 10 Aug 2013 10:41:16 +0000 (03:41 -0700)]
Merge pull request #4749 from tdm00/update-install-doc-link-to-master

Change links from 5-3 branch to point to master instead

10 years agoMerge pull request #4750 from ronaldvaneede/test_service_button
Dmitriy Zaporozhets [Sat, 10 Aug 2013 10:40:32 +0000 (03:40 -0700)]
Merge pull request #4750 from ronaldvaneede/test_service_button

Fix for #4535 ('Test settings' button for services gives 500 on empty repo)

10 years agoMerge branch 'warn-against-using-master' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 10 Aug 2013 10:20:03 +0000 (10:20 +0000)]
Merge branch 'warn-against-using-master' of /home/git/repositories/gitlab/gitlabhq

10 years agoAdded can_test? mehod to Service model and added tests
Ronald van Eede [Fri, 9 Aug 2013 18:14:02 +0000 (20:14 +0200)]
Added can_test? mehod to Service model and added tests

10 years agoChange links to 5-3 branch to point to master instead
Troy Murray [Fri, 9 Aug 2013 18:08:56 +0000 (14:08 -0400)]
Change links to 5-3 branch to point to master instead

10 years agoStronger and more specific warning.
Sytse Sijbrandij [Fri, 9 Aug 2013 13:37:28 +0000 (15:37 +0200)]
Stronger and more specific warning.

10 years agoExtend CHANGELOG for 6.0
Dmitriy Zaporozhets [Fri, 9 Aug 2013 13:17:52 +0000 (16:17 +0300)]
Extend CHANGELOG for 6.0

10 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Fri, 9 Aug 2013 13:00:04 +0000 (16:00 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

10 years agoMerge branch 'improve-wording' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 9 Aug 2013 12:59:51 +0000 (12:59 +0000)]
Merge branch 'improve-wording' of /home/git/repositories/gitlab/gitlabhq

10 years agoMerge branch 'update_gitlab_shell_in_5_4_upgrade' of /home/git/repositories/gitlab...
Dmitriy Zaporozhets [Fri, 9 Aug 2013 12:59:10 +0000 (12:59 +0000)]
Merge branch 'update_gitlab_shell_in_5_4_upgrade' of /home/git/repositories/gitlab/gitlabhq

10 years agoUpdate to gitlab-shell 1.5.0 during 5.3-5.4 update
Jacob Vosmaer [Fri, 9 Aug 2013 12:46:25 +0000 (14:46 +0200)]
Update to gitlab-shell 1.5.0 during 5.3-5.4 update

10 years agoThx Jacob.
Sytse Sijbrandij [Fri, 9 Aug 2013 12:46:09 +0000 (14:46 +0200)]
Thx Jacob.

10 years agoBetter wording of diff surpression.
Sytse Sijbrandij [Fri, 9 Aug 2013 12:25:22 +0000 (14:25 +0200)]
Better wording of diff surpression.

10 years agoMerge pull request #4738 from fnkr/patch-1
Jacob Vosmaer [Fri, 9 Aug 2013 11:55:17 +0000 (04:55 -0700)]
Merge pull request #4738 from fnkr/patch-1

new animated-screenshots

10 years agochanged the image link to include the commit SHA
Florian Kaiser [Fri, 9 Aug 2013 11:31:16 +0000 (13:31 +0200)]
changed the image link to include the commit SHA

10 years agoMerge branch 'fix/branch-padding' of /home/git/repositories/dzaporozhets/gitlabhq
Dmitriy Zaporozhets [Thu, 8 Aug 2013 20:49:40 +0000 (20:49 +0000)]
Merge branch 'fix/branch-padding' of /home/git/repositories/dzaporozhets/gitlabhq

10 years agoRemove unecessary paddding at Branches#index page
Dmitriy Zaporozhets [Thu, 8 Aug 2013 20:48:06 +0000 (20:48 +0000)]
Remove unecessary paddding at Branches#index page

10 years agoMerge branch 'master' of /home/git/repositories/dzaporozhets/gitlabhq
Dmitriy Zaporozhets [Thu, 8 Aug 2013 20:45:36 +0000 (20:45 +0000)]
Merge branch 'master' of /home/git/repositories/dzaporozhets/gitlabhq

10 years agoquickfix
Dmitriy Zaporozhets [Thu, 8 Aug 2013 20:38:41 +0000 (23:38 +0300)]
quickfix

10 years agoFix form mr issue with ci
Dmitriy Zaporozhets [Thu, 8 Aug 2013 20:34:36 +0000 (23:34 +0300)]
Fix form mr issue with ci

10 years agoRemove unecessary paddding at Branches#recent page
Dmitriy Zaporozhets [Thu, 8 Aug 2013 20:25:47 +0000 (20:25 +0000)]
Remove unecessary paddding at Branches#recent page

10 years agoFix assign-to-me buttton
Dmitriy Zaporozhets [Thu, 8 Aug 2013 18:26:13 +0000 (21:26 +0300)]
Fix assign-to-me buttton

10 years agoMention Merge requests on forks in changelog
Dmitriy Zaporozhets [Thu, 8 Aug 2013 18:14:19 +0000 (21:14 +0300)]
Mention Merge requests on forks in changelog

10 years agoimprove MergeRequest edit page
Dmitriy Zaporozhets [Thu, 8 Aug 2013 18:11:28 +0000 (21:11 +0300)]
improve MergeRequest edit page

10 years agoupdate devise to 2.2.5
Dmitriy Zaporozhets [Thu, 8 Aug 2013 16:45:03 +0000 (19:45 +0300)]
update devise to 2.2.5

10 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 8 Aug 2013 16:00:53 +0000 (19:00 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

10 years agoCompact list for commits page
Dmitriy Zaporozhets [Thu, 8 Aug 2013 15:59:46 +0000 (18:59 +0300)]
Compact list for commits page

10 years agoMerge branch 'karlhungus-mr-on-fork' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 8 Aug 2013 15:46:09 +0000 (15:46 +0000)]
Merge branch 'karlhungus-mr-on-fork' of /home/git/repositories/gitlab/gitlabhq

10 years agoRevert notification specs
Dmitriy Zaporozhets [Thu, 8 Aug 2013 14:42:27 +0000 (17:42 +0300)]
Revert notification specs

10 years agoFix filter context. Dont duplicate target project name for MR
Dmitriy Zaporozhets [Thu, 8 Aug 2013 14:29:31 +0000 (17:29 +0300)]
Fix filter context. Dont duplicate target project name for MR

10 years agoMerge pull request #4664 from tdm00/clarify-adding-custom-oauth-provider
Jacob Vosmaer [Thu, 8 Aug 2013 14:24:49 +0000 (07:24 -0700)]
Merge pull request #4664 from tdm00/clarify-adding-custom-oauth-provider

Clarify documentation on how to add custom Omniauth provider to GitLab

10 years agoClarify documentation on how to add custom Omniauth provider to GitLab
Troy Murray [Mon, 29 Jul 2013 13:18:31 +0000 (09:18 -0400)]
Clarify documentation on how to add custom Omniauth provider to GitLab

10 years agofix chosen ui. fixed network tests
Dmitriy Zaporozhets [Thu, 8 Aug 2013 13:14:38 +0000 (16:14 +0300)]
fix chosen ui. fixed network tests

10 years agoUpdate chosen, improve ui, fix MR fork tests
Dmitriy Zaporozhets [Thu, 8 Aug 2013 12:14:59 +0000 (15:14 +0300)]
Update chosen, improve ui, fix MR fork tests

10 years agonew animated-screenshots
Florian Kaiser [Thu, 8 Aug 2013 11:51:57 +0000 (13:51 +0200)]
new animated-screenshots

- half size: 1465 KB -> 641KB
- mutch better quality
- no MakeAGIF.com branding
- HTTPS link (via github gist) so there is no github-camo proxy needed (camo makes this image loading 0.55s slower in my short test)
- all source-files are available here: https://gist.github.com/fnkr/2f9badd56bfe0ed04ee7

10 years agoFix unmerged diff for non-fork MR
Dmitriy Zaporozhets [Thu, 8 Aug 2013 09:44:33 +0000 (12:44 +0300)]
Fix unmerged diff for non-fork MR

10 years agoreset db schema
Dmitriy Zaporozhets [Thu, 8 Aug 2013 09:30:50 +0000 (12:30 +0300)]
reset db schema

10 years agoMerge branch 'master' into karlhungus-mr-on-fork
Dmitriy Zaporozhets [Thu, 8 Aug 2013 09:22:09 +0000 (12:22 +0300)]
Merge branch 'master' into karlhungus-mr-on-fork

Conflicts:
app/contexts/filter_context.rb
app/contexts/search_context.rb
app/models/merge_request.rb
app/models/note.rb
app/views/shared/_merge_requests.html.haml
spec/controllers/commit_controller_spec.rb
spec/services/notification_service_spec.rb

10 years agoMerge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus...
Dmitriy Zaporozhets [Thu, 8 Aug 2013 09:12:46 +0000 (12:12 +0300)]
Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork

10 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 8 Aug 2013 08:58:44 +0000 (11:58 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

10 years agoIncrease input padding. Minor ui fixes
Dmitriy Zaporozhets [Thu, 8 Aug 2013 08:57:34 +0000 (11:57 +0300)]
Increase input padding. Minor ui fixes

10 years agoFix wiki popup for new page
Dmitriy Zaporozhets [Thu, 8 Aug 2013 08:40:42 +0000 (11:40 +0300)]
Fix wiki popup for new page

10 years agoMerge pull request #4710 from gitlabhq/contributing_guide
Jacob Vosmaer [Thu, 8 Aug 2013 07:56:25 +0000 (00:56 -0700)]
Merge pull request #4710 from gitlabhq/contributing_guide

Add guidelines for the Contributing Process in PROCESS.md

10 years agoAdd information about the contributing process
Jacob Vosmaer [Mon, 5 Aug 2013 12:23:25 +0000 (14:23 +0200)]
Add information about the contributing process

10 years agofix tests
Dmitriy Zaporozhets [Thu, 8 Aug 2013 07:27:52 +0000 (10:27 +0300)]
fix tests

10 years agoMerge branch 'improve/proper_form_classes' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:55:39 +0000 (20:55 +0000)]
Merge branch 'improve/proper_form_classes' of /home/git/repositories/gitlab/gitlabhq

10 years agoBetter filter var for MR. show reset filter only if makes sense
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:54:26 +0000 (23:54 +0300)]
Better filter var for MR. show reset filter only if makes sense

10 years agoReplace xlarge and xxlarge classes
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:40:29 +0000 (23:40 +0300)]
Replace xlarge and xxlarge classes

10 years agoReplace .actions with .form-actions
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:35:24 +0000 (23:35 +0300)]
Replace .actions with .form-actions

10 years agouse control-group classes for inline forms in rest pages
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:32:20 +0000 (23:32 +0300)]
use control-group classes for inline forms in rest pages

10 years agouse control-group classes for inline forms in project area pages
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:30:40 +0000 (23:30 +0300)]
use control-group classes for inline forms in project area pages

10 years agouse control-group classes for inline forms in project new/edit pages
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:28:02 +0000 (23:28 +0300)]
use control-group classes for inline forms in project new/edit pages

10 years agouse control-group classes for inline forms in profile and group pages
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:24:34 +0000 (23:24 +0300)]
use control-group classes for inline forms in profile and group pages

10 years agouse control-group classes for inline forms in issues/mr
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:22:46 +0000 (23:22 +0300)]
use control-group classes for inline forms in issues/mr

10 years agouse control-group classes for inline forms in admin area
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:20:10 +0000 (23:20 +0300)]
use control-group classes for inline forms in admin area

10 years agoIncrease amount of search results for issues, mr, projects
Dmitriy Zaporozhets [Wed, 7 Aug 2013 19:51:36 +0000 (22:51 +0300)]
Increase amount of search results for issues, mr, projects

10 years agoMerge pull request #4727 from Itxaka/master
Jacob Vosmaer [Wed, 7 Aug 2013 08:10:50 +0000 (01:10 -0700)]
Merge pull request #4727 from Itxaka/master

added python api wrapper

10 years agoadded python api wrapper
Itxaka Serrano [Tue, 6 Aug 2013 19:24:29 +0000 (21:24 +0200)]
added python api wrapper

10 years agoMore compact lists for dashboard issues, mr
Dmitriy Zaporozhets [Tue, 6 Aug 2013 18:22:41 +0000 (21:22 +0300)]
More compact lists for dashboard issues, mr

10 years agoDashboard/Group issues and mr pages refactoring
Dmitriy Zaporozhets [Tue, 6 Aug 2013 18:12:01 +0000 (21:12 +0300)]
Dashboard/Group issues and mr pages refactoring

10 years agoRestyle group members page a bit
Dmitriy Zaporozhets [Tue, 6 Aug 2013 17:12:20 +0000 (20:12 +0300)]
Restyle group members page a bit

10 years agotoggle content instead of disabling button for group members editing
Dmitriy Zaporozhets [Tue, 6 Aug 2013 15:49:37 +0000 (18:49 +0300)]
toggle content instead of disabling button for group members editing

10 years agoAbility to edit group member permissions
Dmitriy Zaporozhets [Tue, 6 Aug 2013 15:45:45 +0000 (18:45 +0300)]
Ability to edit group member permissions

10 years agoShow correct group membership in profile
Dmitriy Zaporozhets [Tue, 6 Aug 2013 15:03:13 +0000 (18:03 +0300)]
Show correct group membership  in profile

10 years agoMinor UI improvements
Dmitriy Zaporozhets [Tue, 6 Aug 2013 14:58:45 +0000 (17:58 +0300)]
Minor UI improvements

10 years agoMerge branch 'add_unofficial_irc_to_readme' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 6 Aug 2013 13:47:02 +0000 (13:47 +0000)]
Merge branch 'add_unofficial_irc_to_readme' of /home/git/repositories/gitlab/gitlabhq

10 years agomore space for months names in network graph
Dmitriy Zaporozhets [Mon, 5 Aug 2013 16:10:20 +0000 (19:10 +0300)]
more space for months names in network graph

10 years agomore space for days in network graph
Dmitriy Zaporozhets [Mon, 5 Aug 2013 16:08:51 +0000 (19:08 +0300)]
more space for days in network graph

10 years agoMerge branch 'refactor/gitlab_git_2' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 5 Aug 2013 16:00:12 +0000 (16:00 +0000)]
Merge branch 'refactor/gitlab_git_2' of /home/git/repositories/gitlab/gitlabhq

10 years agoFix tests
Dmitriy Zaporozhets [Mon, 5 Aug 2013 15:29:44 +0000 (18:29 +0300)]
Fix tests

10 years agouse rubygems for gitlab_git gem
Dmitriy Zaporozhets [Mon, 5 Aug 2013 15:16:37 +0000 (18:16 +0300)]
use rubygems for gitlab_git gem

10 years agoMerge pull request #4705 from DarthNerdus/new-user-email
Jacob Vosmaer [Mon, 5 Aug 2013 15:16:00 +0000 (08:16 -0700)]
Merge pull request #4705 from DarthNerdus/new-user-email

Add appropriate article to new user email.

10 years agoRefactor recent branches page
Dmitriy Zaporozhets [Mon, 5 Aug 2013 14:59:58 +0000 (17:59 +0300)]
Refactor recent branches page