summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '36629-35958-add-cluster-application-section' into ↵add-ingress-to-cluster-applicationsEric Eastwood2017-11-062-10/+20
|\ | | | | | | add-ingress-to-cluster-applications
| * I18n general app error and update attributes from reviewEric Eastwood2017-11-062-10/+20
| |
* | Merge branch '36629-35958-add-cluster-application-section' into ↵Eric Eastwood2017-11-067-34/+115
|\ \ | |/ | | | | | | | | | | | | | | add-ingress-to-cluster-applications Conflicts: app/assets/javascripts/clusters/clusters_bundle.js app/assets/javascripts/clusters/components/application_row.vue app/assets/javascripts/clusters/services/clusters_service.js
| * Add FE tests for not_installable/scheduled and cluster banner rules36629-35958-add-cluster-application-sectionEric Eastwood2017-11-067-34/+117
| |
| * Add active? to Platforms::KubernetesKamil Trzcinski2017-11-061-0/+4
| |
| * Add support for not_installable/scheduled and to not show created bannerKamil Trzcinski2017-11-066-5/+21
| |
* | Add active? to Platforms::KubernetesKamil Trzcinski2017-11-061-0/+4
| |
* | Add support for not_installable/scheduled and to not show created bannerKamil Trzcinski2017-11-067-5/+27
| |
* | Merge branch '36629-35958-add-cluster-application-section' into ↵Kamil Trzcinski2017-11-061-0/+2
|\ \ | |/ | | | | add-ingress-to-cluster-applications
| * Return empty applications if not Kubernetes [ci skip]Kamil Trzcinski2017-11-061-0/+2
| |
* | Fix ingress endpointKamil Trzcinski2017-11-061-1/+1
| |
* | Merge branch '36629-35958-add-cluster-application-section' into ↵Kamil Trzcinski2017-11-062-3/+0
|\ \ | |/ | | | | add-ingress-to-cluster-applications
| * Remove not used ingress and runnerKamil Trzcinski2017-11-063-9/+1
| |
* | Set installation pathsKamil Trzcinski2017-11-061-3/+2
| |
* | Add ingress applicationKamil Trzcinski2017-11-064-13/+72
| |
* | Merge branch '36629-35958-add-cluster-application-section' into ↵Kamil Trzcinski2017-11-06255-1435/+2340
|\ \ | |/ | | | | add-ingress-to-cluster-applications
| * Merge remote-tracking branch 'origin/refactor-clusters' into ↵Kamil Trzcinski2017-11-06246-1421/+2146
| |\ | | | | | | | | | 36629-35958-add-cluster-application-section
| | * Fix statis analysysShinya Maeda2017-11-051-1/+1
| | |
| | * Merge branch 'master' into refactor-clustersShinya Maeda2017-11-05241-1260/+1888
| | |\
| | | * Merge branch '37473-expose-project-visibility-as-ci-variable' into 'master'Kamil Trzciński2017-11-054-1/+9
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Expose project visibility as CI variable" Closes #37473 See merge request gitlab-org/gitlab-ce!15193
| | | | * Harcode project visibility37473-expose-project-visibility-as-ci-variableMatija Čupić2017-11-051-1/+1
| | | | |
| | | | * Expose project visibility as CI variableMatija Čupić2017-11-044-1/+9
| | | | |
| | | * | Merge branch 'fix_migration_that_adds_ff_merge_field' into 'master'Stan Hu2017-11-042-1/+10
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | Fix a migration that adds merge_requests_ff_only_enabled column to MR table Closes #39382 and #39357 See merge request gitlab-org/gitlab-ce!15195
| | | | * update a changelogValery Sizov2017-11-041-0/+5
| | | | |
| | | | * Put a condition to old migration that adds fast_forward column to MRsValery Sizov2017-11-041-1/+5
| | | |/
| | | * Merge branch 'sh-headless-chrome-support' into 'master'Stan Hu2017-11-03149-456/+624
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace PhantomJS with Headless Chrome for GitLab Integration Tests Closes #30876 See merge request gitlab-org/gitlab-ce!12244
| | | | * fix flaky tests by removing unneeded clicks and focus actionsMike Greiling2017-11-031-16/+1
| | | | |
| | | | * Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-03102-834/+1294
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (33 commits) Ignore SQL CACHE hits in Sherlock Fix SQL timings for the performance bar Find the LFS-objects for a fork within a the fork network Remove bottom-border from last responsive table row Add system hooks user_rename and group_rename Unlink a project from a fork network when it's source was deleted. Make sure the settings page renders when root of a fork is deleted Remove Peek's original keyboard shortcut (numpad 0, keycode 96) Add application setting to Auto DevOps docs Enable MergeableSelector in scss-lint (for !14567) Enable MergeableSelector in scss-lint (for !14055) Enable MergeableSelector in scss-lint (for !14062) Enable MergeableSelector in scss-lint (for !14398) Enable MergeableSelector in scss-lint (for !13480) Enable MergeableSelector in scss-lint (for !13473) Enable MergeableSelector in scss-lint (for !13600) Enable MergeableSelector in scss-lint Resolve ""To do" should be "Todos" on Todos list page" Avoid regenerating the ref path for the environment Remove white space at bottom of issue boards ...
| | | | * | fix flaky test in gfm_autocomplete_spec.rbMike Greiling2017-11-031-1/+0
| | | | | |
| | | | * | don't attempt to click on hidden elementsMike Greiling2017-11-031-4/+6
| | | | | |
| | | | * | replace use of unsupported trigger method with clickMike Greiling2017-11-032-2/+2
| | | | | |
| | | | * | prevent race condition when attempting to cancel a file uploadMike Greiling2017-11-031-2/+4
| | | | | |
| | | | * | confirm javascript modal when resetting email tokensMike Greiling2017-11-031-2/+2
| | | | | |
| | | | * | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-02433-3801/+4275
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (109 commits) Remove Filesystem check metrics that use too much CPU to handle requests Set merge_request_diff_id on MR when creating Add a column linking an MR to its diff Remove useless closeReopenReport specs Clarify external artifacts only working when GitLab pages is enabled Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in Remove an exception from the git user default SSH config check Geo route whitelisting is too optimistic Update .nvmrc to current stable (v9.0.0) Update documentation Address Douwe's feedback Refactor responsive table styles to support nested error block Add changelog items Update specs for sudo behavior Move RSS and incoming email tokens from User Settings > Accounts to User Settings > Access Tokens Remove user authentication_token column Migrate user private tokens to personal access tokens Add sudo API scope Consistently use PersonalAccessToken instead of PersonalToken Remove User#private_token ...
| | | | * | | use resize_window helperMike Greiling2017-11-021-1/+2
| | | | | | |
| | | | * | | refactor wait_for_requests, add slow_requests block helperMike Greiling2017-11-029-50/+64
| | | | | | |
| | | | * | | target label instead of obscured input elementMike Greiling2017-11-021-3/+1
| | | | | | |
| | | | * | | scroll to top before attempting to click the "Side-by-side" buttonMike Greiling2017-11-021-3/+2
| | | | | | |
| | | | * | | remove out-of-date comments about webdriver compatabilityMike Greiling2017-11-021-5/+1
| | | | | | |
| | | | * | | explicitly add Accept: */* HTTP header back to testMike Greiling2017-11-021-1/+3
| | | | | | |
| | | | * | | add visible argument to helper rather than duplicating codeMike Greiling2017-11-021-3/+3
| | | | | | |
| | | | * | | add InspectRequests helper automatically to :js testsMike Greiling2017-11-024-5/+1
| | | | | | |
| | | | * | | add CookieHelper and InputHelper automatically to :js testsMike Greiling2017-11-0210-18/+2
| | | | | | |
| | | | * | | fix bracket stylingMike Greiling2017-11-021-5/+5
| | | | | | |
| | | | * | | remove unused capybara_select2 helperMike Greiling2017-11-011-5/+0
| | | | | | |
| | | | * | | add spacing around yieldMike Greiling2017-11-011-0/+2
| | | | | | |
| | | | * | | add slow_requests! to filtered search tests which expect to see a loading ↵Mike Greiling2017-11-015-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | spinner
| | | | * | | make window resizing more resiliant on small screens when headless mode is offMike Greiling2017-11-011-3/+7
| | | | | | |
| | | | * | | fix flaky fill_in use in which return key would occasionally be intercepted ↵Mike Greiling2017-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | by autocomplete
| | | | * | | move resize option the pre-test hooks instead of post-testMike Greiling2017-11-011-3/+3
| | | | | | |
View Lorry Controller Status