Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-23add item to chnagelogremove_diffs_from_db_ce_37639Valery Sizov
2017-10-23Add spec to prove that non-latest diff files are removed after merge an MRValery Sizov
2017-10-20Remove non-last diff_files from the databaseValery Sizov
2017-10-17Merge branch 'zj-gitaly-n-1-call-test' into 'master'Douwe Maan
Allow testing on Gitaly call count See merge request gitlab-org/gitlab-ce!14837
2017-10-17Merge branch 'fix/github-doc' into 'master'Rémy Coutable
Clarify how to resume GitHub import on docs See merge request gitlab-org/gitlab-ce!14905
2017-10-17Merge branch 'bump-git-2-13-6' into 'master'Rémy Coutable
Bump Git version to 2.13.6 See merge request gitlab-org/gitlab-ce!14906
2017-10-17Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan
Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842
2017-10-17Merge branch 'bvl-group-trees' into 'master'Douwe Maan
Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055
2017-10-17Allow configuring the circuitbreaker through the API and UIBob Van Landuyt
2017-10-17Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt
Instead of from the configuration file
2017-10-17Add existing circuitbreaker settings to the databaseBob Van Landuyt
2017-10-17Update gitaly.mdZeger-Jan van de Weg
2017-10-17Update documentationZeger-Jan van de Weg
2017-10-17Merge branch 'sprite-icon-class' into 'master'Phil Hughes
Add ability to pass class name to spriteIcon helper Closes #39079 See merge request gitlab-org/gitlab-ce!14855
2017-10-17Bump Git version to 2.13.6Balasankar C
2017-10-17clarify resuming importJames Lopez
2017-10-16Merge branch 'patch-29' into 'master'Rémy Coutable
Fix link to "Job Permissions" See merge request gitlab-org/gitlab-ce!14896
2017-10-16Merge branch '37978-extra-border-radius-while-editing-a-file' into 'master'Annabel Dunstone Gray
Remove extra border radius when editing a file Closes #37978 See merge request gitlab-org/gitlab-ce!14803
2017-10-16Remove extra border radius when editing a fileRachel Pipkin
2017-10-16Merge branch 'update-new-project-docs' into 'master'Achilleas Pipinellis
Update new project docs See merge request gitlab-org/gitlab-ce!14893
2017-10-16Fix link to "Job Permissions"Willi Rath
2017-10-16Merge branch '39035-move-gitlab-export-to-top-import-list' into 'master'Annabel Dunstone Gray
39035 Move GitLab export option to top of import list when creating a new project Closes #39035 See merge request gitlab-org/gitlab-ce!14830
2017-10-16Merge branch 'fl-autodevops-fix' into 'master'Phil Hughes
Remove banner from pipelines page Closes #38641, #39051, and #38827 See merge request gitlab-org/gitlab-ce!14849
2017-10-16Remove banner from pipelines pageFilipa Lacerda
2017-10-16Update new project docsAnnabel Dunstone Gray
2017-10-16Merge branch 'fix_global_board_routes_39073' into 'master'Douwe Maan
Remove "boards" from TOP_LEVEL_ROUTES Closes #39073 See merge request gitlab-org/gitlab-ce!14861
2017-10-16Merge branch 'sha-handling' into 'master'Douwe Maan
Adds requirements that supports anything in sha params Closes #26561 and #2709 See merge request gitlab-org/gitlab-ce!14462
2017-10-16Merge branch '39017-gitlabusagepingworker-is-not-running-on-gitlab-com' into ↵Douwe Maan
'master' Resolve "GitlabUsagePingWorker is not running on GitLab.com" See merge request gitlab-org/gitlab-ce!14867
2017-10-16Merge branch 'zj-add-performance-changelog-cat' into 'master'Robert Speicher
Add Performance category to the changelog Closes #36417 See merge request gitlab-org/gitlab-ce!14865
2017-10-16Merge branch 'ide-update-monaco' into 'master'Jacob Schatz
Upgrading Monaco Closes #38607 See merge request gitlab-org/gitlab-ce!14629
2017-10-16Merge branch 'rc-gitlab-qa-26-add-instance-mattermost-scenario' into 'master'Grzegorz Bizon
Add Test::Integration::Mattermost See merge request gitlab-org/gitlab-ce!14818
2017-10-16Merge branch 'git-env-handle-arrays' into 'master'Sean McGivern
Add Gitlab::Git::Env.to_env_hash See merge request gitlab-org/gitlab-ce!14841
2017-10-16Merge branch 'patch-19' into 'master'Sean McGivern
update postgresql requirements See merge request gitlab-org/gitlab-ce!14885
2017-10-16Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' ↵Grzegorz Bizon
into 'master' Resolve "Remove "Build failed" TODO if it has been auto-retried" Closes #38236 See merge request gitlab-org/gitlab-ce!14869
2017-10-16Move tags out to containing featureRichard Clamp
We can currently reduce the number of times we specify the tag of a given example group by moving them hoisting them up one level to the containing `feature`
2017-10-16Cleanup a stray instance variableRichard Clamp
This was added as part of the previous filtering via RSpec::Config. It should have been removed previously as part of moving the logic to specify the tags we wanted in Specs::Runner
2017-10-16Allow testing on Gitaly call countZeger-Jan van de Weg
Previous efforts were aimed at detecting N + 1 queries, general regressions are hard to find and mitigate.
2017-10-16Add Gitlab::Git::Env.to_env_hashJacob Vosmaer
2017-10-16Merge branch 'winh-indeterminate-dropdown' into 'master'Phil Hughes
Fix alignment for indeterminate marker in dropdowns Closes #38963 See merge request gitlab-org/gitlab-ce!14809
2017-10-16Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern
Conflict resolution refactor See merge request gitlab-org/gitlab-ce!14747
2017-10-16Merge branch 'fix_diff_parsing' into 'master'Sean McGivern
Fix diff parser so it tolerates to diff special markers in the content Closes #34431 See merge request gitlab-org/gitlab-ce!14848
2017-10-16Don't create build failed todo when build is retriedSean McGivern
When a build is retried automatically, we close any open todos. However, we do that _before_ creating a new build failed todo. To solve this, we check if the build is retried before creating the todo. We also ensure that the build _instance_ has the correct attribute set, without needing to reload it from the database.
2017-10-16Explicitly tag :core and :mattermost scenariosRichard Clamp
It's adding additional potentially confusing behaviour to derive test tagging from the file path, as it's not immediately apparent where that lives when considering the tests in isolation. Instead, just explicitly tag. * Remove the tagging of examples based on :file_path * Explicitly tags scenarios as :core, or :mattermost
2017-10-16Make usage ping scheduling more robustSean McGivern
On GitLab.com, we see that cron jobs sometimes don't run. This appears to be because the process that polls for current cron jobs only has a 60 second validity period, so if (for whatever reason) it misses those 60 seconds, we have to wait until the next execution. For the usage ping, this is particularly problematic, as that's only scheduled to run once a week. Changing it to run for every minute in a 10 minute period should work around this, if the above diagnosis is correct. The job itself obtains an exclusive lease for 24 hours, so rescheduling in quick succession is safe.
2017-10-16Merge branch 'gitaly-call-kwargs' into 'master'Sean McGivern
Fix confusing double usage of 'metadata' See merge request gitlab-org/gitlab-ce!14871
2017-10-16Fix confusing double usage of 'metadata'Jacob Vosmaer (GitLab)
2017-10-16Move rspec cli handling logic into Specs::RunnerRichard Clamp
Here we convert Specs::Runner#rspec to use keyword arguments[1] and pass named parameters rather than a pre-processed array of cli switches. This allows parameter to cli logic to live just in Specs::Runner. [1] https://robots.thoughtbot.com/ruby-2-keyword-arguments
2017-10-16Merge branch 'an/popen-deadline' into 'master'Sean McGivern
Popen with a timeout See merge request gitlab-org/gitlab-ce!14872
2017-10-16Popen with a timeoutAndrew Newdigate
2017-10-16Merge branch 'implements-closing-docs' into 'master'Sean McGivern
Docs for Add "implements" to the default issue closing message regex See merge request gitlab-org/gitlab-ce!14880