summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update new project docsupdate-new-project-docsAnnabel Dunstone Gray2017-10-162-1/+1
|
* Merge branch 'fix_global_board_routes_39073' into 'master'Douwe Maan2017-10-164-16/+20
|\ | | | | | | | | | | | | Remove "boards" from TOP_LEVEL_ROUTES Closes #39073 See merge request gitlab-org/gitlab-ce!14861
| * Fix feature specs for new scoped urls for boardsfix_global_board_routes_39073Valery Sizov2017-10-131-2/+2
| |
| * Add a changelog itemValery Sizov2017-10-131-0/+5
| |
| * Remove boards from the list of reserved top pathsValery Sizov2017-10-131-1/+0
| |
| * Move global boards routes under "-" scopeValery Sizov2017-10-131-13/+13
| |
* | Merge branch 'sha-handling' into 'master'Douwe Maan2017-10-169-28/+33
|\ \ | | | | | | | | | | | | | | | | | | Adds requirements that supports anything in sha params Closes #26561 and #2709 See merge request gitlab-org/gitlab-ce!14462
| * | Adds requirements that supports anything in sha paramsGuilherme Vieira2017-10-129-28/+33
| | |
* | | Merge branch '39017-gitlabusagepingworker-is-not-running-on-gitlab-com' into ↵Douwe Maan2017-10-162-5/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "GitlabUsagePingWorker is not running on GitLab.com" See merge request gitlab-org/gitlab-ce!14867
| * | | Make usage ping scheduling more robust39017-gitlabusagepingworker-is-not-running-on-gitlab-comSean McGivern2017-10-162-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'zj-add-performance-changelog-cat' into 'master'Robert Speicher2017-10-163-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Performance category to the changelog Closes #36417 See merge request gitlab-org/gitlab-ce!14865
| * | | | Add Performance category to the changelogZeger-Jan van de Weg2017-10-133-1/+7
| | |_|/ | |/| | | | | | | | | | Resolves gitlab-org/gitlab-ce#36417
* | | | Merge branch 'ide-update-monaco' into 'master'Jacob Schatz2017-10-164-6/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrading Monaco Closes #38607 See merge request gitlab-org/gitlab-ce!14629
| * | | | Fixes the Problem with the Repo Editor Loading Typescript Serviceside-update-monacoTim Zallmann2017-10-122-2/+3
| | | | |
| * | | | Upgraded MonacoTim Zallmann2017-10-052-4/+4
| | | | |
* | | | | Merge branch 'rc-gitlab-qa-26-add-instance-mattermost-scenario' into 'master'Grzegorz Bizon2017-10-1610-21/+87
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Test::Integration::Mattermost See merge request gitlab-org/gitlab-ce!14818
| * | | | | Move tags out to containing featureRichard Clamp2017-10-165-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`
| * | | | | Cleanup a stray instance variableRichard Clamp2017-10-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Explicitly tag :core and :mattermost scenariosRichard Clamp2017-10-166-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Move rspec cli handling logic into Specs::RunnerRichard Clamp2017-10-162-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Update commentRichard Clamp2017-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Entrypoint is intended as a base class, so mention that in the comment.
| * | | | | Simplify tag specificationRichard Clamp2017-10-134-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by Grzegorz, we can be more declarative in our configuration of the tags the Entrypoint cares about Here we add a tags method to the entrypoint class, and use that to declare the tags an entrypoint is interested in (:core for the existing Test::Instance, :core and :mattermost for Test::Integration::Mattermost) We declare everything in specs/features that isn't in specs/features/mattermost, to have the tag :core, though that clean up better if we move the integration tests out of specs/features.
| * | | | | Fixup company nameRichard Clamp2017-10-131-1/+1
| | | | | |
| * | | | | Add Test::Integration::MattermostRichard Clamp2017-10-136-15/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here we add a new entrypoint for the test suite, Test::Integration::Mattermost. It is to ensure that mattermost integration is working when enabling the embedded mattermost of gitlab-omnibus It runs all the example groups from Test::Instance, in addition to any groups tagged :mattermost * Extracts a common entrypoint class from Test::Instance as Scenario::Entrypoint, and uses that as the base for Test::Instance and Test::Integration::Mattermost * RSpec groups defined in `specs/features/mattermost/**_spec.rb` are tagged with :mattermost so they can be filtered out of the default run. * Tests tagged :mattermost are filtered out by default, and are un-filtered by Test::Integration::Mattermost
* | | | | | Merge branch 'git-env-handle-arrays' into 'master'Sean McGivern2017-10-163-6/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::Git::Env.to_env_hash See merge request gitlab-org/gitlab-ce!14841
| * | | | | | Add Gitlab::Git::Env.to_env_hashJacob Vosmaer2017-10-163-6/+49
| | | | | | |
* | | | | | | Merge branch 'patch-19' into 'master'Sean McGivern2017-10-161-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update postgresql requirements See merge request gitlab-org/gitlab-ce!14885
| * | | | | | | update postgresql requirementsBen Bodenmiller2017-10-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | | Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' ↵Grzegorz Bizon2017-10-165-6/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Remove "Build failed" TODO if it has been auto-retried" Closes #38236 See merge request gitlab-org/gitlab-ce!14869
| * | | | | | | | Don't create build failed todo when build is retried38236-remove-build-failed-todo-if-it-has-been-auto-retriedSean McGivern2017-10-165-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge branch 'winh-indeterminate-dropdown' into 'master'Phil Hughes2017-10-162-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment for indeterminate marker in dropdowns Closes #38963 See merge request gitlab-org/gitlab-ce!14809
| * | | | | | | | | Fix alignment for indeterminate marker in dropdownswinh-indeterminate-dropdownWinnie Hellmann2017-10-112-0/+6
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-1628-345/+420
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflict resolution refactor See merge request gitlab-org/gitlab-ce!14747
| * | | | | | | | | Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-1212-43/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having a distinct class just for that was a bit overkill
| * | | | | | | | | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-1224-323/+334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename classes to (hopefully) clearer names while we're doing that.
| * | | | | | | | | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-1218-300/+388
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553
| * | | | | | | | | Clean hierarchy of calls between models and Gitalb::Git for blob searchAlejandro Rodríguez2017-10-122-3/+5
| | | | | | | | | |
| * | | | | | | | | Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-1210-20/+20
| | | | | | | | | |
| * | | | | | | | | Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-123-60/+52
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix_diff_parsing' into 'master'Sean McGivern2017-10-163-1/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix diff parser so it tolerates to diff special markers in the content Closes #34431 See merge request gitlab-org/gitlab-ce!14848
| * | | | | | | | | | add a changelog itemfix_diff_parsingValery Sizov2017-10-151-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Fix diff parser so it tolerates to diff special markers in the contentValery Sizov2017-10-152-1/+20
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gitaly-call-kwargs' into 'master'Sean McGivern2017-10-161-4/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix confusing double usage of 'metadata' See merge request gitlab-org/gitlab-ce!14871
| * | | | | | | | | | Fix confusing double usage of 'metadata'Jacob Vosmaer (GitLab)2017-10-161-4/+16
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'an/popen-deadline' into 'master'Sean McGivern2017-10-165-1/+208
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Popen with a timeout See merge request gitlab-org/gitlab-ce!14872
| * | | | | | | | | | Popen with a timeoutAndrew Newdigate2017-10-165-1/+208
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'implements-closing-docs' into 'master'Sean McGivern2017-10-161-1/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs for Add "implements" to the default issue closing message regex See merge request gitlab-org/gitlab-ce!14880
| * | | | | | | | | | Update automatic_issue_closing.mdimplements-closing-docsVictor Wu2017-10-131-1/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'backport-milestone-select-change' into 'master'Filipa Lacerda2017-10-161-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport a change in milestone_select from EE See merge request gitlab-org/gitlab-ce!14878
| * | | | | | | | | | | Backport a change in milestone_select from EEbackport-milestone-select-changePhil Hughes2017-10-131-0/+2
| |/ / / / / / / / / /
View Lorry Controller Status