summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move a spec related to merge requests out of a feature related to issuesrs-move-mr-slash-command-spec-from-issuesRobert Speicher2017-07-202-26/+18
|
* Update CHANGELOG.md for 9.3.9James Edwards-Jones2017-07-201-0/+4
| | | [ci skip]
* Merge branch 'pawel/prometheus_multiproc_dir_documentation' into 'master'Filipa Lacerda2017-07-202-6/+25
|\ | | | | | | | | Documentation and link to explanation of prometheus_multiproc_dir See merge request !12956
| * Documentation and link to explanation of prometheus_multiproc_dirpawel/prometheus_multiproc_dir_documentationPawel Chojnacki2017-07-202-6/+25
| | | | | | | | - Change the wording a little bit
* | Merge branch '5971-webhook-testing' into 'master'Rémy Coutable2017-07-2044-130/+663
|\ \ | | | | | | | | | | | | | | | | | | Wrong data type when testing webhooks Closes #5971 See merge request !11728
| * | Wrong data type when testing webhooksAlexander Randa2017-07-2044-130/+663
|/ /
* | Merge branch '34174_add_french_translations_of_commits_page' into 'master'Rémy Coutable2017-07-202-28/+1099
|\ \ | | | | | | | | | | | | | | | | | | Add French translations of Commits Page & Pipeline Charts Closes #34174 and #34794 See merge request !12409
| * | Add French translations of Commits Page & Pipeline ChartsHuang Tao2017-07-202-28/+1099
|/ /
* | Merge branch 'feature/send-diff-limits-to-gitaly' into 'master'Robert Speicher2017-07-209-31/+75
|\ \ | | | | | | | | | | | | Migrate DiffCollection limiting logic to Gitaly See merge request !12867
| * | Migrate DiffCollection limiting logic to Gitalyfeature/send-diff-limits-to-gitalyAhmad Sherif2017-07-199-31/+75
| | |
* | | Merge branch 'rc/cob-backport-ce-to-ee-fix' into 'master'Robert Speicher2017-07-201-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix logger disabling on the CI: instantiate an ActiveSupport::TaggedLogging See merge request !12987
| * | | Fix logger disabling on the CI: instantiate an ActiveSupport::TaggedLoggingrc/cob-backport-ce-to-ee-fixRémy Coutable2017-07-201-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'rc/leverage-new-cache-policies' into 'master'Kamil Trzciński2017-07-201-28/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Leverage the new cache policies in .gitlab-ci.yml See merge request !12978
| * | | | The setup-test-env should push and pull the default cacherc/leverage-new-cache-policiesRémy Coutable2017-07-201-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Leverage the new cache policies in .gitlab-ci.ymlRémy Coutable2017-07-191-28/+62
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '34999_add_japanese_translations_of_pipeline_schedules' into ↵Rémy Coutable2017-07-201-3/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add Japanese translations of Pipeline Schedules Closes #34999 See merge request !12826
| * | | | | Add Japanese translations of Pipeline SchedulesHuang Tao2017-07-201-3/+23
|/ / / / /
* | | | | Merge branch 'migration-status' into 'master'Rémy Coutable2017-07-201-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add option to specify migration status on at the migration site See merge request !12976
| * | | | | Add option to specify migration status on at the migration sitemigration-statusAndrew Newdigate2017-07-191-2/+2
| | | | | |
* | | | | | Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'Kamil Trzciński2017-07-206-6/+97
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix docker tag reference routing constraints Closes #35220 and gitlab-com/support-forum#2246 See merge request !12961
| * | | | | | Add a changelog entry for docker tag routing fixfix/gb/fix-container-registry-tag-routingGrzegorz Bizon2017-07-191-0/+4
| | | | | | |
| * | | | | | Add a test for container repository name regexpGrzegorz Bizon2017-07-192-0/+15
| | | | | | |
| * | | | | | Fix docker tag reference routing constraintsGrzegorz Bizon2017-07-194-6/+78
| | | | | | |
* | | | | | | Merge branch 'feature/gb/auto-retry-failed-ci-job' into 'master'Kamil Trzciński2017-07-2011-5/+236
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to auto retry a failed CI/CD job Closes #3442 See merge request !12909
| * | | | | | | Change auto-retry count to a correct value in docsGrzegorz Bizon2017-07-202-4/+4
| | | | | | | |
| * | | | | | | Fix CI/CD job auto-retry specsfeature/gb/auto-retry-failed-ci-jobGrzegorz Bizon2017-07-202-4/+4
| | | | | | | |
| * | | | | | | Do not allow to auto-retry a job more than 2 timesGrzegorz Bizon2017-07-193-3/+3
| | | | | | | |
| * | | | | | | Update changelog entry for a auto-retry of CI/CD jobsGrzegorz Bizon2017-07-191-1/+1
| | | | | | | |
| * | | | | | | Add basic docs for CI/CD job auto-retry featureGrzegorz Bizon2017-07-181-0/+26
| | | | | | | |
| * | | | | | | Add changelog entry for auto-retry of CI/CD job featureGrzegorz Bizon2017-07-181-0/+4
| | | | | | | |
| * | | | | | | Add specs for pipeline process with auto-retriesGrzegorz Bizon2017-07-172-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also resolve a possible race condition - a next stage should not start until are retries are done in a previous one.
| * | | | | | | Add specs seeding jobs with auto-retries configuredGrzegorz Bizon2017-07-171-0/+14
| | | | | | | |
| * | | | | | | Make it possible to auto retry a failed CI/CD jobGrzegorz Bizon2017-07-172-1/+42
| | | | | | | |
| * | | | | | | Make it possible to count a number of job retriesGrzegorz Bizon2017-07-173-0/+53
| | | | | | | |
| * | | | | | | Add a new `retry` CI/CD configuration keywordGrzegorz Bizon2017-07-174-4/+70
| | | | | | | |
* | | | | | | | Merge branch 'backstage/gb/build-stage-id-ref-bg-migration-cleanup' into ↵Yorick Peterse2017-07-204-4/+56
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Implement build stage_id reference migration clean up Closes #34893 See merge request !12785
| * | | | | | | | Fix background migration cleanup specsGrzegorz Bizon2017-07-201-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to use a spy because an `after` RSpec hook is also going to call the migration we want to test, so we need to use `have_received` expectation. See gitlab-org/gitlab-ce#35351 for more details.
| * | | | | | | | Merge branch 'master' into backstage/gb/build-stage-id-ref-bg-migration-cleanupbackstage/gb/build-stage-id-ref-bg-migration-cleanupGrzegorz Bizon2017-07-19129-336/+3792
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (59 commits) Resolve "Clarify k8s service keys" Add Portuguese Brazil translations of Commits Page & Pipeline Charts Add Japanese Translation to i18n Update Prometheus gem to version that explicitly calls `munmap` Simplify width for dropdown-menu on mobile Update CHANGELOG.md for 9.3.7 Remove developer documentation about not describing symbols Incorporate Gitaly's Commits#between RPC Adapt to new Gitaly commit message format Remove transitions on nav link hover Provide option to trigger build only for official CE and EE repos in .com Fix queries duration sorting in Performance Bar Rename Project nav items Add structured logging for Rails processes Disable Rails logging in CI test environments Fix download artifacts button alignment Update avatar border to be opaque for better stacking Fixed typos Fix typos Fix external issue trackers redirect ... Conflicts: db/schema.rb
| * | | | | | | | | Isolate stage_id reference clean up migrationGrzegorz Bizon2017-07-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addreses a review remarks discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12785/diffs#note_35276344
| * | | | | | | | | Fix database schema version numberGrzegorz Bizon2017-07-181-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix background migrations module specsGrzegorz Bizon2017-07-181-3/+3
| | | | | | | | | |
| * | | | | | | | | Remove migration dependency from stage_id migrationGrzegorz Bizon2017-07-182-5/+3
| | | | | | | | | |
| * | | | | | | | | Remove obsolete argument from bg migrations codeGrzegorz Bizon2017-07-181-1/+1
| | | | | | | | | |
| * | | | | | | | | Add specs for stage_id reference cleanup migrationGrzegorz Bizon2017-07-181-11/+18
| | | | | | | | | |
| * | | | | | | | | Add pending set of specs for stage_id cleanup migrationGrzegorz Bizon2017-07-181-0/+22
| | | | | | | | | |
| * | | | | | | | | Rename stage_id reference clean up migrationGrzegorz Bizon2017-07-181-1/+1
| | | | | | | | | |
| * | | | | | | | | Implement build stage_id reference migration clean upGrzegorz Bizon2017-07-182-1/+22
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '34036-sidebar-mobile' into 'master'Phil Hughes2017-07-2010-43/+164
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Navigation - Add contextual navigation on mobile" Closes #34036 See merge request !12944
| * | | | | | | | Fix JS; make buttons sr accessibile; fix overlayAnnabel Dunstone Gray2017-07-198-15/+24
| | | | | | | | |
| * | | | | | | | Fix eslintAnnabel Dunstone Gray2017-07-182-2/+2
| | | | | | | | |
View Lorry Controller Status