home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,647 Commits 48 Branches 340 Tags
c4f9dff480ea030d6878b0197a71670f3a141e0e
Commit Graph
8647 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets c4f9dff480 Merge branch 'simplify-emails-content' into 'master' 
Streamline the content of notification emails

In notification emails, the actual content of the email is often buried under several blocks of chrome — and may even be truncated or completely missing. Ideally, the notification emails would be like *real emails*: a short message of meaningful text, sent from the author of the change that triggered the notification.

This MR includes the following changes to notification emails:

* Remove much of the chrome (e.g. the "GitLab" header)
* Emphasize the content (no more small, grayed-out content)
* Add missing informations to the emails (issue description in "new issue" email, file name in "diff comment" email)
* Add a consistent "View in GitLab" link in the footer
* The assignee is displayed only if someone is assigned
* Fix a rendering bug when viewing emails with [Zimbra](http://www.zimbra.com/)

We use these patches at [Capitaine Train](http://www.capitainetrain.com), and it has been a surprisingly big productivity boost for us.

![Before and after](http://f.cl.ly/items/3n0P2c2v1P0y011c0D3e/Before%20and%20After.png)
 2014-03-11 10:39:29 +00:00
Dmitriy Zaporozhets dcda7516d6 Use username instead of wierd email for first login 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 12:18:14 +02:00
Dmitriy Zaporozhets f16de8ac8c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-11 11:29:18 +02:00
Dmitriy Zaporozhets 767f7d9ae7 Merge branch 'ldap-code' into 'master' 
LDAP code from EE
 2014-03-11 09:28:41 +00:00
Dmitriy Zaporozhets c6d39a14d6 Add User#requires_ldap_check? method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 10:24:07 +02:00
Dmitriy Zaporozhets ae68a66a98 Merge pull request #6478 from infoMantisGmbH/master 
Allow underscore as the first char for project names.
 2014-03-11 10:13:52 +02:00
Dmitriy Zaporozhets 4b9466903f Merge pull request #6503 from mjdetullio/fix/group-admin 
[6.6] Fixes a bug with group member administration
 2014-03-11 10:12:21 +02:00
Dmitriy Zaporozhets cf890b227a Add User#last_credential_check_at 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 10:07:22 +02:00
Dmitriy Zaporozhets e57e1e04e3 Remove non-exist method from ldap security check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 09:15:04 +02:00
Matt DeTullio 5d6d795d60 Fixes a bug with group member administration 
Group owners were not able to remove any users from their group if they were the only owner.
 2014-03-10 22:56:26 -04:00
Dmitriy Zaporozhets 92a928468f Merge branch 'catch_missing_command' into 'master' 
Catch missing commands in Rake tasks
 2014-03-10 18:48:31 +00:00
Dmitriy Zaporozhets 3e864036e7 Fix ldap_user_auth_spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-10 19:16:43 +02:00
Jacob Vosmaer ad71eca8bb Catch missing commands in rake tasks with '' 2014-03-10 18:14:59 +01:00
Dmitriy Zaporozhets d55ee139eb Merge branch 'remove-dot-org' into 'master' 
Remove Dot Org
 2014-03-10 17:12:06 +00:00
dosire 509c45163a Update references to gitlab dot com. 2014-03-10 17:40:40 +01:00
Dmitriy Zaporozhets 0aa389b491 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-10 17:34:09 +02:00
Dmitriy Zaporozhets ea432f6032 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-03-10 17:33:57 +02:00
Dmitriy Zaporozhets a7df646e05 Merge pull request #6480 from jvanbaarsen/add-envrc-to-ignore 
Add envrc to git-ignore
 2014-03-10 17:30:38 +02:00
Dmitriy Zaporozhets dca8f6d4a6 Merge pull request #6492 from tsigo/gitlab-shell-custom-path 
Respect custom gitlab_shell path in gitlab:gitlab_shell:check task
 2014-03-10 17:30:21 +02:00
Dmitriy Zaporozhets d33d550e3e Merge pull request #6500 from tsigo/natural-tag-sorting 
Natural version sorting
 2014-03-10 17:27:23 +02:00
Dmitriy Zaporozhets 322a8f1d6d Merge branch 'add-enterprise-linux' into 'master' 
Add Enterprise Linux
 2014-03-10 15:18:02 +00:00
Dmitriy Zaporozhets 5ae9de7403 Merge branch 'increase-nginx-push-size' into 'master' 
Increase Nginx Push Size
 2014-03-10 15:13:18 +00:00
Dmitriy Zaporozhets b1ff8e31b1 Add ldap check in application_controller and internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-10 17:10:23 +02:00
Dmitriy Zaporozhets 0fdab6a747 Remove copyright 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-10 17:09:45 +02:00
Dmitriy Zaporozhets daa7f077db Port LDAP code from EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-10 14:48:08 +02:00
Jacob Vosmaer 0142aa5a34 Merge pull request #6494 from tsigo/fix-redis-version-check 
Fix now-invalid invocation of `run_and_match` in gitlab:check
 2014-03-10 12:18:45 +01:00
dosire b5264c24e8 Update changelog. 2014-03-10 09:15:30 +01:00
dosire 6bf5215b23 Some people are getting the error 'The remote end hung up unexpectedly' due to large chuncks. 2014-03-10 09:11:19 +01:00
Robert Speicher efd860d1da Remove extra whitespace 2014-03-10 03:44:49 -04:00
Sytse Sijbrandij 2ae6f17deb Merge pull request #6498 from Nullreff/master 
Fix grammar in zero_authorized_projects view
 2014-03-10 08:01:26 +01:00
Robert Speicher 74d2085cdf Sort tag names using VersionSorter 2014-03-09 00:01:06 -05:00
Robert Speicher a37c679400 Remove arguments from grouped_options_refs 
Must have been left over from a previous revision, but the argument
wasn't used anywhere in the method.
 2014-03-09 00:01:06 -05:00
Robert Speicher 29db8efaa4 Add version_sorter gem 2014-03-09 00:01:06 -05:00
Ryan Mendivil 1c46a0d471 Fix grammar in zero_authorized_projects view 2014-03-08 10:33:28 -09:00
Robert Speicher c5f76e5939 Popen (at least on OSX) expects an Array, not a String 
This was causing the gitlab:check task to exit prematurely with the
error "System commands must be given as an array of strings."
 2014-03-07 21:39:48 -05:00
Robert Speicher 30f8713aa1 Respect custom gitlab_shell path in gitlab:gitlab_shell:check task 
Prior to this change, if I customized the config value of
`gitlab.gitlab_shell.path`, the check would ignore this value in favor
of `"~<gitlab.gitlab_shell.ssh_user>/gitlab-shell/"` resulting in a
failed check when the configuration was otherwise valid.
 2014-03-07 21:05:56 -05:00
dosire 339fce559a Add enterprise linux distributions as officially supported. 2014-03-07 16:35:59 +01:00
Sytse Sijbrandij c3f088d261 Merge pull request #6489 from cirosantilli/typo-trihher 
Correct typos in web_hooks help.
 2014-03-07 09:54:55 +01:00
Ciro Santillli 8199ba05b8 Correct typos in web_hooks help. 2014-03-07 09:43:14 +01:00
Dmitriy Zaporozhets c4d4481f4c Merge branch 'fix-group-projects-sort' into 'master' 
Sort projects by activity at group show page
 2014-03-06 19:23:14 +00:00
Dmitriy Zaporozhets 8634d0d5c1 Sort projects by activity at group show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-06 18:31:08 +02:00
Dmitriy Zaporozhets 9ff75e6a6f Merge branch 'fix-discover-branch' into 'master' 
Fix Discover Branch

Fixes #1073
 2014-03-06 16:18:52 +00:00
Jeroen van Baarsen 9583631666 Add envrc to git-ignore 
envrc files are created when you use direnv (Its recommended in
combination with spring, see: https://github.com/rails/spring#setup)
 2014-03-06 15:55:57 +01:00
Dmitriy Zaporozhets 694388dfbc Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-06 15:50:18 +02:00
Dmitriy Zaporozhets cf6a0ff760 Merge branch 'assets-css-helpers' into 'master' 
Use rails helper image-url for reference images in css

Fixes #1001
 2014-03-06 13:49:55 +00:00
Dmitriy Zaporozhets 0776199b4a Update gitlab_git to version 5.7.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-06 15:48:56 +02:00
Sytse Sijbrandij 75f595ac92 Merge pull request #6447 from jvanbaarsen/patch-2 
Added part about the help to markdown
 2014-03-06 14:24:59 +01:00
mk 61a72bc2e2 Allow underscore as the first char for project names. 
Not sure if the default_regex really has to be expanded for this special use case. We tried to extend only the project_name_regex first, but that didn't help.
 2014-03-06 14:08:40 +01:00
Dmitriy Zaporozhets 2ed06dc41d Fix group_icon spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-06 14:04:01 +02:00
Jeroen van Baarsen 60978e94bb Added part about the help to markdown 2014-03-06 12:36:34 +01:00