Commits · 6b8a96da1809f3754e4331fb927052367888fb81 · nexedi / gitlab-ce

15 Sep, 2015 1 commit
- Add 8.0 CE-to-EE update guide · 6b8a96da
  Robert Speicher authored Sep 15, 2015
```
[ci skip]
```
  6b8a96da
10 Sep, 2015 5 commits

Merge branch 'rs-changelog' into 'master' · c9b81ac1
Robert Speicher authored Sep 10, 2015
```
Add 7.14.x entries to CHANGELOG-EE

[ci skip]

See merge request !23
```
c9b81ac1
Add 7.14.x entries to CHANGELOG-EE · dbd58b54
Robert Speicher authored Sep 10, 2015

dbd58b54

Merge branch 'ff-merge' into 'master' · 15281bdd

Dmitriy Zaporozhets authored Sep 10, 2015

Fast-forward merge button

For #337, #338 

- [x] fast-forward merge option in project settings
- [x] fast-forward merge button
- [x] message if ff is not possible
- [x] rebase button if ff is not possible and rebase is enabled
- [x] rebase button depends on ff-only setting
- [x] remove `rebase enabled by default` checkbox from project settings
- [x] implement rebase feature
- [x] write tests
- [x] update CHANGELOG and documentation
- [x] mention in 8.0 blog post

See merge request !485

15281bdd

Merge branch 'ff-merge' · a2b64b3c
Dmitriy Zaporozhets authored Sep 10, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
a2b64b3c
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee · 9cc31183
Dmitriy Zaporozhets authored Sep 10, 2015

9cc31183

09 Sep, 2015 1 commit

Merge branch 'approvals_permission_ext' into 'master' · c0f65900

Dmitriy Zaporozhets authored Sep 09, 2015

Extend approvals permissions for guests and reporters

https://dev.gitlab.org/gitlab/gitlab-ee/issues/328

See merge request !487

c0f65900

08 Sep, 2015 3 commits
- Merge branch 'master' into 'master' · df41707c
  Dmitriy Zaporozhets authored Sep 08, 2015
```
Correct grant_type in example

Fix the capitalisation of the grant_type parameter. If it's in capitals it doesn't work, and it also looks like this is a field that we need to fill in when actually it just needs to be the exact string "authorization_code".

See merge request !22
```
  df41707c
- Improve spelling: Rebase from -> Rebase onto · 246314e0
  Dmitriy Zaporozhets authored Sep 08, 2015
  
  246314e0
- Extend approvals permissions for guests and reporters · 144d2919
  Valery Sizov authored Sep 08, 2015
  
  144d2919
07 Sep, 2015 6 commits
- Merge branch 'ff-merge' of dev.gitlab.org:gitlab/gitlab-ee into ff-merge · adbb4f13
  Dmitriy Zaporozhets authored Sep 07, 2015
  
  adbb4f13
- Skip rebase if another in progress · 9fa498f0
  Dmitriy Zaporozhets authored Sep 07, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9fa498f0
- Fix rubocop issues · a6e480fa
  Dmitriy Zaporozhets authored Sep 07, 2015
  
  a6e480fa
- Add documentation for ff-merge and rebase · b6e06124
  Dmitriy Zaporozhets authored Sep 07, 2015
  
  b6e06124
- Write tests for ff-merge and rebase services · 57505bfe
  Dmitriy Zaporozhets authored Sep 07, 2015
  
  57505bfe
- Detect rebase state based on rebase directory · 72e536b5
  Dmitriy Zaporozhets authored Sep 07, 2015
  
  72e536b5
03 Sep, 2015 1 commit
- Move rebase to async worker · 7c12a8d4
  Dmitriy Zaporozhets authored Sep 03, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7c12a8d4
02 Sep, 2015 1 commit
- Implement rebase feature · 34457b30
  Dmitriy Zaporozhets authored Sep 02, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  34457b30
01 Sep, 2015 3 commits
- Update changelog · b8540106
  Dmitriy Zaporozhets authored Sep 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b8540106
- Add some tests for ff-only feature · 192c59e5
  Dmitriy Zaporozhets authored Sep 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  192c59e5
- Fix name and description for ff-only merge checkbox · 2b51d4d8
  Dmitriy Zaporozhets authored Sep 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2b51d4d8
27 Aug, 2015 12 commits
- Merge branch 'addition_to_kerberos_doc_for_omnibus_config' into 'master' · a9f92209
  Douwe Maan authored Aug 27, 2015
```
Add omnibus-gitlab configuration options to the kerberos doc.

Extension of gitlab-org/gitlab-ee!6

See merge request !20
```
  a9f92209
- Migrate projects with rebase feature enabled · baebeb48
  Dmitriy Zaporozhets authored Aug 27, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  baebeb48
- Rebase button depends on ff-only merge feature · 971c6e8d
  Dmitriy Zaporozhets authored Aug 27, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  971c6e8d
- Correct grant_type in example · 1acad14c
  Alex Warren authored Aug 27, 2015
  
  1acad14c
- Implement fast-forward merge · 88115792
  Dmitriy Zaporozhets authored Aug 27, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  88115792
- Render rebase button and ff merge button · 584ff6f8
  Dmitriy Zaporozhets authored Aug 27, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  584ff6f8
- Add ff-merge only checkbox to project settings · e5f75999
  Dmitriy Zaporozhets authored Aug 27, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e5f75999
- Merge branch 'group-settings-fix' into 'master' · c5eb75d6
  Dmitriy Zaporozhets authored Aug 27, 2015
```
Fix sidebar navigation issue when viewing Group Settings pages

Fix for #3

See merge request !21
```
  c5eb75d6
- Add tests for group active tab · 1f6ebcb9
  Dmitriy Zaporozhets authored Aug 27, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1f6ebcb9
- Add omnibus-gitlab configuration options to the kerberos doc. · 4cdd7848
  Marin Jankovski authored Aug 27, 2015
  
  4cdd7848
- Add changelog item · f790206a
  Dmitriy Zaporozhets authored Aug 27, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f790206a
- Use group settings layout for audit events and hooks · 5d17dcca
  Dmitriy Zaporozhets authored Aug 27, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5d17dcca
26 Aug, 2015 7 commits
- Merge branch 'ce-to-ee' into 'master' · 55964cbb
  Dmitriy Zaporozhets authored Aug 26, 2015
```
CE to EE



See merge request !484
```
  55964cbb
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee · 243bf651
  Dmitriy Zaporozhets authored Aug 26, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  243bf651
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 6c23fd38
  Dmitriy Zaporozhets authored Aug 26, 2015
  
  6c23fd38
- Merge branch 'fluid-fixed-layout' into 'master' · ef1776b8
  Dmitriy Zaporozhets authored Aug 26, 2015
```
Limit content width for big screens except certain pages

- [x] limit content width to 1200px
- [x] align header with head
- [x] set full-width for split diff pages

Fixes #2353
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1207
```
  ef1776b8
- Merge branch 'blame_fix' into 'master' · 626c6f97
  Dmitriy Zaporozhets authored Aug 26, 2015
```
Improve perofrmance of git blame

https://gitlab.com/gitlab-org/gitlab-ce/issues/2286

Now, it's four times as faster.

See merge request !1209
```
  626c6f97
- Fix header for anonymous users too · 468d2925
  Dmitriy Zaporozhets authored Aug 26, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  468d2925
- Improve perofrmance of git blame · 99b2be76
  Valery Sizov authored Aug 26, 2015
  
  99b2be76