OSDN Git Service
Dmitriy Zaporozhets [Thu, 8 Aug 2013 09:30:50 +0000 (12:30 +0300)]
reset db schema
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
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
Dmitriy Zaporozhets [Thu, 8 Aug 2013 08:58:44 +0000 (11:58 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 8 Aug 2013 08:57:34 +0000 (11:57 +0300)]
Increase input padding. Minor ui fixes
Dmitriy Zaporozhets [Thu, 8 Aug 2013 08:40:42 +0000 (11:40 +0300)]
Fix wiki popup for new page
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
Jacob Vosmaer [Mon, 5 Aug 2013 12:23:25 +0000 (14:23 +0200)]
Add information about the contributing process
Dmitriy Zaporozhets [Thu, 8 Aug 2013 07:27:52 +0000 (10:27 +0300)]
fix tests
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
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
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:40:29 +0000 (23:40 +0300)]
Replace xlarge and xxlarge classes
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:35:24 +0000 (23:35 +0300)]
Replace .actions with .form-actions
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:32:20 +0000 (23:32 +0300)]
use control-group classes for inline forms in rest 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
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
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
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:22:46 +0000 (23:22 +0300)]
use control-group classes for inline forms in issues/mr
Dmitriy Zaporozhets [Wed, 7 Aug 2013 20:20:10 +0000 (23:20 +0300)]
use control-group classes for inline forms in admin area
Dmitriy Zaporozhets [Wed, 7 Aug 2013 19:51:36 +0000 (22:51 +0300)]
Increase amount of search results for issues, mr, projects
Jacob Vosmaer [Wed, 7 Aug 2013 08:10:50 +0000 (01:10 -0700)]
Merge pull request #4727 from Itxaka/master
added python api wrapper
Itxaka Serrano [Tue, 6 Aug 2013 19:24:29 +0000 (21:24 +0200)]
added python api wrapper
Dmitriy Zaporozhets [Tue, 6 Aug 2013 18:22:41 +0000 (21:22 +0300)]
More compact lists for dashboard issues, mr
Dmitriy Zaporozhets [Tue, 6 Aug 2013 18:12:01 +0000 (21:12 +0300)]
Dashboard/Group issues and mr pages refactoring
Dmitriy Zaporozhets [Tue, 6 Aug 2013 17:12:20 +0000 (20:12 +0300)]
Restyle group members page a bit
Dmitriy Zaporozhets [Tue, 6 Aug 2013 15:49:37 +0000 (18:49 +0300)]
toggle content instead of disabling button for group members editing
Dmitriy Zaporozhets [Tue, 6 Aug 2013 15:45:45 +0000 (18:45 +0300)]
Ability to edit group member permissions
Dmitriy Zaporozhets [Tue, 6 Aug 2013 15:03:13 +0000 (18:03 +0300)]
Show correct group membership in profile
Dmitriy Zaporozhets [Tue, 6 Aug 2013 14:58:45 +0000 (17:58 +0300)]
Minor UI improvements
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
Dmitriy Zaporozhets [Mon, 5 Aug 2013 16:10:20 +0000 (19:10 +0300)]
more space for months names in network graph
Dmitriy Zaporozhets [Mon, 5 Aug 2013 16:08:51 +0000 (19:08 +0300)]
more space for days in network graph
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
Dmitriy Zaporozhets [Mon, 5 Aug 2013 15:29:44 +0000 (18:29 +0300)]
Fix tests
Dmitriy Zaporozhets [Mon, 5 Aug 2013 15:16:37 +0000 (18:16 +0300)]
use rubygems for gitlab_git gem
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.
Dmitriy Zaporozhets [Mon, 5 Aug 2013 14:59:58 +0000 (17:59 +0300)]
Refactor recent branches page
Dmitriy Zaporozhets [Mon, 5 Aug 2013 13:55:15 +0000 (16:55 +0300)]
Fix edit files
Dmitriy Zaporozhets [Mon, 5 Aug 2013 13:51:04 +0000 (16:51 +0300)]
Update main calls to gitlab_git
Dmitriy Zaporozhets [Mon, 5 Aug 2013 09:32:24 +0000 (12:32 +0300)]
Fix find_diff for note when noteable is nil
Dmitriy Zaporozhets [Mon, 5 Aug 2013 09:26:33 +0000 (12:26 +0300)]
move backup logic to lib. Fixed removing outdated backups
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'.
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'.
Dmitriy Zaporozhets [Sun, 4 Aug 2013 17:43:49 +0000 (20:43 +0300)]
Move diff parsing to own class. Correctly identify note diff line
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
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
Dmitriy Zaporozhets [Sun, 4 Aug 2013 16:00:41 +0000 (19:00 +0300)]
st_diff field for Note
Dmitriy Zaporozhets [Sun, 4 Aug 2013 14:18:49 +0000 (17:18 +0300)]
Dont allow file edit for non-branches ref
Dmitriy Zaporozhets [Sun, 4 Aug 2013 14:14:15 +0000 (17:14 +0300)]
Sanitize issues title in autocomplete 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
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.
Dmitriy Zaporozhets [Sun, 4 Aug 2013 13:35:18 +0000 (16:35 +0300)]
Add warnings about removing team classes
Dmitriy Zaporozhets [Sun, 4 Aug 2013 13:27:32 +0000 (16:27 +0300)]
Fix broken user link in email
Dmitriy Zaporozhets [Sun, 4 Aug 2013 13:22:06 +0000 (16:22 +0300)]
Fix sending 2 emails on issue close
Dmitriy Zaporozhets [Sun, 4 Aug 2013 10:16:27 +0000 (13:16 +0300)]
Modify style for .slead
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
Robert Schilling [Sat, 3 Aug 2013 12:40:43 +0000 (14:40 +0200)]
Improve markup detection, fixes #4695
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
Dmitriy Zaporozhets [Sat, 3 Aug 2013 08:32:17 +0000 (11:32 +0300)]
Add dealing with newlines for editor in installation.md
Dmitriy Zaporozhets [Sat, 3 Aug 2013 08:30:07 +0000 (11:30 +0300)]
Fix edit project page when repo does not exist
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
Dmitriy Zaporozhets [Fri, 2 Aug 2013 13:47:25 +0000 (13:47 +0000)]
Merge branch 'destroy_duplicate_keys' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Fri, 2 Aug 2013 13:43:30 +0000 (15:43 +0200)]
Delete duplicate keys in migrate_keys task
Dmitriy Zaporozhets [Fri, 2 Aug 2013 12:50:04 +0000 (15:50 +0300)]
Restyle breadcrumbs
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
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
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
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
Dmitriy Zaporozhets [Fri, 2 Aug 2013 09:49:20 +0000 (12:49 +0300)]
Fixed Diff suppressed link for MR
Dmitriy Zaporozhets [Fri, 2 Aug 2013 09:15:30 +0000 (12:15 +0300)]
FIx wiki tests. Fixed margin for issues page
Dmitriy Zaporozhets [Thu, 1 Aug 2013 19:37:30 +0000 (22:37 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 1 Aug 2013 19:35:40 +0000 (22:35 +0300)]
Dont load bootstrap buttons. Modified css with new buttons
Dmitriy Zaporozhets [Thu, 1 Aug 2013 19:35:04 +0000 (22:35 +0300)]
Restyle buttons
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.
Sytse Sijbrandij [Thu, 1 Aug 2013 19:23:57 +0000 (21:23 +0200)]
Better description based on a conversation in the contributor room.
Dmitriy Zaporozhets [Thu, 1 Aug 2013 13:20:18 +0000 (16:20 +0300)]
Improve new project page
Dmitriy Zaporozhets [Thu, 1 Aug 2013 13:11:50 +0000 (16:11 +0300)]
Fix minor wording
Dmitriy Zaporozhets [Thu, 1 Aug 2013 12:59:57 +0000 (15:59 +0300)]
Fix MR modal
Dmitriy Zaporozhets [Thu, 1 Aug 2013 12:21:43 +0000 (15:21 +0300)]
Add titles for blame view and Edit mode
Dmitriy Zaporozhets [Thu, 1 Aug 2013 11:55:30 +0000 (14:55 +0300)]
UI changes: removed box shadow for ui-box and file-holder
Dmitriy Zaporozhets [Wed, 31 Jul 2013 17:45:25 +0000 (20:45 +0300)]
Fix spinach tests
Dmitriy Zaporozhets [Wed, 31 Jul 2013 14:53:42 +0000 (17:53 +0300)]
More descriptions for pages
Dmitriy Zaporozhets [Wed, 31 Jul 2013 14:39:57 +0000 (17:39 +0300)]
Add page titles with for profile area
Dmitriy Zaporozhets [Wed, 31 Jul 2013 14:05:22 +0000 (17:05 +0300)]
Improve Notifications page. Much easier to find muted projects now
Dmitriy Zaporozhets [Wed, 31 Jul 2013 13:24:11 +0000 (16:24 +0300)]
Semibold headers
Dmitriy Zaporozhets [Wed, 31 Jul 2013 11:33:09 +0000 (14:33 +0300)]
Improve project team page usability
Izaak Alpert [Tue, 30 Jul 2013 20:19:17 +0000 (16:19 -0400)]
Removed some debug code
Change-Id: Ibd0088f498faccc72acda2783b61bbea19bd835d
Izaak Alpert [Tue, 30 Jul 2013 20:09:40 +0000 (16:09 -0400)]
Updated format_patch to use '..' rather than '...'
Was incorrectly including commits reachable from rev2.
Change-Id: I3560e5d5ce474ba3d374f29ae16190b1f74989be
Robert Schilling [Tue, 30 Jul 2013 18:23:30 +0000 (20:23 +0200)]
Add 'repository' to path blacklist, fixes #4591
Robert Schilling [Tue, 30 Jul 2013 17:06:45 +0000 (19:06 +0200)]
Add support for reStructured Text markup language
Dmitriy Zaporozhets [Tue, 30 Jul 2013 13:04:11 +0000 (06:04 -0700)]
Merge pull request #4669 from jackbot/reenable-create-project-button
Reenable the create project button after errors
Jack Weeden [Tue, 30 Jul 2013 12:05:24 +0000 (13:05 +0100)]
Reenable the create project button after errors
Currently if you try to create a project from an existing repo but give it a bad
URL, you see the "Import url should be a valid url" error and the form, but the
submit button is disabled meaning you can't fix the URL and resubmit the form.
This fix just enables the button when the project has an error.
Closes #4070
Javier Castro [Mon, 29 Jul 2013 20:34:53 +0000 (17:34 -0300)]
Fix test case for notification_service
Dmitriy Zaporozhets [Tue, 30 Jul 2013 11:21:57 +0000 (04:21 -0700)]
Merge pull request #4662 from jzi/allow_archive_for_deploy_key
allow all git-upload-* commands for deploy keys
Dmitriy Zaporozhets [Tue, 30 Jul 2013 11:12:24 +0000 (14:12 +0300)]
Remove ugly button and truncate too long project names. Remove unecessary newlines
Dmitriy Zaporozhets [Tue, 30 Jul 2013 10:35:33 +0000 (13:35 +0300)]
Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork
Conflicts:
app/views/projects/commit/show.html.haml
app/views/projects/compare/show.html.haml
app/views/projects/merge_requests/branch_from.js.haml
Jakub Zienkiewicz [Mon, 29 Jul 2013 14:05:08 +0000 (16:05 +0200)]
extract server-side git commands to constants
Jakub Zienkiewicz [Mon, 29 Jul 2013 12:25:33 +0000 (14:25 +0200)]
allow all git-upload-* commands for deploy keys
Sytse Sijbrandij [Mon, 29 Jul 2013 20:06:12 +0000 (20:06 +0000)]
Merge branch 'improve/6-0-update-docs' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 29 Jul 2013 19:59:41 +0000 (22:59 +0300)]
More informative Dashboard#projects page