summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | Update rspec to 3.7Robert Speicher2018-06-072-18/+18
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rails5-enum-nil' into 'master'Sean McGivern2018-06-113-21/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable mapping to nil in enums Closes #47032 and #46279 See merge request gitlab-org/gitlab-ce!19288
| * | | | | | | | | | | | | | | | | | Enable mapping to nil in enumsJan Provaznik2018-06-063-21/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enum in Rails 5 does not map nil values - IOW nil value remains nil, even if there is a key with nil value in the enum definition. This commit overrides the underlying Enum methods so nil value is still mapped. This solution is far from being ideal: it uses dynamic definition of methods which introduces more magic/confusion into the codebase. It would be better to get rid of the nil value in enums.
* | | | | | | | | | | | | | | | | | | Merge branch '44742-tech-debt' into 'master'Phil Hughes2018-06-111-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "`TimeTrackingComparisonPane` vue component tech debt" Closes #44742 See merge request gitlab-org/gitlab-ce!19593
| * | | | | | | | | | | | | | | | | | Uses tooltip correctly in comparion_pane component. Removes incorrect usage ↵Filipa Lacerda2018-06-081-6/+5
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of aria attributes
* | | | | | | | | | | | | | | | | | Merge branch 'sh-remove-sclau-docs' into 'master'Achilleas Pipinellis2018-06-111-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove SCLAU to mirror https://gitlab.com/gitlab-org/gitlab-ee/commit/cd5cef8f84a2b8c58a741e90afec232243a9f3a9 See merge request gitlab-org/gitlab-ce!19621
| * | | | | | | | | | | | | | | | | | Remove SCLAU to mirror ↵Stan Hu2018-06-101-4/+0
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/commit/cd5cef8f84a2b8c58a741e90afec232243a9f3a9
* | | | | | | | | | | | | | | | | | Merge branch 'upgrade-gitlab-markup' into 'master'Douwe Maan2018-06-113-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gitlab-markup to fix render issue with reStructuredText See merge request gitlab-org/gitlab-ce!19596
| * | | | | | | | | | | | | | | | | Upgrade gitlab-markup to fix render issue with reStructuredTextGabriel Mazetto2018-06-083-3/+8
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'qa-wait-for-job-trace' into 'master'Grzegorz Bizon | off until 20th June2018-06-112-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update QA deploy key clone test to wait for job traces Closes gitlab-qa#269 See merge request gitlab-org/gitlab-ce!19557
| * | | | | | | | | | | | | | | | | Move qa test use of refresh selector into the job pageDJ Mountney2018-06-082-1/+6
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Update QA deploy key clone test to wait for job tracesDJ Mountney2018-06-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise if the completion status loaded before the trace, the test will fail.
* | | | | | | | | | | | | | | | | | Merge branch 'mk/authorized-push-to-protected-branch-test-qa' into 'master'Grzegorz Bizon | off until 20th June2018-06-117-56/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QA test for authorized push to protected branch See merge request gitlab-org/gitlab-ce!18696
| * | | | | | | | | | | | | | | | | | Rename method according to new role nameMichael Kozono2018-06-082-4/+4
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Reuse Push factoryMichael Kozono2018-06-083-40/+27
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Tweak scenario descriptionsMichael Kozono2018-06-081-2/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Refactor out variableMichael Kozono2018-06-081-2/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix protected branch fabricationMichael Kozono2018-06-081-0/+5
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Reduce wait timeMichael Kozono2018-06-081-4/+3
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Reduce default wait intervalMichael Kozono2018-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because if reload is true, then we spend a lot of time waiting for page load and yielding (to has_css? etc, which already waits for the default Capybara time) anyway. And if reload is false, there’s no reason not to check what’s on the page at all times. There doesn’t seem to be a downside.
| * | | | | | | | | | | | | | | | | | Remove arbitrary 5 second waitMichael Kozono2018-06-081-1/+3
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix the “no matches” optimizationMichael Kozono2018-06-081-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the subgroup doesn’t exist, this will now return false as soon as the “Sorry” text appears, instead of waiting for the default Capybara wait time.
| * | | | | | | | | | | | | | | | | | Remove unnecessary waitMichael Kozono2018-06-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, it actually seems to wait the full 60 seconds, indicating it never finds the element.
| * | | | | | | | | | | | | | | | | | Reduce spec durationMichael Kozono2018-06-081-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The former “user is able to protect a branch” test no longer has a lot of value after adding the new “authorized users are allowed to push” test, and its setup is redundant, so we may as well save QA spec time by combining them.
| * | | | | | | | | | | | | | | | | | Dry up testsMichael Kozono2018-06-081-43/+35
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add test for authorized push to protected branchMichael Kozono2018-06-081-0/+26
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'dz-jupyter-use-nip-io' into 'master'Grzegorz Bizon | off until 20th June2018-06-112-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use nip.io instead of xip.io for jupyter domain suggestion See merge request gitlab-org/gitlab-ce!19576
| * | | | | | | | | | | | | | | | | Use nip.io instead of xip.io for jupyter domain suggestionDmitriy Zaporozhets2018-06-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | | Merge branch 'blackst0ne-bump-grape-path-helpers-gem-to-1-0-5' into 'master'Stan Hu2018-06-083-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump grape-path-helpers to 1.0.5 See merge request gitlab-org/gitlab-ce!19604
| * | | | | | | | | | | | | | | | | | Bump grape-path-helpers to 1.0.5blackst0ne2018-06-083-7/+14
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'sh-log-destroy-attempt' into 'master'Robert Speicher2018-06-081-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more logging before a project is destroyed See merge request gitlab-org/gitlab-ce!19602
| * | | | | | | | | | | | | | | | | | Add more logging before a project is destroyedStan Hu2018-06-081-0/+5
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a simple log message but also allows EE to insert database events within the transaction (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6059/diffs).
* | | | | | | | | | | | | | | | | | Merge branch 'bvl-terms-on-registration' into 'master'Robert Speicher2018-06-0815-120/+248
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users can accept terms during registration Closes gitlab-ee#6262 and #47621 See merge request gitlab-org/gitlab-ce!19583
| * | | | | | | | | | | | | | | | | Users can accept terms during registrationBob Van Landuyt2018-06-0815-120/+248
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user checks the `accept` checkbox, we will track that acceptance as usual. That way they don't need to accept again after they complete the registration. When an unauthenticated user visits the `/-/users/terms` page, there is no button to accept, decline or continue. The 'current-user menu' is also hidden from the top bar.
* | | | | | | | | | | | | | | | | Merge branch 'sh-bump-google-chrome' into 'master'Mike Greiling2018-06-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Google Chrome to V67 See merge request gitlab-org/gitlab-ce!19601
| * | | | | | | | | | | | | | | | Bump Google Chrome to V67Stan Hu2018-06-081-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'fix-artifact-breadcrumb' into 'master'Annabel Gray2018-06-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix artifact breadcrumbs Closes #47587 See merge request gitlab-org/gitlab-ce!19588
| * | | | | | | | | | | | | | | Fix artifact breadcrumbClement Ho2018-06-081-2/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rs-schema-spec-parity' into 'master'Nick Thomas2018-06-081-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor schema_spec.rb for CE-EE parity and simplicity See merge request gitlab-org/gitlab-ce!19563
| * | | | | | | | | | | | | | | | Refactor schema_spec.rb for CE-EE parity and simplicityRobert Speicher2018-06-071-1/+5
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch ↵Achilleas Pipinellis2018-06-081-3/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '47532-follow-up-from-resolve-add-deploy-strategies-to-auto-devops-settings' into 'master' Resolve "Follow-up from "Resolve "Add deploy strategies to Auto DevOps settings""" Closes #47532 See merge request gitlab-org/gitlab-ce!19554
| * | | | | | | | | | | | | | | | | Copyedit Auto DevOps deployment strategy docsAchilleas Pipinellis2018-06-081-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | Add brief technical explanation for deploy strategies variablesMatija Čupić2018-06-081-0/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Link option descriptionsMatija Čupić2018-06-071-2/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add option descriptionsMatija Čupić2018-06-071-0/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add deployment strategy docsMatija Čupić2018-06-071-0/+9
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '47519-discussion-padding' into 'master'Clement Ho2018-06-081-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "discussion has a weird margin around it" Closes #47519 and #47507 See merge request gitlab-org/gitlab-ce!19569
| * | | | | | | | | | | | | | | | | Remove padding on .codeAnnabel Dunstone Gray2018-06-071-4/+0
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'update-11-0-templates' into 'master'Mayra Cabrera2018-06-0810-240/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates templates for 11.0 See merge request gitlab-org/gitlab-ce!19573
| * | | | | | | | | | | | | | | | | Updates templates for 11.0Filipa Lacerda2018-06-0810-240/+31
| | | | | | | | | | | | | | | | | |