summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* add license approvals for vue-loaderadd-vue-loaderMike Greiling2017-04-091-0/+30
|
* clean up webpack configMike Greiling2017-04-091-5/+6
|
* add vue-loader dependencies and basic configMike Greiling2017-04-091-0/+4
|
* Add a name field to the group edit formadd-field-for-group-nameDouglas Lovell2017-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables user specification of group name vs. name inferred from group path. Cause new group form to copy name from path Adds some new page-specific javascript that copies entry from the group path field to the group name field when the group name field is initially empty. Remove duplicate group name entry field on group edit form This corrects the duplicated name entry field and tests that the JavaScript does not update the group name field if the user edits the group path. (Editing the group path is not recommended in any case, but it is possible.) Address eslint errors in group.js Enable group name copy with dispatch and explore group creation The dispatch and explore group creation forms require the group.js asset, and their tests now require testing against poltergeist Update workflow new group instruction Update the gitlab basics group creation document Add a change log entry Remove unused variable for eslint
* Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-072-0/+3
|\ | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356
| * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-063-1/+15
| |\ | | | | | | | | | # Conflicts: # spec/lib/gitlab/import_export/all_models.yml
| * \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-062-0/+4
| |\ \
| * \ \ Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0612-38/+99
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss
| * | | | Update bundle path for Protected Tags bundleKushal Pandya2017-04-061-1/+1
| | | | |
| * | | | Protected tags copy/paste from protected branchesJames Edwards-Jones2017-03-311-0/+2
| | | | | | | | | | | | | | | | | | | | Should provide basic CRUD backend for frontend to work from. Doesn’t include frontend, API, or the internal API used from gitlab-shell
| * | | | Add protected tags to bundle config18471-restrict-tags-push-uiKushal Pandya2017-03-211-0/+1
| | | | |
* | | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track ↵Paweł Chojnacki2017-04-071-0/+6
| |_|_|/ |/| | | | | | | | | | | application readiness
* | | | Merge branch ↵Kamil Trzciński2017-04-062-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation' into 'master' Resolve "Run CI/CD pipelines on a schedule" - "Basic backend implementation" See merge request !10133
| * | | | Change configuration in gitlab.com as trigger_schedule_worker will perform ↵Shinya Maeda2017-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | twice a day 2
| * | | | Change configuration in gitlab.com as trigger_schedule_worker will perform ↵Shinya Maeda2017-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | twice a day
| * | | | Rename ScheduledTrigger to TriggerSchedule. Because table structure changed.Shinya Maeda2017-04-062-4/+4
| | | | |
| * | | | Add config for workerShinya Maeda2017-04-062-0/+6
| | |_|/ | |/| |
* | | | Merge commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971' into ↵feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-062-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/multi-level-container-registry-images * commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971': (28 commits) Award emoji button smiley animation Introduced empty/error UX states to environments monitoring. Github import rake task Remove individual modal width styles Fix RuboCop for removing index Link to docs site for file in doc/ Disable invalid service templates (again) Show CI status as Favicon on Pipelines, Job and MR pages STL file viewer Wait for the PDF to be loaded before doing anything remove unnecessary lease as cron job Search for opened MRs - include reopened MRs ProjectsFinder should handle more options Clearly show who triggered the pipeline in email Make it possible to preview pipeline success/failed emails Add remove_concurrent_index to database helper Add more tests for subgroups feature Large features by the 1st, small ones by the 3rd Ask people to create EE MRs on the 7th fix project authorizations migration issue ...
| * | | Merge branch 'fix/gh-import-status-check' into 'master' Sean McGivern2017-04-061-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Periodically mark projects that are stuck in importing as failed Closes #17709 See merge request !10207
| | * | | Periodically mark projects that are stuck in importing as failedJames Lopez2017-04-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds import jid to projects Refactor middleware to set custom expiration time via sidekiq options Add completed_jids option to sidekiq status and a few other changes
| * | | | STL file viewerPhil Hughes2017-04-061-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-065-16/+32
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (94 commits) Merge branch 'open-redirect-fix-continue-to' into 'security' Merge branch 'open-redirect-host-fix' into 'security' Merge branch 'path-disclosure-proj-import-export' into 'security' Merge branch '29364-private-projects-mr-fix' Merge branch '30125-markdown-security' Issue title realtime Update CHANGELOG.md for 8.16.9 Update CHANGELOG.md for 8.17.5 Update CHANGELOG.md for 9.0.4 Add "search" optional param and docs for V4 Use PDFLab to render PDFs in GitLab Separate Scala from Java in CI examples Fix broken link Reorganize CI examples, add more links Refactor CI index page Remove deprecated field from workhorse response Use gitlab-workhorse 1.4.3 Document how ETag caching middleware handles query parameters Make group skip validation in the frontend Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware ...
| * | | Issue title realtimeRegis Boudinot2017-04-062-0/+2
| | | |
| * | | Merge branch 'gitaly-prevent-autoload' into 'master' Rémy Coutable2017-04-051-13/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Deal with Rails autoload instance variable resets See merge request !10338
| | * | | Deal with Rails autoload instance variable resetsJacob Vosmaer2017-04-051-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails auto-load (a development feature) can end up resetting instance variables on classes. This breaks Gitlab::GitalyClient, which uses instance variables to keep global hashes to look up channels and addresses. This change adds code that regenerates the hashes if they suddenly become nil.
| * | | | Use PDFLab to render PDFs in GitLabSam Rose2017-04-051-1/+7
| | |/ / | |/| |
| * | | Load a preview of Sketch 43 filessketch-preview-filesJacob Schatz2017-04-052-0/+19
| |/ / | | | | | | | | | | | | | | | | | | Sketch 43 files are technically a zip file, so the JavaScript opens the zip file & locates a preview.png which is just a quick preview of the last sketch page edited. After that is loaded it simply places the image into the DOM
| * | use a less memory-intensive sourcemap when running in CIMike Greiling2017-04-041-1/+2
| | |
| * | Refactor test_utils bundleMike Greiling2017-04-041-1/+0
| | |
| * | Merge branch '24187-set-git-terminal-prompt-env-var-in-initializer' into ↵Douwe Maan2017-04-041-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Adds git terminal prompt env var to application rb Closes #24187 See merge request !10372
| | * | adds git terminal prompt env var to application rb24187-set-git-terminal-prompt-env-var-in-initializerTiago Botelho2017-04-031-0/+1
| | | |
* | | | Fix Rubocop offenses related to registry routesGrzegorz Bizon2017-04-051-2/+2
| | | |
* | | | Improve container repository tags controller routeGrzegorz Bizon2017-04-051-5/+4
| | | |
* | | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-044-9/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (57 commits) Ensure we generate unique usernames otherwise validations fail Fix a Knapsack issue that would load support/capybara.rb before support/env.rb Ensure users have a short username otherwise a click event is triggered ... Enable the `bullet_logger` setting; enable `raise` in test environment Fix Rubocop offenses Set the right timeout for Gitlab::Shell#fetch_remote Refactoring Projects::ImportService Move methods that are not related to mirroring to the repository model Fix GitHub pull request formatter spec Rename skip_metrics to imported on the importable concern Add CHANGELOG Remove unused include from RepositoryImportWorker Skip MR metrics when importing projects from GitHub Fetch GitHub project as a mirror to get all refs at once Make file templates easy to use and discover Ensure user has a unique username otherwise `user10` would match `user1` Ensure the AbuseReport fixtures create unique reported users Don't use FFaker in factories, use sequences instead Fix brittle specs Fix the AbuseReport seeder ... Conflicts: db/schema.rb
| * | | Enable the `bullet_logger` setting; enable `raise` in test environmentrs-bullet-raiseRobert Speicher2017-04-031-4/+9
| |/ /
| * | Add support for Gitaly calls over TCP connectionfeature/support-grpc-calls-over-tcp-connAhmad Sherif2017-04-032-2/+2
| | | | | | | | | | | | Closes gitaly#166
| * | Relax constraint on Wiki IDs, since subdirectories can contain spacessh-relax-wiki-slug-constraintStan Hu2017-04-021-3/+1
| | | | | | | | | | | | | | | | | | | | | If a subdirectory contains spaces, GitLab would be unable to generate the route in the sidebar, resulting in an Error 500. Closes #30357
* | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-037-25/+64
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (230 commits) Fix N+1 query in loading pipelines in merge requests Fix Spinach and Capybara dependencies Prevent users from disconnecting gitlab account from CAS 30276 Move issue, mr, todos next to profile dropdown in top nav Refactor SearchController#show Properly eagerly-load the Capybara server for JS feature specs only Updating documentation to include a missing step in the update procedure Eager-load the Capybara server to prevent timeouts Increase Capybara's timeout Add metrics button to Environment Overview page Fix link to Jira service documentation Handle parsing OpenBSD ps output properly to display sidekiq infos on ... Eliminate unnecessary queries that add ~500 ms of load time for a large issue 20914 Limits line length for project home page Allow users to import GitHub projects to subgroups Update dpl CI example Fix the docs:check:links job Don't clean up the gitlab-test-fork_bare repo Make GitLab use Gitaly for commit_is_ancestor Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery ...
| * | Merge branch '24784-system-notes-meta-data' into 'master' Sean McGivern2017-03-301-1/+1
| |\ \ | | | | | | | | | | | | | | | | Add metadata for system notes See merge request !9964
| | * | Add system_note_metadata modelJarka Kadlecova2017-03-281-1/+1
| | | |
| * | | Merge branch '29843-project-subgroup-transfer' into 'security'Rémy Coutable2017-03-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Use full path for moving directories when changing namespace path See merge request !2078
| * | | Merge branch 'gitaly-socket-per-shard' into 'master' Sean McGivern2017-03-293-21/+46
| |\ \ \ | | | | | | | | | | | | | | | | | | | | One Gitaly connection per storage shard See merge request !10150
| | * | | Change socket_path to gitaly_addressJacob Vosmaer2017-03-292-11/+25
| | | | |
| | * | | Expand relative paths in storagesJacob Vosmaer2017-03-291-10/+19
| | | | |
| | * | | Separate GRPC channels per repository storageJacob Vosmaer2017-03-292-2/+4
| | | | |
| * | | | Merge branch 'ipython-notebook-viewer' into 'master' Jacob Schatz2017-03-281-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | iPython notebook viewer See merge request !10017
| | * | | | Started iPython notebook viewerPhil Hughes2017-03-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using NotebookLab library [ci skip]
| * | | | | Merge branch 'fix/gb/environments-folders-route' into 'master' Kamil Trzciński2017-03-281-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix environment folder route when special chars present Closes #29922 See merge request !10250
| | * | | | Fix environment folder route when special chars presentGrzegorz Bizon2017-03-271-1/+1
| | | |/ / | | |/| |
| * | | | spread out webpack bundles per-line to reduce conflicts in EEMike Greiling2017-03-271-1/+5
| | | | |
View Lorry Controller Status