Commit Graph
22886 Commits
Author SHA1 Message Date
Jacob Schatz 3c078cef41 adds exclamation point when assigned user cannot merge 2016-01-18 20:12:06 -05:00
Robert Speicher b64b4c711f Merge branch 'fix_changelog' into 'master'
Move entry `Fix: As an admin, cannot add oneself as a member to a
group/project`

The CHANGELOG entry said it was fixed in 8.2.3. However, I found
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1942 that
suggests it wasn't fixed until 8.3.0. A customer experienced this
issue on 8.2.3, still. This ultimately led to me investigating this
further.

[ci skip]

See merge request !2488
2016-01-18 22:13:28 +00:00
Robert Speicher 65b95ccbd7 Merge branch 'fix/events-data-limit-for-mysql' into 'master'
Fix limit for `data` column in `events` table when using MySQL

Closes #9084 

See merge request !2486
2016-01-18 21:56:16 +00:00
Robert Speicher 402feec6dd Update MySQL docs
[ci skip]
2016-01-18 16:54:29 -05:00
Robert Speicher 23bb6aefa0 Merge branch 'update-devise' into 'master'
Update devise to version 3.5.4

Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2642

See merge request !2490
2016-01-18 21:46:20 +00:00
Douglas Barbosa Alexandre a936a1021f Update devise to version 3.5.4 2016-01-18 19:39:31 -02:00
Tomasz Maczukin a7daf33bc5 Modify CHANGELOG entry [ci skip] 2016-01-18 21:29:16 +01:00
Tomasz Maczukin f386a4bd15 Update CHANGELOG 2016-01-18 21:27:57 +01:00
Tomasz Maczukin d1c474ae6a Add information about PostgreSQL<>MySQL 'text' type differences into to installation docs 2016-01-18 21:27:56 +01:00
Tomasz Maczukin b76bfe35c7 Add limit change for 'data' column in 'events' when using MySQL 2016-01-18 21:27:56 +01:00
Grzegorz Bizon 1d5f96cf97 Merge branch 'ux/improve-artifacts-browser' into 'master'
Improve UX in build artifacts browser

This improves UX in build artifacts browser, and makes it more consistent with repository tree browser we already have.

---
Before:

![ux_artifacts_before](/uploads/9869ff74afd5e6636f0df81c7823fb6f/ux_artifacts_before.png)

---
After:

![ux_artifacts_after](/uploads/cdb68925f4489bb852fd701870e6d6a0/ux_artifacts_after.png)

---

It is easier to click on a file/directory entry now, because we don't need to click on a entry's basename (that can be really short, like `..` parent directory). We also show `Compressed to` size that indicates how much storage does this entry really consume.

Row for an entry is also highlighted on hover and we do not have Download button (clicking on a file row / file basename is enough to download a file).

Closes #10242 

See merge request !2477
2016-01-18 19:43:26 +00:00
Drew Blessing ab33b93dae Move entry Fix: As an admin, cannot add oneself as a member to a group/project 2016-01-18 19:18:35 +00:00
Grzegorz Bizon 121866a3f2 Add Changelog entry for improvements in builds artifacts browser 2016-01-18 19:58:16 +01:00
Grzegorz Bizon c7fe3c846a Update build artifacts metadata fixture to 0.0.2 2016-01-18 19:58:16 +01:00
Grzegorz Bizon 13f0ea12e3 Improve ux in builds artifacts browser 2016-01-18 19:58:16 +01:00
Robert Speicher 21ac92b8ba Merge branch 'remove-leading-comma-award-emoji' into 'master'
Remove leading comma when user is the only one to award that emoji

Fixes #9073

See merge request !2450
2016-01-18 18:28:39 +00:00
Robert Speicher 9f03ae8c91 Update CHANGELOG and VERSION for 8.5.0-pre 2016-01-18 12:43:05 -05:00
Robert Speicher c7d52e563b Merge branch 'workhorse-0.6.0' into 'master'
Use gitlab-workhorse 0.6.0

[ci skip]

See merge request !2483
2016-01-18 17:41:02 +00:00
Robert Speicher af39109be9 Merge branch 'fix-gravator-default-url' into 'master'
Ensure Gravatar host looks like an actual host

Solves #10243.

I've chosen to simplify the method that extracts the host: since we
only need the host, let's get rid of the path and thus get rid of the
escaping problems!

Unit tests should ensure that most of the cases are covered.

See merge request !2482
2016-01-18 17:31:32 +00:00
Jacob Vosmaer 4472c07f81 Use gitlab-workhorse 0.6.0 2016-01-18 16:06:03 +01:00
Rémy Coutable 2723dea667 Ensure Gravatar host looks like an actual host 2016-01-18 14:58:16 +01:00
Yorick Peterse f603f3b30b Merge branch 'issuable-group-projects' into 'master'
See merge request !2481
2016-01-18 13:24:51 +00:00
Yorick Peterse 31e7b3935f Merge branch 'sherlock-table-html' into 'master'
See merge request !2480
2016-01-18 13:21:03 +00:00
Yorick Peterse dc235c9944 Merge branch 'instrument-finders' into 'master'
See merge request !2479
2016-01-18 13:20:50 +00:00
Yorick Peterse d6a8021ea1 Scope issue projects to a Group when possible
When using IssuableFinder with a Group we can greatly reduce the amount
of projects operated on (due to not including all public/internal
projects) by simply passing it down to the ProjectsFinder class.

This reduces the timings of the involved queries from roughly 300
ms to roughly 20 ms.

Fixes gitlab-org/gitlab-ce#4071, gitlab-org/gitlab-ce#3707
2016-01-18 12:27:33 +01:00
Yorick Peterse 021d4ebdb8 Replaced "td" with "th" in the Sherlock SQL list 2016-01-18 12:03:17 +01:00
Yorick Peterse 8c4210e676 Added metrics instrumentation for all finders 2016-01-18 11:54:22 +01:00
Achilleas Pipinellis 23b4d31def Merge branch 'rc-document-new-api-pagination-headers' into 'master'
Document new API pagination headers

Document new API pagination headers introduced in !2426. Solves #8098.

/cc @dzaporozhets @dblessing

See merge request !2435
2016-01-18 10:00:50 +00:00
Achilleas Pipinellis 4a76f9217a Clean up pagination documentation [ci skip]
- Fix heading names
- Fix curl example
- Use full request output
- Use table for the extra headers
2016-01-18 10:55:25 +01:00
Jacob Schatz 835f1961e6 Merge branch 'margin-update' into 'master'
update

old
![Screenshot_2016-01-14_22.46.52](/uploads/d165897a6118c4b276e6b53982077cb5/Screenshot_2016-01-14_22.46.52.png)

new
![Screenshot_2016-01-14_22.46.21](/uploads/6b34cd8b1a2799506676103fcbc80450/Screenshot_2016-01-14_22.46.21.png)


See merge request !2441
2016-01-18 00:52:42 +00:00
Dmitriy Zaporozhets 513b45686e Merge branch 'hook_url_limit' into 'master'
Raise hook url limit

1. Up varchar url limit to 2000 chars instead 255
2. Maybe migration?
3. 255 characters - it is not enough
4. nil
5. nil

See merge request !1940
2016-01-18 00:36:31 +00:00
Jacob Schatz 80be924546 Merge branch 'diff-white-line-fix' into 'master'
Removes white line when hiding diff comments in MR

Fixes #6071 

See merge request !2407
2016-01-18 00:34:17 +00:00
Dmitriy Zaporozhets 5433637d30 Merge branch 'comment-text-remains-in-text-box-after-submitting-it' into 'master'
Fixes issue where firefox does not delete message after comment submit

Issue was **not** in the way comment was being submitted.
`app/assets/javascripts/awards_handler.coffee` was throwing an error.
This error was preventing any js from running after it.
Fixes #1473

See merge request !2452
2016-01-18 00:19:34 +00:00
Dmitriy Zaporozhets 26d28ea0b4 Merge branch 'rs-abuse-report-validation' into 'master'
Use a more sensible message for the AbuseReport uniqueness validation

Previously it was "user has already been taken", when really we were
saying the user has already been reported.

See merge request !2461
2016-01-18 00:17:27 +00:00
Zeger-Jan van de Weg 182cc843b0 Remove leading comma when user is the only one to award that emoji
Fixes #9073
2016-01-17 19:10:03 +01:00
Dmitriy Zaporozhets a6e073fa9b Merge branch 'issue-page-keeps-jumping-up' into 'master'
Issue page keeps jumping up

This happens when the discussion side is smaller than the sidebar and the sidebar will need to scroll. When this happens I calculate the height of the two and see if the discussion panel is smaller and make them the same height and add a class `no-affix` which makes the sidebar relative positioning so it won't stick to the top.

See merge request !2417
2016-01-17 17:01:35 +00:00
Robert Speicher 6754caed3c Autosize the textarea in showEditForm
[ci skip]
2016-01-16 22:17:57 -05:00
Robert Speicher d633755350 Use a more sensible message for the AbuseReport uniqueness validation
Previously it was "user has already been taken", when really we were
saying the user has already been reported.
2016-01-16 16:50:43 -05:00
Robert Speicher b6e1df7ad4 Merge branch 'abuse-autofill-message' into 'master'
Autofill abuse message text with user url. Closes #2838

See merge request !2396
2016-01-16 17:05:11 +00:00
Josh Frye 2d3655cd14 sanitize user supplied input. 2016-01-16 10:49:51 -05:00
Josh Frye c70ed7f2cd Autofill abuse message text with user url. Closes #2838 2016-01-16 10:47:12 -05:00
Achilleas Pipinellis 5cd2f77769 Merge branch 'github_importer' into 'master'
Add the version each feature was introduced in GitHub importer



See merge request !2457
2016-01-16 09:58:04 +00:00
Achilleas Pipinellis ed969aabdd Importing GitHub cross-repository PRs is not supported atm
[ci skip]
2016-01-16 10:55:44 +01:00
Achilleas Pipinellis 50984c13a2 Merge branch 'saml-ts' into 'master'
Added advanced SAML troubleshooting

/cc @dblessing @balameb

See merge request !2456
2016-01-15 23:54:02 +00:00
Robert Speicher 714ae482c1 Merge branch 'rs-silence-statemachine-in-cron' into 'master'
Prevent StateMachine warnings from outputting during a cron task

[ci skip]

Closes #5931

See merge request !2458
2016-01-15 22:49:16 +00:00
Robert Speicher e8785ded1e Prevent StateMachine warnings from outputting during a cron task
[ci skip]

Closes #5931
2016-01-15 17:47:56 -05:00
Achilleas Pipinellis 3fbd2b6964 Add the version each feature was introduced and remove note 2016-01-15 23:45:25 +01:00
Patricio Cano db66b12b29 Added advanced SAML troubleshooting 2016-01-15 17:02:25 -05:00
Robert Speicher 8a028cf3a2 Merge branch 'fix-autocomplete-new-issues' into 'master'
Fix autocomplete for new issues/MRs/snippets

Fixes gitlab-org/gitlab-ce#8067

See merge request !2446
2016-01-15 20:57:56 +00:00
Jacob Schatz 604a811f80 Fixes issue where firefox does not delete message after comment submit
Issue was **not** in the way comment was being submitted.
`app/assets/javascripts/awards_handler.coffee` was throwing an error.
This error was preventing any js from running after it.
Fixes #1473
2016-01-15 14:06:31 -05:00