summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Fix double request issue in artifacts browserGrzegorz Bizon2016-01-191-1/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'feature/expose-ci-lint-tool'Douwe Maan2016-01-196-12/+33
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove dropdown containing CI Lint button on builds pagefeature/expose-ci-lint-toolGrzegorz Bizon2016-01-183-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to CI Lint on builds page will be a separate button from now on.
| * | | | | | | | | | | Update build artifacts feature testsGrzegorz Bizon2016-01-171-6/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Add Changelog entry for exposing CI Lint tool on builds pageGrzegorz Bizon2016-01-171-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Add specs for CI Lint button exposed on a builds pageGrzegorz Bizon2016-01-173-5/+20
| | | | | | | | | | | |
| * | | | | | | | | | | Reuse existing CSS classes when exposing CI Lint toolGrzegorz Bizon2016-01-171-10/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Expose link to CI Lint Tool on builds pageGrzegorz Bizon2016-01-171-1/+13
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-consider-re-assign-as-a-mention'Douwe Maan2016-01-193-9/+71
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | This will ensure previous assignee gets an email even if his notif level is ↵fix-consider-re-assign-as-a-mentionRémy Coutable2016-01-152-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "on mention"
| * | | | | | | | | | | Add changelog entry for fix-consider-re-assign-as-a-mentionRémy Coutable2016-01-151-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Consider re-assign as a mention from a notification point of viewRémy Coutable2016-01-152-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will ensure new assignee gets an email even if his notif level is "on mention".
* | | | | | | | | | | | Merge branch 'warning-pending-migrations' into 'master' Robert Speicher2016-01-193-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raise an error on page load when there are pending migrations in development mode. Fixes #5990 See merge request !2491
| * | | | | | | | | | | | Raise an error on page load if there are pending migrations on dev envDouglas Barbosa Alexandre2016-01-191-0/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Ensure that doesn't have pending migrations when running the specsDouglas Barbosa Alexandre2016-01-192-3/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'browse-issues-incorrect-positioning-in-firefox-on-commit-page' ↵Dmitriy Zaporozhets2016-01-191-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix positioning issues with browse files button Issue is that in Firefox clipboard is blocking the browse files from moving all the way to the right. Move clipboard up 1px into -1px to unblock "browse files" SS from firefox: ![Screen_Shot_2016-01-18_at_4.01.58_PM](/uploads/312a5f1e55ca707081f718e2413416fb/Screen_Shot_2016-01-18_at_4.01.58_PM.png) Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/10849 See merge request !2489
| * | | | | | | | | | | | | Fix positioning issues with browse files buttonbrowse-issues-incorrect-positioning-in-firefox-on-commit-pageJacob Schatz2016-01-181-0/+4
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue is that in Firefox clipboard is blocking the browse files from moving all the way to the right. Move clipboard up 1px into -1px to unblock browse files
* | | | | | | | | | | | | Merge branch 'search-title-clipped' into 'master' Dmitriy Zaporozhets2016-01-191-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search title gets clipped vertically. Fixed by adding height to search title css. **Before:** ![Screen_Shot_2016-01-16_at_10.12.14_AM](/uploads/2651de6ae38251e1f20acade0c69a629/Screen_Shot_2016-01-16_at_10.12.14_AM.png) **After:** ![Screen_Shot_2016-01-16_at_10.12.05_AM](/uploads/6852e9a653bde1975d7fdfa4dbc302d8/Screen_Shot_2016-01-16_at_10.12.05_AM.png) See merge request !2460
| * | | | | | | | | | | | | Search title was getting clipped horizontally.search-title-clippedJacob Schatz2016-01-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed by adding height to search title css.
* | | | | | | | | | | | | | Merge branch 'sorting-dropdown-does-not-fit-filter-bar' into 'master' Dmitriy Zaporozhets2016-01-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce margin to fit dropdowns ![Screen_Shot_2016-01-18_at_7.51.23_PM](/uploads/03336f86fde25d6d045742297a19751c/Screen_Shot_2016-01-18_at_7.51.23_PM.png) Fixes #10747 See merge request !2492
| * | | | | | | | | | | | | Reduce margin to fit dropdownsJacob Schatz2016-01-181-1/+1
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #10747
* | | | | | | | | | | | | Merge branch 'fix_changelog' into 'master' Robert Speicher2016-01-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | Move entry `Fix: As an admin, cannot add oneself as a member to a group/project`fix_changelogDrew Blessing2016-01-181-1/+1
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix/events-data-limit-for-mysql' into 'master' Robert Speicher2016-01-184-2/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix limit for `data` column in `events` table when using MySQL Closes #9084 See merge request !2486
| * | | | | | | | | | | | | Update MySQL docsRobert Speicher2016-01-183-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | Modify CHANGELOG entry [ci skip]Tomasz Maczukin2016-01-181-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | 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