Commit Graph
29507 Commits
Author SHA1 Message Date
Jacob Schatz b4812e2e86 Merge branch 'dropdown-link-lineheight' into 'master'
Fixed dropdown link line-height

## What does this MR do?

Fixes line-height issue on dropdown menu links

## Why was this MR needed?

The line-height of some dropdown links were taking the parent, most noticeable the commit header

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-08_at_12.26.13](/uploads/51d6bbb4d727da0e3f27d715d6556d4f/Screen_Shot_2016-06-08_at_12.26.13.png)

After:

![Screen_Shot_2016-06-08_at_12.25.03](/uploads/2dcbfaa67982500eef42cfe4247cd54d/Screen_Shot_2016-06-08_at_12.25.03.png)

See merge request !4531
2016-06-08 20:59:46 +00:00
Jacob Schatz 2268c6c70e Merge branch 'dz-improve-ui-consistency' into 'master'
Improve ui consistency

* Decline idea of using gray buttons actively in UI
* remove icons from some buttons that already has text
* standardizes margin between buttons 


First step in https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 

See merge request !4533
2016-06-08 20:51:52 +00:00
Robert Speicher 18f5cca25b Merge branch '14098-customize-after-sign-up-path' into 'master'
Allow custom text on 'almost there' page

Add a new application setting, after_sign_up_text. This is text to be
rendered as Markdown and shown on the 'almost there' page after a user
signs up, but before they've confirmed their account.

Closes #14098.

See merge request !4098
2016-06-08 20:49:01 +00:00
Robert Speicher fe75d163ab Merge branch '13840-allow-clones-from-http-url-s-without-appending-git' into 'master'
Allow clones from /namespace/project

Allow `git clone https://host/namespace/project` to work, in addition to `git clone https://host/namespace/project.git`

Closes #13840.

See merge request !4530
2016-06-08 20:48:24 +00:00
Sean McGivern cba32b71bd Allow clones from /namespace/project
Redirect /namespace/project/info/refs to
/namespace/project.git/info/refs, so `git clone` works on either
namespace/project.git or namespace/project.
2016-06-08 20:55:34 +01:00
Robert Speicher d74e93ce46 Merge branch 'password-min-length-placeholder' into 'master'
Added minimum password length to password field

Add a placeholder to the password field in the register form with the minimum number of characters required. Also added a pattern to the field to stop it submitting if less than that.

Closes #17765

See merge request !4458
2016-06-08 19:48:03 +00:00
Robert Speicher ff5284b632 Merge branch 'issue_14553' into 'master'
Set target="_blank" for external links

Closes #14553

See merge request !4526
2016-06-08 19:25:47 +00:00
Robert Speicher 97b0074278 Merge branch 'rubocop/disable-uniq-before-pluck-cop' into 'master'
Disable Rails/UniqBeforePluck rubocop cop

 Rails/UniqBeforePluck seems to have some bugs 

* https://github.com/bbatsov/rubocop/issues/3122
* https://github.com/bbatsov/rubocop/issues/3148

and we had some problems in EE with that https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/425#note_12245005

See merge request !4477
2016-06-08 18:40:49 +00:00
Robert Speicher 0cfa368bf8 Fix version references in 8.8 to 8.9 update guide
[ci skip]
2016-06-08 14:20:46 -04:00
Sean McGivern 40b6d9064a Allow custom text on 'almost there' page
Add a new application setting, after_sign_up_text. This is text to be
rendered as Markdown and shown on the 'almost there' page after a user
signs up, but before they've confirmed their account.

Tweak the styles for that page so that centered lists look reasonable.
2016-06-08 19:08:53 +01:00
Alfredo Sumaran 26d4e63341 Update CHANGELOG 2016-06-08 13:07:20 -05:00
Alfredo Sumaran 27ada5aa46 Combine tests for internal links 2016-06-08 13:07:20 -05:00
Alfredo Sumaran 064cff13fd Remove obvious comment and extra line 2016-06-08 13:07:20 -05:00
Alfredo Sumaran 7be19db42f Set target="_blank" for external links 2016-06-08 13:07:20 -05:00
Jacob Schatz e6daf1f899 Merge branch 'admin-nav' into 'master'
Sidebar updates

## What does this MR do?
Updates `nav/_admin.html.haml` and `nav/_explore.html.haml` to match new compact sidebar design

## Screenshots (if relevant)
![Screen_Shot_2016-06-07_at_2.19.18_PM](/uploads/5699987001de901a67d503b097d1b19d/Screen_Shot_2016-06-07_at_2.19.18_PM.png)

See merge request !4517
2016-06-08 17:36:53 +00:00
Kamil Trzciński 19c8fa1be8 Merge branch 'knapsack-update-results-only-on-master' into 'master'
Update Knapsack report only on master

## What does this MR do?

Makes to generate Knapsack report only on master. This speed-ups tests, because the last stage can be run significant time after previous stages.


See merge request !4540
2016-06-08 17:15:35 +00:00
Yorick Peterse abaaad6760 Merge branch '17960-issues-api-endpoint-performs-poorly' into 'master'
Optimize issuable APIs interaction with notes

See merge request !4471
2016-06-08 16:37:31 +00:00
Rémy Coutable ae7fc2e12b Merge branch 'improve-notification-settings-migrations' into 'master'
Remove notification settings in batches

## What does this MR do?

This improves the performance of the migration `db/migrate/20160603180330_remove_duplicated_notification_settings.rb` by removing duplicate rows in batches instead of using a single big `DELETE FROM` query.

## Why was this MR needed?

The original migration would locally take 45 minutes to complete, possibly up to hours on GitLab.com and similar setups.

## What are the relevant issue numbers?

#18289

See merge request !4529
2016-06-08 16:11:41 +00:00
Alejandro Rodríguez 83e1274145 Update CHANGELOG 2016-06-08 12:05:23 -04:00
Jacob Schatz 53498e4286 Merge branch 'remove-labels-from-filter' into 'master'
Removable labels from filtered issuables label bar

When filtering by labels, a remove button appears next to each label. This then removes that label & refreshes the issuable filter form

![Screen_Shot_2016-05-17_at_12.07.47](/uploads/b21e86247aa1bbfd347bef1eb21f1562/Screen_Shot_2016-05-17_at_12.07.47.png)

Closes #15474

See merge request !4178
2016-06-08 14:56:47 +00:00
Jacob Schatz fadf791519 Merge branch 'webhooks-shared-form' into 'master'
Backported from EE shared form for web hooks

## What does this MR do?

EE uses a shared form for web hooks - so this brings that across to CE.

See merge request !4457
2016-06-08 14:55:55 +00:00
Dmitriy Zaporozhets bf9e482695 Remove unnecessary icons from buttons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08 17:32:49 +03:00
Kamil Trzcinski e7bf943127 Update Knapsack report only on master 2016-06-08 16:29:09 +02:00
Alejandro Rodríguez fade1a4cde Fix pseudo n+1 queries with Note and Note Authors in issuables APIs
This was not a clear cut n+1 query, given that if you're directly subscribed to all issues
that the API is returning you never really need to check for the notes. However, if you're
subscribed to _all_ of them, then for each issuable you need to go once to `notes`, and
once to `users` (for the authors). By preemtively loading notes and authors, at worst you have
1 extra query, and at best you saved 2n extra queries. We also took advantage of this preloading
of notes when counting user notes.
2016-06-08 10:26:05 -04:00
Alejandro Rodríguez ad83c30855 Remove projects inclusion in notes_with_associations to skip some unnecessary queries
`notes_with_associations` are used for `participant` declarations, but `Participable`
only really cares about the target entity project, and not the participants
projects.

`notes_with_associations` are also used in `Commit::has_been_reverted?` which
employs the reference extractor of the commit, so no references to the notes
projects are made there (`Mentionable::all_references` cares only about the
`author` and other `attr_mentionable`). A paralel situation occurs on
`Issue::referenced_merge_requests`.
2016-06-08 10:26:05 -04:00
Yorick Peterse 3883bc05d2 Remove notification settings in batches
This improves performance of the duplicate notification settings
migration by removing duplicates in batches instead of using one big
"DELETE FROM" query.

The previous query would locally run over 45 minutes without even
finishing. This new setup finished in a matter of seconds.

Fixes #18289
2016-06-08 16:20:42 +02:00
Dmitriy Zaporozhets 1dc001730b Cleanup and imrpove issue/mr buttons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08 17:20:07 +03:00
Rémy Coutable 722211cddf Merge branch 'support-fog-azure' into 'master'
Add fog-azure to supported backup list

!4396 left out Azure by accident.


See merge request !4444
2016-06-08 14:18:31 +00:00
Dmitriy Zaporozhets 366ad9ff72 Reject idea of using white/gray button depends on bg color
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08 17:11:43 +03:00
Rémy Coutable 07b32287e5 Merge branch 'git-http-controller' into 'master'
Dismantling Grack::Auth part 1: Git HTTP clients

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/14501

This does not completely get rid of Grack::Auth yet because Git LFS
support is 'behind' it and I would like to not make this MR bigger
than needed.

- changed tests to make HTTP requests instead of calling Rack apps
- added missing test cases for Git HTTP authentication
- moved Git HTTP requests into a 'normal' Rails controller

See merge request !3361
2016-06-08 14:03:27 +00:00
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
Dmitriy Zaporozhets e533890bf1 Improve button color for issue and mr pages
* make sidebar button white
* make header button gray if not primary

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08 16:38:18 +03:00
Stan Hu 8d6c4b307c Merge branch 'fix-markdown-spec' into 'master'
Fix markdown_spec to not use `before(:all)` in order to properly cleanup database after testing



See merge request !4515
2016-06-08 13:30:19 +00:00
Dmitriy Zaporozhets c3024affb3 Use hex value instead of rgba for gray border color
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08 16:29:40 +03: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
Douwe Maan 53bf9da4b4 Merge branch 'test-for-ci_authorized_runners' into 'master'
Add a test for User#ci_authorized_runners

## What does this MR do?

Add a test for User#ci_authorized_runners

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

Should we add `Project#add_user` so that it's similar to `Group#add_user`?

## Why was this MR needed?

I am going to make some changes to this method for !4093, but I couldn't find a corresponding test so I want to add it in case I would break anything.

## What are the relevant issue numbers?

This is a test for current behaviour, before implementing #3407

See merge request !4404
2016-06-08 12:27:46 +00:00
Douwe Maan a0320bed7e Merge branch 'gh-disable-webhooks' into 'master'
Check if GitHub rate limite API was reached before update Webhooks

## What does this MR do?

Checks if the job needs to sleep, and wait for the rate limit to be reseted before update each Webhook.

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

No.

## Why was this MR needed?

The import process can fail if the API rate limit was reached during the import process.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/17498

## Screenshots (if relevant)

Not relevant.

See merge request !4509
2016-06-08 12:27:35 +00:00
Kamil Trzciński c0f31845d3 Merge branch 'knapsack-env-ci' into 'master'
Enable Knapsack only in CI environment

Fixes running tests locally. Enables Knapsack only in CI environment.

cc @grzesiek 

See merge request !4528
2016-06-08 12:06:16 +00:00
Phil Hughes 8cd17f748b Fixed dropdown line-height
Most noticable on the commit header
2016-06-08 12:24:10 +01:00
Phil Hughes d3ff691d76 Fixed issue with dropdown toggle not updating
Added tests
2016-06-08 11:45:17 +01:00
Phil Hughes f4eb55724f Darken the border between remove label and label name 2016-06-08 11:45:17 +01:00
Phil Hughes cba0321f96 Updated design 2016-06-08 11:45:17 +01:00
Phil Hughes 519c758fa9 Removable labels from filtered issuables label bar
When filtering by labels, a remove button appears next to each label. This then removes that label & refreshes the issuable filter form

Closes #15474
2016-06-08 11:45:17 +01:00
Kamil Trzcinski eb95019178 Enable Knapsack only in CI environment 2016-06-08 11:43:13 +02:00
Jacob Vosmaer df62cbd917 Add parentheses 2016-06-08 11:42:25 +02:00
Jacob Vosmaer bebe110dff Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-http-controller
Conflicts:
	lib/gitlab/workhorse.rb
2016-06-08 10:31:33 +02: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 402767e0f5 Merge branch '18074-cancel-pipeline-text' into 'master'
Change color of canceled ci text to gray

## What does this MR do?
Change text color of Canceled builds from `$gl-danger` to `$gl-gray`

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

## Screenshots (if relevant)
<img src="/uploads/f2ac59c5081c31cfb34bdc0470e31384/Screen_Shot_2016-06-01_at_10.38.17_AM.png" width="600px">

See merge request !4412
2016-06-08 03:39:48 +00:00
Robert Speicher 703026c03e Merge branch 'bump-recaptcha-gem' into 'master'
Bump recaptcha gem to 3.0.0 to remove deprecated stoken support

Google deprecated the use of stoken in its reCAPTCHA, so this gem is
necessary to make things work again.

Closes #18210 

See merge request !4484
2016-06-07 21:38:04 +00:00
Stan Hu f4beec8a90 Add Azure to supported backup list (left out accidentally) 2016-06-07 14:16:37 -07:00