summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* IssueNotes: Switch back to Write pane when note cancel or submit.acet-switch-markdown-paneFatih Acet2017-09-221-1/+3
|
* Merge branch 'winh-upgrade-nokogiri' into 'master'Robert Speicher2017-09-212-5/+5
|\ | | | | | | | | Upgrade Nokogiri because of CVE-2017-9050 See merge request gitlab-org/gitlab-ce!14427
| * Upgrade Nokogiri because of CVE-2017-9050winh-upgrade-nokogiriWinnie Hellmann2017-09-212-5/+5
| |
* | Merge branch 'acet-fix-comment-form-resize' into 'master'Jacob Schatz2017-09-212-0/+22
|\ \ | | | | | | | | | | | | | | | | | | IssueNotes: Resize comment form after note submit and discard. Closes #38115 See merge request gitlab-org/gitlab-ce!14401
| * | IssueNotes: Resize comment form after note submit and discard.acet-fix-comment-form-resizeFatih Acet2017-09-212-0/+22
| | |
* | | Merge branch 'tc-bump-version-10.1-pre' into 'master'Robert Speicher2017-09-211-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Bump VERSION to 10.1.0-pre [ci skip] See merge request gitlab-org/gitlab-ce!14426
| * | Bump VERSION to 10.1.0-preToon Claes2017-09-211-1/+1
|/ /
* | Merge branch 'cache-csrf-token' into 'master'Phil Hughes2017-09-215-12/+112
|\ \ | | | | | | | | | | | | | | | | | | Standardize access to CSRF token in JavaScript Closes #37773 See merge request gitlab-org/gitlab-ce!14241
| * | Standardize access to CSRF token in JavaScriptBryce Johnson2017-09-215-12/+112
|/ /
* | Merge branch 'hide-frontmatter-help-page' into 'master'Robert Speicher2017-09-211-2/+8
|\ \ | | | | | | | | | | | | Do not show YAML frontmatter for doc pages under /help See merge request gitlab-org/gitlab-ce!14345
| * | Do not show YAML frontmatter for doc pages under /helpAchilleas Pipinellis2017-09-191-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We recently started adding YAML frontmatter in docs so that we can show more information, but that only works for the docs portal at docs.gitlab.com. For example, we want to add a last_updated entry https://gitlab.com/gitlab-org/gitlab-ce/issues/37677 Whereas this is useful for the docs portal, it looks ugly for docs under /help.
* | | Merge branch 'force-two-up-view' into 'master'Filipa Lacerda2017-09-212-6/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Force two up view Closes #32613 See merge request gitlab-org/gitlab-ce!14397
| * | | [skip ci] Add changelogforce-two-up-viewClement Ho2017-09-201-0/+5
| | | |
| * | | Force two up viewClement Ho2017-09-201-6/+14
| |/ /
* | | Merge branch 'bvl-transient-failure-health-controller-spec' into 'master'Douwe Maan2017-09-211-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't memoize storage configuration on `FsShardsCheck` Closes #38140 See merge request gitlab-org/gitlab-ce!14419
| * | | Don't memoize storage configuration on `FsShardsCheck`bvl-transient-failure-health-controller-specBob Van Landuyt2017-09-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These values are already coming from memory, so we don't need to memoize. If we do memoize these, than the would not be stubbed when calling `stub_storage_settings` in specs
* | | | Merge branch 'dm-closing-issue-urls' into 'master'Robert Speicher2017-09-213-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly detect multiple issue URLs after 'Closes...' in MR descriptions Closes #33745 See merge request gitlab-org/gitlab-ce!14411
| * | | | Correctly detect multiple issue URLs after 'Closes...' in MR descriptionsdm-closing-issue-urlsDouwe Maan2017-09-213-3/+8
| | | | |
* | | | | Merge branch '32894-update-ux-icon-documentation' into 'master'Marcia Ramos2017-09-212-12/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "[Meta] Create Uniquely 'GitLab' Icons" Closes #32894 See merge request gitlab-org/gitlab-ce!14396
| * | | | | update spacing32894-update-ux-icon-documentationsarrahvesselov2017-09-201-0/+4
| | | | | |
| * | | | | updated verbiage and added todosarrahvesselov2017-09-201-1/+4
| | | | | |
| * | | | | added icon image and updated verbiagesarrahvesselov2017-09-192-12/+3
| | | | | |
* | | | | | Merge branch 'docs/owners-can-create-subgroups' into 'master'Marcia Ramos2017-09-211-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document that group Owners can always create subgroups See merge request gitlab-org/gitlab-ce!14416
| * | | | | | Document that group Owners can always create subgroupsAchilleas Pipinellis2017-09-211-4/+5
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/30473 MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14046
* | | | | | Merge branch '32796-add-ee-tag-detection-to-remove-old-in-gitlab-backup' ↵Rémy Coutable2017-09-212-6/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Adds EE tag detection to remove_old in gitlab backup. Closes #32796 See merge request gitlab-org/gitlab-ce!14413
| * | | | | | Adds EE tag detection to remove_old in gitlab backup.Tiago Botelho2017-09-212-6/+12
| |/ / / / /
* | | | | | Merge branch 'docs/autodevops-cleanup' into 'master'Achilleas Pipinellis2017-09-214-200/+370
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto DevOps docs cleanup Closes #37666, #37592, #37468, and #31641 See merge request gitlab-org/gitlab-ce!14293
| * | | | | Auto DevOps docs cleanupAchilleas Pipinellis2017-09-214-200/+370
|/ / / / /
* | | | | Merge branch 'docs-updates-sharing-permissions-and-project-filter' into 'master'Achilleas Pipinellis2017-09-211-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | new sharing permissions screenshot See merge request gitlab-org/gitlab-ce!14408
| * | | | new sharing permissionsMike Bartlett2017-09-211-0/+0
| | | | |
* | | | | Merge branch '37220-es-modules' into 'master'Phil Hughes2017-09-2141-870/+931
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use modules in common utils See merge request gitlab-org/gitlab-ce!14074
| * | | | | Exports all the methods in the same place37220-es-modulesFilipa Lacerda2017-09-181-25/+28
| | | | | |
| * | | | | Merge branch 'master' into 37220-es-modulesMike Greiling2017-09-18357-4475/+7015
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (148 commits) Remove gaps under nav on build page Replace the 'project/snippets.feature' spinach test with an rspec analog Use correct group members path for members flyout link Replace the 'project/commits/revert.feature' spinach test with an rspec analog Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0' Replace the 'project/archived.feature' spinach test with an rspec analog Fix broken link in docs/api/wiki.md Fixed the new sidebars width when browser has scrollbars Improve 'spec/features/profiles/*' specs Replace the 'search.feature' spinach test with an rspec analog dedupe yarn packages add dependency approvals (all MIT license) update build image to latest with node 8.x, yarn 1.0.2, and chrome 61 Ensure we use `Entities::User` for non-admin `users/:id` API requests Minor update to address Sean McGivern's comment. Add data migration Fix setting share_with_group_lock created services for keys Prepare Repository#merge for migration to Gitaly Never connect to webpack-dev-server over SSL ...
| * | | | | | Fix context for jquery eventFilipa Lacerda2017-09-151-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused function
| * | | | | | fixed mr widget options specPhil Hughes2017-09-131-3/+2
| | | | | | |
| * | | | | | fixed todos specPhil Hughes2017-09-122-28/+15
| | | | | | |
| * | | | | | Merge branch 'master' into 37220-es-modulesFilipa Lacerda2017-09-12101-1184/+1735
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (35 commits) Use WikiPages::CreateService in spec/features/projects/wiki/user_updates_wiki_page_spec.rb Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog Docs group mrs list view search bar Replace the project/milestone.feature spinach test with an rspec analog Make all the tooltips in the same direction on the commit info box Reset all connection schema cache after migration tests Emoji was rendered as italic Adds Event polyfill for IE Add gitaly to patch update doc Document how to swap database tables. Replace 'project/wiki.feature' spinach test with an rspec analog Check for sidebar cookie instead of class when resizing window update installation and update instructions for 10.0 Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog Remove confidential toggle checkbox and related code as no longer necessary Bump grape_logging gem to 1.7.0 to get status codes for error messages Expand filtered parameters to include `token` Replace the project/team_management.feature spinach test with an rspec analog Replace the profile/emails.feature spinach test with an rspec analog Replace project/group_links.feature spinach test with an rspec analog ...
| * | | | | | | fixed location.pathname not being resetPhil Hughes2017-09-121-1/+1
| | | | | | | |
| * | | | | | | 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