summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Mention group query in GraphQL documentationbw-add-graphql-groupsBrett Walker2019-04-231-1/+5
|
* Refactor group query specBrett Walker2019-04-232-107/+28
| | | | and removing unnecessary code
* Basic GraphQL for a groupBrett Walker2019-04-2312-4/+296
| | | | | Add new query for Groups, with new GroupType and NamespaceType
* Merge branch 'support-negative-matches' into 'master'Grzegorz Bizon2019-04-239-6/+221
|\ | | | | | | | | Support negative matches See merge request gitlab-org/gitlab-ce!27510
| * Support negative matchesKamil Trzciński2019-04-239-6/+221
| | | | | | | | | | This adds support for != and !~ operators giving more flexibility in comparing values
* | Merge branch '47584-label-text-color' into 'master'Fatih Acet2019-04-234-0/+10
|\ \ | | | | | | | | | | | | | | | | | | Fix issue with list label text color Closes #47584 See merge request gitlab-org/gitlab-ce!26794
| * | Fix issue with list label text colorTucker Chapman2019-04-234-0/+10
|/ /
* | Merge branch 'id-feature-flag-to-disable-lfs-check' into 'master'Douwe Maan2019-04-232-0/+13
|\ \ | |/ |/| | | | | | | | | Add feature flag to disable LFS check Closes #60588 See merge request gitlab-org/gitlab-ce!27451
| * Add feature flag to disable LFS checkIgor2019-04-232-0/+13
|/
* Merge branch 'docs/list-whitespace' into 'master'Achilleas Pipinellis2019-04-231-4/+5
|\ | | | | | | | | Add whitespace for list so it renders See merge request gitlab-org/gitlab-ce!27564
| * Add whitespace for list so it rendersEvan Read2019-04-231-4/+5
|/
* Merge branch 'upgrade-to-rails-5-1' into 'master'Rémy Coutable2019-04-2343-429/+288
|\ | | | | | | | | Upgrade Rails to 5.1 See merge request gitlab-org/gitlab-ce!27480
| * Remove use of deprecated methodsupgrade-to-rails-5-1Heinrich Lee Yu2019-04-231-2/+2
| | | | | | | | Changed after upstream refactor
| * Update changelog entryHeinrich Lee Yu2019-04-231-2/+2
| |
| * Fix project auto dev ops failureHeinrich Lee Yu2019-04-232-0/+4
| |
| * Bump Rails version to 5.1.7Heinrich Lee Yu2019-04-234-80/+35
| | | | | | | | Removes unneeded patches
| * Upgrade Rails to 5.1.6.1Jasper Maes2019-04-2343-423/+323
| | | | | | | | Model.new.attributes now also returns encrypted attributes.
* | Merge branch 'pages-domain-letsencrypt-settings' into 'master'Andreas Brandl2019-04-232-0/+18
|\ \ | | | | | | | | | | | | Add auto_ssl_enabled to pages domains See merge request gitlab-org/gitlab-ce!27304
| * | Add auto_ssl_enabled for pages domainspages-domain-letsencrypt-settingsVladimir Shushlin2019-04-122-0/+18
| | |
* | | Merge branch 'docs/variables-mr-pipelines' into 'master'Marcia Ramos2019-04-231-17/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make it clearer when CI_MERGE_REQUEST_ variables are available Closes #60308 See merge request gitlab-org/gitlab-ce!27460
| * | | Make it clearer when CI_MERGE_REQUEST_ variables are availableAchilleas Pipinellis2019-04-231-17/+17
|/ / /
* | | Merge branch ↵Kamil Trzciński2019-04-233-42/+74
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60569-timeline-entry-label-link-is-not-applying-the-filter-on-issues' into 'master' Adds `label_name` back as a scalar param in `IssuableFinder` Closes #60569 See merge request gitlab-org/gitlab-ce!27507
| * | | Add label_name as scalar param of IssuableFinder60569-timeline-entry-label-link-is-not-applying-the-filter-on-issuesHeinrich Lee Yu2019-04-233-42/+74
| | |/ | |/| | | | | | | This was removed by a previous MR but broke some links
* | | Merge branch 'update_proofreader' into 'master'Rémy Coutable2019-04-231-3/+0
|\ \ \ | | | | | | | | | | | | | | | | Update proofreader.md - remove incorrect proofreader and resign See merge request gitlab-org/gitlab-ce!27567
| * | | update proofreaderHuang Tao2019-04-231-2/+0
| | | | | | | | | | | | Resignation of Chinese Traditional(繁體中文-台湾) and Chinese Traditional(繁體中文-香港) proofreader positions
| * | | update proofreaderHuang Tao2019-04-231-1/+0
| | | | | | | | | | | | Since it's an incorrect Korean proofreader, all remove @htve
* | | | Merge branch 'patch-52' into 'master'Rémy Coutable2019-04-231-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update proofreader.md - Request to be proofreader See merge request gitlab-org/gitlab-ce!27556
| * | | | Update proofreader.md - Request to be proofreaderIvan Ip2019-04-221-0/+1
| | | | |
* | | | | Merge branch 'patch-53' into 'master'60811-docs-feedback-add-available-in-which-planSean McGivern2019-04-232-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Externalize some strings in issue page and new issue page See merge request gitlab-org/gitlab-ce!27529
| * | | | | Externalize some strings in issue page and new issue pageVictor Wu2019-04-232-6/+6
|/ / / / /
* | | | | Merge branch 'sh-avoid-fetching-temp-refs-within-project' into 'master'Douwe Maan2019-04-236-10/+110
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create a temp reference for branch comparisons within project Closes #58315 See merge request gitlab-org/gitlab-ce!24038
| * | | | | Make use of local ref if it is reachablesh-avoid-fetching-temp-refs-within-projectOswaldo Ferreira2019-04-193-19/+61
| | | | | |
| * | | | | Add spec for CompareServiceStan Hu2019-04-181-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The return result for the source or target branch being missing was ambiguous before. It should be an empty compare to indicate no comparison could be done.
| * | | | | Check that source and target branch existStan Hu2019-04-183-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the return value is consistent if the source and/or branch do not exist.
| * | | | | Remove source_branch_name commit checkStan Hu2019-04-182-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | This should already be done in Gitlab::Git:Compare.
| * | | | | Don't create a temp reference for branch comparisons within projectStan Hu2019-04-183-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A temp reference is only needed to fetch a branch from another project, as in the case for forked repositories. For branch comparisons within the same project, we can just use the existing branch names to do the comparison. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/38689#note_126107862
* | | | | | Merge branch '59572-remove-protected-branch-creation-flag' into 'master'Sean McGivern2019-04-232-80/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove protected_branch_creation feature flag Closes #59572 See merge request gitlab-org/gitlab-ce!27543
| * | | | | | Remove protected_branch_creation feature flag59572-remove-protected-branch-creation-flagPatrick Bajao2019-04-222-80/+44
| | | | | | |
* | | | | | | Merge branch 'tc-move-geo-cursor-bin-ce' into 'master'Robert Speicher2019-04-231-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude ee/bin from Naming/FileName cop See merge request gitlab-org/gitlab-ce!27488
| * | | | | | | Exclude ee/bin from Naming/FileName coptc-move-geo-cursor-bin-ceToon Claes2019-04-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/6565
* | | | | | | | Merge branch 'sh-bump-sidekiq-5.2.6' into 'master'Robert Speicher2019-04-232-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Sidekiq to 5.2.7 See merge request gitlab-org/gitlab-ce!27512
| * | | | | | | | Bump Sidekiq to 5.2.7sh-bump-sidekiq-5.2.6Stan Hu2019-04-222-3/+3
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes minor bugs (https://github.com/mperham/sidekiq/blob/master/Changes.md#526) and keeps version used with gitlab-monitor consistent.
* | | | | | | | Merge branch 'resolve-ee-ce-diff-of-noteable-discussion' into 'master'Phil Hughes2019-04-231-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve EE / CE diff of noteable_discussion See merge request gitlab-org/gitlab-ce!27562
| * | | | | | | | Resolve EE / CE diff of noteable_discussionresolve-ee-ce-diff-of-noteable-discussionPaul Slaughter2019-04-221-1/+6
| |/ / / / / / /
* | | | | | | | Merge branch '58252-web-ide-dropdown-duplicates' into 'master'Phil Hughes2019-04-235-64/+64
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Web IDE template dropdown showing duplicates" Closes #58252 See merge request gitlab-org/gitlab-ce!27237
| * | | | | | | | Revert "Increased page size to 100"Natalia Tepluhina2019-04-235-64/+64
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2869a61f3b7aeb8b6d79c74332c93e32cec20caa.
* | | | | | | | Merge branch '59514-uploading-images-base64' into 'master'Phil Hughes2019-04-239-7/+39
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Web IDE uploading images shows base64 string" Closes #59514 See merge request gitlab-org/gitlab-ce!27471
| * | | | | | | | Adds changelog entry59514-uploading-images-base64Denys Mishunov2019-04-181-0/+5
| | | | | | | | |
| * | | | | | | | Stores 'binary' and 'rawPath' attr after uploadDenys Mishunov2019-04-185-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When uploading a file, we need to flag binary files correspondingly so that it gets propagated all the way to RepoEditor as it decides on whether to show editor for this or that file or not (shouldHideEditor()) - rawPath needs to be propagate all the way to ContentViewer as well so that uploaded images could be rendered as a base64 image right away instead of raw base64 string
| * | | | | | | | Always hides editor in Web IDE for binary filesDenys Mishunov2019-04-171-1/+1
| | | | | | | | |
View Lorry Controller Status