Software Publico / Gitlab

13 Mar, 2014

16 commits

50670948 Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-03-13 23:20:02 +0200
632fe8fb Update changelog ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 23:19:50 +0200
65cb88f3 Correct BackgroundJobs page for both OSX and linux ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 23:15:33 +0200

2a7da96a Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabh… ... Browse Code »

…q 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 +0200

6f5a9b41 Merge pull request #6360 from jvanbaarsen/fix-6328-expose-username ... Browse Code »
```
Also expose username for the /discover endpoint
```
Dmitriy Zaporozhets
2014-03-13 22:40:01 +0200
c8e1c53f Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn in… ... Browse Code »
```
…to cirosantilli-rm-dir-prefix
```
Dmitriy Zaporozhets
2014-03-13 22:36:39 +0200
3f2d9410 Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-03-13 22:36:08 +0200
88742aea Merge pull request #6523 from jvanbaarsen/patch-4 ... Browse Code »
```
Added entry for the new webhook
```
Dmitriy Zaporozhets
2014-03-13 22:33:08 +0200
3082d2a4 Merge branch 'tighten_logrotate' into 'master' ... Browse Code »
```
Tighten Logrotate
```
Dmitriy Zaporozhets
2014-03-13 20:07:57 +0000
42ef81be Merge branch 'patch_update_robustness' into 'master' ... Browse Code »
```
Patch Update Robustness
```
Dmitriy Zaporozhets
2014-03-13 20:07:19 +0000
494dc8ca Update httparty ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 20:29:03 +0200
b4edf4f9 Added entry for the new webhook Browse Code »

Jeroen van Baarsen
2014-03-13 12:04:33 +0100
5be42456 Create event and clear cache on new trag push ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 11:37:13 +0200
b0a86cb3 Use gitlab:setup inside gitlab:test ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 11:33:33 +0200
46cc3b22 Add mysql limits to db during setup ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 10:47:53 +0200
c4263dfb Fix BackgroundJobs page ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 10:39:41 +0200

12 Mar, 2014

10 commits

85a4d1ec Update the logrotate configuration in 6.7 Browse Code »

Jacob Vosmaer
2014-03-12 16:01:34 +0100
3e6fe8bf Add 6.6-to-6.7.md update guide Browse Code »

Jacob Vosmaer
2014-03-12 16:01:10 +0100
c22646d2 Logrotate daily, keeping 90 days of old logs ... Browse Code »
```
Also remove the 'delaycompress' option which is not needed because we
use 'copytruncate'.
```
Jacob Vosmaer
2014-03-12 15:26:39 +0100
ae4ae2b2 Move images from vendor to app so they are compiled by rails ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 10:19:24 +0200
1c23f2b2 Correct image path to social icons ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 10:08:58 +0200
75c9c68c Rebuild schame from migrations ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 09:55:08 +0200
56318a24 Merge pull request #6474 from jvanbaarsen/post-tag-hook ... Browse Code »
```
Add web hooks on tag
```
Dmitriy Zaporozhets
2014-03-12 09:52:34 +0200
cc57a25c Merge pull request #6510 from jvanbaarsen/rake-task-for-limits ... Browse Code »
```
Added rake task to add limits back in mysql
```
Dmitriy Zaporozhets
2014-03-12 09:19:59 +0200
f9c4bb56 Changed limits to a higher order Browse Code »

Jeroen van Baarsen
2014-03-12 08:13:27 +0100

55fbe71a Fix error with reopened merge request not properly reloading ... Browse Code »

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 +0200

11 Mar, 2014

14 commits

71b1030b Added rake task to add limits back in mysql Browse Code »

Jeroen van Baarsen
2014-03-11 19:23:02 +0100

a599d812 Merge branch 'fix/social-account-block' into 'master' ... Browse Code »

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 +0000

7157f79c Refactor js behaviours helpers ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-11 15:15:08 +0200
9f405068 SHow group name in access granted email ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-11 13:33:47 +0200
0c3aa2e8 More entries to CHANGELOG ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-11 13:18:10 +0200

c4f9dff4 Merge branch 'simplify-emails-content' into 'master' ... Browse Code »

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 +0000

dcda7516 Use username instead of wierd email for first login ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-11 12:18:14 +0200
f16de8ac Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-03-11 11:29:18 +0200
767f7d9a Merge branch 'ldap-code' into 'master' ... Browse Code »
```
LDAP code from EE
```
Dmitriy Zaporozhets
2014-03-11 09:28:41 +0000
c6d39a14 Add User#requires_ldap_check? method ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-11 10:24:07 +0200
ae68a66a Merge pull request #6478 from infoMantisGmbH/master ... Browse Code »
```
Allow underscore as the first char for project names.
```
Dmitriy Zaporozhets
2014-03-11 10:13:52 +0200
4b946690 Merge pull request #6503 from mjdetullio/fix/group-admin ... Browse Code »
```
[6.6] Fixes a bug with group member administration
```
Dmitriy Zaporozhets
2014-03-11 10:12:21 +0200
cf890b22 Add User#last_credential_check_at ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-11 10:07:22 +0200
e57e1e04 Remove non-exist method from ldap security check ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-11 09:15:04 +0200