Commit Graph
29012 Commits
Author SHA1 Message Date
DJ Mountney 4ecc10fade Reduce the filters on the todos joins project query by being explicit about the join 2016-06-02 11:24:18 -07:00
DJ Mountney c3e923c496 Ensure we don't show TODOS for projects pending delete
By joining the Todos on the project table.
2016-06-02 11:24:18 -07:00
Robert Speicher ab75b21c83 Update CHANGELOG for 8.8.3
[ci skip]
2016-06-02 13:59:34 -04:00
Robert Speicher 7deb21b626 Merge branch 'issue_18102' into 'master'
Fixes missing number on generated ordered list

Closes #18102 

See merge request !4437
2016-06-02 17:15:26 +00:00
Robert Speicher e6389dfee6 Merge branch 'reduce-fog-deps' into 'master'
Reduce number of fog gem dependencies

Currently supported:

* AWS
* Azure
* OpenStack
* Google
* local storage

Closes #15352

See merge request !4396
2016-06-02 16:35:42 +00:00
Yorick Peterse 61cfda255f Merge branch 'issue-18032' into 'master'
Cache project build count. Closes #18032

See merge request !4377
2016-06-02 16:21:49 +00:00
Robert Speicher f0d6d71117 Merge branch 'tests/move-shortcuts-specs-to-valid-directory' into 'master'
Move feature specs for shortcuts to valid directory

This MR moves tests to valid directory that matches our namespace we use in code.

See merge request !4433
2016-06-02 15:43:13 +00:00
Josh Frye 2605a0a844 Refactor. Add tests. 2016-06-02 11:10:57 -04:00
Josh Frye 4d9622e7d3 Invalidate cache on build change 2016-06-02 11:10:57 -04:00
Josh Frye 2d05de7af8 Cache project build count. Closes #18032 2016-06-02 11:10:57 -04:00
Yorick Peterse 81621e46e7 Merge branch 'issue-18036' into 'master'
Cache assigned issue and merge request count. Closes #18036 and #18035

See merge request !4378
2016-06-02 15:01:50 +00:00
Jacob Schatz 879a2f8148 Merge branch 'search-box-blur' into 'master'
Clicking search pill focuses field

When clicking the pill in the search field, it now focus the field. Previously you would have to make sure you click in the field.

Fixed an issue where clicking out of the field wouldn't remove the focus
outline

Also reduced some of the HTML to remove what isn't needed

See merge request !4279
2016-06-02 14:57:50 +00:00
Alfredo Sumaran c966d55e6a Fixes missing number on generated ordered list 2016-06-02 09:36:09 -05:00
Stan Hu 5accd87ad7 Merge branch 'fix-inline-filter-speed' into 'master'
Fix serious performance bug with rendering Markdown with InlineDiffFilter

Nokogiri's `node.replace` was being unnecessarily called for every text node in
the document due to a comparison bug. The code previously was comparing the
HTML representation of the full document against the text node, which would
always fail. Fix the comparison to just compare the modified text.

Closes #18011 


See merge request !4392
2016-06-02 13:56:24 +00:00
Josh Frye 0f3df62e1a Update specs. Add CHANGELOG entry 2016-06-02 09:25:40 -04:00
Josh Frye 8835b7889a Flush cache in callback. Add tests 2016-06-02 09:13:59 -04:00
Josh Frye bfccea3703 Cache assigned open issue count. Closes #18035 2016-06-02 09:13:59 -04:00
Josh Frye bffe0d6325 Cache assigned merge request count. Closes #18036 2016-06-02 09:13:59 -04:00
Rémy Coutable f828b74483 Merge branch '14446-no_group_avatar-png-link' into 'master'
Fix link to blank group icon

When the group is the default blank icon, this needs to use the
`image_path` helper; otherwise, the link won't work if assets are
precompiled. This still works fine for uploaded icons in either case.

Closes #14446.

See merge request !4375
2016-06-02 11:29:33 +00:00
Rémy Coutable 8d23e87242 Merge branch 'chujinjin/gitlab-ce-fix_wiki_project_clone_address_error' into 'master'
Fix wiki project clone address error

_Note: Originally opened at !4407 by @chujinjin._

---

fix wiki project clone address error in Wiki Git Access View, show as below:

![image](/uploads/5e3bf6d1418c42862a885319c31bc3cf/image.png)

Fixes #17643.

See merge request !4429
2016-06-02 11:27:36 +00:00
Sean McGivern 1521dc51e9 Fix link to blank group icon
When the group is the default blank icon, this needs to use the
`image_path` helper; otherwise, the link won't work if assets are
precompiled. This still works fine for uploaded icons in either case.
2016-06-02 11:19:27 +01: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
Grzegorz Bizon 1abb0ed97d Move feature specs for shortcuts to valid directory 2016-06-02 11:05:54 +02:00
chujinjinandRémy Coutable c102b03e76 Fix wiki project clone address error 2016-06-02 09:46:26 +02:00
Stan Hu ad3d0585aa Fix serious performance bug with rendering Markdown with InlineDiffFilter
Nokogiri's `node.replace` was being unnecessarily called for every text node in
the document due to a comparison bug. The code previously was comparing the
HTML representation of the full document against the text node, which would
always fail. Fix the comparison to just compare the modified text.

Closes #18011
2016-06-01 21:56:27 -07: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 e5bb417cde Reduce number of fog gem dependencies
Closes #15352
2016-06-01 11:51:26 -07: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