summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update manage_large_binaries_with_git_lfs.mdpatch-42Francis Potter2019-02-061-0/+1
* Merge branch 'winh-note_app_spec-vue-test-utils' into 'master'sh-bump-supported-ruby-versionsFatih Acet2019-02-061-81/+86
|\
| * Convert note_app_spec.js to Vue test utilsWinnie Hellmann2019-02-041-81/+86
* | Merge branch 'gt-externalize-app-views-email_rejection_mailer' into 'master'Filipa Lacerda2019-02-054-2/+10
|\ \
| * | Externalize strings from `/app/views/email_rejection_mailer`George Tsiolis2019-02-054-2/+10
* | | Merge branch '54544-update-project-topics-styling-to-use-badges-design' into ...Fatih Acet2019-02-054-4/+25
|\ \ \
| * | | Resolve "Update project topics styling to use badges design"Brandon Labuschagne2019-02-054-4/+25
|/ / /
* | | Merge branch 'patch-29' into 'master'Evan Read2019-02-051-3/+3
|\ \ \
| * | | docs: improve OpenSSH installation on Windows optionsBen Bodenmiller2019-02-051-3/+3
|/ / /
* | | Merge branch 'rd-update-last_activity_on-on-logins-and-browsing-activity-5494...Stan Hu2019-02-0511-0/+154
|\ \ \
| * | | Remove comment about needing cookie supportStan Hu2019-02-051-2/+1
| * | | Update last_activity_on for Users on some main GET endpointsRubén Dávila2019-02-0511-0/+155
* | | | Merge branch 'use-deployment-relation-to-fetch-environment-ce' into 'master'Stan Hu2019-02-053-2/+37
|\ \ \ \
| * | | | Backport: Optimize slow pipelines.js responseShinya Maeda2019-02-053-2/+37
* | | | | Merge branch 'adriel-use-svg-icon-for-deployment-series' into 'master'Phil Hughes2019-02-053-0/+99
|\ \ \ \ \
| * | | | | Use svg icon for deployment seriesAdriel Santiago2019-02-053-0/+99
* | | | | | Merge branch 'jej/avoid-csrf-check-on-saml-failure' into 'master'Rémy Coutable2019-02-053-1/+29
|\ \ \ \ \ \
| * | | | | | Avoid CSRF check on SAML failure endpointJames Edwards-Jones2019-02-043-1/+29
* | | | | | | Merge branch 'ce-reduce-diff-in-groups-update_service' into 'master'Nick Thomas2019-02-051-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Reduce diff with EE in Groups::UpdateServiceRémy Coutable2019-02-041-0/+6
* | | | | | | | Merge branch 'ce-reduce-diff-in-ci-create_pipeline_service' into 'master'Nick Thomas2019-02-054-3/+72
|\ \ \ \ \ \ \ \
| * | | | | | | | Reduce the diff with EE in Ci::CreatePipelineServiceRémy Coutable2019-02-044-3/+72
* | | | | | | | | Merge branch 'docs-operations-index' into 'master'Achilleas Pipinellis2019-02-051-0/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Docs: add index for project operationsMarcia Ramos2019-02-051-0/+11
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ce-reduce-diff-in-search-global_service' into 'master'Douglas Barbosa Alexandre2019-02-051-4/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Reduce diff with EE in Search::GlobalServiceRémy Coutable2019-02-051-4/+10
* | | | | | | | | | Merge branch 'mj/security-mr-template' into 'master'Yorick Peterse2019-02-051-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Author is Developer in sec. release MR templateMarin Jankovski2019-02-051-2/+2
* | | | | | | | | | | Merge branch 'diff-file-finder' into 'master'Filipa Lacerda2019-02-0522-304/+404
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added fuzzy file finder to merge requestsPhil Hughes2019-02-0522-304/+404
* | | | | | | | | | | | Merge branch 'jlenny-DocPagesTemplates' into 'master'Marcia Ramos2019-02-052-4/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Instructions on how to use Pages templatesJason Lenny2019-02-052-4/+18
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'bvl-codeowner-rules-model-ce' into 'master'Sean McGivern2019-02-053-27/+25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Adds helper for `find_or_create_by` in transactionBob Van Landuyt2019-02-053-27/+25
* | | | | | | | | | | | | Merge branch 'speedup-gitlab-assets-compile' into 'master'Sean McGivern2019-02-059-16/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add cache to the 'compile-assets' and 'gitlab:assets:compile' jobsRémy Coutable2019-02-057-16/+47
| * | | | | | | | | | | | Monkey-patch Sprockets to prevent cache ballooningRémy Coutable2019-02-052-0/+25
* | | | | | | | | | | | | Merge branch 'sh-encode-content-disposition' into 'master'Sean McGivern2019-02-0513-24/+129
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add Rails 6 deprecation error messageStan Hu2019-02-051-0/+7
| * | | | | | | | | | | | | Encode Content-Disposition filenamesStan Hu2019-02-0413-24/+122
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jprovazn-remove-redcarpet' into 'master'Grzegorz Bizon2019-02-0558-699/+148
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove Redcarpet markdown engineJan Provaznik2019-02-0458-699/+148
* | | | | | | | | | | | | Merge branch 'not-run-pipeline-on-empty-merge-request' into 'master'Grzegorz Bizon2019-02-054-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix false-positive specHiroyuki Sato2019-02-051-18/+18
| * | | | | | | | | | | | Move validation logic to service layerHiroyuki Sato2019-01-287-30/+26
| * | | | | | | | | | | | Make presence_of_commits_in_merge_request private methodHiroyuki Sato2019-01-251-6/+6
| * | | | | | | | | | | | Don't create merge request pipeline without commitsHiroyuki Sato2019-01-206-6/+38
* | | | | | | | | | | | | Merge branch 'fix_jira_integration_VCS1019' into 'master'Sean McGivern2019-02-053-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix comparing equality between `ActionController::Parameters` and a `Hash`....Daniel Juarez2019-02-053-1/+16
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'pl-serialize-ac-parameters' into 'master'Sean McGivern2019-02-053-6/+79
|\ \ \ \ \ \ \ \ \ \ \ \