home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,299 Commits 48 Branches 340 Tags
471e183f8aefbbcf9f83386217030f6775bbc134
Commit Graph
11299 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 471e183f8a Better ldap info sentence 2014-08-12 08:02:20 +00:00
Dmitriy Zaporozhets ced5d5177a Show ldap notice on group member page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-12 10:45:20 +03:00
Dmitriy Zaporozhets fc16223c81 Show group ldap settings on admin/group page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-12 10:33:27 +03:00
Dmitriy Zaporozhets 005c421fcf Merge branch '711ee' into 'master' 
711ee

add the 7.1.1-ee packages

See merge request !138
 2014-07-29 11:45:14 +00:00
Job van der Voort 53f47353c0 add 7.1.1-ee packages 2014-07-29 13:32:18 +02:00
Dmitriy Zaporozhets 0b79c55f1e Merge branch 'admin_group_edit' into 'master' 
Fix bug: edit LDAP group settings from admin panel

Fixes #137.

See merge request !136
 2014-07-28 16:36:47 +00:00
Jacob Vosmaer d092a34f71 Fix bug: edit LDAP group settings from admin panel 
The group_params method was filtering out the ldap_cn and ldap_access
attributes when creating/updating a group from the admin interface.
 2014-07-28 16:28:09 +02:00
Sytse Sijbrandij c4e3382c85 Merge branch 'jira_docs' into 'master' 
Move JIRA setup screenshots inline

See merge request !135
 2014-07-25 13:56:18 +00:00
Jacob Vosmaer dcc14b0048 Include JIRA setup screenshots with image tags 2014-07-24 14:37:39 +02:00
Dmitriy Zaporozhets 0696b12f0e Force encoding to utf8. ruby 1.9 fix 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 12:32:19 +03:00
Sytse Sijbrandij 57e5118986 Merge branch '710ee' into 'master' 
710ee

/cc @jacobvosmaer @sytse

See merge request !134
 2014-07-22 13:24:02 +00:00
Job van der Voort 4442a20a6d add 7.1.0-ee packages 2014-07-22 14:50:58 +02:00
Dmitriy Zaporozhets 83ab423630 Merge branch 'ce-7-1-0' into 'master' 
Pull CE 7.1.0

See merge request !133
 2014-07-22 08:50:16 +00:00
Dmitriy Zaporozhets 961ea22246 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1-0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/projects_controller.rb
 2014-07-22 09:54:24 +03:00
Dmitriy Zaporozhets 68a9203bce Version to 7.1.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v7.1.0 		2014-07-22 09:52:19 +03:00
Dmitriy Zaporozhets 98c66b508c Merge branch 'use_fullpath' into 'master' 
If referer in request is incorrect use fullpath

Fixes #1444

See merge request !982
 2014-07-22 06:50:35 +00:00
Marin Jankovski b421750035 Call store_location_for once. 2014-07-22 08:34:16 +02:00
Dmitriy Zaporozhets 4f47eaf9ae Merge branch 'fix-default-branch' into 'master' 
Fix project default branch change

It is a regression since 7.0. It was caused with switch to `strong_params`.

This MR is safe to merge and it fixes issue https://gitlab.com/gitlab-org/gitlab-ce/issues/433

See merge request !984
 2014-07-22 06:12:00 +00:00
Dmitriy Zaporozhets af2a6ec150 Add useless test. Uncomment when we improve testing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-21 22:52:01 +03:00
Dmitriy Zaporozhets 2a4c73c0a2 Fix project default branch change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-21 22:47:41 +03:00
Dmitriy Zaporozhets 77df49aa76 Merge branch 'manual_testing_doc_update' into 'master' 
Manual testing doc update

Added language highlighting to the list of manual testing steps.

/cc @sytse @jacobvosmaer @job

See merge request !132
 2014-07-21 15:58:31 +00:00
Dmitriy Zaporozhets c5678d4ecb Merge branch 'fix_signup_config' into 'master' 
Fix signup config

See merge request !983
 2014-07-21 15:57:46 +00:00
Marin Jankovski 6604668d9b Update manual testing doc with syntax highlighting check. 2014-07-21 17:43:16 +02:00
Dmitriy Zaporozhets 648cd13438 Merge branch 'patch-email' into 'master' 
Patch email

See merge request !981
 2014-07-21 15:30:11 +00:00
Jacob Vosmaer 285bb09b98 Move signup_enabled and signin_enabled back 
This partially reverts b5543be19d by restoring the nesting
for the signup_enabled and signin_enabled attributes.
 2014-07-21 17:10:28 +02:00
Jacob Vosmaer 5093c800a7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-07-21 16:34:27 +02:00
Marin Jankovski 9714061bb0 If the referer is not set, use fullpath. 2014-07-21 15:45:27 +02:00
Dmitriy Zaporozhets cfde0936ea Merge branch 'file-upload-bugfix' into 'master' 
Bugfix for Multiple File Upload Dialogs

Fixes issue #426, where a page with multiple dropzones can accidentally trigger multiple file upload dialogs when the user clicks the "selecting them" link.

By specifying the closest "div-dropzone-wrapper" before sending a click to "div-dropzone", duplicate events are prevented from firing.

See merge request !153
 2014-07-21 10:36:24 +00:00
Dmitriy Zaporozhets 72f50fcb2c Merge branch 'fix/avatar_relative_url' into 'master' 
Fix Avatar and Relative URL

Fixes https://github.com/gitlabhq/gitlabhq/issues/7270

Instead of `URI::join` use a simple join with a slash. This is how all other places in GitLab join URLs and it doesn't muck with the relative path.

See merge request !144
 2014-07-21 10:34:41 +00:00
Sytse Sijbrandij f2abc372c7 Merge branch 'centos-7-0-1-ee' into 'master' 
Centos 7 0 1 ee

Adds the centos 7.0.1-ee package to the list.

See merge request !131
 2014-07-21 08:52:01 +00:00
Sytse Sijbrandij ebc1c4bde9 Account for the EE only situation. 2014-07-21 10:50:03 +02:00
Sytse Sijbrandij e443e59542 Simplify email procedure now that subscribers are on the newsletter list. 2014-07-21 10:47:38 +02:00
Job van der Voort ac900a62c9 add centos 7.0.1-ee package 2014-07-21 10:37:07 +02:00
Dmitriy Zaporozhets 6a10e2e52a Mention email change in README 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-20 09:23:25 +03:00
Dmitriy Zaporozhets 91ab8570c7 Merge branch 'change-admin-email' into 'master' 
Change admin email

Related to #1446

See merge request !979
 2014-07-20 06:21:14 +00:00
Dmitriy Zaporozhets d8af525926 Merge branch 'rc-twitter' into 'master' 
Rc twitter

/cc @marin

See merge request !978
 2014-07-19 20:56:00 +00:00
Dmitriy Zaporozhets c86962e098 Change deafult admin email to example.com 2014-07-19 14:27:01 +03:00
Sytse Sijbrandij 3926150f5f Improve rc tweet. 2014-07-18 15:17:40 +02:00
Sytse Sijbrandij 84b6163b79 Merge branch 'release-template' into 'master' 
Release template

See merge request !974
 2014-07-18 13:16:20 +00:00
Job van der Voort 907f92e8a1 7.0.1-ee packages 2014-07-18 15:11:30 +02:00
GitLab 824821b4e9 Fixing an issue where pages with multiple dropzones can trigger multiple file upload dialogs under certain conditions. 2014-07-17 21:33:21 +00:00
Dmitriy Zaporozhets 22fb992db7 Merge branch 'release-candidate' into 'master' 
Release candidate

See merge request !129
 2014-07-17 16:41:19 +00:00
Dmitriy Zaporozhets d76700a87f 7.1 CE to EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 18:20:54 +03:00
Dmitriy Zaporozhets a2e5ec7c40 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into release-candidate 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
 2014-07-17 18:17:32 +03:00
Dmitriy Zaporozhets b634d2801e Merge branch 'release-candidate' into 'master' 
Release candidate

* add 7.0-7.1 update doc
* add 6.0-7.1 update doc
* update installation doc
* Bump version

Part of #1435

See merge request !977
v7.1.0.rc1 		2014-07-17 15:13:49 +00:00
Dmitriy Zaporozhets 2bd20b7c4d Update guide from 6.0 to 7.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:57:04 +03:00
Dmitriy Zaporozhets 4db9c6e0a8 Version to rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:50:04 +03:00
Dmitriy Zaporozhets f59a721ee0 Point installation manual to 7-1-stable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:49:54 +03:00
Dmitriy Zaporozhets 771f4dbc3e Update guide from 7.0 to 7.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:49:33 +03:00
Dmitriy Zaporozhets f10c189b21 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-07-17 15:56:18 +03:00