Commits · 4a21db82ec8edfc79a1b16d5d28bdd7e82085234 · Kirill Smelkov / gitlab-ce · GitLab

17 Sep, 2014 8 commits
- Merge branch 'first-meaningful-line-in-md' of https://github.com/yglukhov/gitlabhq into 7-4-pre · 4a21db82
  Dmitriy Zaporozhets authored Sep 17, 2014
  
  4a21db82
- Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre · 8bff9a40
  Dmitriy Zaporozhets authored Sep 17, 2014
  
  8bff9a40
- Merge branch 'readme-anchor' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre · 6dff16a6
  Dmitriy Zaporozhets authored Sep 17, 2014
  
  6dff16a6
- Fix README anchor tests · d771253b
  Dmitriy Zaporozhets authored Sep 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d771253b
- Version 7.3.rc1. · 630d0424
  Marin Jankovski authored Sep 17, 2014
  
  630d0424
- Updates to the update/install docs for 7.3.rc1 · 2b35c887
  Marin Jankovski authored Sep 17, 2014
  
  2b35c887
- Highlight the word master when referring to a branch name to make it more obvious, thanks Ben. · 8952c5ce
  Sytse Sijbrandij authored Sep 17, 2014
  
  8952c5ce
- Merge branch 'doc/welcome_message' into 'master' · 553680d0
  Job van der Voort authored Sep 17, 2014
```
Document the extra.sign_in_text setting for CE

See merge request !1027
```
  553680d0
16 Sep, 2014 8 commits
- Merge branch 'gitlab_check_hooks_symlink' into 'master' · 39c47844
  Dmitriy Zaporozhets authored Sep 16, 2014
```
Check for hooks directory symlink in gitlab:check

See merge request !1094
```
  39c47844
- Merge branch 'dont-rebase-pushed-commits' into 'master' · 5104b6c8
  Dmitriy Zaporozhets authored Sep 16, 2014
```
Dont rebase pushed commits

/cc @jacobvosmaer

See merge request !1095
```
  5104b6c8
- Don't rebase pushed commits. · 5a14213f
  Sytse Sijbrandij authored Sep 16, 2014
  
  5a14213f
- Merge branch 'new_relic' into 'master' · 500a1a7b
  Dmitriy Zaporozhets authored Sep 16, 2014
```
Add dormant New Relic gem

See merge request !1089
```
  500a1a7b
- Add dormant New Relic gem · 66ae1bde
  Jacob Vosmaer authored Sep 12, 2014
```
The gem can be enabled and configured via environment variables.
```
  66ae1bde
- Check for hooks directory symlink in gitlab:check · 45a6b624
  Jacob Vosmaer authored Sep 16, 2014
  
  45a6b624
- Merge branch 'order_mr_api' into 'master' · 71e05544
  Marin Jankovski authored Sep 16, 2014
```
API MR ordering

Fixes #1477

See merge request !1076
```
  71e05544
- Fix typo in comment. · 685754b0
  Marin Jankovski authored Sep 16, 2014
  
  685754b0
15 Sep, 2014 13 commits
- Merge branch 'redis_socket' into 'master' · 892371bc
  Dmitriy Zaporozhets authored Sep 15, 2014
```
Use sockets to connect to Redis

See merge request !1088
```
  892371bc
- Merge branch 'use-members-models' into 'refator-members-logic' · 07bc48c5
  Dmitriy Zaporozhets authored Sep 15, 2014
```
Use members models

See merge request !1
```
  07bc48c5
- Fix finder and tests for new membership models · 4f1bb91a
  Dmitriy Zaporozhets authored Sep 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4f1bb91a
- Different created_at and updated_at time in api merge_requests spec. · f37b4cc5
  Marin Jankovski authored Sep 15, 2014
  
  f37b4cc5
- Ordering and sorting for MR in api. · b99b2e60
  Marin Jankovski authored Sep 09, 2014
  
  b99b2e60
- More fixes to project members api · 6558e52d
  Dmitriy Zaporozhets authored Sep 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6558e52d
- Fix access_level api · ce49f035
  Dmitriy Zaporozhets authored Sep 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ce49f035
- Replace project_access attribute with access_level in specs and API · 77c64a9b
  Dmitriy Zaporozhets authored Sep 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  77c64a9b
- Move hook models in separate dir · 38ed0dea
  Dmitriy Zaporozhets authored Sep 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  38ed0dea
- Fix project member management · 39ab7527
  Dmitriy Zaporozhets authored Sep 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  39ab7527
- Fix adminarea and emails for new membership logic · bdbadebe
  Dmitriy Zaporozhets authored Sep 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bdbadebe
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 09b23228
  Dmitriy Zaporozhets authored Sep 15, 2014
  
  09b23228
- Merge branch 'implement_comments_on_parallel_diff' into 'master' · 79190fe0
  Dmitriy Zaporozhets authored Sep 15, 2014
```
Implement comments on parallel diff

Fixes #1565

See merge request !1090
```
  79190fe0
14 Sep, 2014 10 commits
- Fix STI+polymorphic for Group <-> GroupMember · 1aa48174
  Dmitriy Zaporozhets authored Sep 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1aa48174
- Fix migration and association for new members table · 13af7de9
  Dmitriy Zaporozhets authored Sep 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  13af7de9
- Replace old references of users_project & users_group · 8210d813
  Dmitriy Zaporozhets authored Sep 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8210d813
- Huge replace of old users_project and users_group references · c69b8e04
  Dmitriy Zaporozhets authored Sep 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c69b8e04
- Add STI to Member model · eb4a9bfb
  Dmitriy Zaporozhets authored Sep 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  eb4a9bfb
- Migrate old membership objects to new Member model · e9b32005
  Dmitriy Zaporozhets authored Sep 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e9b32005
- Add Member AR model · 757426db
  Dmitriy Zaporozhets authored Sep 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  757426db
- Add members table migration · 3503b504
  Dmitriy Zaporozhets authored Sep 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3503b504
- Merge pull request #7753 from tamers/patch-1 · 67cf376d
  Robert Schilling authored Sep 14, 2014
```
Fix grammatical error in 'not merged changes' msg
```
  67cf376d
- Fix grammatical error in 'not merged changes' msg · a391cd21
  Tamer Sherif authored Sep 14, 2014
  
  a391cd21
13 Sep, 2014 1 commit
- Merge pull request #7528 from exromany/patch-1 · b3a88a0f
  Robert Schilling authored Sep 13, 2014
```
Update user_management.md
```
  b3a88a0f