summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Gitaly restoretest-backup-restoreAhmad Hassan2018-04-281-50/+53
|
* Merge branch 'ee-5514-fix-epic-collapsed-sidebar-label-click' into 'master'Filipa Lacerda2018-04-271-1/+1
|\ | | | | | | | | CE Backport: Reveal labels dropdown when labels icon is clicked on collapsed Epic sidebar See merge request gitlab-org/gitlab-ce!18611
| * Export class as defaultKushal Pandya2018-04-271-1/+1
| |
* | Merge branch 'qa-add-more-key-tests' into 'master'Grzegorz Bizon2018-04-2730-132/+270
|\ \ | |/ |/| | | | | | | | | Add more QA SSH key tests Closes gitlab-qa#183 See merge request gitlab-org/gitlab-ce!17662
| * Merge remote-tracking branch 'upstream/master' into qa-add-more-key-testsLin Jen-Shin2018-04-25102-289/+690
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (36 commits) Change language to be more inclusive of those with accessibility requirements Show group id in group settings Cleanup after adding MR diff's commit_count (try 2) Mock Pager in Karma tests Backport dev env check for storage settings deprecation Do not preload settings Update import on actions file to fix conflict when rewire plugin was added Broken link fix Make /copy_metadata only handle the first issuable passed Allow admins to push to empty repos Only show push-to-master authorized users Add documentation about resetting the runner registration token Document externally hosted LFS objects Align project avatar on small viewports fix CI BABEL_ENV variable document the spyOnDependency method disable sourcemaps when generating coverage report to avoid out-of-memory errors only apply rewire plugin when running karma tests fix illegal references to "this" in module context add default exports to prevent rewire plugin from breaking vuex ...
| * | Use remote_branch insteadLin Jen-Shin2018-04-251-2/+4
| | |
| * | Merge remote-tracking branch 'upstream/master' into qa-add-more-key-testsLin Jen-Shin2018-04-24312-1558/+3659
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (86 commits) Fix unassign slash command preview Add CHANGELOG entry Show Runner's description on job's page Fix an N+1 for MRs from forks on the MR index page Improve documentation of SSRF protection Replace find file project spinach tests with RSpec Fix docs typo for ci/lint [Backport] Burndown chart for group milestone Bump lograge to 0.10.0 and remove monkey patch Add Capybara debugging methods to docs Update CHANGELOG.md for 10.7.1 Add missing changelog entry Resolve "Avatar URLs are wrong when using a CDN path and Object Storage" Fix users not seeing labels from private groups when being a member of a child project Update doorkeeper for: Update links to /ci/lint with ones to project ci/lint Resolve "Namespace factory is problematic" Auth::User classes refactor adds should_save? Replace define_method with alias_method in Omniauth Controllers Describe workaround when restore fails because of `Errno::EBUSY` ...
| * | | Rename location to uri; Handle uri for HTTP; Fix pushing remoteLin Jen-Shin2018-04-246-18/+24
| | | |
| * | | Merge remote-tracking branch 'upstream/master' into qa-add-more-key-testsLin Jen-Shin2018-04-23610-3929/+10424
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (166 commits) Flowdock uses Gitaly, not Grit Removes 'no job log' from trace action Fix missing namespace for some internal users Dedupe yarn dependencies Downgrade MySQL CI service from 8.0 to 5.7 Atomic internal ids for all models Add documentation on how to configure Redis Sentinel by persistent class Update CHANGELOG.md for 10.7.0 Update index.md Resolve "Text from the diff is showing within a table header inside the discussion after the discussion is resolved" Don't include lfs_file_locks data in export bundle Documentation: Frontend Building Checklist Fix a documentation typo for GitLab pages Refactored activity calendar Add an API endpoint to download git repository snapshots Fix issues without links when added from boards new issue modal Respect visibility options and description when importing project from template Resolve "Improve tooltips of collapsed sidebars" Update Container Scanning documentation Fix typo in vue.md ...
| * | | | Use all_elements insteadLin Jen-Shin2018-04-231-2/+2
| | | | |
| * | | | Use qa selectors for secret variablesLin Jen-Shin2018-04-212-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem of using .js-ci-variable-input-value is that, whenever the value is hidden, then this selector won't be set, instead, .js-secret-value-placeholder would be set. If we just fill the value, the value is revealed. But if we visit this later, the values were be hidden. This means we don't have a consistent way to count the values. Adding an unique qa selector to both revealed and hidden values would make it easier to track the values. To make it look more consistent, let's also do the same for the key.
| * | | | It's actually raising QA::Service::Shellout::CommandErrorLin Jen-Shin2018-04-201-1/+2
| | | | |
| * | | | Unify the use of repository_locationLin Jen-Shin2018-04-205-13/+9
| | | | |
| * | | | s/all_element/all_elements/gLin Jen-Shin2018-04-202-3/+3
| | | | |
| * | | | We no longer populate the title, so don't test itLin Jen-Shin2018-04-181-1/+0
| | | | |
| * | | | Properly fill variable pair to the last fieldsLin Jen-Shin2018-04-173-9/+9
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master' into qa-add-more-key-testsLin Jen-Shin2018-04-171316-19443/+51716
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (536 commits) Fix flash errors in performance bar for cached responses Force content to align right Method to track recoverable exceptions in sentry Move PipelineFailed vue component fixed targetmode being included in project FE Docs: Fix header hierarchy in Vuex section of Vue.md Adds helpers to remove withespace and linebreaks `package-qa` was renamed to `package-and-qa` Fix container scanning in vendored GitLab CI configuration for Auto Devops Fixed web IDE not working for sub-groups Remove web ide beta flag from docs and update Make the message break into a new line instead of truncating it Backport Web IDE docs to gitlab-ce link to product handbook piece on permissions Update faraday_middlewar to 0.12.2 Double-check next value for internal ids. Resolve "skeleton placeholder on diff has white background" Replace the `project/commits/comments.feature` spinach test with an rspec analog Set ENV['IN_MEMORY_APPLICATION_SETTINGS'] to 'true in spec/db/production/settings_spec.rb Update docs on `.gitlab-ci.yml` and variables policy ...
| * | | | | Sign out so we could sign in; Clean up previous keysLin Jen-Shin2018-04-031-0/+3
| | | | | |
| * | | | | Populate the fingerprint by known titleLin Jen-Shin2018-04-033-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, if we have more than one deploy key, it would be ambiguous.
| * | | | | Checkout to a new branchLin Jen-Shin2018-04-033-1/+11
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into qa-add-more-key-testsLin Jen-Shin2018-04-03286-3174/+7341
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (147 commits) Replace the `project/issues/issues.feature` spinach test with an rspec analog [Rails5] Isolate `test_after_commit` gem backport missing object storage worker specs Resolve "Clicking confidential and lock icons on sidebar should also activate dropdown" Add button type to settings toggle Move Sidekiq exporter logs to log/sidekiq_exporter.log Rename allow_private_networks to allow_local_network Make error messages even more descriptive Added rescue to show a custom error when testing project integrations Raise more descriptive errors when URLs are blocked Backport changes in EE MR 4972: System Header and Footer Adds validators and rack cookie helper apply feedback add changelog fix the rake task from being to strict about Group Bump html-pipeline to 2.7.1 Update docs for API for issue and merge request description templates Add pagination docs to commit status API Update brakeman 3.6.1 to 4.2.1 Handle CR-LFs properly in .gitmodules file ...
| * | | | | | Put project and runner in before(:all)Lin Jen-Shin2018-03-291-27/+34
| | | | | | |
| * | | | | | Use Service::Shellout.shell to spawn a commandLin Jen-Shin2018-03-292-7/+4
| | | | | | |
| * | | | | | Introduce repository_ssh_uri as a project productLin Jen-Shin2018-03-292-4/+8
| | | | | | |
| * | | | | | Only test some of the keys for nowLin Jen-Shin2018-03-291-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We could speed it up and test more keys later
| * | | | | | Remove test against DSA ssh keys becauseLin Jen-Shin2018-03-294-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we're not really supporting them out of the box. See: https://gitlab.com/gitlab-org/gitlab-ce/issues/44363
| * | | | | | Make sure the job is not still runningLin Jen-Shin2018-03-291-1/+8
| | | | | | |
| * | | | | | Update qa/Dockerfile for openssh-clientLin Jen-Shin2018-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jessie doesn't support `ssh-keygen -l -E` but stretch does: https://manpages.debian.org/jessie/openssh-client/ssh-keygen.1.en.html
| * | | | | | Run through all kinds of ssh keys for deploy keyLin Jen-Shin2018-03-292-52/+67
| | | | | | |
| * | | | | | Implement other ssh keys and use ssh-keygen insteadLin Jen-Shin2018-03-2913-19/+114
| | | | | | |
| * | | | | | Introduce Key namespace so we could put more keysLin Jen-Shin2018-03-296-25/+30
| | | | | | |
* | | | | | | Merge branch 'winh-clear-interval-merge-request-failed' into 'master'Clement Ho2018-04-262-61/+87
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear refresh interval when MRWidgetFailedToMerge component is destroyed See merge request gitlab-org/gitlab-ce!18600
| * | | | | | | Clear refresh interval when MRWidgetFailedToMerge component is destroyedWinnie Hellmann2018-04-262-61/+87
|/ / / / / / /
* | | | | | | Merge branch 'winh-dashboard-any-milestone' into 'master'Phil Hughes2018-04-263-41/+86
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset milestone filter when clicking "Any Milestone" in dashboard Closes #45295 See merge request gitlab-org/gitlab-ce!18531
| * | | | | | | Reset milestone filter when clicking "Any Milestone" in dashboardWinnie Hellmann2018-04-263-41/+86
|/ / / / / / /
* | | | | | | Merge branch 'pravi/gitlab-ce-remove-vendored-peek' into 'master'Sean McGivern2018-04-269-220/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `peek-performance_bar` from the performance bar See merge request gitlab-org/gitlab-ce!18597
| * | | | | | | remove peek performance_barPirate Praveen2018-04-269-220/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'docs/edge-label-to-quality' into 'master'Rémy Coutable2018-04-261-14/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the Edge label to Quality See merge request gitlab-org/gitlab-ce!18457
| * | | | | | | | Rename the Edge label to QualityRémy Coutable2018-04-261-14/+13
|/ / / / / / / /
* | | | | | | | Merge branch 'delete-object-state-models' into 'master'Sean McGivern2018-04-265-26/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete object_state_models.md See merge request gitlab-org/gitlab-ce!18588
| * | | | | | | | Remove link to object state modelVictor Wu2018-04-264-1/+0
| | | | | | | | |
| * | | | | | | | Delete object_state_models.mdVictor Wu2018-04-251-25/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-calendar' into 'master'Mike Greiling2018-04-261-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix calendar day position See merge request gitlab-org/gitlab-ce!18516
| * | | | | | | | | Fix calendar day positionClement Ho2018-04-261-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'restore-size-and-position-for-fork-icon' into 'master'Rémy Coutable2018-04-264-2/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore size and position for fork icon See merge request gitlab-org/gitlab-ce!18449
| * | | | | | | | | Restore size and position for fork iconGeorge Tsiolis2018-04-184-2/+8
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceNick Thomas2018-04-26183-1221/+1495
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ide-temp-file-folder-fixes' into 'master'Filipa Lacerda2018-04-2617-136/+266
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bugs with IDE new directory Closes #44838 See merge request gitlab-org/gitlab-ce!18274
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into ide-temp-file-folder-fixesPhil Hughes2018-04-25384-1836/+4400
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | force modified icon in tree list & tab barPhil Hughes2018-04-253-2/+11
| | | | | | | | | | | | |