Commit Graph
7754 Commits
Author SHA1 Message Date
Rémy Coutable 99ea32714b Merge branch 'fix-endless-redirect' into 'master'
Fix endless redirections when accessing user OAuth applications when they are disabled

## What does this MR do?

This MR fixes a bug where the browser would be redirect endlessly when attempting to access the user's OAuth applications when an admin has disabled this system-wide setting.

## Are there points in the code the reviewer needs to double check?

I assume disabling the nav button is better than showing a page that says, "OAuth applications are disabled by the admin."

## Why was this MR needed?

Lots of users were confused when they hit endless redirect errors.

## What are the relevant issue numbers?

#14770 

See merge request !4525
2016-06-08 13:57:58 +00:00
Stan Hu 3b50d96b8a Fix endless redirections when accessing user OAuth applications when they are disabled
Also hides the "Applications" nav button if OAuth applications are disabled by the admin.

Closes #14770
2016-06-08 05:52:04 -07:00
Jacob Schatz 915ad255cd Merge branch '18080-project-header-alignment' into 'master'
Add flexbox to project header

## What does this MR do?
Adds flexbox to project header to keep components vertically centered regardless of description presence/length

## What are the relevant issue numbers?
Closes  #18080 

## Screenshots (if relevant)
![Screen_Shot_2016-06-01_at_12.02.42_PM](/uploads/edd769110b52ec34046f4079619e45eb/Screen_Shot_2016-06-01_at_12.02.42_PM.png)     
![Screen_Shot_2016-06-01_at_12.02.35_PM](/uploads/c5c2828ba5688a2588d3721a2d21d5fe/Screen_Shot_2016-06-01_at_12.02.35_PM.png)

See merge request !4417
2016-06-08 03:39:59 +00:00
Jacob Schatz babf20c8ab Merge branch 'notification-dropdown-labels' into 'master'
Notifications dropdown on project page now has descriptions

## What does this MR do?

Adds descriptions to the notification settings dropdown on project pages. Also changed the order of them to make more sense.

## What are the relevant issue numbers?

Part of #12758

## Screenshots (if relevant)

![Screen_Shot_2016-05-31_at_09.35.24](/uploads/b30d82701a13ec15f672139e1225acf5/Screen_Shot_2016-05-31_at_09.35.24.png)

See merge request !4374
2016-06-07 18:06:37 +00:00
Jacob Schatz c3ce61ba41 Merge branch '18058-sub-nav' into 'master'
Sub navigation

## What does this MR do?
Styles sub nav   
cc @dzaporozhets  @skyruler @jschatz1 

## What are the relevant issue numbers?
#18058 and #17983 

## Screenshots (if relevant)
![Screen_Shot_2016-06-03_at_12.10.26_PM](/uploads/8b948c32699a93ab0a390bda31e0e411/Screen_Shot_2016-06-03_at_12.10.26_PM.png)
![Screen_Shot_2016-06-03_at_12.10.34_PM](/uploads/241115c35d0618f3de739be9a670416d/Screen_Shot_2016-06-03_at_12.10.34_PM.png)

See merge request !4468
2016-06-07 17:13:21 +00:00
Jacob Schatz 7d315aecfb Merge branch '18013-compact-sidebar' into 'master'
Implement compact side nav

## What does this MR do?
Implements new compact nav design   
Note- new navbar icons are in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4268)

## What are the relevant issue numbers?
Closes #18013 

## Screenshots (if relevant)
![Screen_Shot_2016-06-02_at_3.20.37_PM](/uploads/d31bd17ae47743f1a20d7429b4396e84/Screen_Shot_2016-06-02_at_3.20.37_PM.png)   
![Screen_Shot_2016-06-02_at_3.20.43_PM](/uploads/d03a080a57707b6a2161127f3904fcd5/Screen_Shot_2016-06-02_at_3.20.43_PM.png)

cc @dzaporozhets 

See merge request !4447
2016-06-07 17:00:44 +00:00
Jacob Schatz 5b83abcc01 Merge branch 'issue_14189' into 'master'
Ability to prioritize labels

Closes #14189 

See merge request !4009
2016-06-07 15:15:07 +00:00
Annabel Dunstone ae6591081a Fix alignment of wiki top area 2016-06-07 10:05:10 -05:00
Annabel Dunstone 2293100d95 Update nav link font size and spacing; fix hamburger icon 2016-06-07 09:16:59 -05:00
Annabel Dunstone ffbd9cd02d Test impersonation using img data attribute instead of username 2016-06-07 09:16:59 -05:00
Annabel Dunstone 7c501895a3 Implement compact side nav 2016-06-07 09:16:59 -05:00
Annabel Dunstone a528b649bf Add scrolling tabs to code subnav 2016-06-07 09:08:15 -05:00
Annabel Dunstone 5db95f5e69 Finish styling sub nav 2016-06-07 09:08:15 -05:00
Phil Hughes 51a62fce04 Fixed failing tests 2016-06-07 15:02:00 +01:00
Phil Hughes e141a1c6f1 Notifications dropdown on project page now has descriptions
This is part of #12758
2016-06-07 15:02:00 +01:00
Annabel Dunstone 664afebbe9 Start styling sub nav 2016-06-07 08:59:40 -05:00
Douwe Maan 8c356ac550 Merge branch 'rename-ci-commit-phase-3' into 'master'
Rename ci_commit in application code

This is third iteration of renaming `[ci_]commit(s)` in application code to `pipeline(s)`.


See merge request !4464
2016-06-07 12:47:25 +00:00
Douwe Maan 3368afd767 Merge branch 'rename-ci-commit-phase-2' into 'master'
Rename Ci::Commit in specs

This is second iteration of renaming Ci::Commit occurences, this time I try to rename all `let's` and `factories` to match what type of object is created:

1. Rename factories: `ci_[...]_commit_[...]` to `ci_[...]_pipeline_[...]`,
2. Rename all `let's(:[ci_]commit)` to `let(:pipeline)`,
3. Rename all occurrences of `[ci_]commit` to `pipeline` if Pipeline object is created

cc @grzesiek @DouweM 

See merge request !4463
2016-06-07 12:45:59 +00:00
Douwe Maan 8c5712a422 Merge branch 'gh-disable-webhooks' 2016-06-07 13:06:43 +02:00
Kamil Trzcinski 9839bbae9c Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 2016-06-07 10:27:27 +02:00
Kamil Trzcinski 6e64d1ac76 Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 2016-06-07 10:26:27 +02:00
Alejandro Rodríguez fbd2169f99 Use better_errors editor links in sherlock
Remember to configure your `better_errors` editor to point to your program of preference
2016-06-06 18:27:26 -04:00
Jacob Schatz 740a6ecba0 Merge branch 'wiki-bottom-padding' into 'master'
Add padding to bottom of wiki page, fix #12921.

## What does this MR do?
Adds padding to the bottom of the wiki page so it's not right up against the edge of the browser window.

## What are the relevant issue numbers?
#12921

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-06_at_12.21.22_PM](/uploads/9710682a57f5e521253f17a65f896f4d/Screen_Shot_2016-06-06_at_12.21.22_PM.png)

After:

![Screen_Shot_2016-06-06_at_12.20.50_PM](/uploads/002068b072050e0f8146757a0386d30f/Screen_Shot_2016-06-06_at_12.20.50_PM.png)

cc: @jschatz1 

See merge request !4490
2016-06-06 20:29:12 +00:00
Jacob Schatz f73292e471 Merge branch 'activity-links' into 'master'
Fixed issue with activity links not being consistent

## What does this MR do?

Previously, links for opening an issue/merge request & commenting where different. Opening would only have a link on the number whereas commenting would have link on the text as well. This standardises it to include the type as well (ie. issue)

## What are the relevant issue numbers?

Closes #17621 

## Screenshots (if relevant)

![Screen_Shot_2016-06-01_at_12.12.09](/uploads/c778b007e6b6c068fcae30e34409ce98/Screen_Shot_2016-06-01_at_12.12.09.png)

See merge request !4400
2016-06-06 19:07:19 +00:00
Jacob Schatz 37afdb076f Merge branch 'edit-mobile' into 'master'
Shows the edit comment button on mobile

## What does this MR do?

Shows the edit comment button on mobile.

## What are the relevant issue numbers?

Closes #17214 

## Screenshots (if relevant)

![Screen_Shot_2016-06-01_at_12.33.13](/uploads/d46b800c175a53821ea8e8af49c07641/Screen_Shot_2016-06-01_at_12.33.13.png)

See merge request !4402
2016-06-06 19:05:51 +00:00
Jacob Schatz 410130b807 Merge branch '18026-consider-removing-issue-merge-request-previous-next-buttons' into 'master'
Remove prev/next buttons on issues and merge requests

## What does this MR do?

Remove prev/next buttons on issues and merge requests sidebar

## Are there points in the code the reviewer needs to double check?

No

## Why was this MR needed?

The buttons were rarely used and added at least 1 query each on every page load which we could live without.

## What are the relevant issue numbers?

#18026

## Screenshots (if relevant)

Below is how it looks. Not sure if it's too much empty space. #17697 discusses a possible substitute for what to put there.

![Captura_de_pantalla_2016-06-06_a_las_11.09.26_a.m.](/uploads/7b379327aa6c608775f99bf47a9c3352/Captura_de_pantalla_2016-06-06_a_las_11.09.26_a.m..png)

![Captura_de_pantalla_2016-06-06_a_las_11.09.38_a.m.](/uploads/68bcae6754ed5ac48f1a6925fdd17d3f/Captura_de_pantalla_2016-06-06_a_las_11.09.38_a.m..png)

See merge request !4442
2016-06-06 18:40:42 +00:00
Jacob Schatz ed9b1bd63f Merge branch 'confidential-issue-notice' into 'master'
Add confidential issue notice in comment box.

## What does this MR do?

Adds a warning about confidential issues to the comment field when the issue is confidential.

## Are there points in the code the reviewer needs to double check?

I don't think so.

## Why was this MR needed?

It wasn't clear to users that they were commenting on a confidential issue, this makes it more explicit.

## What are the relevant issue numbers?

Fixes #15288 

## Screenshots (if relevant)

This is what it looks like at various screen sizes:

![Screen_Shot_2016-06-03_at_2.56.54_PM](/uploads/eb7f318bc19101f8514d7a4f10a77d73/Screen_Shot_2016-06-03_at_2.56.54_PM.png)

![Screen_Shot_2016-06-03_at_2.58.51_PM](/uploads/13674c3f1227b0d566b1d2aafc6712ed/Screen_Shot_2016-06-03_at_2.58.51_PM.png)

![Screen_Shot_2016-06-03_at_2.58.37_PM](/uploads/14ad419ed3ed86b7fbc080152e4030fa/Screen_Shot_2016-06-03_at_2.58.37_PM.png)

cc: @jschatz1 @dzaporozhets 

See merge request !4473
2016-06-06 18:29:48 +00:00
Kamil Trzcinski 1311f8c2c1 Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 2016-06-06 20:24:30 +02:00
Kamil Trzcinski 4e38d88df5 Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 2016-06-06 20:24:21 +02:00
Connor Shea d2b7c39a55 Add padding to bottom of wiki page, fix #12921. 2016-06-06 12:22:59 -06:00
Alfredo Sumaran a04897b76b Typo 2016-06-06 11:59:49 -05:00
Sean McGivernandAlfredo Sumaran 77f30af017 Tidy up Ruby style in templates 2016-06-06 11:59:49 -05:00
Alfredo Sumaran b4e4e61184 Show functionality only for users with the ability to edit labels 2016-06-06 11:59:49 -05:00
Alfredo Sumaran d4bcf51692 Show prioritized labels only on the first page and when there's labels created 2016-06-06 11:59:49 -05:00
Alfredo Sumaran b0bfd78948 Typo 2016-06-06 11:59:49 -05:00
Alfredo Sumaran 8f0bf29767 Add unprioritized scope 2016-06-06 11:59:49 -05:00
Alfredo Sumaran bf0c4426ff Feedback 2016-06-06 11:59:49 -05:00
Sean McGivernandAlfredo Sumaran 1cc0209a80 Fix style
- `reorder(nil)` is better than `reorder('')`
- Only use ASCII in comments
2016-06-06 11:59:49 -05:00
Sean McGivernandAlfredo Sumaran b28237b4d2 Don't try to count a relation with aliases
Work around ActiveRecord count and column aliases issue as described at:
  <https://github.com/rails/rails/issues/15138#issuecomment-61325080>

AR doesn't promise that `#count` (which is called by `#any?`) will work
for relations using `#select`, which means we need a workaround instead.
2016-06-06 11:59:49 -05:00
Alfredo Sumaran 1648c395e5 Fix syntax 2016-06-06 11:59:49 -05:00
Alfredo Sumaran 25ee66e88c Sorting improvements and styling 2016-06-06 11:59:49 -05:00
Rémy CoutableandAlfredo Sumaran 499bb9f305 Improve Issuable.order_labels_priority
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-06 11:59:49 -05:00
Thijs WoutersandAlfredo Sumaran d8263b2851 Sort by label priority
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-06 11:59:49 -05:00
Alfredo Sumaran 0e2f26dd2a Prioritize labels functionality 2016-06-06 11:59:49 -05:00
Douwe Maan 4d4a9b7c8a Merge branch 'notes-are-awardables' into 'master'
Notes are awardables

## What does this MR do?

Makes sure we can :thunder_cloud_rain: comments/notes.

## What are the relevant issue numbers?
Follows up upon !2901, depends on !3785

Closes #3655 

## Screenshots (if relevant)
TODO



See merge request !4291
2016-06-06 16:48:35 +00:00
Alejandro Rodríguez 535d11302e Remove prev/next buttons on issues and merge requests
The buttons were rarely used and added at least 1 query each on every page load.
2016-06-06 12:01:50 -04:00
Douglas Barbosa Alexandre 17152602b0 Add a message warning user that Webhooks will be disabled 2016-06-06 12:07:45 -03:00
Kamil Trzcinski ef35ca238d Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 2016-06-06 16:46:44 +02:00
Kamil Trzcinski d9b292f872 Merge remote-tracking branch 'origin/master' into rename-ci-commit
# Conflicts:
#	spec/features/builds_spec.rb
2016-06-06 16:33:52 +02:00
Kamil Trzcinski d225de32cb Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 2016-06-06 11:21:54 +02:00