summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* cache jQuery selectorph-ajax-into-axiosPhil Hughes2018-01-301-5/+7
|
* fixed issuable_spec.jsPhil Hughes2018-01-291-4/+22
|
* Converted integration_settings_form to axiosPhil Hughes2018-01-292-75/+101
|
* Converted issuable_bulk_update_actions to axiosPhil Hughes2018-01-291-9/+4
|
* Converted issuable_index to axiosPhil Hughes2018-01-291-13/+15
|
* Converted group_label_subscription to axiosPhil Hughes2018-01-291-14/+13
|
* Converted graphs_show to axiosPhil Hughes2018-01-291-7/+9
|
* Converted gl_dropdown to axiosPhil Hughes2018-01-291-19/+12
|
* Merge branch 'gitlab-git-spawn-env' into 'master'Rémy Coutable2018-01-293-23/+35
|\ | | | | | | | | Set alternate object directories in run_git See merge request gitlab-org/gitlab-ce!16715
| * Set alternate object directories in run_gitJacob Vosmaer (GitLab)2018-01-293-23/+35
|/
* Merge branch '42290-pass-BUNDLE_PATH' into 'master'Rémy Coutable2018-01-292-2/+10
|\ | | | | | | | | | | | | Resolve "Make tests running bundle install for gitaly more flexible" Closes #42290 See merge request gitlab-org/gitlab-ce!16654
| * Pass BUNDLE_PATH to install to the same path for test42290-pass-BUNDLE_PATHLin Jen-Shin2018-01-262-2/+10
| |
* | Merge branch 'sh-digital-ocean-s3-docs' into 'master'Achilleas Pipinellis2018-01-291-8/+10
|\ \ | | | | | | | | | | | | Digital Ocean Spaces now supports AWS v4 streaming API See merge request gitlab-org/gitlab-ce!16745
| * | Digital Ocean Spaces now supports AWS v4 streaming APIStan Hu2018-01-281-8/+10
|/ / | | | | | | See https://github.com/fog/fog-aws/issues/428#issuecomment-360869183
* | Merge branch 'generalize-js-toggle-buttons' into 'master'Filipa Lacerda2018-01-2612-155/+225
|\ \ | | | | | | | | | | | | Generalize toggle_buttons for JavaScript usage See merge request gitlab-org/gitlab-ce!16689
| * | Generalize toggle_buttons.jsgeneralize-js-toggle-buttonsEric Eastwood2018-01-2612-155/+225
| | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110
* | | Merge branch 'fix/issues-spec' into 'master'Stan Hu2018-01-261-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix spec failures in issues_spec.rb Closes #42488 See merge request gitlab-org/gitlab-ce!16744
| * | | Fix spec failures in issues_spec.rbAhmad Sherif2018-01-261-2/+2
| | | |
* | | | Merge branch 'cs-fix-commercial-content-check' into 'master'Robert Speicher2018-01-262-8/+15
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Include the GitLab version info when commercial content on help page is disabled Closes #42486 See merge request gitlab-org/gitlab-ce!16743
| * | | Fix #42486.Connor Shea2018-01-262-8/+15
|/ / /
* | | Merge branch ↵Douwe Maan2018-01-2611-8/+53
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | '42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error' into 'master' Resolve "Import from GitLab.com fails (destination already exists and is not an empty directory error)." Closes #42327 See merge request gitlab-org/gitlab-ce!16714
| * | update code based on feedback42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-errorJames Lopez2018-01-267-7/+16
| | |
| * | add changelogJames Lopez2018-01-261-0/+6
| | |
| * | fix specJames Lopez2018-01-261-1/+1
| | |
| * | add specJames Lopez2018-01-263-1/+14
| | |
| * | disable retry attempts for Import/Export until that is fixedJames Lopez2018-01-263-2/+13
| | |
| * | add an extra specJames Lopez2018-01-261-1/+5
| | |
| * | fix validation error on servicesJames Lopez2018-01-265-4/+6
|/ /
* | Merge branch 'fl-mr-widget-components' into 'master'Phil Hughes2018-01-267-355/+357
|\ \ | | | | | | | | | | | | Moves components into vue files: See merge request gitlab-org/gitlab-ce!16719
| * | Adds missing i18nFilipa Lacerda2018-01-261-2/+2
| | |
| * | Merge branch 'master' into fl-mr-widget-componentsFilipa Lacerda2018-01-2556-272/+451
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Open links in a new tab on the user page Improve empty project overview Make Gitaly RepositoryExists opt-out Fix .batch_lfs_pointers accepting a lazy enumerator Look for rugged with static analysis Look at notes created just before merge when deciding if an MR can be reverted Cache rubocop cache for CI Update gitlab-styles and re-enable the RSpec/SingleLineHook cop again Make Gitlab::Git::Repository#run_git private Default to HTTPS for all Gravatar URLs Handle special characters on API request of issuable templates Update secret_values to support dynamic elements within parent Add note within ux documentation that further changes should be made within the design.gitlab project Disable throwOnError in KaTeX to reveal user where is the problem
| * | | Moves components into vue files:fl-mr-widget-componentsFilipa Lacerda2018-01-257-355/+357
| | | | | | | | | | | | | | | | | | | | | | | | - mr_widget_failed_to_merge - mr_widget_merge_when_pipeline_succeeds Adds i18n
* | | | Merge branch ↵Grzegorz Bizon2018-01-266-13/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-ico' into 'master' Port some non-EE-specific config/ changes to CE Closes #42420 See merge request gitlab-org/gitlab-ce!16710
| * | | | Port some non-EE-specific config/ changes to CE42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-icoRémy Coutable2018-01-256-13/+29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'qa/ee-4698-backport' into 'master'Grzegorz Bizon2018-01-268-15/+92
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport QA changes from EE Closes gitlab-ee#4698 See merge request gitlab-org/gitlab-ce!16728
| * | | | | Pick EE for qa/qa/page/menu/side.rbqa/ee-4698-backportLin Jen-Shin2018-01-261-0/+1
| | | | | |
| * | | | | Pick the EE version for this fileLin Jen-Shin2018-01-261-5/+5
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into qa/ee-4698-backportLin Jen-Shin2018-01-269-4/+139
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: Just don't expand if it's already expanded fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec tests Fix rubocop offenses introduced in !16623 Prefer local variables over given/let Try to restore page's state Add more views check Respect the latest changes from master Add a scenario for adding secret variables
| * | | | | | Backport QA changes from EEGabriel Mazetto2018-01-268-11/+87
| | | | | | |
* | | | | | | Merge branch 'filipefreire_155' into 'master'Rémy Coutable2018-01-264-0/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-qa !155 - push creates event on activity page See merge request gitlab-org/gitlab-ce!16423
| * \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into ↵Filipe Freire2018-01-251-2/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | filipefreire_155
| * \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into ↵Filipe Freire2018-01-25969-9131/+15572
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | filipefreire_155
| * | | | | | | | improve push events selector in activity.rbFilipe Freire2018-01-181-5/+1
| | | | | | | | |
| * | | | | | | | improve interaction with activity on side.rbFilipe Freire2018-01-181-1/+3
| | | | | | | | |
| * | | | | | | | improvements after CRFilipe Freire2018-01-165-28/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + move activity click to side.rb + add element check on activity.rb + minor fixes
| * | | | | | | | Merge branch 'filipefreire_155' of https://gitlab.com/filipefreire/gitlab-ce ↵Filipe Freire2018-01-160-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into filipefreire_155
| | * \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into ↵Filipe Freire2018-01-16256-2086/+4021
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filipefreire_155
| * | \ \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into ↵Filipe Freire2018-01-16256-2086/+4021
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / / filipefreire_155
| * | | | | | | | | improvement after CRFilipe Freire2018-01-124-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - test reaches Activity page - the actual git push seems to be failing - had problems with defining selectors
| * | | | | | | | | improvements after CRFilipe Freire2018-01-122-9/+8
| | | | | | | | | |
View Lorry Controller Status