home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,316 Commits 48 Branches 340 Tags
ecb137bb4a036b327a2fa9ce9cedd289dd5fbfb0
Commit Graph
11316 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan-Willem van der Meer ecb137bb4a Fix typo 2014-08-12 17:25:04 +02:00
Jan-Willem van der Meer 2721694dbb Remove unused proteced keyword 2014-08-11 16:58:25 +02:00
Jan-Willem van der Meer 429ab088bc Add entrypoint for sending emails to users 2014-08-11 14:20:29 +02:00
Jan-Willem van der Meer a0259ecc6e Make selectbox naming match issue #126 2014-08-11 13:38:11 +02:00
Jan-Willem van der Meer e0d6a086c1 Add request specs for unsubscribe 2014-08-11 13:37:21 +02:00
Jan-Willem van der Meer 0f1351adbe Add unsubscribe link 2014-08-11 13:23:12 +02:00
Jan-Willem van der Meer aa31260d7e Enable unsubscribe for admin emails 2014-08-11 13:01:53 +02:00
Jan-Willem van der Meer 44cced4a1f Add unsubscribe field for admin emails 
This will completely unsubscribe you from any admin emails
 2014-08-11 10:41:50 +02:00
Jan-Willem van der Meer 831b0e3d55 Also test if email is being sent 2014-08-11 10:33:14 +02:00
Jan-Willem van der Meer cd45fd7011 Test basic email flow 2014-08-11 09:54:12 +02:00
Jan-Willem van der Meer 13b423ce4c Improve feature description 2014-08-08 20:51:05 +02:00
Jan-Willem van der Meer 07e86b12f7 Send emails via sidekiq worker 2014-08-08 20:49:56 +02:00
Jan-Willem van der Meer 71f7675cd9 Display list of recipientgroups properly 
- Use html5 validation
- initiate create action
 2014-08-08 20:47:08 +02:00
Jan-Willem van der Meer 859aa33abf Disable debug of assets by default 
This reduces the time to load a page in development mode by 200%
 2014-08-08 17:14:57 +02:00
Jan-Willem van der Meer 3b98830f7e Give Admin email an interface 2014-08-08 17:13:04 +02:00
Jan-Willem van der Meer 7776d4d07d Simplify feature 2014-08-08 15:28:52 +02:00
Jan-Willem van der Meer 2be5aab425 Use singular route 
Even simpler
 2014-08-08 15:24:14 +02:00
Jan-Willem van der Meer dbc60e7f35 Add initial email route 2014-08-08 14:34:15 +02:00
Jan-Willem van der Meer a955975cbb Initial steps in feature 2014-08-08 14:25:50 +02:00
Jan-Willem van der Meer 6900555ea2 Add feature overview for admin email notications 2014-08-08 12:21:27 +02: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