summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Update CHANGELOGTomasz Maczukin2016-01-181-0/+1
| | | | | | |
| * | | | | | Add information about PostgreSQL<>MySQL 'text' type differences into to ↵Tomasz Maczukin2016-01-182-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | installation docs
| * | | | | | Add limit change for 'data' column in 'events' when using MySQLTomasz Maczukin2016-01-181-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'update-devise' into 'master' Robert Speicher2016-01-182-6/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update devise to version 3.5.4 Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2642 See merge request !2490
| * | | | | Update devise to version 3.5.4Douglas Barbosa Alexandre2016-01-182-6/+6
|/ / / / /
* | | | | Merge branch 'ux/improve-artifacts-browser' into 'master' Grzegorz Bizon2016-01-187-22/+29
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add Changelog entry for improvements in builds artifacts browserGrzegorz Bizon2016-01-181-1/+2
| | | | |
| * | | | Update build artifacts metadata fixture to 0.0.2Grzegorz Bizon2016-01-181-0/+0
| | | | |
| * | | | Improve ux in builds artifacts browserGrzegorz Bizon2016-01-185-21/+27
|/ / / /
* | | | Merge branch 'remove-leading-comma-award-emoji' into 'master' Robert Speicher2016-01-182-4/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove leading comma when user is the only one to award that emoji Fixes #9073 See merge request !2450
| * | | | Remove leading comma when user is the only one to award that emojiZeger-Jan van de Weg2016-01-172-4/+10
| | | | | | | | | | | | | | | | | | | | Fixes #9073
* | | | | Update CHANGELOG and VERSION for 8.5.0-preRobert Speicher2016-01-182-1/+3
| | | | |
* | | | | Merge branch 'workhorse-0.6.0' into 'master' Robert Speicher2016-01-182-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 0.6.0 [ci skip] See merge request !2483
| * | | | | Use gitlab-workhorse 0.6.0Jacob Vosmaer2016-01-182-2/+2
| | | | | |
* | | | | | Merge branch 'fix-gravator-default-url' into 'master' Robert Speicher2016-01-183-8/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Ensure Gravatar host looks like an actual hostfix-gravator-default-urlRémy Coutable2016-01-183-8/+59
|/ / / / / /
* | | | | | Merge branch 'issuable-group-projects' into 'master' Yorick Peterse2016-01-181-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | See merge request !2481
| * | | | | | Scope issue projects to a Group when possibleissuable-group-projectsYorick Peterse2016-01-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge branch 'sherlock-table-html' into 'master' Yorick Peterse2016-01-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | See merge request !2480
| * | | | | | | Replaced "td" with "th" in the Sherlock SQL listsherlock-table-htmlYorick Peterse2016-01-181-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'instrument-finders' into 'master' Yorick Peterse2016-01-181-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | See merge request !2479
| * | | | | | | Added metrics instrumentation for all findersinstrument-findersYorick Peterse2016-01-181-0/+6
| |/ / / / / /
* | | | | | | Merge branch 'rc-document-new-api-pagination-headers' into 'master' Achilleas Pipinellis2016-01-181-1/+47
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document new API pagination headers Document new API pagination headers introduced in !2426. Solves #8098. /cc @dzaporozhets @dblessing See merge request !2435
| * | | | | | Clean up pagination documentation [ci skip]Achilleas Pipinellis2016-01-181-16/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix heading names - Fix curl example - Use full request output - Use table for the extra headers
| * | | | | | Document new API pagination headersrc-document-new-api-pagination-headersRémy Coutable2016-01-141-1/+24
| | | | | | |
* | | | | | | Merge branch 'margin-update' into 'master' Jacob Schatz2016-01-181-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | updatemargin-updateAndriy Dyadyura2016-01-141-1/+1
| | | | | | | |
| * | | | | | | updateAndriy Dyadyura2016-01-141-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'hook_url_limit' into 'master' Dmitriy Zaporozhets2016-01-186-17/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Raise hook url limitKirilll Zaycev2016-01-156-17/+22
| |/ / / / / / /
* | | | | | | | Merge branch 'diff-white-line-fix' into 'master' Jacob Schatz2016-01-181-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes white line when hiding diff comments in MR Fixes #6071 See merge request !2407
| * | | | | | | | Removes white line when hiding diff comments in MRPhil Hughes2016-01-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6071
* | | | | | | | | Merge branch 'comment-text-remains-in-text-box-after-submitting-it' into ↵Dmitriy Zaporozhets2016-01-181-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | | | | | Fixes issue where firefox does not delete message after comment submitcomment-text-remains-in-text-box-after-submitting-itJacob Schatz2016-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge branch 'rs-abuse-report-validation' into 'master' Dmitriy Zaporozhets2016-01-182-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Use a more sensible message for the AbuseReport uniqueness validationrs-abuse-report-validationRobert Speicher2016-01-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was "user has already been taken", when really we were saying the user has already been reported.
* | | | | | | | | | Merge branch 'issue-page-keeps-jumping-up' into 'master' Dmitriy Zaporozhets2016-01-173-1/+36
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | fixes scrollbar jump by making discussion the same size as the sidebar when ↵issue-page-keeps-jumping-upJacob Schatz2016-01-134-12/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sidebar is bigger, and not allowing affix to do fixed position on the sidebar
| * | | | | | | | | initial fixJacob Schatz2016-01-133-5/+12
| | | | | | | | | |
* | | | | | | | | | Autosize the textarea in showEditFormRobert Speicher2016-01-161-0/+1
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'abuse-autofill-message' into 'master' Robert Speicher2016-01-164-2/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Autofill abuse message text with user url. Closes #2838 See merge request !2396
| * | | | | | | | sanitize user supplied input.Josh Frye2016-01-162-25/+2
| | | | | | | | |
| * | | | | | | | Autofill abuse message text with user url. Closes #2838Josh Frye2016-01-164-1/+26
|/ / / / / / / /
* | | | | | | | Merge branch 'github_importer' into 'master' Achilleas Pipinellis2016-01-161-11/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the version each feature was introduced in GitHub importer See merge request !2457
| * | | | | | | | Importing GitHub cross-repository PRs is not supported atmAchilleas Pipinellis2016-01-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Add the version each feature was introduced and remove notegithub_importerAchilleas Pipinellis2016-01-151-11/+8
| | | | | | | | |
* | | | | | | | | Merge branch 'saml-ts' into 'master' Achilleas Pipinellis2016-01-151-2/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added advanced SAML troubleshooting /cc @dblessing @balameb See merge request !2456
| * | | | | | | | | Added advanced SAML troubleshootingsaml-tsPatricio Cano2016-01-151-2/+14
| |/ / / / / / / /
* | | | | | | | | Merge branch 'rs-silence-statemachine-in-cron' into 'master' Robert Speicher2016-01-151-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent StateMachine warnings from outputting during a cron task [ci skip] Closes #5931 See merge request !2458
| * | | | | | | | Prevent StateMachine warnings from outputting during a cron taskRobert Speicher2016-01-151-0/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Closes #5931
View Lorry Controller Status