Software Publico / Gitlab

14 Mar, 2014

15 commits

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

Conflicts:
	CHANGELOG
```
Dmitriy Zaporozhets
2014-03-14 12:58:43 +0200
bce8edbb Require gitlab-shell v1.8.4 ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 12:57:26 +0200
f0a417df Merge branch 'dzaporozhets/gitlabhq-import-timeout' Browse Code »

Dmitriy Zaporozhets
2014-03-14 12:53:18 +0200
ac6b9faf Fix specs ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 12:53:05 +0200
b007cadf Fix project creation test ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 12:19:02 +0200
0d7986a8 Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq in… ... Browse Code »
```
…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
58e4e6b0 Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-03-14 11:06:48 +0200
8839339e Override rake test ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 11:06:10 +0200
cad79433 Merge pull request #6526 from mavimo/patch-1 ... Browse Code »
```
Fixed error on mysql install link
```
Dmitriy Zaporozhets
2014-03-14 11:03:48 +0200
9b36941f Merge pull request #6527 from tsigo/quieter-test-output ... Browse Code »
```
Quieter test output
```
Dmitriy Zaporozhets
2014-03-14 11:03:29 +0200
f6f80659 Override rake spec and rake spinach tasks ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 10:44:16 +0200
48e90540 Open/close LDAP in ApplicationController ... Browse Code »
```
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
56df3dbf Add Gitlab::LDAP::Access.open ... Browse Code »
```
This new method wraps Gitlab::LDAP::Adapter.open to enable connection
reuse.
```
Jacob Vosmaer
2014-03-14 08:55:50 +0100
af53aa90 Add Gitlab::LDAP::Adapter.open ... Browse Code »
```
This new method is based on Net::LDAP.open, which reuses a single LDAP
connection.
```
Jacob Vosmaer
2014-03-14 08:53:46 +0100
5a616649 Allow passing an adapter to Gitlab::LDAP::Person Browse Code »

Jacob Vosmaer
2014-03-14 08:52:57 +0100

13 Mar, 2014

23 commits

09834380 TestEnv.reset_satellite_dir should run 'git clean' quietly ... Browse Code »
```
Removes the "Removing gitlabhq" messages cluttering spec output
```
Robert Speicher
2014-03-13 17:25:55 -0400
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

599ee967 Fixed error on mysql install link ... Browse Code »
```
Fixed error on install guide to mysql conf page.
```
Marco Vito Moscaritolo
2014-03-13 22:04:36 +0100
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
9064fba0 Mention retry feature for repository import in CHANGELOG ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 21:15:18 +0200
d1bee5e3 Remove default value for Project#imported ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 20:35:11 +0200
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
10c0cb8c Add migration for already imported projects ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 11:28:41 +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
44c94039 Hide retry import form for non masters ... Browse Code »
```
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 Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 10:27:05 +0200

12 Mar, 2014

2 commits

b47646ef Add retry feature to project import ... Browse Code »
```
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 Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 19:25:48 +0200