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

29 5月, 2014 12 次提交
- J
  
  render items from doc · fd476cf6
  由 Job van der Voort 提交于 4月 18, 2014
  
  fd476cf6
- J
  
  render readme in help · e61e3eaa
  由 Job van der Voort 提交于 4月 15, 2014
  
  e61e3eaa
- D
  Add stuff to CHANGELOG · ce498eed
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ce498eed
- D
  Merge branch 'master-create-group-projects' into 'master' · 13cbc82a
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Master can create group projects

It also includes Project transfer refactoring

Fixes #1284
```
  13cbc82a
- D
  Merge pull request #7032 from erbunao/markdown_clipboard · 64b1956b
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Implements clipboard feature for markdown areas.
```
  64b1956b
- D
  Fix tests · cea0fc1d
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cea0fc1d
- D
  Allow masters to create projects in groups · 1932f902
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1932f902
- D
  Modify specs for new project transfer code · 14f78d06
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  14f78d06
- D
  Use new Projects::TransferService class · 900d3079
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  900d3079
- D
  Add ability rule for creating project in namespace · aea79b80
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  aea79b80
- D
  Refactor project transfer service. Add security check when create or transfer project into group · aca6be50
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  aca6be50
- D
  Remove old rake task · 6ba4cb1d
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6ba4cb1d
28 5月, 2014 16 次提交
- E
  
  Implements and refactors clipboard feature for markdown. · 22732346
  由 erbunao 提交于 5月 28, 2014
  
  22732346
- D
  Merge branch 'render_org_files' into 'master' · 260c877c
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Render org files

Fixes #1215
```
  260c877c
- D
  Merge branch 'link-to-installation-options' into 'master' · 10fad7b0
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Link to installation options
```
  10fad7b0
- D
  Merge branch 'backport-ci-service' into 'master' · 5580dc99
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Backport CI service refactoring from EE

It allows easier contribution of different CI services.
Fixes #1280
```
  5580dc99
- D
  
  Link to installation page. · 59f68b1b
  由 dosire 提交于 5月 28, 2014
  
  59f68b1b
- M
  Add changelog for version to 6.9.1. · 666260bf
  由 Marin Jankovski 提交于 5月 27, 2014
```
Conflicts:
	CHANGELOG
	VERSION
```
  666260bf
- S
  Merge branch 'use_newer_git_version' into 'master' · c183019c
  由 Sytse Sijbrandij 提交于 5月 28, 2014
```
Use newer git version

Fixes #1272
```
  c183019c
- M
  
  Keep the lowest requirement for git in the documentation. · 82855e07
  由 Marin Jankovski 提交于 5月 27, 2014
  
  82855e07
- M
  
  Add org-ruby for rendering .org files. · dc158af6
  由 Marin Jankovski 提交于 5月 28, 2014
  
  dc158af6
- D
  Fix haml indent · a3db7631
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a3db7631
- D
  Fix tests · 8a3807c8
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8a3807c8
- D
  Backport CI service refactoring from EE · a18ae13e
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
It allows easier contribution of different CI services
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a18ae13e
- D
  Merge branch 'gitlab-shell-upgrade-might-be-required' into 'master' · 49c50ee8
  由 Dmitriy Zaporozhets 提交于 5月 28, 2014
```
Gitlab shell upgrade might be required

Also got rid of `sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production` since gitlab:check is more important.
```
  49c50ee8
- D
  
  Make it more obvious that GitLab Shell should be upgraded. · ca907e4f
  由 dosire 提交于 5月 28, 2014
  
  ca907e4f
- D
  Merge branch 'remove-branch-btn' into 'master' · 6bd114a7
  由 Dmitriy Zaporozhets 提交于 5月 27, 2014
```
Don't show remove branch button if you are not allowed to remove it

Fixes #1213
```
  6bd114a7
- D
  Merge branch 'move_script_to_bin' into 'master' · 3682e726
  由 Dmitriy Zaporozhets 提交于 5月 27, 2014
```
Move script to bin

Fixes #925
```
  3682e726
27 5月, 2014 12 次提交
- D
  Dont show remove source branch ckecbox/button if you dont have such · affd376f
  由 Dmitriy Zaporozhets 提交于 5月 27, 2014
```
permissions for MR page
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  affd376f
- D
  Merge branch 'gitlab_shell_in_upgrader_guide' into 'master' · d25bc257
  由 Dmitriy Zaporozhets 提交于 5月 27, 2014
```
Gitlab shell in upgrader guide

Fixes #1214
```
  d25bc257
- D
  Merge branch 'add_titles_to_help_pages' into 'master' · 19ea3622
  由 Dmitriy Zaporozhets 提交于 5月 27, 2014
```
Add titles to help pages

Fixes #1183
```
  19ea3622
- D
  Merge branch 'ldap_user_filter_fix' into 'master' · c862bc6f
  由 Dmitriy Zaporozhets 提交于 5月 27, 2014
```
LDAP user filter fix
```
  c862bc6f
- M
  
  Move from script to bin directory. · 2341cefd
  由 Marin Jankovski 提交于 5月 27, 2014
  
  2341cefd
- M
  Merge branch 'merge-patch-changelog-back-into-master' into 'master' · cb4b504b
  由 Marin Jankovski 提交于 5月 27, 2014
```
Merge patch changelog back into master

/cc @dzaporozhets
```
  cb4b504b
- M
  
  Fix typo in text. · cee88509
  由 Marin Jankovski 提交于 5月 27, 2014
  
  cee88509
- J
  Revert "Actually use the 'user_filter' configuration option" · 7dfb678d
  由 Jacob Vosmaer 提交于 5月 27, 2014
```
This reverts commit e9d4587f, which is
incompatible with GitLab's built in LDAP user filter: a GitLab LDAP
filter is [added on top of the other filters used to find the
user](https://gitlab.com/gitlab-org/gitlab-ce/blob/982d4d51e8110bec280eb00db0fb756b062103d9/lib/gitlab/ldap/adapter.rb#L61)

Example GitLab LDAP filter: `(memberOf=cn=foo,dc=bar)`.

In contrast, an omniauth-ldap filter [replaces the 'normal'
filters](https://gitlab.com/gitlab-org/omniauth-ldap/blob/76d77543dec0c585bb4e974262f43675f9810953/lib/omniauth/strategies/ldap.rb#L55)

Example omniauth-ldap user filter:
`(&(uid=%{username})(memberOf=cn=foo,dc=bar))`.
```
  7dfb678d
- D
  
  Cherry-pick the changelog additions into master. · c8b58f00
  由 dosire 提交于 5月 27, 2014
  
  c8b58f00
- M
  
  Add directions on how to upgrade gitlab-shell in the upgrader guide. · 046647a7
  由 Marin Jankovski 提交于 5月 27, 2014
  
  046647a7
- M
  
  Add titles to doc pages. · f22c7095
  由 Marin Jankovski 提交于 5月 27, 2014
  
  f22c7095
- D
  Merge branch 'compare-api' into 'master' · 3bdf0e29
  由 Dmitriy Zaporozhets 提交于 5月 27, 2014
```
Compare api

Fixes #1165
```
  3bdf0e29