home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,129 Commits 48 Branches 340 Tags
34457b307bb4d60a8abe8be3e63b44f986b802bd
Commit Graph
20129 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Josef Kufner fa65db9aa8 Add changelog entry 2015-08-25 19:44:59 +02:00
Josef Kufner ad85f1f560 Change plots to bar graphs 2015-08-25 19:44:59 +02:00
Dmitriy Zaporozhets 5757087761 Merge branch 'dropdown-positioning' into 'master' 
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
 2015-08-25 17:35:28 +00:00
Dmitriy Zaporozhets 7140e800ee Merge branch 'separate-activity' into 'master' 
Re-use project partial for rendering explore projects from dashboard

For consistency with projects on dashboard after !1198

Before:

![Screenshot_2015-08-25_18.21.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/53bcf6909fe55b2e331ea6a720cb12ce/Screenshot_2015-08-25_18.21.48.png)

After:

![Screenshot_2015-08-25_18.20.22](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fbda93828ec28ef1ac874d65b4a04c2b/Screenshot_2015-08-25_18.20.22.png)

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

See merge request !1200
 2015-08-25 16:54:54 +00:00
Douwe Maan 2df94f9763 Merge branch 'rs-re-enable-user-reference-spec' into 'master' 
Re-enable the "links with adjacent text" UserReferenceFilter spec

See merge request !1194
 2015-08-25 16:44:14 +00:00
Dmitriy Zaporozhets 084da5253b Re-use project partial for rendering explore projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-25 18:20:06 +02:00
Dmitriy Zaporozhets a0284b5b85 Merge branch 'separate-activity' into 'master' 
Separate activity page

Move activity to separate page.

Part of #2225

![Screenshot_2015-08-25_15.07.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2126b22ed7b98a2f748c96ad60bc8b2e/Screenshot_2015-08-25_15.07.23.png)

See merge request !1198
 2015-08-25 16:19:12 +00:00
Hannes Rosenögger 4a4d9fe16e UI Improvement for the project page 
This commit improves the positioning of the dropdown menu on the project page.
 2015-08-25 17:58:29 +02:00
Dmitriy Zaporozhets 7569010bc3 Fix tests and last push widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-25 16:36:54 +02:00
Dmitriy Zaporozhets 429c0d1491 Merge branch 'fix-reload-with-full-diff-in-compare-branch' into 'master' 
Fix "Reload with full diff" URL button in compare branch view

This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.

See merge request !1195
 2015-08-25 14:13:05 +00:00
Dmitriy Zaporozhets c11e43145f Make some visual improvements to dashboard page after we moved activity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-25 15:23:25 +02:00
Dmitriy Zaporozhets 8f68c38746 Dashboard activity as separate page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-25 14:13:04 +02:00
Dmitriy Zaporozhets 1c2ce6efde Merge branch 'improve-abuse-reports' into 'master' 
Improve abuse reports management

* Link to user profile instead of user admin page
* One button for remove user and report
* Remove user and report without page reloading

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

See merge request !1196
 2015-08-25 10:21:22 +00:00
Dmitriy Zaporozhets c1b490d6ef Merge branch 'handle-smtp-input-errors' into 'master' 
Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to prevent Sidekiq retries

### What does this MR do?

This MR gracefully handles SMTP input errors (e.g. incorrect or invalid e-mail addresses) to prevent these types of exceptions from causing Sidekiq to retry the task. If these specific exceptions occur, they will be logged, and the e-mail will be dropped from the queue.

### Why was this MR needed?

If you include an author that has a misspelled e-mail address, Sidekiq will keep sending e-mail to all the recipients even if they have already received the e-mail. The only way to recover is to clear the Sidekiq queue.

Note that other exceptions can still be thrown (e.g. `IOError`, `Net::SMTPAuthenticationError`, `Net::SMTPServerBusy`, `Net::SMTPUnknownError`, and `TimeoutError`). If the worker encounters these, Sidekiq should retry the task.

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/9560

See merge request !1163
 2015-08-25 09:23:43 +00:00
Dmitriy Zaporozhets 13f8fc9784 Fix remove report button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-25 10:57:56 +02:00
Dmitriy Zaporozhets e02b7bf443 Improve abuse reports management 
* Link to user profile instead of user admin page
* One button for remove user and report
* Remove user and report with page reloading

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-25 10:52:10 +02:00
Dmitriy Zaporozhets c06cf2bde6 Merge branch 'upgrade-browser-gem' into 'master' 
Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode

GitLab currently displays the "outdated browser" message if users run Internet Explorer 11 in Compatibility Mode. @fnando [updated the browser gem](https://github.com/fnando/browser/pull/168) to use IE's Trident version to determine the "true" version of IE11.

Closes #2271

See merge request !1188
 2015-08-25 08:05:30 +00:00
Stan Hu 3bee4a6712 Fix "Reload with full diff" URL button in compare branch view 
This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.
 2015-08-24 23:35:26 -07:00
Robert Speicher 646c1f0324 Re-enable the "links with adjacent text" UserReferenceFilter spec 2015-08-24 18:56:01 -07:00
Robert Speicher c52fe24c36 Merge branch 'reply-by-email-improvements' into 'master' 
Ignore empty incoming messages (Reply by email)

We should also update mail_room when https://github.com/tpitale/mail_room/pull/35 goes in, but that can wait a bit.

See merge request !1190
 2015-08-24 21:56:07 +00:00
Robert Speicher f9ac553db1 Merge branch 'rs-changelog-update' into 'master' 
Move changelog entry to 7.14.1

[ci skip]

See merge request !1192
 2015-08-24 19:31:32 +00:00