OSDN Git Service

wvm/gitlab.git
11 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

11 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

11 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

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

11 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

11 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

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

11 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

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

11 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

11 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

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

11 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

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

11 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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

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

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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

11 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

11 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

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

11 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

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

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

11 years agoFix edit files
Dmitriy Zaporozhets [Mon, 5 Aug 2013 13:55:15 +0000 (16:55 +0300)]
Fix edit files

11 years agoUpdate main calls to gitlab_git
Dmitriy Zaporozhets [Mon, 5 Aug 2013 13:51:04 +0000 (16:51 +0300)]
Update main calls to gitlab_git

11 years agoFix find_diff for note when noteable is nil
Dmitriy Zaporozhets [Mon, 5 Aug 2013 09:32:24 +0000 (12:32 +0300)]
Fix find_diff for note when noteable is nil

11 years agomove backup logic to lib. Fixed removing outdated backups
Dmitriy Zaporozhets [Mon, 5 Aug 2013 09:26:33 +0000 (12:26 +0300)]
move backup logic to lib. Fixed removing outdated backups

11 years agoUpdate new_user_email.text.erb
Jesse Read [Sun, 4 Aug 2013 22:04:47 +0000 (18:04 -0400)]
Update new_user_email.text.erb

Fixed template to include the word 'the'.

11 years agoUpdate new_user_email.html.haml
Jesse Read [Sun, 4 Aug 2013 22:04:20 +0000 (18:04 -0400)]
Update new_user_email.html.haml

Fixed template to include the word 'the'.

11 years agoMove diff parsing to own class. Correctly identify note diff line
Dmitriy Zaporozhets [Sun, 4 Aug 2013 17:43:49 +0000 (20:43 +0300)]
Move diff parsing to own class. Correctly identify note diff line

11 years agoDont show comment on diff if diff line was changed after comment left
Dmitriy Zaporozhets [Sun, 4 Aug 2013 16:35:47 +0000 (19:35 +0300)]
Dont show comment on diff if diff line was changed after comment left

11 years agoStore diff with line note. It makes possible to see inline notes with proper diff...
Dmitriy Zaporozhets [Sun, 4 Aug 2013 16:01:57 +0000 (19:01 +0300)]
Store diff with line note. It makes possible to see inline notes with proper diff even if MR diff changed

11 years agost_diff field for Note
Dmitriy Zaporozhets [Sun, 4 Aug 2013 16:00:41 +0000 (19:00 +0300)]
st_diff field for Note

11 years agoDont allow file edit for non-branches ref
Dmitriy Zaporozhets [Sun, 4 Aug 2013 14:18:49 +0000 (17:18 +0300)]
Dont allow file edit for non-branches ref

11 years agoSanitize issues title in autocomplete for comment
Dmitriy Zaporozhets [Sun, 4 Aug 2013 14:14:15 +0000 (17:14 +0300)]
Sanitize issues title in autocomplete for comment

11 years agoIt was hard to click on small edit icon for comment
Dmitriy Zaporozhets [Sun, 4 Aug 2013 13:46:46 +0000 (16:46 +0300)]
It was hard to click on small edit icon for comment

11 years agoMerge pull request #4663 from jackbot/autocomplete_in_editable_notes
Dmitriy Zaporozhets [Sun, 4 Aug 2013 13:36:36 +0000 (06:36 -0700)]
Merge pull request #4663 from jackbot/autocomplete_in_editable_notes

Show autocomplete list when editing notes.

11 years agoAdd warnings about removing team classes
Dmitriy Zaporozhets [Sun, 4 Aug 2013 13:35:18 +0000 (16:35 +0300)]
Add warnings about removing team classes

11 years agoFix broken user link in email
Dmitriy Zaporozhets [Sun, 4 Aug 2013 13:27:32 +0000 (16:27 +0300)]
Fix broken user link in email

11 years agoFix sending 2 emails on issue close
Dmitriy Zaporozhets [Sun, 4 Aug 2013 13:22:06 +0000 (16:22 +0300)]
Fix sending 2 emails on issue close

11 years agoModify style for .slead
Dmitriy Zaporozhets [Sun, 4 Aug 2013 10:16:27 +0000 (13:16 +0300)]
Modify style for .slead

11 years agoMerge pull request #4698 from Razer6/improve_markup_detection
Dmitriy Zaporozhets [Sun, 4 Aug 2013 09:25:36 +0000 (02:25 -0700)]
Merge pull request #4698 from Razer6/improve_markup_detection

Improve markup detection, fixes #4695

11 years agoImprove markup detection, fixes #4695
Robert Schilling [Sat, 3 Aug 2013 12:40:43 +0000 (14:40 +0200)]
Improve markup detection, fixes #4695

11 years agoMerge pull request #4673 from Razer6/support_restructured_text
Dmitriy Zaporozhets [Sat, 3 Aug 2013 08:45:51 +0000 (01:45 -0700)]
Merge pull request #4673 from Razer6/support_restructured_text

Add support for reStructured Text markup language

11 years agoAdd dealing with newlines for editor in installation.md
Dmitriy Zaporozhets [Sat, 3 Aug 2013 08:32:17 +0000 (11:32 +0300)]
Add dealing with newlines for editor in installation.md

11 years agoFix edit project page when repo does not exist
Dmitriy Zaporozhets [Sat, 3 Aug 2013 08:30:07 +0000 (11:30 +0300)]
Fix edit project page when repo does not exist

11 years agoMerge pull request #4612 from axilleas/bump-gitlab-shell-version_master
Dmitriy Zaporozhets [Sat, 3 Aug 2013 07:15:05 +0000 (00:15 -0700)]
Merge pull request #4612 from axilleas/bump-gitlab-shell-version_master

Bump version of gitlab-shell to 1.7.0

11 years agoMerge branch 'destroy_duplicate_keys' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 2 Aug 2013 13:47:25 +0000 (13:47 +0000)]
Merge branch 'destroy_duplicate_keys' of /home/git/repositories/gitlab/gitlabhq

11 years agoDelete duplicate keys in migrate_keys task
Jacob Vosmaer [Fri, 2 Aug 2013 13:43:30 +0000 (15:43 +0200)]
Delete duplicate keys in migrate_keys task

11 years agoRestyle breadcrumbs
Dmitriy Zaporozhets [Fri, 2 Aug 2013 12:50:04 +0000 (15:50 +0300)]
Restyle breadcrumbs

11 years agoFixed Fixed issue when project default branch selected from non-exists and UI does...
Dmitriy Zaporozhets [Fri, 2 Aug 2013 12:20:55 +0000 (15:20 +0300)]
Fixed Fixed issue when project default branch selected from non-exists and UI does not allow to change it

11 years agoAdded ability to close milestone with opened issues. UI for milestone page improved
Dmitriy Zaporozhets [Fri, 2 Aug 2013 10:44:25 +0000 (13:44 +0300)]
Added ability to close milestone with opened issues. UI for milestone page improved

11 years agoMerge pull request #4618 from jacargentina/notification-on-commits
Dmitriy Zaporozhets [Fri, 2 Aug 2013 10:02:05 +0000 (03:02 -0700)]
Merge pull request #4618 from jacargentina/notification-on-commits

Fix notifications to handle participants and mentions on commits too

11 years agoMerge pull request #4674 from Razer6/update_path_blacklist
Dmitriy Zaporozhets [Fri, 2 Aug 2013 09:51:51 +0000 (02:51 -0700)]
Merge pull request #4674 from Razer6/update_path_blacklist

Add 'repository' to path blacklist, fixes #4591

11 years agoFixed Diff suppressed link for MR
Dmitriy Zaporozhets [Fri, 2 Aug 2013 09:49:20 +0000 (12:49 +0300)]
Fixed Diff suppressed link for MR

11 years agoFIx wiki tests. Fixed margin for issues page
Dmitriy Zaporozhets [Fri, 2 Aug 2013 09:15:30 +0000 (12:15 +0300)]
FIx wiki tests. Fixed margin for issues page

11 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 1 Aug 2013 19:37:30 +0000 (22:37 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

11 years agoDont load bootstrap buttons. Modified css with new buttons
Dmitriy Zaporozhets [Thu, 1 Aug 2013 19:35:40 +0000 (22:35 +0300)]
Dont load bootstrap buttons. Modified css with new buttons

11 years agoRestyle buttons
Dmitriy Zaporozhets [Thu, 1 Aug 2013 19:35:04 +0000 (22:35 +0300)]
Restyle buttons

11 years agoMerge pull request #4692 from gitlabhq/i-should-no-create-branches-on-github
Sytse Sijbrandij [Thu, 1 Aug 2013 19:26:49 +0000 (12:26 -0700)]
Merge pull request #4692 from gitlabhq/i-should-no-create-branches-on-github

Better description based on a conversation in the contributor room.

11 years agoBetter description based on a conversation in the contributor room.
Sytse Sijbrandij [Thu, 1 Aug 2013 19:23:57 +0000 (21:23 +0200)]
Better description based on a conversation in the contributor room.

11 years agoImprove new project page
Dmitriy Zaporozhets [Thu, 1 Aug 2013 13:20:18 +0000 (16:20 +0300)]
Improve new project page

11 years agoFix minor wording
Dmitriy Zaporozhets [Thu, 1 Aug 2013 13:11:50 +0000 (16:11 +0300)]
Fix minor wording

11 years agoFix MR modal
Dmitriy Zaporozhets [Thu, 1 Aug 2013 12:59:57 +0000 (15:59 +0300)]
Fix MR modal

11 years agoAdd titles for blame view and Edit mode
Dmitriy Zaporozhets [Thu, 1 Aug 2013 12:21:43 +0000 (15:21 +0300)]
Add titles for blame view and Edit mode

11 years agoUI changes: removed box shadow for ui-box and file-holder
Dmitriy Zaporozhets [Thu, 1 Aug 2013 11:55:30 +0000 (14:55 +0300)]
UI changes: removed box shadow for ui-box and file-holder