summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | Extract variables collection item to a separate classGrzegorz Bizon2018-03-126-36/+103
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Document runner's expecations regarding variable collectionGrzegorz Bizon2018-03-121-6/+11
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Make variables collection to runner mapping explicitGrzegorz Bizon2018-03-073-7/+5
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collectionsGrzegorz Bizon2018-03-077133-125747/+302357
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (6164 commits)
| * | | | | | | | | | | | | | | | | | | Fix hash syntax in variables collection classbackstage/gb/refactor-ci-cd-variables-collectionsGrzegorz Bizon2017-09-221-2/+2
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Introduce CI/CD variables collection classGrzegorz Bizon2017-09-223-11/+132
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs-ci-build-spec-warnings' into 'master'Kamil Trzciński2018-03-151-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove RSpec warnings from `spec/models/ci/build_spec.rb` See merge request gitlab-org/gitlab-ce!17755
| * | | | | | | | | | | | | | | | | | | | Don't attempt to override a `set` with a `let`rs-ci-build-spec-warningsRobert Speicher2018-03-141-8/+8
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Don't use `not_to raise_error(SomeError)`Robert Speicher2018-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ab-44205-user_interacted_projects-migration' into 'master'Yorick Peterse2018-03-153-49/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix concurrency issue with migration for user_interacted_projects table. Closes #44205 See merge request gitlab-org/gitlab-ce!17728
| * | | | | | | | | | | | | | | | | | | | | Fix concurrency issue with migration for user_interacted_projects table.ab-44205-user_interacted_projects-migrationAndreas Brandl2018-03-143-49/+110
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The concurrency issue originates from inserts on `user_interacted_projects` from the app while running the post-deploy migration. This change comes with a strategy to lock the table while removing duplicates and creating the unique index (and similar for FK constraints). Also, we'll have a non-unique index until the post-deploy migration is finished to speed up queries during that time. Closes #44205.
* | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-fe-html' into 'master'Tim Zallmann2018-03-151-1/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add HTML style guide See merge request gitlab-org/gitlab-ce!17616
| * | | | | | | | | | | | | | | | | | | | | Add HTML style guideClement Ho2018-03-151-1/+51
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-fe-principles' into 'master'Tim Zallmann2018-03-151-1/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add frontend guide principles See merge request gitlab-org/gitlab-ce!17613
| * | | | | | | | | | | | | | | | | | | | Add frontend guide principlesClement Ho2018-03-151-1/+33
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'patch-28' into 'master'Grzegorz Bizon2018-03-151-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update README.md See merge request gitlab-org/gitlab-ce!17344
| * | | | | | | | | | | | | | | | | | | Update README.mdJohn Burak2018-02-271-2/+2
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update README.mdJohn Burak2018-02-271-4/+4
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update README.mdJohn Burak2018-02-260-0/+0
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update README.mdJohn Burak2018-02-261-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update README.mdJohn Burak2018-02-261-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update README.mdJohn Burak2018-02-261-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update README.mdJohn Burak2018-02-241-1/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'dm-mirror-hard-failed-invites' into 'master'Robert Speicher2018-03-142-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent sending an access request from failing when the project has invited masters/owners See merge request gitlab-org/gitlab-ce!17760
| * | | | | | | | | | | | | | | | | | | | Prevent sending an access request to a project from failing when the project ↵dm-mirror-hard-failed-invitesDouwe Maan2018-03-112-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has invited members
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'Robert Speicher2018-03-145-46/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix moving local, unhashed upload or pages directories during group transfer Closes #43993 See merge request gitlab-org/gitlab-ce!17658
| * | | | | | | | | | | | | | | | | | | | | Tag subgroup tests with :nested_groupsmk/fix-move-upload-files-on-group-transferMichael Kozono2018-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Remove obsolete commentMichael Kozono2018-03-131-1/+0
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Appease Metrics/AbcSize copMichael Kozono2018-03-131-18/+22
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Ensure data integrityMichael Kozono2018-03-131-1/+5
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Refactor specsMichael Kozono2018-03-132-15/+27
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fix moving local files during namespace transferMichael Kozono2018-03-135-22/+99
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-24' into 'master'Douwe Maan2018-03-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add me as proofreader See merge request gitlab-org/gitlab-ce!17593
| * | | | | | | | | | | | | | | | | | | | | | Add me as proofreaderChangHo Cha2018-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-30' into 'master'Douwe Maan2018-03-141-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add Indonesian proofreader See merge request gitlab-org/gitlab-ce!17579
| * | | | | | | | | | | | | | | | | | | | | | | add Indonesian proofreaderAhmad Naufal Mukhtar2018-03-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tz-prettier-base' into 'master'42027-hide-hover-data-in-performance-dashboard-legendFilipa Lacerda2018-03-149-14/+214
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettier Phase 1: Prettier Configuration, Prettifying of files and documentation See merge request gitlab-org/gitlab-ce!17695
| * | | | | | | | | | | | | | | | | | | | | | | | Prettier Phase 1: Prettier Configuration, Prettifying of files and documentationTim Zallmann2018-03-149-14/+214
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ci-lint-dispatcher-fix' into 'master'Filipa Lacerda2018-03-142-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change path of CI lints create index.js file Closes #44181 See merge request gitlab-org/gitlab-ce!17751
| * | | | | | | | | | | | | | | | | | | | | | | add check for ace editor on create routeci-lint-dispatcher-fixPhil Hughes2018-03-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Change path of CI lints create index.js filePhil Hughes2018-03-141-0/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the route action is create it defaults to new, this saves us having multiple files for the same route Closes #44181
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'update-net-ssh' into 'master'Douwe Maan2018-03-142-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update net-ssh 4.1.0 -> 4.2.0 (Fixes #21734) Closes #21734 See merge request gitlab-org/gitlab-ce!17688
| * | | | | | | | | | | | | | | | | | | | | | | Update net-ssh 4.1.0 -> 4.2.0 (Fixes #21734)Pirate Praveen2018-03-142-3/+3
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch '43806-update-ruby-saml-to-1.7.2' into 'master'Robert Speicher2018-03-143-10/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0 (CVE-2017-11428, CVE-2017-11430) Closes #43806 See merge request gitlab-org/gitlab-ce!17734
| * | | | | | | | | | | | | | | | | | | | | | Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0Takuya Noguchi2018-03-143-10/+15
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'update-fog-aws' into 'master'Robert Speicher2018-03-142-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update fog-aws 1.4 -> 2.0 See merge request gitlab-org/gitlab-ce!17708
| * | | | | | | | | | | | | | | | | | | | | | | update fog-aws 1.4 -> 2.0Pirate Praveen2018-03-132-6/+6
| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'update-acts-as-taggable-on' into 'master'Robert Speicher2018-03-142-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update acts-as-taggable-on to 5.0 See merge request gitlab-org/gitlab-ce!17689
| * | | | | | | | | | | | | | | | | | | | | | | | Update acts-as-taggable-on to 5.0Pirate Praveen2018-03-122-6/+6
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - only older ruby and activerecord support dropped
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'update-sentry-raven' into 'master'Douwe Maan2018-03-142-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update sentry-raven 2.5.3 -> 2.7 (Fixes #24029) Closes #24029 See merge request gitlab-org/gitlab-ce!17709