summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Import modules instead of using the ones in global namespaceFilipa Lacerda2017-09-0932-170/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes set favicon related methods from global scope Improves test related with favicon Removes convertPermissionToBoolean from global scope. Adds tests for convertPermissionToBoolean - were non existant Removes setParamInURL from gl.utils Removes parseIntPagination from gl.utils namespace Remove normalizeCRLFHeaders from gl.utils namespace Removes normalizeHeaders from gl.utils namespace Use gl.utils for filtered search Fix bad import Fix broken test by cleaning window.history namespace Adds changelog
| * | | | | | | | | | | Use modules in common utilsFilipa Lacerda2017-09-0914-769/+779
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'feature/plantuml-restructured-text' into 'master'Douwe Maan2017-09-213-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gitlab-markup gem See merge request gitlab-org/gitlab-ce!14395
| * | | | | | | | | | | Upgrade gitlab-markup gemMarkus Koller2017-09-203-3/+8
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '38088-remove-banner-to-customize-experience' into 'master'Douwe Maan2017-09-216-157/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove banner to customize experience" Closes #38088 See merge request gitlab-org/gitlab-ce!14384
| * | | | | | | | | | | | Deleted another Fixture due to User Callout38088-remove-banner-to-customize-experienceTim Zallmann2017-09-201-30/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixture Creation removedTim Zallmann2017-09-201-5/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Deleted Karma Specs for userCalloutTim Zallmann2017-09-201-49/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Removed User Callout for Customer ExperienceTim Zallmann2017-09-204-73/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'events-redundant-where' into 'master'Rémy Coutable2017-09-213-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant WHERE from event queries Closes #38129 See merge request gitlab-org/gitlab-ce!14389
| * | | | | | | | | | | | | Remove redundant WHERE from event queriesevents-redundant-whereYorick Peterse2017-09-203-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default scope in Event would add a "WHERE author_id IS NOT NULL" clause to every query. Now that "events.author_id" has a NOT NULL clause set this filter is redundant and we can safely remove it. In this commit we also add a validation on events.author_id (previously only defined in PushEvent) just in case something tries to create data without an author ID. This way we can present a nicer error message compared to PostgreSQL's foreign key error messages. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38129
* | | | | | | | | | | | | | Merge branch 'remove-use-key-worker' into 'master'Rémy Coutable2017-09-218-65/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop using Sidekiq for updating Key#last_used_at Closes #36663 See merge request gitlab-org/gitlab-ce!14391
| * | | | | | | | | | | | | | Stop using Sidekiq for updating Key#last_used_atremove-use-key-workerYorick Peterse2017-09-208-65/+116
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes things simpler as no scheduling is involved. Further we remove the need for running a SELECT + UPDATE just to get the key and update it, whereas we only need an UPDATE when setting last_used_at directly in a request. The added service class takes care of updating Key#last_used_at without using Sidekiq. Further it makes sure we only try to obtain a Redis lease if we're confident that we actually need to do so, instead of always obtaining it. We also make sure to _only_ update last_used_at instead of also updating updated_at. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36663
* | | | | | | | | | | | | | Merge branch 'resolve-discussions-btn' into 'master'Phil Hughes2017-09-211-14/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make resolve discussion icon gray See merge request gitlab-org/gitlab-ce!14398
| * | | | | | | | | | | | | Make resolve discussion icon grayresolve-discussions-btnAnnabel Dunstone Gray2017-09-201-14/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '10-0-sync-master' into 'master'Simon Knox2017-09-2116-79/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync dev to gitlab.com See merge request gitlab-org/gitlab-ce!14406
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJarka Kadlecova2017-09-2116-79/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Update CHANGELOG.md for 9.5.5Simon Knox2017-09-1816-79/+19
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | Merge branch 'fix-image-diff-swipe-handle' into 'master'Annabel Dunstone Gray2017-09-202-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix image diff swipe handle offset to correctly align with the frame Closes #37928 See merge request gitlab-org/gitlab-ce!14392
| * | | | | | | | | | | | | Fix image diff swipe handle offset to correctly align with the framefix-image-diff-swipe-handleClement Ho2017-09-202-1/+7
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '38049-fix-resolve-in-new-issue-btn' into 'master'Annabel Dunstone Gray2017-09-203-8/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the "resolve discussion in a new issue" button Closes #38049 See merge request gitlab-org/gitlab-ce!14357
| * | | | | | | | | | | | Fix the "resolve discussion in a new issue" buttonNick Thomas2017-09-203-8/+17
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '37862-breadcrumbs-mobile' into 'master'Tim Zallmann2017-09-202-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mobile sidebar button to match height of desktop breadcrumbs Closes #37862 See merge request gitlab-org/gitlab-ce!14282
| * | | | | | | | | | | | Vertically center hamburger button37862-breadcrumbs-mobileAnnabel Dunstone Gray2017-09-182-7/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Increase tap target on hamburger menuAnnabel Dunstone Gray2017-09-152-3/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix mobile sidebar button to match height of desktop breadcrumbsAnnabel Dunstone Gray2017-09-141-0/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'gitlab-git-popen' into 'master'Douwe Maan2017-09-207-13/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitlab::Git's Popen on that module's code Closes gitaly#597 See merge request gitlab-org/gitlab-ce!14237
| * | | | | | | | | | | | | Use Gitlab::Git's Popen on that module's codegitlab-git-popenAlejandro Rodríguez2017-09-207-13/+19
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the current Gitaly migration to depend on less code outside of the Gitlab::Git module
* | | | | | | | | | | | | Merge branch '32796-tighten-up-remove-old-while-backing-up-gitlab' into 'master'Rémy Coutable2017-09-202-10/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tighten up remove_old regex from gitlab backup manager. Closes #32796 See merge request gitlab-org/gitlab-ce!14333
| * | | | | | | | | | | | | Tighten up remove_old regex from gitlab backup manager.32796-tighten-up-remove-old-while-backing-up-gitlabTiago Botelho2017-09-202-10/+38
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'workhorse-3.1.0' into 'master'Rémy Coutable2017-09-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 3.1.0 See merge request gitlab-org/gitlab-ce!14390
| * | | | | | | | | | | | | Use gitlab-workhorse 3.1.0Jacob Vosmaer2017-09-201-1/+1
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix-counts-caching' into 'master'Douwe Maan2017-09-2012-15/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix refreshing of issues/MR count caches Closes #38061 See merge request gitlab-org/gitlab-ce!14363
| * | | | | | | | | | | | | Fix refreshing of issues/MR count cachesfix-counts-cachingYorick Peterse2017-09-1912-15/+28
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the open issues/MR count caches are refreshed properly when creating new issues or MRs. This MR also includes a change to the cache keys to ensure all caches are rebuilt on the fly. This particular problem was not caught in the test suite due to a null cache being used, resulting in all calls that would use a cache using the underlying data directly. In production the code would fail because a newly saved record returns an empty hash in #changes meaning checks such as `state_changed? || confidential_changed?` would return false for new rows, thus never updating the counters. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38061
* | | | | | | | | | | | | Merge branch 'fix-autodevops-monitoring' into 'master'Kamil Trzciński2017-09-201-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support new auto-deploy helm chart Closes #38028 See merge request gitlab-org/gitlab-ce!14386
| * | | | | | | | | | | | Support new auto-deploy helm chartfix-autodevops-monitoringAlessio Caiazza2017-09-201-4/+0
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New auto-deploy helm chart has new names in order to support Auto Monitoring. Works with, but does not require charts/charts.gitlab.io!66 See gitlab-ce#38028
* | | | | | | | | | | | Merge branch '37713-enable-ee_compat_check-for-forks' into 'master'Rémy Coutable2017-09-203-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable ee_compat_check for forks, but not EE Closes #37713 See merge request gitlab-org/gitlab-ce!14189
| * | | | | | | | | | | | Update ee_compat_check for community contributors37713-enable-ee_compat_check-for-forksLin Jen-Shin2017-09-151-1/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Enable ee_compat_check for forks, but not EELin Jen-Shin2017-09-152-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We exclude known EE projects, and check the project directory name for EE forks.
* | | | | | | | | | | | | Merge branch '36884-gitaly-admin-version' into 'master'Tim Zallmann2017-09-203-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitaly version to Admin Dashboard Closes #36884 See merge request gitlab-org/gitlab-ce!14313
| * | | | | | | | | | | | | Add Gitaly version to Admin DashboardJacopo2017-09-193-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Displays the Gitaly version in the admin dashboard.
* | | | | | | | | | | | | | Merge branch 'fix/gb/fix-moving-issue-with-ambiguous-references' into 'master'Rémy Coutable2017-09-207-24/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rewriting issue references with group milestones Closes #37746 See merge request gitlab-org/gitlab-ce!14294
| * | | | | | | | | | | | | | Fix rewriting issue references with group milestonesGrzegorz Bizon2017-09-207-24/+77
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '20049-projects-api-forks' into 'master'Rémy Coutable2017-09-207-9/+221
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "make project data via API report forks of this project" Closes #20049 See merge request gitlab-org/gitlab-ce!14355
| * | | | | | | | | | | | | Employ ForkProjectsFinder in ForksControllerMark Fletcher2017-09-201-5/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add an API endpoint to determine the forks of a projectMark Fletcher2017-09-204-4/+169
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Introduce ForkProjectsFinder classMark Fletcher2017-09-202-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Will dry up the code to find projects between the ForksController and the API
* | | | | | | | | | | | | | Merge branch 'add_tooltip_for_milestone_in_issues_list' into 'master'Douwe Maan2017-09-205-4/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tooltip for milestone due date to issue and merge request lists Closes #18864 See merge request gitlab-org/gitlab-ce!14318
| * | | | | | | | | | | | | | Add tooltip for milestone due date to issue and merge request listsVitaliy @blackst0ne Klachkov2017-09-205-4/+15
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'mk-clarify-moving-namespaces' into 'master'Douwe Maan2017-09-205-9/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify how to rename username or group path See merge request gitlab-org/gitlab-ce!13914