Commit Graph
29470 Commits
Author SHA1 Message Date
Kamil Trzcinski a0adafddd0 Remove require_relative 'import_spec_helper' 2016-06-08 18:18:49 +02:00
Kamil Trzcinski 9560639e81 Move ImportSpecHelper to spec/support/ 2016-06-08 17:21:08 +02:00
Kamil Trzcinski 13d941e185 Make Omniauth providers specs to not modify global configuration 2016-06-08 16:50:05 +02: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
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
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
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
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
Robert Speicher fd248392dd Merge branch 'optimise-email-css' into 'master'
Optimise email CSS for speed with Premailer

Speed up emails-on-push by removing all descendant selectors from the
CSS they use, which can make the CSS inlining much more efficient in
certain cases.

See: https://gitlab.com/gitlab-org/gitlab-ee/issues/490

See merge request !4511
2016-06-07 20:42:52 +00:00
Robert Speicher 4531b5da64 Merge branch 'upgrade-nokogiri' into 'master'
Bump nokogiri to 1.6.8

Number of important security and bug fixes. See:
https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md#168--2016-06-06

See merge request !4500
2016-06-07 20:36:54 +00:00
Stan Hu 405d752b9b Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
Closes #18210
2016-06-07 13:32:29 -07:00
Stan Hu 2cbb17da31 Merge branch 'load-knapsack-if-defined' into 'master'
Load knapsack in Rakefile only when is bundled

Fixes `production` builds: https://dev.gitlab.org/gitlab/omnibus-gitlab/builds/85407

cc @marin 

See merge request !4514
2016-06-07 18:37:38 +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
Kamil Trzcinski 88b0a9efc4 Load knapsack in Rakefile only when is bundled 2016-06-07 20:02:03 +02:00
Kamil Trzcinski 76d618404e Fix markdown_spec to not use before(:all) in order to properly cleanup database after testing 2016-06-07 19:45:44 +02:00
Stan Hu 40b17bdebd Merge branch 'add-license-finder-to-contributing' into 'master'
Add License Finder information to contribution acceptance criteria.

To make it clear what should be done when the license finder test fails.

cc: @stanhu 

See merge request !4512
2016-06-07 17:41:21 +00:00
Connor Shea 629b4e68e8 Add License Finder information to contribution acceptance criteria. 2016-06-07 11:23:26 -06:00
Stan Hu 5bb3e1934c Add LGPLv2 to license whiltelist 2016-06-07 10:14:18 -07: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
Yorick Peterse 99913b3d2c Merge branch '18082-instrument-repositorycheck-singlerepositoryworker-manually' into 'master'
Instrument `RepositoryCheck::SingleRepositoryWorker` manually

See merge request !4446
2016-06-07 16:56:01 +00:00
Alejandro Rodríguez d485ec9f1c Instrument RepositoryCheck::SingleRepositoryWorker manually
This worker is called manually by `RepositoryCheck::BatchWorker` meaning it's not tracked automatically by the Sidekiq middleware.
2016-06-07 12:10:55 -04:00
Rémy Coutable be78a556d9 Merge branch 'refactor/ci-config-add-facade' into 'master'
Add new GitLab CI configuration facade class

## What does this MR do?

This MR is a first iteration of major CI configuration refactoring. See #17139 and #15060 for more details.

## What are the relevant issue numbers?

Closes #17139

See merge request !4462
2016-06-07 16:05:26 +00:00
Stan Hu 8e41b21db1 Bump nokogiri to 1.6.8
Number of important security and bug fixes. See:
https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md#168--2016-06-06
2016-06-07 08:50:17 -07: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
Kamil Trzciński 25370fd158 Merge branch 'knapsack-for-master' into 'master'
Fix knapsack for master

It were mistakenly to invoke `rspec` where it should invoke `spinach`.


See merge request !4510
2016-06-07 15:09:35 +00:00
Annabel Dunstone ae6591081a Fix alignment of wiki top area 2016-06-07 10:05:10 -05:00
Lin Jen-Shin 4f34cf3241 Add a blank line between before and it:
Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12301563
2016-06-07 22:34:09 +08:00
Lin Jen-Shin 4fcdcc36f1 Avoid using subject and is_expected.to:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12274602
2016-06-07 22:34:09 +08:00
Lin Jen-Shin 5f3e647330 Prefer do and end for before/after:
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12217415
2016-06-07 22:34:09 +08:00
Lin Jen-Shin db95704fb4 Fix method definition style 2016-06-07 22:34:09 +08:00
Lin Jen-Shin 2dd60b9b3f Use rspec's matchers and update style:
Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12194552
2016-06-07 22:34:09 +08:00
Lin Jen-Shin 0c2962eb86 Use subject for more consistent testing style:
Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12194489
2016-06-07 22:34:09 +08:00
Lin Jen-Shin 5360ef2c5b This is easier to write:
Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12194471
2016-06-07 22:34:09 +08:00
Lin Jen-Shin e8cf89fa06 Add a test for User#ci_authorized_runners 2016-06-07 22:34:09 +08:00
Annabel Dunstone ef37b57f1f Update charcoal theme colors 2016-06-07 09:16:59 -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 e8a0cafc7d Fix control btn position 2016-06-07 09:16:59 -05:00
Annabel Dunstone ca985283b4 Remove todos count tests in nav 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