summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | CE Port: Log impersonation actions in audit logce-port-315-log-impersonation-actions-in-audit-logmanojmj2019-07-234-4/+21
* | | | | | | | | | | Merge branch 'if-64257-active_session_lookup_key_cleanup' into 'master'Bob Van Landuyt2019-07-236-5/+102
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rake task to cleanup expired ActiveSession lookup keysif-64257-active_session_lookup_key_cleanupImre Farkas2019-07-226-5/+102
* | | | | | | | | | | | Merge branch 'extend-yamllint-ci' into 'master'Lin Jen-Shin2019-07-234-27/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Extend yamllint test to changelogsPeter Dave Hello2019-07-234-27/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'gsemet/gitlab-ce-gsemet-master-patch-33258' into 'master'Sean McGivern2019-07-236-7/+59
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add specs for specifying pipeline behaviorMatija Čupić2019-07-236-14/+55
| * | | | | | | | | | | | Multiple pipeline support for Build statusGaetan Semet2019-07-173-1/+12
* | | | | | | | | | | | | Merge branch 'georgekoltsov/64377-add-better-log-msg-to-members-mapper' into ...Ash McKenzie2019-07-233-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add changelog entrygeorgekoltsov/64377-add-better-log-msg-to-members-mapperGeorge Koltsov2019-07-232-1/+7
| * | | | | | | | | | | | Add MembersMapper#ensure_default_user! specGeorge Koltsov2019-07-171-0/+10
| * | | | | | | | | | | | Add better error message MembersMapper#ensure_default_member!George Koltsov2019-07-171-0/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'FixLocaleEN' into 'master'Bob Van Landuyt2019-07-232-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Remove duplicated mapping key in config/locales/en.ymlPeter Dave Hello2019-07-222-6/+5
* | | | | | | | | | | | Merge branch 'rm-src-branch' into 'master'Grzegorz Bizon2019-07-235-20/+124
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Refactor create_params and update_paramsrm-src-branchChristian Couder2019-07-171-23/+19
| * | | | | | | | | | | | Support rm src branch on merge w/ push optionChristian Couder2019-07-175-1/+109
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'backward-compatible-request-profiles' into 'master'Grzegorz Bizon2019-07-237-32/+130
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Bring backward compatibility for request profilesKamil Trzciński2019-07-237-32/+130
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'tz-update-stylelint' into 'master'Fatih Acet2019-07-232-214/+309
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updates all our stylelint dependenciesTim Zallmann2019-07-232-214/+309
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '6544-remove-scss-diff-ce' into 'master'Phil Hughes2019-07-233-0/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Resolve difference in app/assets/stylesheets/application.scss6544-remove-scss-diff-ceLukas Eipert2019-07-223-0/+15
* | | | | | | | | | | | Merge branch 'leipert-resolve-ee-diff' into 'master'Phil Hughes2019-07-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Port common class only used in EEleipert-resolve-ee-diffLukas Eipert2019-07-221-0/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'issue/61207' into 'master'Phil Hughes2019-07-233-20/+37
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | hoverable area on collapsed sidebar iconsMichel Engelen2019-07-233-20/+37
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'rs-fixtures-parity' into 'master'Lin Jen-Shin2019-07-231-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | CE pipelines don't respond to sourced_pipelinesrs-fixtures-parityRobert Speicher2019-07-221-3/+3
| * | | | | | | | | | | | CE-EE parity for pipelines development fixtureRobert Speicher2019-07-221-1/+13
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-7-0' into 'master'Grzegorz Bizon2019-07-232-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.7.0update-gitlab-runner-helm-chart-to-0-7-0Steve Azzopardi2019-07-192-1/+6
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sh-update-webpack-bundle-analyzer' into 'master'Kushal Pandya2019-07-232-15/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update webpack-bundle-analyzer to 3.3.2sh-update-webpack-bundle-analyzerStan Hu2019-07-222-15/+16
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs-saml-sso-updates' into 'master'Evan Read2019-07-232-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Docs: Update old SAML settings screenshotTristan Williams2019-07-232-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'pl-flat_map-qa' into 'master'Dan Davison2019-07-224-9/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | QA: Prefer `flat_map` over `map` + `flatten`Peter Leitzen2019-07-224-9/+7
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'ce-4946-resolve-ee-config' into 'master'Robert Speicher2019-07-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Port EE specific settings to CELin Jen-Shin2019-07-221-0/+1
* | | | | | | | | | | | Merge branch '64091-fix-sprockets-paths' into 'master'Stan Hu2019-07-222-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add CHANGELOG.md entryMike Greiling2019-07-221-0/+5
| * | | | | | | | | | | | Fix xterm CSS not loadingMike Greiling2019-07-221-1/+4
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sh-make-githost-json' into 'master'Mayra Cabrera2019-07-223-9/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Convert githost.log to JSON formatStan Hu2019-07-223-9/+16
* | | | | | | | | | | | | Merge branch 'group_with_cluster_factory' into 'master'Robert Speicher2019-07-222-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Adds cluster_for_group factory for convienencegroup_with_cluster_factoryThong Kuah2019-07-192-6/+6
* | | | | | | | | | | | | Merge branch 'fix-params-name-bug' into 'master'Mayra Cabrera2019-07-222-5/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add review remarksGosia Ksionek2019-07-222-5/+69
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'resolve-remaining-import-export-differences' into 'master'Robert Speicher2019-07-223-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |