提交 · 5e7e814e813da0ab9dcadd0c223a3aff6e89dfdd · 李少辉-开发者 / gitlab-foss

17 3月, 2014 1 次提交
- J
  
  Drop UsersGroup orphans using `rails runner` · 5e7e814e
  由 Jacob Vosmaer 提交于 3月 17, 2014
  
  5e7e814e
15 3月, 2014 1 次提交
- J
  
  Add check for orphaned UsersGroups · 4aa3ce75
  由 Jacob Vosmaer 提交于 3月 14, 2014
  
  4aa3ce75
14 3月, 2014 38 次提交
- D
  Remove confusing code · 17a9ecf8
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  17a9ecf8
- D
  Fix global search · e07b2f52
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e07b2f52
- D
  
  Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 02b310df
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
  
  02b310df
- D
  Clear rake task only if defined · fa3c087a
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fa3c087a
- D
  Merge branch 'new_lines_markdown' into 'master' · 00815dd4
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
New Lines Behaviour in Markdown

Per markdown specification, only render line-breaks when you end a line with two or more spaces.
```
  00815dd4
- M
  
  Add to changelog changes for markdown. · ccc14fa2
  由 Marin Jankovski 提交于 3月 14, 2014
  
  ccc14fa2
- M
  
  Ignore newlines per md standard. · f3ceebad
  由 Marin Jankovski 提交于 3月 14, 2014
  
  f3ceebad
- D
  Fix mr process order on push. · b5d81174
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
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: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b5d81174
- D
  Merge branch 'ldap_connections' · 1ec106b8
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  1ec106b8
- D
  Require gitlab-shell v1.8.4 · bce8edbb
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bce8edbb
- D
  
  Merge branch 'dzaporozhets/gitlabhq-import-timeout' · f0a417df
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
  
  f0a417df
- D
  Fix specs · ac6b9faf
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ac6b9faf
- D
  Fix project creation test · b007cadf
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b007cadf
- D
  Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq... · 0d7986a8
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	db/schema.rb
```
  0d7986a8
- D
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · 58e4e6b0
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
  
  58e4e6b0
- D
  Override rake test · 8839339e
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8839339e
- D
  Merge pull request #6526 from mavimo/patch-1 · cad79433
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Fixed error on mysql install link
```
  cad79433
- D
  Merge pull request #6527 from tsigo/quieter-test-output · 9b36941f
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Quieter test output
```
  9b36941f
- D
  Override rake spec and rake spinach tasks · f6f80659
  由 Dmitriy Zaporozhets 提交于 3月 14, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f6f80659
- J
  Open/close LDAP in ApplicationController · 48e90540
  由 Jacob Vosmaer 提交于 3月 14, 2014
```
By opening the LDAP connection at the controller level we can reuse it
for all LDAP queries during the request.
```
  48e90540
- J
  Add Gitlab::LDAP::Access.open · 56df3dbf
  由 Jacob Vosmaer 提交于 3月 14, 2014
```
This new method wraps Gitlab::LDAP::Adapter.open to enable connection
reuse.
```
  56df3dbf
- J
  Add Gitlab::LDAP::Adapter.open · af53aa90
  由 Jacob Vosmaer 提交于 3月 14, 2014
```
This new method is based on Net::LDAP.open, which reuses a single LDAP
connection.
```
  af53aa90
- J
  
  Allow passing an adapter to Gitlab::LDAP::Person · 5a616649
  由 Jacob Vosmaer 提交于 3月 14, 2014
  
  5a616649
- R
  TestEnv.reset_satellite_dir should run 'git clean' quietly · 09834380
  由 Robert Speicher 提交于 3月 13, 2014
```
Removes the "Removing gitlabhq" messages cluttering spec output
```
  09834380
- D
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · 50670948
  由 Dmitriy Zaporozhets 提交于 3月 13, 2014
  
  50670948
- D
  Update changelog · 632fe8fb
  由 Dmitriy Zaporozhets 提交于 3月 13, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  632fe8fb
- D
  Correct BackgroundJobs page for both OSX and linux · 65cb88f3
  由 Dmitriy Zaporozhets 提交于 3月 13, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  65cb88f3
- D
  Merge branch 'toggle_diff_comments' of... · 2a7da96a
  由 Dmitriy Zaporozhets 提交于 3月 13, 2014
```
Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments
Signed-off-by: NDmitriy 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
```
  2a7da96a
- M
  Fixed error on mysql install link · 599ee967
  由 Marco Vito Moscaritolo 提交于 3月 13, 2014
```
Fixed error on install guide to mysql conf page.
```
  599ee967
- D
  Merge pull request #6360 from jvanbaarsen/fix-6328-expose-username · 6f5a9b41
  由 Dmitriy Zaporozhets 提交于 3月 13, 2014
```
Also expose username for the /discover endpoint
```
  6f5a9b41
- D
  Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn... · c8e1c53f
  由 Dmitriy Zaporozhets 提交于 3月 13, 2014
```
Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn into cirosantilli-rm-dir-prefix
```
  c8e1c53f
- D
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · 3f2d9410
  由 Dmitriy Zaporozhets 提交于 3月 13, 2014
  
  3f2d9410
- D
  Merge pull request #6523 from jvanbaarsen/patch-4 · 88742aea
  由 Dmitriy Zaporozhets 提交于 3月 13, 2014
```
Added entry for the new webhook
```
  88742aea
- D
  Merge branch 'tighten_logrotate' into 'master' · 3082d2a4
  由 Dmitriy Zaporozhets 提交于 3月 13, 2014
```
Tighten Logrotate
```
  3082d2a4
- D
  Merge branch 'patch_update_robustness' into 'master' · 42ef81be
  由 Dmitriy Zaporozhets 提交于 3月 13, 2014
```
Patch Update Robustness
```
  42ef81be
- D
  Mention retry feature for repository import in CHANGELOG · 9064fba0
  由 Dmitriy Zaporozhets 提交于 3月 13, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9064fba0
- D
  Remove default value for Project#imported · d1bee5e3
  由 Dmitriy Zaporozhets 提交于 3月 13, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d1bee5e3
- D
  Update httparty · 494dc8ca
  由 Dmitriy Zaporozhets 提交于 3月 13, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  494dc8ca