OSDN Git Service

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

11 years agoFix spinach tests
Dmitriy Zaporozhets [Wed, 31 Jul 2013 17:45:25 +0000 (20:45 +0300)]
Fix spinach tests

11 years agoMore descriptions for pages
Dmitriy Zaporozhets [Wed, 31 Jul 2013 14:53:42 +0000 (17:53 +0300)]
More descriptions for pages

11 years agoAdd page titles with for profile area
Dmitriy Zaporozhets [Wed, 31 Jul 2013 14:39:57 +0000 (17:39 +0300)]
Add page titles with for profile area

11 years agoImprove Notifications page. Much easier to find muted projects now
Dmitriy Zaporozhets [Wed, 31 Jul 2013 14:05:22 +0000 (17:05 +0300)]
Improve Notifications page. Much easier to find muted projects now

11 years agoSemibold headers
Dmitriy Zaporozhets [Wed, 31 Jul 2013 13:24:11 +0000 (16:24 +0300)]
Semibold headers

11 years agoImprove project team page usability
Dmitriy Zaporozhets [Wed, 31 Jul 2013 11:33:09 +0000 (14:33 +0300)]
Improve project team page usability

11 years agoAdd 'repository' to path blacklist, fixes #4591
Robert Schilling [Tue, 30 Jul 2013 18:23:30 +0000 (20:23 +0200)]
Add 'repository' to path blacklist, fixes #4591

11 years agoAdd support for reStructured Text markup language
Robert Schilling [Tue, 30 Jul 2013 17:06:45 +0000 (19:06 +0200)]
Add support for reStructured Text markup language

11 years agoMerge pull request #4669 from jackbot/reenable-create-project-button
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

11 years agoReenable 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

11 years agoFix test case for notification_service
Javier Castro [Mon, 29 Jul 2013 20:34:53 +0000 (17:34 -0300)]
Fix test case for notification_service

11 years agoMerge pull request #4662 from jzi/allow_archive_for_deploy_key
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

11 years agoextract server-side git commands to constants
Jakub Zienkiewicz [Mon, 29 Jul 2013 14:05:08 +0000 (16:05 +0200)]
extract server-side git commands to constants

11 years agoallow all git-upload-* commands for deploy keys
Jakub Zienkiewicz [Mon, 29 Jul 2013 12:25:33 +0000 (14:25 +0200)]
allow all git-upload-* commands for deploy keys

11 years agoMerge branch 'improve/6-0-update-docs' of /home/git/repositories/gitlab/gitlabhq
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

11 years agoMore informative Dashboard#projects page
Dmitriy Zaporozhets [Mon, 29 Jul 2013 19:59:41 +0000 (22:59 +0300)]
More informative Dashboard#projects page

11 years agoFix typo in update docs for 6.0
Dmitriy Zaporozhets [Mon, 29 Jul 2013 19:19:03 +0000 (19:19 +0000)]
Fix typo in update docs for 6.0

11 years agoAdd sing-in button for public area panel
Dmitriy Zaporozhets [Mon, 29 Jul 2013 18:41:05 +0000 (21:41 +0300)]
Add sing-in button for public area panel

11 years agoPrevent top margin for first element in markdown/wiki/readme typography
Dmitriy Zaporozhets [Mon, 29 Jul 2013 18:24:38 +0000 (21:24 +0300)]
Prevent top margin for first element in markdown/wiki/readme typography

11 years agoSuggest MR title based on from branch
Dmitriy Zaporozhets [Mon, 29 Jul 2013 18:17:46 +0000 (21:17 +0300)]
Suggest MR title based on from branch

11 years agoAutofocus to project name at projects#new. Added description field to projects#new...
Dmitriy Zaporozhets [Mon, 29 Jul 2013 18:06:59 +0000 (21:06 +0300)]
Autofocus to project name at projects#new. Added description field to projects#new. Increased timeout for flash message

11 years agoMerge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 29 Jul 2013 17:52:59 +0000 (20:52 +0300)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

11 years agoMerge pull request #4667 from seif/patch-1
Dmitriy Zaporozhets [Mon, 29 Jul 2013 17:23:51 +0000 (10:23 -0700)]
Merge pull request #4667 from seif/patch-1

Fix link to emoji cheat sheet

11 years agoAdd deprecations to update docs for 6.0
Dmitriy Zaporozhets [Mon, 29 Jul 2013 17:11:55 +0000 (17:11 +0000)]
Add deprecations to update docs for 6.0

11 years agoFix link to emoji cheat sheet
Seif Attar [Mon, 29 Jul 2013 17:08:45 +0000 (18:08 +0100)]
Fix link to emoji cheat sheet

11 years agoMerge branch 'improve/public_area' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 29 Jul 2013 14:56:11 +0000 (14:56 +0000)]
Merge branch 'improve/public_area' of /home/git/repositories/gitlab/gitlabhq

11 years agoPublic area spinach tests
Dmitriy Zaporozhets [Mon, 29 Jul 2013 14:07:03 +0000 (17:07 +0300)]
Public area spinach tests

11 years agoFix hardcoded condition and unassigned vars
Dmitriy Zaporozhets [Mon, 29 Jul 2013 13:51:04 +0000 (16:51 +0300)]
Fix hardcoded condition and unassigned vars

11 years agoRender readme file in public project#show
Dmitriy Zaporozhets [Mon, 29 Jul 2013 13:50:00 +0000 (16:50 +0300)]
Render readme file in public project#show

11 years agoShow autocomplete list when editing notes.
Jack Weeden [Mon, 29 Jul 2013 13:16:36 +0000 (14:16 +0100)]
Show autocomplete list when editing notes.

11 years agoMerge pull request #4660 from jojosch/fix-typos
Jacob Vosmaer [Mon, 29 Jul 2013 12:11:25 +0000 (05:11 -0700)]
Merge pull request #4660 from jojosch/fix-typos

Fix typos

11 years agoFix typos
Johannes Schleifenbaum [Mon, 29 Jul 2013 10:46:00 +0000 (12:46 +0200)]
Fix typos

11 years agoRemove reference to broken auth icon functionality
Jacob Vosmaer [Mon, 29 Jul 2013 09:12:44 +0000 (11:12 +0200)]
Remove reference to broken auth icon functionality

11 years agoMerge pull request #4651 from mahmouds/patch-1
Yves Senn [Mon, 29 Jul 2013 05:47:37 +0000 (22:47 -0700)]
Merge pull request #4651 from mahmouds/patch-1

fix typo

11 years agoPublic area: Project#show page prototype
Dmitriy Zaporozhets [Sat, 27 Jul 2013 18:23:35 +0000 (21:23 +0300)]
Public area: Project#show page prototype

11 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sat, 27 Jul 2013 17:22:56 +0000 (20:22 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

11 years agoRemove unecessary %br in help area
Dmitriy Zaporozhets [Sat, 27 Jul 2013 16:34:37 +0000 (19:34 +0300)]
Remove unecessary %br in help area

11 years agofix typo
Mahmoud Mostafa [Sat, 27 Jul 2013 10:25:40 +0000 (13:25 +0300)]
fix typo

11 years agoMerge pull request #4634 from jacargentina/master
Dmitriy Zaporozhets [Sat, 27 Jul 2013 07:45:39 +0000 (00:45 -0700)]
Merge pull request #4634 from jacargentina/master

Added show user name as a tooltip on issue participants list

11 years agoShow tooltip with author email for commit
Dmitriy Zaporozhets [Sat, 27 Jul 2013 07:40:38 +0000 (10:40 +0300)]
Show tooltip with author email for commit

11 years agoAdded show user name as a tooltip on every call to link_to_member when the name is...
Javier Castro [Wed, 24 Jul 2013 21:09:56 +0000 (18:09 -0300)]
Added show user name as a tooltip on every call to link_to_member when the name is not shown inline

11 years agoMerge pull request #4619 from thomasbiddle/merge_request_api
Jacob Vosmaer [Fri, 26 Jul 2013 15:00:42 +0000 (08:00 -0700)]
Merge pull request #4619 from thomasbiddle/merge_request_api

Adding links to the merge requests and group documentation.

11 years agoAdding links to the merge requests and group documentation.
TJ Biddle [Fri, 26 Jul 2013 14:53:35 +0000 (07:53 -0700)]
Adding links to the merge requests and group documentation.

11 years agoFix notifications to handle participants and mentions on commits too
Javier Castro [Mon, 22 Jul 2013 18:45:56 +0000 (15:45 -0300)]
Fix notifications to handle participants and mentions on commits too

11 years agoImprove grammar of label hints
Jacob Vosmaer [Wed, 24 Jul 2013 15:26:14 +0000 (17:26 +0200)]
Improve grammar of label hints

11 years agoMerge pull request #4606 from chaixl/master
Yves Senn [Tue, 23 Jul 2013 09:35:13 +0000 (02:35 -0700)]
Merge pull request #4606 from chaixl/master

Add assets precompile step for fixing activities lost and some UI style issues

11 years agoMerge pull request #4600 from lukaselmer/patch-1
Jacob Vosmaer [Mon, 22 Jul 2013 08:28:50 +0000 (01:28 -0700)]
Merge pull request #4600 from lukaselmer/patch-1

Replace vim by editor

11 years agoBump version of gitlab-shell to 1.7.0
Axilleas Pipinellis [Mon, 22 Jul 2013 06:18:48 +0000 (09:18 +0300)]
Bump version of gitlab-shell to 1.7.0

11 years agoMerge pull request #4605 from jvanbaarsen/installation-manual-fix
Yves Senn [Sun, 21 Jul 2013 10:41:21 +0000 (03:41 -0700)]
Merge pull request #4605 from jvanbaarsen/installation-manual-fix

Fixed an old reference to puma

11 years agoAdd assets precompile step for fixing activities lost and some UI style issues
Chai Xue Liang [Sat, 20 Jul 2013 11:20:21 +0000 (04:20 -0700)]
Add assets precompile step for fixing activities lost and some UI style issues

11 years agoFixed an old reference to puma
Jeroen van Baarsen [Sat, 20 Jul 2013 10:31:13 +0000 (12:31 +0200)]
Fixed an old reference to puma

11 years agoReplace vim by editor
Lukas Elmer [Fri, 19 Jul 2013 15:29:10 +0000 (17:29 +0200)]
Replace vim by editor

11 years agoDoc for update from 5.3 to 5.4
Dmitriy Zaporozhets [Thu, 18 Jul 2013 16:32:13 +0000 (19:32 +0300)]
Doc for update from 5.3 to 5.4

11 years agoMerge branch 'nginx_alternatives_in_recipes' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 18 Jul 2013 16:22:35 +0000 (16:22 +0000)]
Merge branch 'nginx_alternatives_in_recipes' of /home/git/repositories/gitlab/gitlabhq

11 years agoMerge pull request #4289 from karlhungus/feature-ldap-signin-with-email-or-username
Dmitriy Zaporozhets [Thu, 18 Jul 2013 16:20:50 +0000 (09:20 -0700)]
Merge pull request #4289 from karlhungus/feature-ldap-signin-with-email-or-username

Allow the ldap logins with email or username

11 years agoRefer to recipes for nginx alternatives
Jacob Vosmaer [Thu, 18 Jul 2013 13:36:01 +0000 (15:36 +0200)]
Refer to recipes for nginx alternatives

11 years agoDefault allow username or email login to false
Izaak Alpert [Thu, 11 Jul 2013 17:05:01 +0000 (13:05 -0400)]
Default allow username or email login to false

-If not specified in the gitlab.yml default this setting to false

Change-Id: I3551df364498dd84ccbd18c90797522e77159f05

11 years agoUpdate the proc/lamda to be consistent
Izaak Alpert [Wed, 26 Jun 2013 14:49:29 +0000 (10:49 -0400)]
Update the proc/lamda to be consistent

Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3

11 years agoAllow the ldap logins with email or username
Izaak Alpert [Tue, 11 Jun 2013 21:15:59 +0000 (17:15 -0400)]
Allow the ldap logins with email or username

Change-Id: I73b4aa4c46afd56ae02fb24abcd673c0724547e4

11 years agoMerge branch 'improve/snippets' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 18 Jul 2013 11:12:01 +0000 (11:12 +0000)]
Merge branch 'improve/snippets' of /home/git/repositories/gitlab/gitlabhq

11 years agoFix tests
Dmitriy Zaporozhets [Thu, 18 Jul 2013 11:11:17 +0000 (14:11 +0300)]
Fix tests

11 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 18 Jul 2013 11:02:04 +0000 (14:02 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

11 years agoRevert "Update installation.md"
Ariejan de Vroom [Thu, 18 Jul 2013 10:59:41 +0000 (12:59 +0200)]
Revert "Update installation.md"

This reverts commit 670e1be7a402b1340393d298c7ebc05930ed7ac3.

11 years agoRevert "Update installation.md"
Ariejan de Vroom [Thu, 18 Jul 2013 10:59:18 +0000 (12:59 +0200)]
Revert "Update installation.md"

This reverts commit b5cd66d41de98c63fdb048e3d0ce600c9353e230.

11 years agoUse gitlab-shell authorized_keys truncation. Fix issue with authorized_keys stored...
Dmitriy Zaporozhets [Thu, 18 Jul 2013 10:55:01 +0000 (13:55 +0300)]
Use gitlab-shell authorized_keys truncation. Fix issue with authorized_keys stored in different location

11 years agoUser links to user snippets
Dmitriy Zaporozhets [Thu, 18 Jul 2013 10:33:43 +0000 (13:33 +0300)]
User links to user snippets

11 years agoMerge pull request #4564 from mpwoodward/patch-2
Ariejan de Vroom [Thu, 18 Jul 2013 10:27:03 +0000 (03:27 -0700)]
Merge pull request #4564 from mpwoodward/patch-2

Update installation.md