summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add more info on artifacts expiry datedocs/expiring-artifactsAchilleas Pipinellis2017-06-062-9/+53
* Merge branch 'docs/registry-self-sign' into 'master'Sean Packham2017-06-061-10/+20
|\
| * Add info on using self-signed certs with RegistryAchilleas Pipinellis2017-06-061-10/+20
* | Merge branch 'docs/powershell-ci-vars' into 'master'Sean Packham2017-06-062-4/+49
|\ \ | |/ |/|
| * Add PowerShell to CI variable docsdocs/powershell-ci-varsJohn Spaetzel2017-06-062-4/+49
* | Merge branch '32642_last_commit_id_in_file_api' into 'master'Grzegorz Bizon2017-06-064-2/+33
|\ \
| * | Introduce optimistic locking support via optional parameter last_commit_id on...Roman Safronov2017-06-064-2/+33
|/ /
* | Merge branch '29271-fix-pages-numeric-domain' into 'master'Grzegorz Bizon2017-06-063-33/+26
|\ \
| * | Allow numeric pages domainDrew Blessing2017-06-063-33/+26
* | | Merge branch 'fix_explanation_of_job_level_variable_override' into 'master'Grzegorz Bizon2017-06-062-2/+2
|\ \ \
| * | | Update explanation of job-level variable override to fit exampleTor Bechmann Yamamoto-Sørensen2017-06-062-2/+2
* | | | Merge branch '14707-allow-activity-feed-to-be-accessible-through-api' into 'm...Rémy Coutable2017-06-0615-443/+721
|\ \ \ \ | |_|_|/ |/| | |
| * | | Accept a username for User-level Events APIMark Fletcher2017-06-063-3/+12
| * | | Introduce an Events APIMark Fletcher2017-06-0615-443/+712
| | |/ | |/|
* | | Merge branch '23643-responsive-environment-tables' into 'master'Phil Hughes2017-06-0615-123/+232
|\ \ \ | |/ / |/| |
| * | Responsive environment tablesAnnabel Dunstone Gray2017-06-0615-123/+232
|/ /
* | Merge branch '33340-fix-broken-master' into 'master'Sean McGivern2017-06-061-2/+2
|\ \
| * | Fix Projects API spec33340-fix-broken-masterRémy Coutable2017-06-061-2/+2
* | | Merge branch 'evn-crosslink-to-architecture' into 'master'Achilleas Pipinellis2017-06-061-3/+5
|\ \ \
| * | | Per discussionevn-crosslink-to-architectureErnst van Nierop2017-05-221-1/+1
| * | | Make sketch dynamic and link back to production architectureernstvn2017-05-221-3/+5
* | | | Merge branch 'docs/remove-ref-to-wheel-settings' into 'master'Sean Packham2017-06-067-32/+14
|\ \ \ \
| * | | | Remove references to old settings locationAchilleas Pipinellis2017-06-067-32/+14
|/ / / /
* | | | Merge branch '30156-api-environment-info-missed' into 'master'Achilleas Pipinellis2017-06-062-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Resolve "API: Environment info missed"Sébastien2017-06-062-0/+1
|/ / /
* | | Merge branch '32236-fix-typo-in-helm-chart-installation-doc' into 'master'Achilleas Pipinellis2017-06-061-2/+2
|\ \ \
| * | | Fix typo on namespaceSébastien2017-06-031-2/+2
* | | | Merge branch 'dz-backport-codeclimate-docs' into 'master'Achilleas Pipinellis2017-06-061-3/+9
|\ \ \ \
| * | | | Fix link to ee code quality docdz-backport-codeclimate-docsDmitriy Zaporozhets2017-06-051-1/+1
| * | | | Backport CI codeclimate example doc change from EEDmitriy Zaporozhets2017-06-051-3/+9
* | | | | Merge branch 'add-note-on-body-size' into 'master'Achilleas Pipinellis2017-06-061-1/+3
|\ \ \ \ \
| * | | | | Update gitlab_chart.mdadd-note-on-body-sizeJoshua Lambert2017-06-051-1/+3
* | | | | | Merge branch 'patch-23' into 'master'Achilleas Pipinellis2017-06-061-1/+1
|\ \ \ \ \ \
| * | | | | | Corrected spelling mistake in permissions.md "it total" -> "in total".Andrew Featherstone2017-06-051-1/+1
* | | | | | | Merge branch 'docs/fix-headings-for-seo' into 'master'Achilleas Pipinellis2017-06-061-4/+4
|\ \ \ \ \ \ \
| * | | | | | | change headings to improve SEOdocs/fix-headings-for-seoMarcia Ramos2017-06-061-4/+4
* | | | | | | | Merge branch '24032-when-changing-project-visibility-setting-change-other-dro...Phil Hughes2017-06-0610-17/+95
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve "When changing project visibility setting, change other dropdowns aut...Mike Greiling2017-06-0610-17/+95
|/ / / / / / / /
* | | | | | | | Merge branch 'issue-23254' into 'master'Rémy Coutable2017-06-063-8/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed style on unsubscribe pageGustav Ernberg2017-06-033-8/+10
* | | | | | | | | Merge branch 'sh-fix-typo-user-activity-service' into 'master'Rémy Coutable2017-06-061-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fix typo in user activity debug log messagesh-fix-typo-user-activity-serviceStan Hu2017-06-031-1/+1
* | | | | | | | | Merge branch '29690-rotate-otp-key-base' into 'master'Brian Neel2017-06-065-0/+256
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add a Rake task to aid in rotating otp_key_baseNick Thomas2017-06-055-0/+256
* | | | | | | | | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'Douwe Maan2017-06-0515-71/+143
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | backports changed import logic from pull mirroring feature into CETiago Botelho2017-06-0515-71/+143
* | | | | | | | | | Merge branch '33321-spec-failure-in-spec-javascripts-pipelines-header_compone...Robert Speicher2017-06-051-1/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix header component spec33321-spec-failure-in-spec-javascripts-pipelines-header_component_spec-js-46-expected-failed-pipeline-123-triggered-4-weeks-ago-by-foo-to-equal-failed-pipeline-123-triggered-3-weeks-ago-by-fooClement Ho2017-06-051-1/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'mk-fix-git-over-http-rejections' into 'master'Douwe Maan2017-06-0518-537/+887
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unnecessary variablemk-fix-git-over-http-rejectionsMichael Kozono2017-06-051-3/+1