Commits · 587e16a4e3d171cfcf477388ca1e5c8c95c8c018 · Kirill Smelkov / gitlab-ce · GitLab

19 Mar, 2014 10 commits
- Merge pull request #6560 from tsigo/visibility-traits · 587e16a4
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Visibility traits for Project Factory
```
  587e16a4
- Add room placeholder for Slack integration · 1921a934
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1921a934
- Merge branch 'nprogress' into 'master' · d2dc0385
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Nprogress
```
  d2dc0385
- Replace turbolink spinner with nprogress · c1fd25ce
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c1fd25ce
- Make use of project factory traits · 1897fb00
  Robert Speicher authored Mar 19, 2014
  
  1897fb00
- Add public/private/internal traits to :project Factory · 65d63470
  Robert Speicher authored Mar 19, 2014
  
  65d63470
- Merge pull request #6558 from tsigo/master · 046773d6
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Fix travis setup
```
  046773d6
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · d7b5656d
  Dmitriy Zaporozhets authored Mar 19, 2014
  
  d7b5656d
- Merge pull request #6550 from razielgn/slack-integration · 11a56ccd
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Added Slack service integration.
```
  11a56ccd
- Fix travis setup · b6778cb2
  Robert Speicher authored Mar 18, 2014
  
  b6778cb2
18 Mar, 2014 5 commits
- Added Slack service integration. · e3fc01b3
  Federico Ravasio authored Mar 18, 2014
  
  e3fc01b3
- Merge branch 'ldap_password' into 'master' · e4a7dae3
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Prevent LDAP users from using reset password function
```
  e4a7dae3
- Do not allow password reset for ldap user. · a740e2d6
  Marin Jankovski authored Mar 18, 2014
  
  a740e2d6
- Merge pull request #5993 from DarkHorseComics/bypass-commented-sqlite · acaf2978
  Jacob Vosmaer authored Mar 18, 2014
```
Explain what to do about legacy sqlite in database.yml
```
  acaf2978
- Merge branch 'check_orphaned_users_groups' into 'master' · 8fa53ce4
  Dmitriy Zaporozhets authored Mar 18, 2014
```
Check Orphaned Users Groups
```
  8fa53ce4
17 Mar, 2014 25 commits
- Add more descriptive line for resolving sqlite error during check · 37192d5e
  Jamey J. DeOrio authored Jan 06, 2014
  
  37192d5e
- 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