Commits · 32268d8ddaf3a545425dba790492c05bc5571e0d · nexedi / gitlab-ce

19 Mar, 2014 3 commits
- push via http now served via /allowed API · 32268d8d
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  32268d8d
- Use GitAccess in internal api · 7b59e2e2
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7b59e2e2
- Add Gitlab::GitAccess class to resolve auth issues during pull/push · b4bef5e6
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b4bef5e6
18 Mar, 2014 8 commits
- Merge branch 'show-shared-projects' into 'master' · b040f5da
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Show shared projects in Group#show page of admin area
```
  b040f5da
- Add tests · 822be2c7
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  822be2c7
- Show shared projects on Group#show in admin area · 334313a7
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  334313a7
- Merge branch 'code-from-ce-6-7' into 'master' · 44b3404e
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Code from CE 6.7

Fixes #75
```
  44b3404e
- Update db schema · 896159ca
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  896159ca
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 · e502d785
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb
```
  e502d785
- Merge branch 'ldap_connection_reuse' into 'master' · 6fd29312
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Ldap Connection Reuse
```
  6fd29312
- Merge branch 'check_orphaned_users_groups' into 'master' · 8fa53ce4
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Check Orphaned Users Groups
```
  8fa53ce4
17 Mar, 2014 29 commits
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 11f20576
  Marin Jankovski authored Mar 17, 2014
  
  11f20576
- Add change to changelog. · 1c6e93ed
  Marin Jankovski authored Mar 17, 2014
  
  1c6e93ed
- Merge pull request #6529 from MrKeiKun/system-hook-fix · b36441f4
  Sytse Sijbrandij authored Mar 17, 2014
```
Fixed some minor typos
```
  b36441f4
- Merge branch 'links_within_same_repo' into 'master' · 493c7a61
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Relative links within one system

When using relative links in md in repository file it will only link within the repository.
When using relative links in md in wiki page, it will only link to wiki pages.
```
  493c7a61
- Merge branch 'mysql-to-og' into 'master' · 66c4a7db
  Dmitriy Zaporozhets authored Mar 17, 2014
```
MySQL to Postgres script
```
  66c4a7db
- Postgresql conversion script. · 70994c34
  dosire authored Mar 17, 2014
  
  70994c34
- Default value for Snippet#private · de855e24
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  de855e24
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · cb43d88a
  Dmitriy Zaporozhets authored Mar 17, 2014
  
  cb43d88a
- Merge pull request #6544 from cirosantilli/show-link-to-public-projects-for-new-users · d5796975
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Show link to public projects for new users.
```
  d5796975
- Drop UsersGroup orphans using `rails runner` · 5e7e814e
  Jacob Vosmaer authored Mar 17, 2014
  
  5e7e814e
- Merge branch 'deeplink' into 'master' · 90d7ac3b
  Sytse Sijbrandij authored Mar 17, 2014
```
Deeplink

/cc @dzaporozhets
```
  90d7ac3b
- We have html targets for paragraphs now. · 67eb14d3
  dosire authored Mar 17, 2014
  
  67eb14d3
- Merge branch 'project-permissions' into 'master' · 0f204c32
  Dmitriy Zaporozhets authored Mar 17, 2014
```
API: Project permissions
```
  0f204c32
- Merge branch 'split-api-files' into 'master' · 63a8af67
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Move project members api to separate file
```
  63a8af67
- Fix tests · c02e3d44
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c02e3d44
- Add more api docs · 86c76ecc
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  86c76ecc
- Add tests for API project permissions info · 928b7f3b
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  928b7f3b
- Remove old entities · 0ea0e542
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0ea0e542
- Add current user permissions info to /api/projects/:id.json · eea31779
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  eea31779
- Use new grape-entity gem with fixed nested entities · a91a6491
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a91a6491
- Update markdown documentation, fix wiki spec. · 656d9548
  Marin Jankovski authored Mar 17, 2014
  
  656d9548
- Update wiki tests. · 3f818a3d
  Marin Jankovski authored Mar 17, 2014
  
  3f818a3d
- Wiki will show relative links related to the wiki gollum repository. · f04d5bfa
  Marin Jankovski authored Mar 17, 2014
  
  f04d5bfa
- Link to blob instead of linking to wiki. · 55e2f353
  Marin Jankovski authored Mar 17, 2014
  
  55e2f353
- Show link to public projects for new users. · 548f070f
  Ciro Santillli authored Mar 17, 2014
  
  548f070f
- Move project members api to separate file · 7c60713e
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7c60713e
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 7bce8748
  Dmitriy Zaporozhets authored Mar 17, 2014
  
  7bce8748
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 788723c3
  Dmitriy Zaporozhets authored Mar 17, 2014
  
  788723c3
- Restore old travis.yml · c0d2b976
  Dmitriy Zaporozhets authored Mar 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c0d2b976