summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add cop for use of remove_columnadd-remove-column-copSean McGivern2017-12-1117-0/+118
* Merge branch 'docs/fix-header-level' into 'master'Achilleas Pipinellis2017-12-111-1/+1
|\
| * Remove a header level in the new 'Automatic CE->EE merge' docRémy Coutable2017-12-111-1/+1
* | Merge branch 'bvl-circuitbreaker-metrics' into 'master'Douwe Maan2017-12-112-2/+25
|\ \
| * | Keep track of storage check timingsBob Van Landuyt2017-12-112-2/+25
* | | Merge branch 'qa/gb/improve-multi-project-pipeline-omnibus-script' into 'master'Grzegorz Bizon2017-12-111-1/+1
|\ \ \ | |/ / |/| |
| * | Do not raise when downstream pipeline is createdqa/gb/improve-multi-project-pipeline-omnibus-scriptGrzegorz Bizon2017-12-111-1/+1
* | | Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-1114-46/+231
|\ \ \ | |_|/ |/| |
| * | Resolve conflicts in app/models/user.rbmk-pick-10-2-4-security-fixesDouwe Maan2017-12-111-27/+7
| * | Manually add 10.2.4 changelog entriesMichael Kozono2017-12-084-15/+11
| * | Merge branch 'note-preview' into 'security-10-2'Fatih Acet2017-12-082-1/+17
| * | Merge branch 'issue_30663' into 'security-10-2'Sean McGivern2017-12-083-0/+21
| * | Merge branch 'rs-security-group-api' into 'security-10-2'Douwe Maan2017-12-083-2/+82
| * | Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'Douwe Maan2017-12-084-28/+60
| * | Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into ...Douwe Maan2017-12-084-11/+71
| |/
* | Merge branch 'recaptcha_check_if_spammable_ce_backport' into 'master'Sean McGivern2017-12-111-2/+8
|\ \
| * | Add recaptcha_check_if_spammable for issualbes than arent spammablesrecaptcha_check_if_spammable_ce_backportLuke Bennett2017-12-081-2/+8
* | | Merge branch 'bw-todo-count-expiration' into 'master'Sean McGivern2017-12-111-2/+2
|\ \ \
| * | | expire todo count calculations to be consistent withbw-todo-count-expirationBrett Walker2017-12-081-2/+2
* | | | Merge branch 'qa_extract_push_to_scenario' into 'master'Grzegorz Bizon2017-12-113-15/+55
|\ \ \ \
| * | | | Check if user is in project page before performing a pushqa_extract_push_to_scenarioFelipe Artur2017-12-071-0/+7
| * | | | Turn push file into a scenarioFelipe Artur2017-12-073-15/+48
* | | | | Merge branch 'fix-image-view-mode' into 'master'Filipa Lacerda2017-12-112-2/+14
|\ \ \ \ \
| * | | | | Fix image view modeClement Ho2017-12-112-2/+14
|/ / / / /
* | | | | Merge branch 'es-module-compare' into 'master'Filipa Lacerda2017-12-114-86/+73
|\ \ \ \ \
| * | | | | revert arrow function changees-module-compareMike Greiling2017-11-301-1/+1
| * | | | | convert CompareAutocomplete from class definition into simple function call, ...Mike Greiling2017-11-303-65/+56
| * | | | | convert Compare class into ES module import/export syntaxMike Greiling2017-11-303-4/+3
| * | | | | refactor Compare class to ES class syntaxMike Greiling2017-11-301-18/+16
| * | | | | remove commits.js import form main.js (related to !14735)Mike Greiling2017-11-301-1/+0
* | | | | | Merge branch 'sh-fix-import-rake-task' into 'master'James Lopez2017-12-115-0/+32
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Remove the need for destroy and add a comment in the specStan Hu2017-12-101-4/+3
| * | | | | Use build instead of create in importer specStan Hu2017-12-101-1/+1
| * | | | | Simplify normalizing of pathsStan Hu2017-12-101-4/+3
| * | | | | Fix failing importer test case on MySQL due to missing trailing slash in root...sh-fix-import-rake-taskStan Hu2017-12-083-1/+15
| * | | | | Fix gitlab:import:repos Rake task moving repositories into the wrong locationStan Hu2017-12-083-0/+20
|/ / / / /
* | | | | Merge branch 'docs/improve-limit-conflicts-with-ee' into 'master'Robert Speicher2017-12-087-355/+110
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add "Guidelines for implementing Enterprise Edition features" in CE developme...docs/improve-limit-conflicts-with-eeRémy Coutable2017-12-061-0/+1
| * | | | Address Robert's and Axil's feedbackRémy Coutable2017-12-064-15/+17
| * | | | Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"Rémy Coutable2017-12-056-353/+105
* | | | | Merge branch '35385-allow-git-pull-push-on-project-redirects' into 'master'Douwe Maan2017-12-0820-52/+510
|\ \ \ \ \
| * | | | | Allow git pull/push on project redirectsMayra Cabrera2017-12-0820-52/+510
|/ / / / /
* | | | | Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master'Mike Greiling2017-12-0812-38/+199
|\ \ \ \ \
| * | | | | Reduce the size of the deploy flag when there's no tag available38032-deploy-markers-should-be-more-verboseJose Ivan Vargas2017-12-071-3/+11
| * | | | | Changed the deploy markers on the prometheus dashboard to be more verboseJose Ivan Vargas2017-12-0712-38/+191
* | | | | | Merge branch '40031-include-assset_sync-gem' into 'master'Douwe Maan2017-12-084-0/+45
|\ \ \ \ \ \
| * | | | | | Resolve "Include asset_sync gem"Ian Baum2017-12-084-0/+45
|/ / / / / /
* | | | | | Merge branch 'fix-event-target-author-preloading' into 'master'Douwe Maan2017-12-082-1/+6
|\ \ \ \ \ \
| * | | | | | Fix N+1 query when displaying eventsfix-event-target-author-preloadingYorick Peterse2017-12-082-1/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jprovazn-ignore-anchors' into 'master'Sean McGivern2017-12-084-0/+23
|\ \ \ \ \ \
View Lorry Controller Status