home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,683 Commits 48 Branches 340 Tags
2a7da96a0d7fb71a1371ce2d97157a2dd8a766f2
Commit Graph
8683 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 2a7da96a0d Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/stylesheets/sections/commits.scss
	app/assets/stylesheets/sections/notes.scss
	app/views/projects/commits/_diffs.html.haml
	features/steps/project/merge_requests.rb
 2014-03-13 23:11:16 +02:00
Dmitriy Zaporozhets c8e1c53f43 Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn into cirosantilli-rm-dir-prefix 2014-03-13 22:36:39 +02:00
Dmitriy Zaporozhets 3f2d94105b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-13 22:36:08 +02:00
Dmitriy Zaporozhets 88742aea68 Merge pull request #6523 from jvanbaarsen/patch-4 
Added entry for the new webhook
 2014-03-13 22:33:08 +02:00
Dmitriy Zaporozhets 3082d2a4be Merge branch 'tighten_logrotate' into 'master' 
Tighten Logrotate
 2014-03-13 20:07:57 +00:00
Dmitriy Zaporozhets 42ef81be54 Merge branch 'patch_update_robustness' into 'master' 
Patch Update Robustness
 2014-03-13 20:07:19 +00:00
Dmitriy Zaporozhets 494dc8ca8b Update httparty 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 20:29:03 +02:00
Jeroen van Baarsen b4edf4f996 Added entry for the new webhook 2014-03-13 12:04:33 +01:00
Dmitriy Zaporozhets 5be424565e Create event and clear cache on new trag push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 11:37:13 +02:00
Dmitriy Zaporozhets b0a86cb3ba Use gitlab:setup inside gitlab:test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 11:33:33 +02:00
Dmitriy Zaporozhets 46cc3b22c9 Add mysql limits to db during setup 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 10:47:53 +02:00
Dmitriy Zaporozhets c4263dfbaf Fix BackgroundJobs page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 10:39:41 +02:00
Jacob Vosmaer 85a4d1ec6c Update the logrotate configuration in 6.7 2014-03-12 16:01:34 +01:00
Jacob Vosmaer 3e6fe8bff0 Add 6.6-to-6.7.md update guide 2014-03-12 16:01:10 +01:00
Jacob Vosmaer c22646d2a4 Logrotate daily, keeping 90 days of old logs 
Also remove the 'delaycompress' option which is not needed because we
use 'copytruncate'.
 2014-03-12 15:26:39 +01:00
Dmitriy Zaporozhets ae4ae2b225 Move images from vendor to app so they are compiled by rails 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-12 10:19:24 +02:00
Dmitriy Zaporozhets 1c23f2b259 Correct image path to social icons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-12 10:08:58 +02:00
Dmitriy Zaporozhets 75c9c68c18 Rebuild schame from migrations 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-12 09:55:08 +02:00
Dmitriy Zaporozhets 56318a24b1 Merge pull request #6474 from jvanbaarsen/post-tag-hook 
Add web hooks on tag
 2014-03-12 09:52:34 +02:00
Dmitriy Zaporozhets cc57a25c39 Merge pull request #6510 from jvanbaarsen/rake-task-for-limits 
Added rake task to add limits back in mysql
 2014-03-12 09:19:59 +02:00
Jeroen van Baarsen f9c4bb5638 Changed limits to a higher order 2014-03-12 08:13:27 +01:00
Daniel CestariandDmitriy Zaporozhets 55fbe71ad1 Fix error with reopened merge request not properly reloading 
If you reopen a Merge Request and then try to update the source branch
it won't properly reload the code since the "reload_code" method still
checks if the MR is "opened" and not just "open" (which includes reopened)
 2014-03-12 08:54:42 +02:00
Jeroen van Baarsen 71b1030bf7 Added rake task to add limits back in mysql 2014-03-11 19:23:02 +01:00
Dmitriy Zaporozhets a599d8120d Merge branch 'fix/social-account-block' into 'master' 
Fix Social Account Block

If you have omniauth enabled, but don't have one of the "Social" providers enabled (GitHub, Twitter, Google), the "Social Accounts" sections shows up, but without icons. This occurred when I was testing Shibboleth. This fixes the issues by checking if there are any `enabled_oauth_providers` rather than if just `Gitlab.config.omniauth.enabled`. Not quite sure how to implement a test for this, but it works :).
 2014-03-11 15:02:07 +00:00
Dmitriy Zaporozhets 7157f79caa Refactor js behaviours helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 15:15:08 +02:00
Dmitriy Zaporozhets 9f405068cd SHow group name in access granted email 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 13:33:47 +02:00
Dmitriy Zaporozhets 0c3aa2e844 More entries to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 13:18:10 +02:00
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