Commit Graph
29027 Commits
Author SHA1 Message Date
Jacob Vosmaer ff7c4e588a Remove code duplication in JwtController 2016-06-06 17:40:30 +02:00
Jacob Vosmaer 07f49626d0 Fix tests 2016-06-06 17:40:26 +02:00
Jacob Vosmaer 3f3b036def Use public_send 2016-06-03 17:23:34 +02:00
Jacob Vosmaer 03bec6b0e9 Argh mixed up all the negatives 2016-06-03 17:14:13 +02:00
Jacob Vosmaer 1fab583266 Remove instances of Auth.new 2016-06-03 17:08:44 +02:00
Jacob Vosmaer fa35aea3dd Refactor Gitlab::Auth rate limiting 2016-06-03 17:07:40 +02:00
Jacob Vosmaer 46d5760c76 Fewer silly instance variables 2016-06-03 16:04:59 +02:00
Jacob Vosmaer 50a357d7e8 Use #present? 2016-06-03 15:49:52 +02:00
Jacob Vosmaer 1564074648 Refactor _allowed? methods as Rémy asked 2016-06-03 15:28:35 +02:00
Jacob Vosmaer 3ffa494ffe Changes after more review from Rémy 2016-06-03 14:57:34 +02:00
Jacob Vosmaer fea591e5c5 Rename finder to find_in_gitlab_or_ldap 2016-06-02 13:42:18 +02:00
Jacob Vosmaer 8299fc277d Merge branch 'master' into git-http-controller
Conflicts:
	config/routes.rb
2016-06-02 13:31:11 +02:00
Achilleas Pipinellis acfbeced52 Merge branch 'minor_doc_updates' into 'master'
Minor doc updates

## What does this MR do?

Adds to and clarifies some documentation. Specifically, when using `gdb` to debug you need to detach and exit when done. Next, this clarifies the type of file locking that we require.

Thanks to @northrup for the details about mandatory vs. advisory file locking.

Note: These were two really small changes so I combined in to one merge request. However, I left the commits separate for clarity.

See merge request !4421
2016-06-02 09:10:04 +00:00
Robert Speicher 30524901e2 Merge branch 'cs-unnecessary-assets' into 'master'
Load d3 only when necessary

Now d3 is only loaded on the users' show page and the graphs pages, where it's necessary.

Redo of !3993.

This decreases page size from 4.6MB to 4.3MB for a given Activity page (before compression), or a savings of 300KB. This is essentially a proof of concept for removing larger dependencies such as the Ace Editor, Chart.js, and Raphael, which will likely provide another 1MB of savings on most pages (again, before compression).

See merge request !4394
2016-06-02 02:49:44 +00:00
Robert Speicher 34861c5f2b Merge branch 'cleanup-readme' into 'master'
Remove Coveralls and Semaphore badges. [ci skip]

Remove Coveralls and Semaphore badges from the README. They're outdated,
unused, and not GitLab CI :)

[ci skip]

See merge request !4334
2016-06-02 02:10:40 +00:00
Connor Shea 586d1a9b24 Move JS graph specs to match assets tree. 2016-06-01 19:48:01 -06:00
Connor Shea 81f4605448 Fix teaspoon 2016-06-01 19:42:49 -06:00
Connor Shea 3eb683b651 Fix indentation 2016-06-01 19:42:49 -06:00
Connor Shea 026b7abc5a Attempt to fix the user page. 2016-06-01 19:42:49 -06:00
Connor Shea 0256e68399 Remove d3 except for on pages where it's necessary. 2016-06-01 19:42:49 -06:00
Robert Speicher 933a6e0d36 Merge branch 'fix-dropdown-cutoff' into 'master'
Adds a `title` attribute to the branch dropdown for when the name has been cut off.

Fixes #18056 

See merge request !4395
2016-06-02 01:33:48 +00:00
Robert Speicher 7d33fba7af Merge branch 'upgrade-devise-two-factor' into 'master'
Upgrade devise, devise-two-factor, and attr_encrypted

Devise 4 includes support for Rails 5, working towards #14286. devise-async doesn't support Devise 4.0 and in 4.1 the bug that was blocking using Devise's built-in ActiveJob integration was fixed. So devise-async is removed. devise-two-factor 3.0.0 is required for Devise 4 support.

attr_encrypted and encryptor are optional but recommended upgrades for devise-two-factor 3.0.0. The mode and algorithm will need to be changed in order to update to attr_encrypted 4.x in the future.

See merge request !4216
2016-06-02 00:44:41 +00:00
Stan Hu 3b53016f59 Merge branch 'downcase-registry-repository' into 'master'
Use downcased path to container repository as this is expected path by Docker

## What does this MR do?

Docker Engine requires path to be lowercase. This makes all container registry paths to be show and used downcased instead of mixed case.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17959


See merge request !4420
2016-06-01 22:06:25 +00:00
Jacob Schatz 07fb3815fe Merge branch '17187-hover-row' into 'master'
Implement new row hover style

## What does this MR do?
Implement new row hover style

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

## Screenshots (if relevant)
![Screen_Shot_2016-06-01_at_1.40.04_PM](/uploads/62db01f405db50531fb648e46dc9598a/Screen_Shot_2016-06-01_at_1.40.04_PM.png)   

cc @dzaporozhets 

See merge request !4422
2016-06-01 21:27:11 +00:00
Kamil Trzcinski 77cb8ec4d1 Introduce container_registry_path_with_namespace 2016-06-01 22:57:50 +02:00
Kamil Trzcinski d1fdefeecd Merge remote-tracking branch 'origin/master' into downcase-registry-repository 2016-06-01 22:56:56 +02:00
Annabel Dunstone d7c76d0999 Implement new row hover style 2016-06-01 13:46:30 -06:00
Drew Blessing c1923aef04 Explicitly mention advisory file locking 2016-06-01 14:46:07 -05:00
Drew Blessing 91496a0965 Add gdb detach instructions 2016-06-01 14:44:29 -05:00
Jacob Schatz 0f96a6c25a Merge branch '17676-merge-request-widget-alignment' into 'master'
MR widget mobile styling

## What does this MR do?

Corrects MR widget styling for mobile viewing.

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

I have tested all MR states.

## Why was this MR needed?

UX.

## What are the relevant issue numbers?

Closes #17676.

## Screenshots (if relevant)

![Screen_Shot_2016-05-31_at_20.04.02](/uploads/b1bc67b1015b2e771ae1b1364b225618/Screen_Shot_2016-05-31_at_20.04.02.png)![Screen_Shot_2016-05-31_at_20.03.50](/uploads/86a552c0d27d6f53cdf1b94631b26449/Screen_Shot_2016-05-31_at_20.03.50.png)![Screen_Shot_2016-05-31_at_20.03.34](/uploads/a5b9e7b634e974095922df9194d493b5/Screen_Shot_2016-05-31_at_20.03.34.png)![Screen_Shot_2016-05-31_at_20.01.35](/uploads/2fc5d49e3c1f2ff2cb324e9527179066/Screen_Shot_2016-05-31_at_20.01.35.png)![Screen_Shot_2016-05-31_at_20.00.25](/uploads/23af913891ff941dc5231872b3c6f177/Screen_Shot_2016-05-31_at_20.00.25.png)![Screen_Shot_2016-05-31_at_19.59.53](/uploads/8abb72609409ba7ca02ad6b35787c15c/Screen_Shot_2016-05-31_at_19.59.53.png)![Screen_Shot_2016-05-31_at_19.58.31](/uploads/fabf1c6c135f5e736614e568fc4cfb53/Screen_Shot_2016-05-31_at_19.58.31.png)![Screen_Shot_2016-05-31_at_19.58.51](/uploads/967a578a34cb3a9dd3723c2f22ce89c4/Screen_Shot_2016-05-31_at_19.58.51.png)![Screen_Shot_2016-05-31_at_23.33.19](/uploads/841af7a90bb3fc3c74a2e51b64fc444f/Screen_Shot_2016-05-31_at_23.33.19.png)![Screen_Shot_2016-05-31_at_23.33.23](/uploads/183fb8407c271d9aa3fefea5d8201238/Screen_Shot_2016-05-31_at_23.33.23.png)

See merge request !4386
2016-06-01 19:40:24 +00:00
Stan Hu e9bb895b5a Merge branch 'fix-note-validation-failure' into 'master'
Fix note validation spec failure

Fix failing build due to project of note not matching issue project.

See merge request !4415
2016-06-01 18:43:44 +00:00
Kamil Trzcinski 6e58e7ff7c Use downcased path to container repository as this is expected path by Docker 2016-06-01 20:43:33 +02:00
Jacob Schatz 5a377d20d5 Merge branch 'add-edge-support' into 'master'
Add Edge to supported browsers list.

Add Microsoft's Edge browser to the list of supported browsers. We support the latest stable version.

See merge request !4416
2016-06-01 17:58:21 +00:00
Connor Shea 22e7aab8fb Add Edge to supported browsers list. [ci skip] 2016-06-01 11:56:54 -06:00
Robert Speicher 93e2761c89 Merge branch 'dont-advertise-ci-skip' into 'master'
Don't advertise the use of "ci skip" in the CONTRIBUTING guide

[ci skip]

See merge request !4406
2016-06-01 17:56:49 +00:00
Robert Speicher 3d3c9c75aa Merge branch 'style/enable-semicolon-rubocop-cop' into 'master'
Enable Style/Semicolon rubocop style cop

Don't use semicolons to terminate expressions.

See #17478.

See merge request !4351
2016-06-01 17:41:19 +00:00
Robert Speicher 164fc34eb2 Merge branch 'rubocop/enable-style-for-cop' into 'master'
Enable Style/For rubocop cop

> Do not use `for`, unless you know exactly why. Most of the time iterators should be used instead. `for` is implemented in terms of `each` (so you're adding a level of indirection), but with a twist - `for` doesn't introduce a new scope (unlike `each`) and variables defined in its block will be visible outside it.

See #17478

See merge request !4397
2016-06-01 17:36:42 +00:00
Stan Hu 30aa64202b Fix note validation spec failures 2016-06-01 10:31:46 -07:00
Dmitriy Zaporozhets 4621531a40 Merge branch 'dz-one-ci-cd-tab' into 'master'
Merge Builds and Pipelines tab into one

Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4053#note_12064642. Main idea is to keep all CI-related pages under one tab. So we can keep top navigation clean. 

First I tried `CI/CD` naming but it looked weird so I just used Pipelines as tab name. I did not change project settings naming. 

cc @ayufan @markpundsack @jschatz1 

See merge request !4340
2016-06-01 16:53:21 +00:00
Douwe Maan 2d084dd848 Merge branch 'separate-banzai-references' into 'master'
Separate reference gathering from rendering

This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query.

cc @rspeicher @DouweM 

See merge request !3969
2016-06-01 15:51:59 +00:00
Yorick Peterse 580d250166 Refactor Participable
There are several changes to this module:

1. The use of an explicit stack in Participable#participants
2. Proc behaviour has been changed
3. Batch permissions checking

== Explicit Stack

Participable#participants no longer uses recursion to process "self" and
all child objects, instead it uses an Array and processes objects in
breadth-first order. This allows us to for example create a single
Gitlab::ReferenceExtractor instance and pass this to any Procs. Re-using
a ReferenceExtractor removes the need for running potentially many SQL
queries every time a Proc is called on a new object.

== Proc Behaviour Changed

Previously a Proc in Participable was expected to return an Array of
User instances. This has been changed and instead it's now expected that
a Proc modifies the Gitlab::ReferenceExtractor passed to it. The return
value of the Proc is ignored.

== Permissions Checking

The method Participable#participants uses
Ability.users_that_can_read_project to check if the returned users have
access to the project of "self" _without_ running multiple SQL queries
for every user.
2016-06-01 16:22:35 +02:00
Douwe Maan ef6fe42ec0 Merge branch 'fix-cancelable-retryable' into 'master'
Fix cancelability and retriablity of pipeline with generic statuses

Currently it's not possible to cancel or retry generic status since this is external thing to GitLab.

This fixes shown actions of pipelines containing only these actions.


See merge request !4380
2016-06-01 14:21:03 +00:00
Rémy Coutable 4581e71c44 Merge branch 'fix/error-500-in-pipeline-when-fork' into 'master'
Use project that belongs to pipeline in view

## What does this MR do?

This MR makes project in pipelines view match the one that pipeline has been created for.

Closes #17943 

See merge request !4376
2016-06-01 12:37:51 +00:00
Rémy Coutable ea80259b48 Don't advertise the use of "ci skip" in the CONTRIBUTING guide
Now that we autoscale runner, we don't need to optimize for their usage
anymore. Abusing of "ci skip", for instance for view changes can lead to
broken specs, so let's just not use it!

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-01 14:18:37 +02:00
Douwe Maan d1c537ad32 Merge branch 'long.polyglot/gitlab-ce-issue_17479_todos_not_remove_when_leave_project' 2016-06-01 13:39:56 +02:00
Kamil Trzcinski 57992f3d03 Fix rubocop offenses 2016-06-01 13:10:00 +02:00
Douwe Maan 9d88a3a1dd Merge branch 'emails-on-push-use-sidekiq-mailers' into 'master'
Make EmailsOnPushWorker use Sidekiq mailers queue

A customer was having issues with EmailsOnPushWorker clogging the Sidekiq queues and merge requests not being handled quickly. While researching whether it would possible to spin up a separate Sidekiq task just to handle merge requests and other key functions, I found that this worker was using the default Sidekiq queue. Moving to the `mailers` queue makes it possible to de-prioritize this worker and give more weight to the others.

See merge request !4390
2016-06-01 11:07:25 +00:00
Douwe Maan 173d83cae9 Merge branch 'prefer-to_reference' into 'master'
Use `Snippet#to_reference` directly

## What does this MR do?

Instead of hard coding snippet reference, we could just use the existing method for that.

## Why was this MR needed?

To address https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4338#note_12166325 from @DouweM

/cc @jschatz1 

See merge request !4379
2016-06-01 10:57:26 +00:00
Douwe Maan 3416bc53fb Merge branch 'rs-remember-me-2fa' into 'master'
Pass the "Remember me" value to the 2FA token form

Prior, if a user had 2FA enabled and checked the "Remember me" field,
the setting was ignored because the OTP input was on a new form and the
value was never passed.

Closes #18000

See merge request !4369
2016-06-01 10:57:05 +00:00
Douwe Maan 4a50e1f051 Merge branch 'current-settings-use-request-store-during-request' 2016-06-01 12:55:00 +02:00