summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ensure branch cleanup regardless of whether the import process succeedsgh-branch-cleanupDouglas Barbosa Alexandre2016-06-022-2/+5
|
* Merge branch '18031-sidebar-labels-queries' into 'master' Yorick Peterse2016-06-024-5/+24
|\ | | | | See merge request !4436
| * issuable#labels_array explicitly load the labelsPaco Guzman2016-06-024-5/+24
| | | | | | | | | | | | | | This will be useful when you want to ask for the number of items and later iterate over them, without needing to ask if the association is load or not. So you avoid extra database queries
* | Merge branch 'rs-todo-has-tooltip' into 'master' Dmitriy Zaporozhets2016-06-021-1/+3
|\ \ | | | | | | | | | | | | | | | | | | Add tooltips to todo target links See merge request !4370
| * | Add tooltips to todo target linksrs-todo-has-tooltipRobert Speicher2016-05-301-1/+3
| | |
* | | Update CHANGELOG for 8.8.3Robert Speicher2016-06-021-7/+17
| |/ |/| | | | | [ci skip]
* | Merge branch 'issue_18102' into 'master' Robert Speicher2016-06-021-2/+0
|\ \ | | | | | | | | | | | | | | | | | | Fixes missing number on generated ordered list Closes #18102 See merge request !4437
| * | Fixes missing number on generated ordered listAlfredo Sumaran2016-06-021-2/+0
| | |
* | | Merge branch 'reduce-fog-deps' into 'master' Robert Speicher2016-06-023-99/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce number of fog gem dependencies Currently supported: * AWS * Azure * OpenStack * Google * local storage Closes #15352 See merge request !4396
| * | | Reduce number of fog gem dependenciesreduce-fog-depsStan Hu2016-06-013-99/+24
| | | | | | | | | | | | | | | | Closes #15352
* | | | Merge branch 'issue-18032' into 'master' Yorick Peterse2016-06-027-1/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Cache project build count. Closes #18032 See merge request !4377
| * | | | Refactor. Add tests.Josh Frye2016-06-027-17/+10
| | | | |
| * | | | Invalidate cache on build changeJosh Frye2016-06-022-1/+6
| | | | |
| * | | | Cache project build count. Closes #18032Josh Frye2016-06-023-0/+15
| | | | |
* | | | | Merge branch 'tests/move-shortcuts-specs-to-valid-directory' into 'master' Robert Speicher2016-06-021-0/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Move feature specs for shortcuts to valid directorytests/move-shortcuts-specs-to-valid-directoryGrzegorz Bizon2016-06-021-0/+0
| | | | |
* | | | | Merge branch 'issue-18036' into 'master' Yorick Peterse2016-06-026-2/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cache assigned issue and merge request count. Closes #18036 and #18035 See merge request !4378
| * | | | | Update specs. Add CHANGELOG entryissue-18036Josh Frye2016-06-025-16/+36
| | | | | |
| * | | | | Flush cache in callback. Add testsJosh Frye2016-06-023-4/+32
| | | | | |
| * | | | | Cache assigned open issue count. Closes #18035Josh Frye2016-06-022-3/+9
| | | | | |
| * | | | | Cache assigned merge request count. Closes #18036Josh Frye2016-06-022-1/+7
| | | | | |
* | | | | | Merge branch 'search-box-blur' into 'master' Jacob Schatz2016-06-023-18/+15
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Clicking search pill focuses fieldsearch-box-blurPhil Hughes2016-05-243-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge branch 'fix-inline-filter-speed' into 'master' Stan Hu2016-06-022-4/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Fix serious performance bug with rendering Markdown with InlineDiffFilterStan Hu2016-06-012-4/+9
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch '14446-no_group_avatar-png-link' into 'master' Rémy Coutable2016-06-022-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Fix link to blank group iconSean McGivern2016-06-022-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'chujinjin/gitlab-ce-fix_wiki_project_clone_address_error' into ↵Rémy Coutable2016-06-022-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | Fix wiki project clone address errorchujinjin/gitlab-ce-fix_wiki_project_clone_address_errorchujinjin2016-06-022-1/+2
| |/ / / /
* | | | | Merge branch 'minor_doc_updates' into 'master' Achilleas Pipinellis2016-06-022-2/+10
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Explicitly mention advisory file lockingDrew Blessing2016-06-011-2/+2
| | | | |
| * | | | Add gdb detach instructionsDrew Blessing2016-06-011-0/+8
| | |/ / | |/| |
* | | | Merge branch 'cs-unnecessary-assets' into 'master' Robert Speicher2016-06-0216-8/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Move JS graph specs to match assets tree.Connor Shea2016-06-013-0/+0
| | | | |
| * | | | Fix teaspoonConnor Shea2016-06-013-3/+3
| | | | |
| * | | | Fix indentationConnor Shea2016-06-011-6/+6
| | | | |
| * | | | Attempt to fix the user page.Connor Shea2016-06-0110-2/+12
| | | | |
| * | | | Remove d3 except for on pages where it's necessary.Connor Shea2016-06-0110-5/+26
| | | | |
* | | | | Merge branch 'cleanup-readme' into 'master' Robert Speicher2016-06-021-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Remove Coveralls and Semaphore badges. [ci skip]cleanup-readmeConnor Shea2016-05-311-2/+0
| | | | |
* | | | | Merge branch 'fix-dropdown-cutoff' into 'master' Robert Speicher2016-06-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a `title` attribute to the branch dropdown for when the name has been cut off. Fixes #18056 See merge request !4395
| * | | | | Add a title attribute to each branch in the branches dropdown on the New MR ↵Connor Shea2016-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | page.
* | | | | | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-0210-31/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Fix a broken specConnor Shea2016-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary fix until Devise 4 fixes this grammar issue: https://github.com/plataformatec/devise/issues/4095
| * | | | | | Upgrade attr_encrypted and encryptorConnor Shea2016-05-307-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attr_encrypted (1.3.4 => 3.0.1) Changelog: https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.m d attr_encrypted 2.x included a vulnerability, so that major version is skipped. 3.x requires that the algorithm and mode used by each encrypted attribute is specified explicitly. `nil` is no longer a valid value for the encrypted_value_iv field, so it’s changed to a randomly generated string.
| * | | | | | Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-305-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Devise (3.5.4 => 4.1.1) Changelog: https://github.com/plataformatec/devise/blob/master/CHANGELOG.md devise-two-factor (2.0.1 => 3.0.0) Changelog: https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md These are reliant on each other, so they have to be upgraded together. devise-async is no longer necessary as Devise 4.1 fixes a bug with the ActiveJob integration.
* | | | | | | Merge branch 'downcase-registry-repository' into 'master' Stan Hu2016-06-013-3/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Introduce container_registry_path_with_namespacedowncase-registry-repositoryKamil Trzcinski2016-06-012-17/+16
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into downcase-registry-repositoryKamil Trzcinski2016-06-013-4/+28
| |\ \ \ \ \ \ \
| * | | | | | | | Use downcased path to container repository as this is expected path by DockerKamil Trzcinski2016-06-013-3/+18
| | | | | | | | |
View Lorry Controller Status