summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make rubocop happy8553_enable_modsecurity_on_cluster_ingressGilbert Roulot2019-04-251-0/+1
* Fix migration number in specGilbert Roulot2019-04-251-1/+1
* Fix migration numberGilbert Roulot2019-04-253-2/+2
* Handle failure in the update of a Ingress applicationGilbert Roulot2019-04-251-2/+7
* Add MR number in the changelogGilbert Roulot2019-04-251-1/+1
* Enable ModSecurity on Ingress applicationsGilbert Roulot2019-04-257-0/+214
* Merge branch 'docs/list-whitespace' into 'master'Achilleas Pipinellis2019-04-231-4/+5
|\
| * 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
|\
| * Remove use of deprecated methodsupgrade-to-rails-5-1Heinrich Lee Yu2019-04-231-2/+2
| * 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
| * Upgrade Rails to 5.1.6.1Jasper Maes2019-04-2343-423/+323
* | Merge branch 'pages-domain-letsencrypt-settings' into 'master'Andreas Brandl2019-04-232-0/+18
|\ \
| * | 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 availableAchilleas Pipinellis2019-04-231-17/+17
|/ / /
* | | Merge branch '60569-timeline-entry-label-link-is-not-applying-the-filter-on-i...Kamil Trzciński2019-04-233-42/+74
|\ \ \
| * | | 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
| | |/ | |/|
* | | Merge branch 'update_proofreader' into 'master'Rémy Coutable2019-04-231-3/+0
|\ \ \
| * | | update proofreaderHuang Tao2019-04-231-2/+0
| * | | update proofreaderHuang Tao2019-04-231-1/+0
* | | | Merge branch 'patch-52' into 'master'Rémy Coutable2019-04-231-0/+1
|\ \ \ \
| * | | | 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 pageVictor Wu2019-04-232-6/+6
|/ / / / /
* | | | | Merge branch 'sh-avoid-fetching-temp-refs-within-project' into 'master'Douwe Maan2019-04-236-10/+110
|\ \ \ \ \
| * | | | | 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
| * | | | | Check that source and target branch existStan Hu2019-04-183-4/+4
| * | | | | Remove source_branch_name commit checkStan Hu2019-04-182-3/+1
| * | | | | Don't create a temp reference for branch comparisons within projectStan Hu2019-04-183-1/+48
* | | | | | Merge branch '59572-remove-protected-branch-creation-flag' into 'master'Sean McGivern2019-04-232-80/+44
|\ \ \ \ \ \
| * | | | | | 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 coptc-move-geo-cursor-bin-ceToon Claes2019-04-181-0/+1
* | | | | | | | Merge branch 'sh-bump-sidekiq-5.2.6' into 'master'Robert Speicher2019-04-232-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump Sidekiq to 5.2.7sh-bump-sidekiq-5.2.6Stan Hu2019-04-222-3/+3
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'resolve-ee-ce-diff-of-noteable-discussion' into 'master'Phil Hughes2019-04-231-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Increased page size to 100"Natalia Tepluhina2019-04-235-64/+64
|/ / / / / / / /
* | | | | | | | Merge branch '59514-uploading-images-base64' into 'master'Phil Hughes2019-04-239-7/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds changelog entry59514-uploading-images-base64Denys Mishunov2019-04-181-0/+5
| * | | | | | | | Stores 'binary' and 'rawPath' attr after uploadDenys Mishunov2019-04-185-2/+18
| * | | | | | | | Always hides editor in Web IDE for binary filesDenys Mishunov2019-04-171-1/+1
| * | | | | | | | Passes file type down to ContentViewerDenys Mishunov2019-04-173-5/+16
* | | | | | | | | Merge branch '58850-fix-misplaced-swipe-view' into 'master'Phil Hughes2019-04-234-30/+116
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Make swipe view images line upftab2019-04-234-30/+116
|/ / / / / / / /