Commits · 246314e0dd3ca19c29e01c6f2abc4f944e287bf6 · nexedi / gitlab-ce

08 Sep, 2015 1 commit
- Improve spelling: Rebase from -> Rebase onto · 246314e0
  Dmitriy Zaporozhets authored Sep 08, 2015
  
  246314e0
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 9 commits
- 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
- 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 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 14 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
Align header with content container · 2fa560d6
Dmitriy Zaporozhets authored Aug 26, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
2fa560d6

Merge branch 'fix' into 'master' · 7bcce28d

Job van der Voort authored Aug 26, 2015

Fixed text about HTTP

Fixed for text to be more clear. Because of tweet https://twitter.com/mystygage/status/630798770012323840

See merge request !1921

7bcce28d

Merge branch 'bar-graphs' into 'master' · bc03dfe7

Dmitriy Zaporozhets authored Aug 26, 2015

Change plots to bar graphs

Since line plot does not make sense for this kind of plots, change them to bar graphs. Bar graphs are easier to read and they look cool too.

I would like to change commits per author plots to bar graphs too, but code looks too messy to modify.

See merge request !645

bc03dfe7

Limit content width for big screens except certain pages · 0276e903
Dmitriy Zaporozhets authored Aug 26, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
0276e903

Merge branch 'ui-improvements' into 'master' · de9f348d

Dmitriy Zaporozhets authored Aug 26, 2015

Ui improvements

* Improve project name/description look on project page
* Increase width of sidebar for several pages

See merge request !1206

de9f348d

Increase width of sidebar for several pages · 73597838
Dmitriy Zaporozhets authored Aug 26, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
73597838
Improve project name/description look on project page · 5ddf38e1
Dmitriy Zaporozhets authored Aug 26, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
5ddf38e1

25 Aug, 2015 5 commits

Merge branch 'fix-reply-by-email-init' into 'master' · 068dcefc
Robert Speicher authored Aug 25, 2015
```
Fix init script for Reply by email

See merge request !1202
```
068dcefc
Fix init script for Reply by email · 02e7b00a
Douwe Maan authored Aug 25, 2015

02e7b00a
Add changelog entry · fa65db9a
Josef Kufner authored Aug 24, 2015

fa65db9a
Change plots to bar graphs · ad85f1f5
Josef Kufner authored May 13, 2015

ad85f1f5

Merge branch 'dropdown-positioning' into 'master' · 57570877

Dmitriy Zaporozhets authored Aug 25, 2015

UI Improvement for the project page

This MR improves the positioning of the dropdown menu on the project page.
I've added the WIP because I didn't check if this can cause any tests to break.
I'll remove it once the CI is green.

Before:
![gitlab_dropdown_old](https://gitlab.com/haynes/gitlab-ce/uploads/ac30810abe9e75154edd2a896c9a4947/gitlab_dropdown_old.png)

After:
![gitlab_dropdown_new](https://gitlab.com/haynes/gitlab-ce/uploads/616c237fe26934ebbbc82f0ce73e72da/gitlab_dropdown_new.png)

This is the MR for the discussion in gitlab-org/gitlab-ce!971 .

/cc @dzaporozhets Can you review it please? 😃

See merge request !1199

57570877