summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump `parser` gem to 2.5.0.5blackst0ne-bump-parser-2-5-0-5blackst0ne2018-04-072-4/+4
| | | | | | | | 1. Synchronize used version of `parser` gem for both versions of rails: 4 and 5. 2. Fix broken CI pipelines for rails5 branches. The 2.5.0.4 version is removed from rubygems, so it's skipped. https://github.com/whitequark/parser/issues/478
* Merge branch 'fix-dashboard-sorting' into 'master'Clement Ho2018-04-072-1/+6
|\ | | | | | | | | Fix Prometheus dashboard sorting See merge request gitlab-org/gitlab-ce!18233
| * Fix dashboard sortingJoshua Lambert2018-04-062-1/+6
|/
* Merge branch 'sh-fix-recaptcha-test' into 'master'Stan Hu2018-04-062-4/+1
|\ | | | | | | | | | | | | Fix the reCAPTCHA spec failures by not rendering the widget in test mode Closes #45138 See merge request gitlab-org/gitlab-ce!18235
| * Fix the reCAPTCHA spec failures by not rendering the widget in test modeStan Hu2018-04-062-4/+1
| | | | | | | | | | | | | | We've seen changes in behavior in the reCAPTCHA widget that led to test failures. To avoid these issues, don't render the widget at all in test mode. Closes #45138
* | Merge branch '42568-pipeline-empty-state' into 'master'Kamil Trzciński2018-04-0632-58/+513
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Wrong empty state for cancelled build, hides existing logs!" Closes #42568 See merge request gitlab-org/gitlab-ce!17646
| * | Add missing trace artifacts to jobs in specMatija Čupić2018-04-061-2/+2
| | |
| * | Merge branch 'master' into '42568-pipeline-empty-state'Kamil Trzciński2018-04-06341-3517/+25979
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/jobs/show.html.haml # lib/gitlab/ci/status/core.rb
| * | | Put Erased empty state at the beginningMatija Čupić2018-04-051-3/+3
| | | |
| * | | Rename success to erased empty state specMatija Čupić2018-04-054-22/+31
| | | |
| * | | Fix job setup in success empty state specsMatija Čupić2018-04-043-7/+9
| | | |
| * | | Add success CI Build empty state statusMatija Čupić2018-04-044-1/+72
| | | |
| * | | Scrolls to the top of the page before erase clickFilipa Lacerda2018-04-041-1/+4
| | | |
| * | | [ci skip] Merge branch 'master' into 42568-pipeline-empty-stateFilipa Lacerda2018-04-04543-4573/+11048
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (293 commits) Revert changelog entry for removed feature Revert "Allow CI/CD Jobs being grouped on version strings" Resolve "Protected branches count is wrong when a wildcard includes several protected branches" Use standard codequality job Resolve "Allow the configuration of a project's merge method via the API" [Rails5] Rename `sort` methods to `sort_by_attribute` Add better LDAP connection handling Updated components to PascalCase Handle invalid params when trying update_username Move network related app settings to expandable blocks [Rails5] Update Gemfile.rails5.lock [ci skip] Update Security Products examples documentation Backport Gitlab::Git::Checksum to CE Add changelog Refactor discussions/notes code Remove unnecessary section looking in admin settings qa Explicitly use page context for qa/factory/settings/hashed_storage.rb Use gitlab_environment because we need: Allow feature gate removal through the API Use shard name in Git::GitlabProjects instead of shard path ...
| * | | | Properly set up job trace in user_browses_job_specMatija Čupić2018-04-031-5/+3
| | | | |
| * | | | Properly set up jobs in mini pipeline graph specMatija Čupić2018-04-031-4/+5
| | | | |
| * | | | Set up traces in build show specMatija Čupić2018-04-031-8/+9
| | | | |
| * | | | Add action_button_title Core status methodMatija Čupić2018-04-031-0/+4
| | | | |
| * | | | Add specs for empty states .matches? methodsMatija Čupić2018-03-295-1/+110
| | | | |
| * | | | Move action button titles to respective statusesMatija Čupić2018-03-2911-5/+35
| | | | |
| * | | | Merge branch 'master' into 42568-pipeline-empty-stateMatija Čupić2018-03-28976-6040/+25619
| |\ \ \ \
| * | | | | Move the empty state extended status to be the beginningMatija Čupić2018-03-282-15/+17
| | | | | |
| * | | | | Fix tests for build empty state statusesMatija Čupić2018-03-2810-20/+57
| | | | | |
| * | | | | Separate the manual empty state from the action empty stateMatija Čupić2018-03-283-12/+25
| | | | | |
| * | | | | Move action link to build extended status illustrationMatija Čupić2018-03-282-1/+3
| | | | | |
| * | | | | Move illustration to build specific statusesMatija Čupić2018-03-2811-44/+101
| | | | | |
| * | | | | Use Gitlab::Ci::Status#illustration in job empty_states partial42568-pipeline-empty-stateMatija Čupić2018-03-262-29/+27
| | | | | |
| * | | | | Set up traces in jobs feature specMatija Čupić2018-03-261-6/+6
| | | | | |
| * | | | | Extend Gitlab::Ci::Status#illustration to include metadataMatija Čupić2018-03-2611-14/+37
| | | | | |
| * | | | | Add illustrations to build statusesMatija Čupić2018-03-2412-0/+48
| | | | | |
| * | | | | Update partial name and remove changes to database fixturesFilipa Lacerda2018-03-193-5/+1
| | | | | |
| * | | | | [ci skip] Merge branch 'master' into 42568-pipeline-empty-stateFilipa Lacerda2018-03-19259-3539/+6069
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (156 commits) Make issue boards height calculation clearer and remove magic numbers Rename `package-qa` in docs Copyedit CI services docs Fix dropzone project show Prettify notes. Fix "A copy of Gitlab::Metrics::Methods" have been removed error Add Jupyter Notebook docs Fixed profile notifications not being editable Rename manual job to `package-and-qa` Update vendored gitlab-ci.yml template for auto-devops Docs: refactor doc general guidelines and style guidelines Use Gitaly 0.91.0 Add version available info to integrity check rake task docs Adds the option to override project description on export via API and fixes the project description not being imported Extract constant for LfsPointerFile::VERSION_LINE Setup Faraday middleware before adapter Revert "Merge branch 'update-httparty' into 'master'" Update Code Quality example documentation Fix timeouts loading /admin/projects page OpenShift install docs: Recommend "add-scc-to-user" over "edit scc" ...
| * \ \ \ \ \ Merge branch 'master' into 42568-pipeline-empty-stateFilipa Lacerda2018-03-1314-43/+141
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix provider server URL used when listing repos to import Fix inconsistent punctuation on MR form Update dependency for svgs Fix timestamp to include %M instead of %I for post-deploy migrations.
| * | | | | | | Render skipped illustration for skipped stateFilipa Lacerda2018-03-121-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into 42568-pipeline-empty-stateFilipa Lacerda2018-03-12486-1567/+3209
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (59 commits) Use Gitaly 0.89.0 Resolve "Hover style for sidebar dropdowns is wrong" fixed spec Respect the protocol in `expose_url` Fix removes source branch text being rendered in merged state Fix code and wiki search results when filename is non-ASCII Include the ee/ directory in backtraces Use GitLab fork of zaproxy Updates file extensions on Vue docs fixed note polling not sending updated last fetched at date added spec for polling Add changelog entry Use `list.id` for `:key` Add changelog entry Update test for change in label dropdown action name Add `createLabelTitle` & `manageLabelsTitle` props for action string Add `headerTitle` prop for container header string Add `isProject` and computed props to for contextual info for dropdown Add `isProject` mock config Use label dropdown helper for rendering contextual string Add helpers for labels dropdown ...
| * | | | | | | | Fix broken testFilipa Lacerda2018-03-091-1/+1
| | | | | | | | |
| * | | | | | | | Handle empty states for job pageFilipa Lacerda2018-03-096-21/+72
| | | | | | | | |
* | | | | | | | | Merge branch 'add-cpu-mem-totals' into 'master'Mike Greiling2018-04-062-5/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Kubernetes CPU/Mem usage totals See merge request gitlab-org/gitlab-ce!17731
| * | | | | | | | | Add Kubernetes CPU/Mem usage totalsJoshua Lambert2018-04-062-5/+28
|/ / / / / / / / /
* | | | | | | | | Merge branch 'da-gitaly-calculate-repository-checksum' into 'master'Stan Hu2018-04-067-120/+111
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Repository checksum calculation is handled by Gitaly when feature is enabled See merge request gitlab-org/gitlab-ce!18210
| * | | | | | | | Move checksum calculation to Gitlab::Git::Repositoryda-gitaly-calculate-repository-checksumDouglas Barbosa Alexandre2018-04-064-146/+89
| | | | | | | | |
| * | | | | | | | Add CHANGELOGDouglas Barbosa Alexandre2018-04-061-0/+5
| | | | | | | | |
| * | | | | | | | Checksum calculation is handled by Gitaly when feature is enabledDouglas Barbosa Alexandre2018-04-062-24/+50
| | | | | | | | |
| * | | | | | | | Add calculate_checksum method to the Gitaly repository clientDouglas Barbosa Alexandre2018-04-062-0/+17
| | | | | | | | |
* | | | | | | | | Merge branch 'jivl-summary-statistics-prometheus-dashboard' into 'master'Filipa Lacerda2018-04-0619-8612/+7085
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add summary statistics to the prometheus dashboard Closes #43973 See merge request gitlab-org/gitlab-ce!17921
| * | | | | | | | | Added specs for rendered output, changed the background for stable tracksJose Ivan Vargas2018-04-067-14/+73
| | | | | | | | | |
| * | | | | | | | | Added specsJose Ivan Vargas2018-04-064-8281/+6543
| | | | | | | | | |
| * | | | | | | | | Componetize the legend componentJose Ivan Vargas2018-04-066-76/+139
| | | | | | | | | |
| * | | | | | | | | Update labels for latency, cpu and memory metricsJose Ivan Vargas2018-04-061-3/+3
| | | | | | | | | |
| * | | | | | | | | UX Adjustments for the prometheus dashboardJose Ivan Vargas2018-04-069-86/+63
| | | | | | | | | |
View Lorry Controller Status