Software Publico / Gitlab

14 Mar, 2014

10 commits

7c5320d2 Merge branch 'snippets-page' into 'master' ... Browse Dir »
```
Render 404 instead of 500 if trying to see snippets of unexisting user

Fixes #1087
```
Dmitriy Zaporozhets
2014-03-14 21:10:12 +0000
f84d015f Fix commit comment count css ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 23:09:43 +0200
a39eeba1 Render 404 instead of 500 if trying to see snippets of unexisting user ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 15:55:41 +0200
17a9ecf8 Remove confusing code ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 14:43:50 +0200
e07b2f52 Fix global search ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 14:41:28 +0200
f3ceebad Ignore newlines per md standard. Browse Dir »

Marin Jankovski
2014-03-14 12:33:03 +0100

b5d81174 Fix mr process order on push. ... Browse Dir »

First close merge requests that being merged. Then update code of open
mr. This fixes bug when MR merged via command line lose their diff
because code reload was before MR close.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2014-03-14 13:02:55 +0200

1ec106b8 Merge branch 'ldap_connections' ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
Dmitriy Zaporozhets
2014-03-14 12:58:43 +0200
0d7986a8 Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq in… ... Browse Dir »
```
…to dzaporozhets/gitlabhq-import-timeout

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	db/schema.rb
```
Dmitriy Zaporozhets
2014-03-14 12:00:21 +0200
48e90540 Open/close LDAP in ApplicationController ... Browse Dir »
```
By opening the LDAP connection at the controller level we can reuse it
for all LDAP queries during the request.
```
Jacob Vosmaer
2014-03-14 09:03:49 +0100

13 Mar, 2014

7 commits

65cb88f3 Correct BackgroundJobs page for both OSX and linux ... Browse Dir »
```
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 Dir »

…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

d1bee5e3 Remove default value for Project#imported ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 20:35:11 +0200
5be42456 Create event and clear cache on new trag push ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 11:37:13 +0200
c4263dfb Fix BackgroundJobs page ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 10:39:41 +0200
44c94039 Hide retry import form for non masters ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 10:27:20 +0200
aaff3566 Redirect to import page from show when import in progress ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 10:27:05 +0200

12 Mar, 2014

9 commits

b47646ef Add retry feature to project import ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 19:26:09 +0200
37db76a3 Project import and retry import scaffold ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 19:25:48 +0200
1436433c Add project import state machine ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 17:15:03 +0200
7f50c7f6 Move project creation to service ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 17:14:48 +0200
42f25e75 Improve import notice ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 10:25:37 +0200
ae4ae2b2 Move images from vendor to app so they are compiled by rails ... Browse Dir »
```
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 Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 10:08:58 +0200
56318a24 Merge pull request #6474 from jvanbaarsen/post-tag-hook ... Browse Dir »
```
Add web hooks on tag
```
Dmitriy Zaporozhets
2014-03-12 09:52:34 +0200

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

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

11 commits

dff9221c Show import notice in callout block ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-11 18:34:43 +0200
a6eb28ab Better explanation for import url ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-11 18:23:03 +0200

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

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 Dir »
```
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 Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-11 13:33:47 +0200

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

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

f16de8ac Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Dir »

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

10 Mar, 2014

3 commits

5d6d795d Fixes a bug with group member administration ... Browse Dir »
```
Group owners were not able to remove any users from their group if they were the only owner.
```
Matt DeTullio
2014-03-10 22:56:26 -0400
d33d550e Merge pull request #6500 from tsigo/natural-tag-sorting ... Browse Dir »
```
Natural version sorting
```
Dmitriy Zaporozhets
2014-03-10 17:27:23 +0200
b1ff8e31 Add ldap check in application_controller and internal api ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-10 17:10:23 +0200