home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 05:26:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,150 Commits 48 Branches 340 Tags
d02febd482c5acbbbf961ccdc5330d686131478d
Commit Graph
20150 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher d02febd482 Merge branch 'rs-update-guide' into 'master' 
Add 8.0 CE-to-EE update guide

[ci skip]

See merge request !24
 2015-09-15 17:49:24 +00:00
Robert Speicher 6b8a96da18 Add 8.0 CE-to-EE update guide 
[ci skip]
 2015-09-15 13:40:47 -04:00
Robert Speicher c9b81ac170 Merge branch 'rs-changelog' into 'master' 
Add 7.14.x entries to CHANGELOG-EE

[ci skip]

See merge request !23
 2015-09-10 18:01:33 +00:00
Robert Speicher dbd58b540c Add 7.14.x entries to CHANGELOG-EE 2015-09-10 13:56:06 -04:00
Dmitriy Zaporozhets 15281bdd26 Merge branch 'ff-merge' into 'master' 
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
 2015-09-10 10:01:49 +00:00
Dmitriy Zaporozhets a2b64b3ca1 Merge branch 'ff-merge' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 11:59:59 +02:00
Dmitriy Zaporozhets 9cc31183a0 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee 2015-09-10 11:57:09 +02:00
Dmitriy Zaporozhets c0f659004c Merge branch 'approvals_permission_ext' into 'master' 
Extend approvals permissions for guests and reporters

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

See merge request !487
 2015-09-09 07:52:12 +00:00
Dmitriy Zaporozhets df41707cf0 Merge branch 'master' into 'master' 
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
 2015-09-08 19:21:07 +00:00
Dmitriy Zaporozhets 246314e0dd Improve spelling: Rebase from -> Rebase onto 2015-09-08 13:27:35 +00:00
Valery Sizov 144d2919f2 Extend approvals permissions for guests and reporters 2015-09-08 12:02:08 +03:00
Dmitriy Zaporozhets adbb4f1378 Merge branch 'ff-merge' of dev.gitlab.org:gitlab/gitlab-ee into ff-merge 2015-09-07 21:20:31 +02:00
Dmitriy Zaporozhets 9fa498f0c9 Skip rebase if another in progress 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-07 21:14:06 +02:00
Dmitriy Zaporozhets a6e480fae4 Fix rubocop issues 2015-09-07 10:46:22 +02:00
Dmitriy Zaporozhets b6e061244b Add documentation for ff-merge and rebase 2015-09-07 10:31:32 +02:00
Dmitriy Zaporozhets 57505bfe01 Write tests for ff-merge and rebase services 2015-09-07 09:56:22 +02:00
Dmitriy Zaporozhets 72e536b5a6 Detect rebase state based on rebase directory 2015-09-07 09:19:16 +02:00
Dmitriy Zaporozhets 7c12a8d418 Move rebase to async worker 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 12:26:56 +02:00
Dmitriy Zaporozhets 34457b307b Implement rebase feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 16:04:51 +02:00
Dmitriy Zaporozhets b854010611 Update changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-01 17:18:48 +02:00
Dmitriy Zaporozhets 192c59e5bc Add some tests for ff-only feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-01 17:18:41 +02:00
Dmitriy Zaporozhets 2b51d4d854 Fix name and description for ff-only merge checkbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-01 11:01:55 +02:00
Douwe Maan a9f922096c Merge branch 'addition_to_kerberos_doc_for_omnibus_config' into 'master' 
Add omnibus-gitlab configuration options to the kerberos doc.

Extension of gitlab-org/gitlab-ee!6

See merge request !20
 2015-08-27 16:09:58 +00:00
Dmitriy Zaporozhets baebeb487a Migrate projects with rebase feature enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-27 16:55:17 +02:00
Dmitriy Zaporozhets 971c6e8d13 Rebase button depends on ff-only merge feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-27 16:46:47 +02:00
Alex Warren 1acad14c9e Correct grant_type in example 2015-08-27 13:55:10 +00:00
Dmitriy Zaporozhets 88115792b1 Implement fast-forward merge 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-27 15:51:46 +02:00
Dmitriy Zaporozhets 584ff6f848 Render rebase button and ff merge button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-27 15:07:19 +02:00
Dmitriy Zaporozhets e5f75999bf Add ff-merge only checkbox to project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-27 14:21:13 +02:00
Dmitriy Zaporozhets c5eb75d661 Merge branch 'group-settings-fix' into 'master' 
Fix sidebar navigation issue when viewing Group Settings pages

Fix for #3

See merge request !21
 2015-08-27 11:13:08 +00:00
Dmitriy Zaporozhets 1f6ebcb94a Add tests for group active tab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-27 11:29:50 +02:00
Marin Jankovski 4cdd78485d Add omnibus-gitlab configuration options to the kerberos doc. 2015-08-27 11:27:15 +02:00
Dmitriy Zaporozhets f790206ace Add changelog item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-27 10:30:05 +02:00
Dmitriy Zaporozhets 5d17dccab8 Use group settings layout for audit events and hooks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-27 10:28:26 +02:00
Dmitriy Zaporozhets 55964cbbad Merge branch 'ce-to-ee' into 'master' 
CE to EE



See merge request !484
 2015-08-26 15:47:31 +00:00
Dmitriy Zaporozhets 243bf65124 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 17:15:12 +02:00
Dmitriy Zaporozhets 6c23fd389f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-26 17:06:32 +02:00
Dmitriy Zaporozhets ef1776b823 Merge branch 'fluid-fixed-layout' into 'master' 
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
 2015-08-26 14:56:04 +00:00
Dmitriy Zaporozhets 626c6f9730 Merge branch 'blame_fix' into 'master' 
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
 2015-08-26 14:19:53 +00:00
Dmitriy Zaporozhets 468d29251d Fix header for anonymous users too 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 16:00:37 +02:00
Valery Sizov 99b2be7625 Improve perofrmance of git blame 2015-08-26 16:39:55 +03:00
Dmitriy Zaporozhets 2fa560d658 Align header with content container 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 13:16:43 +02:00
Job van der Voort 7bcce28df6 Merge branch 'fix' into 'master' 
Fixed text about HTTP

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

See merge request !1921
 2015-08-26 11:16:13 +00:00
Dmitriy Zaporozhets bc03dfe774 Merge branch 'bar-graphs' into 'master' 
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
 2015-08-26 10:25:59 +00:00
Dmitriy Zaporozhets 0276e9032a Limit content width for big screens except certain pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 11:51:28 +02:00
Dmitriy Zaporozhets de9f348dfa Merge branch 'ui-improvements' into 'master' 
Ui improvements

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

See merge request !1206
 2015-08-26 09:16:39 +00:00
Dmitriy Zaporozhets 735978388f Increase width of sidebar for several pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 10:36:08 +02:00
Dmitriy Zaporozhets 5ddf38e188 Improve project name/description look on project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 10:21:51 +02:00
Robert Speicher 068dcefc86 Merge branch 'fix-reply-by-email-init' into 'master' 
Fix init script for Reply by email

See merge request !1202
 2015-08-25 19:22:02 +00:00
Douwe Maan 02e7b00a54 Fix init script for Reply by email 2015-08-25 12:03:58 -07:00