Commit Graph
9578 Commits
Author SHA1 Message Date
Valery Sizov 144d2919f2 Extend approvals permissions for guests and reporters 2015-09-08 12:02:08 +03: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 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 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 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
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
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
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
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
Douwe Maan 2088880383 Ignore empty incoming messages. 2015-08-24 10:57:35 -07:00
Douwe Maan e449426a4e Merge branch 'fix-error-500-groups-with-avatar' into 'master'
Fix Error 500 in API when accessing a group that has an avatar

Closes #2340

See merge request !1189
2015-08-24 15:23:10 +00:00
Stan Hu 19f478e00d Fix Error 500 in API when accessing a group that has an avatar
Closes #2340
2015-08-24 07:46:06 -07:00
Valery Sizov 56527b63e8 Ability to search milestones 2015-08-24 13:59:01 +03:00
Stan Hu ed1d4fa477 Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab
and request them each session. Pass these tokens to the project import data.

This prevents the need to encrypt these tokens and clear them in case they
expire or get revoked.

For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get
an Error 500 with no way to recover:

```
Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000
Processing by Import::BitbucketController#status as HTML
Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms)

NameError (uninitialized constant Import::BitbucketController::Unauthorized):
  app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized'
```

Closes #1871
2015-08-23 09:23:44 -07:00
Maël Valais a9e409179b Create cross-reference for closing references on commits pushed to non-default branches.
I also revamped the tests on "closing reference commits" (= "Fixes #xxxx" for example).
Now, there are two different contexts:
- when the commits with "closing reference" are pushed to the default branch,
- when the commits with "closing reference" are pushed to a non-default branch.

Closes gitlab-org/gitlab-ce#2190.
2015-08-22 16:49:09 +02:00
Robert Speicher f0bdf7f810 Merge branch 'reply-by-email' into 'master'
Reply by email

Fixes #1360.

It's far from done, but _it works_.

See merge request !1173
2015-08-22 00:00:08 +00:00
Douwe Maan af9f1ec2ae Fix sign in form when just Kerberos is enabled 2015-08-21 16:51:45 -07:00
Douwe Maan 0daa21ed8c Merge branch 'fix-email-autocomplete' into 'master'
Fix bug preventing invite by e-mail

This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320

See merge request !1181
2015-08-21 22:25:59 +00:00
Stan Hu 577df6b8ca List the current user first in issuable dropdowns 2015-08-21 14:27:21 -07:00
Stan Hu 3715a0f29b Fix bug preventing invite by e-mail
This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320
2015-08-21 13:47:56 -07:00
Robert Speicher d0d435a22e Merge branch 'fix-mr-create-permissions' into 'master'
Check permissions on target project in merge request create service.

See merge request !1183
2015-08-21 18:02:16 +00:00
Douwe Maan 69708dab9f Block blocked users from replying to threads by email. 2015-08-21 10:14:45 -07:00
Douwe Maan 414533ca48 Check permissions on target project in merge request create service. 2015-08-21 09:47:39 -07:00
Robert Speicher 1346756f74 Merge branch 'fix-fork-mr-labels' into 'master'
Fix bug where non-project members of the target project could set labels on new merge requests.

Fixes #2292.

See merge request !1180
2015-08-21 16:37:09 +00:00
Dmitriy Zaporozhets 9bd6c41a02 Merge branch 'commit-image-branch' into 'master'
Fixed JS issue with diff image loading

Fixes #1323

Whilst I couldn't reproduce the error locally, I did manage to get the same JS error message that was in the live env.

See merge request !463
2015-08-21 15:11:09 +00:00
Dmitriy Zaporozhets d43d7ffd6f Merge branch 'hide-recent-push' into 'master'
Only show recent push event if the branch still exists or a recent merge request has not been created

Closes #2277

See merge request !1167
2015-08-21 14:54:53 +00:00
Dmitriy Zaporozhets 59525d6b28 Merge branch 'comment-case-insensetive-search' into 'master'
Case-insensitive search for comments

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

See merge request !1174
2015-08-21 14:53:36 +00:00
Dmitriy Zaporozhets 677bf6615f Merge branch 'issue-2306-repo-size-display' into 'master'
Add size information back to project summary screen.

![gitlab-with-size](https://gitlab.com/nneul/gitlab-ce/uploads/84d15169aa7ee4e966465a71ca383f24/gitlab-with-size.png)

See merge request !1178
2015-08-21 10:21:48 +00:00
Douwe Maan 77e508d8fd Fix bug where non-project members of the target project could set labels on new merge requests. 2015-08-20 18:32:32 -07:00
Douwe Maan 2de0935e27 Merge branch 'fix-blame-lines-grouping' into 'master'
Fix blame view line groupings

Before:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b84f75183244e58683b9172c772591d6/image.png)

After:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/12ef635deefd3616142e65f064252020/image.png)

Closes #2305

See merge request !1176
2015-08-20 21:24:48 +00:00
Douwe Maan 02b7be4a68 Remove weirdness. 2015-08-20 14:03:09 -07:00
Douwe Maan 3d51a6d435 Merge branch 'master' into reply-by-email 2015-08-20 12:19:19 -07:00