Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2017-02-01Final fixesKamil Trzcinski
2017-02-01Split PagesController into PagesController and PagesDomainsControllerKamil Trzcinski
1. PagesController is used to show all domains and general overview of Pages 2. PagesDomainsController is used to manage pages domains
2017-02-01Fix the remove_pagesKamil Trzcinski
2017-02-01Implement extra domains and save pages configurationKamil Trzcinski
2017-02-01Initial work on GitLab Pages updateKamil Trzcinski
2017-02-01Fix pages path settings option.Kamil Trzcinski
2017-02-01Fix pages storage pathKamil Trzcinski
2017-02-01Re-add missing gitlab_on_standard_portKamil Trzcinski
2017-02-01Change pages domain to hostKamil Trzcinski
2017-02-01Support https and custom port for pagesKamil Trzcinski
2017-02-01Fix specsKamil Trzcinski
2017-02-01Add GitLab PagesKamil Trzcinski
- The pages are created when build artifacts for `pages` job are uploaded - Pages serve the content under: http://group.pages.domain.com/project - Pages can be used to serve the group page, special project named as host: group.pages.domain.com - User can provide own 403 and 404 error pages by creating 403.html and 404.html in group page project - Pages can be explicitly removed from the project by clicking Remove Pages in Project Settings - The size of pages is limited by Application Setting: max pages size, which limits the maximum size of unpacked archive (default: 100MB) - The public/ is extracted from artifacts and content is served as static pages - Pages asynchronous worker use `dd` to limit the unpacked tar size - Pages needs to be explicitly enabled and domain needs to be specified in gitlab.yml - Pages are part of backups - Pages notify the deployment status using Commit Status API - Pages use a new sidekiq queue: pages - Pages use a separate nginx config which needs to be explicitly added
2017-01-31Abillity to promote project labels to group labelsRitave
Fixes #24021
2017-01-28Merge branch '27280-fix-unititalized-constant' into 'master' Robert Speicher
Resolve "NameError: uninitialized constant ApplicationSetting::DEFAULTS" Closes #27280 See merge request !8805
2017-01-27Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/Rémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-27Move a begin/rescue clause to ApplicationSetting.expireRémy Coutable
Also, remove non-existing Ci::ApplicationSetting.expire! Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-27Add the rspec_profiling gem and documentation to the GitLab development ↵Nick Thomas
environment
2017-01-26Merge branch 'mysql-sources-utf8mb4-fix' into 'master'Rémy Coutable
Gitlab from sources : proper utf8mb4 support for MySQL 5.5 to 5.7 See merge request !8508
2017-01-25Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan
Fix race conditions for AuthorizedProjectsWorker Closes #26194 and #26310 See merge request !8701
2017-01-25Merge branch 'dz-fix-group-canonical-route' into 'master' Dmitriy Zaporozhets
Fix 500 error for Group#web_url method if nested group See merge request !8743
2017-01-25Fix race conditions for AuthorizedProjectsWorkerYorick Peterse
There were two cases that could be problematic: 1. Because sometimes AuthorizedProjectsWorker would be scheduled in a transaction it was possible for a job to run/complete before a COMMIT; resulting in it either producing an error, or producing no new data. 2. When scheduling jobs the code would not wait until completion. This could lead to a user creating a project and then immediately trying to push to it. Usually this will work fine, but given enough load it might take a few seconds before a user has access. The first one is problematic, the second one is mostly just annoying (but annoying enough to warrant a solution). This commit changes two things to deal with this: 1. Sidekiq scheduling now takes places after a COMMIT, this is ensured by scheduling using Rails' after_commit hook instead of doing so in an arbitrary method. 2. When scheduling jobs the calling thread now waits for all jobs to complete. Solution 2 requires tracking of job completions. Sidekiq provides a way to find a job by its ID, but this involves scanning over the entire queue; something that is very in-efficient for large queues. As such a more efficient solution is necessary. There are two main Gems that can do this in a more efficient manner: * sidekiq-status * sidekiq_status No, this is not a joke. Both Gems do a similar thing (but slightly different), and the only difference in their name is a dash vs an underscore. Both Gems however provide far more than just checking if a job has been completed, and both have their problems. sidekiq-status does not appear to be actively maintained, with the last release being in 2015. It also has some issues during testing as API calls are not stubbed in any way. sidekiq_status on the other hand does not appear to be very popular, and introduces a similar amount of code. Because of this I opted to write a simple home grown solution. After all, all we need is storing a job ID somewhere so we can efficiently look it up; we don't need extra web UIs (as provided by sidekiq-status) or complex APIs to update progress, etc. This is where Gitlab::SidekiqStatus comes in handy. This namespace contains some code used for tracking, removing, and looking up job IDs; all without having to scan over an entire queue. Data is removed explicitly, but also expires automatically just in case. Using this API we can now schedule jobs in a fork-join like manner: we schedule the jobs in Sidekiq, process them in parallel, then wait for completion. By using Sidekiq we can leverage all the benefits such as being able to scale across multiple cores and hosts, retrying failed jobs, etc. The one downside is that we need to make sure we can deal with unexpected increases in job processing timings. To deal with this the class Gitlab::JobWaiter (used for waiting for jobs to complete) will only wait a number of seconds (30 by default). Once this timeout is reached it will simply return. For GitLab.com almost all AuthorizedProjectWorker jobs complete in seconds, only very rarely do we spike to job timings of around a minute. These in turn seem to be the result of external factors (e.g. deploys), in which case a user is most likely not able to use the system anyway. In short, this new solution should ensure that jobs are processed properly and that in almost all cases a user has access to their resources whenever they need to have access.
2017-01-24Fix 500 error for Group#web_url method if nested groupDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-01-24Add metric initializer specSean McGivern
An empty file in one of the instrumented directories will cause the app to fail to start when metrics are enabled. Metrics aren't enabled by default in development or test. We could handle the empty file case explicitly, but a file could still not define the constant it is expected to, so instead run the initializer manually in a spec and check that it succeeds.
2017-01-20Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable
Moved the webhooks and services gear options to a single one called integrations See merge request !8380
2017-01-19Merge branch 'feature/gitaly-feature-flag' into 'master' Robert Speicher
Gitaly feature flag See merge request !8440
2017-01-19Moved the webhooks and services gear options to a single one called integrationsJose Ivan Vargas
2017-01-18Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledAhmad Sherif
2017-01-18Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan
Backport timetracking to CE See merge request !8195
2017-01-17Merge branch '24915_merge_slash_command' into 'master' Sean McGivern
Support `/merge` slash command for MRs Closes #24915 See merge request !7746
2017-01-15Backport timetracking frontend to CE.Bryce Johnson
2017-01-15change how pagination component is loadedRegis
2017-01-13Gitlab from sources : proper utf8mb4 support for MySQL 5.5 to 5.7Guillaume Simon
2017-01-11refresh merge widget after using /merge commandJarka Kadlecova
2017-01-10Add basic searchClement Ho
2017-01-09Merge branch 'master' into auto-pipelines-vueRegis
2017-01-09Merge branch 'track_last_used_date_of_ssh_keys' into 'master' Sean McGivern
Record and show last used date of SSH Keys See merge request !8113
2017-01-08Record and show last used date of SSH KeysVincent Wong
Addresses: Issue #13810 1. Adds a last_used_at attribute to the Key table/model 2. Update a key's last_used_at whenever it gets used 3. Display how long ago an ssh key was last used
2017-01-06Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran
Moved the members and groups to single option called members Closes #25985 See merge request !8281
2017-01-05Merge branch 'master' into auto-pipelines-vueFilipa Lacerda
* master: (35 commits) Adds back removed class in merge request pipelines table Fix dropdown icon alignment Simplify HTML of mini pipeline graph and dropdown Creates individual html for dropdown Adds simplified CSS for the new dropdown Removes old CSS Improves dropdown item in Chrome, Firefox and Safari Use SCSS variables for colors. Fix scss linter errors Adds animation when the stage is hovered. Adds back tooltip on dropdown toggle Fixes broken tests additional css changes to get more into direction of mockups Adds CHANGELOG entry Removes unneeded `window` declaration Decreases font-size on login page Ensure internal Gitlab::Git references use the namespace Absorb gitlab_git Fix review comments. Add spec for note edit and fix one commented spec. Review fixes. Use gl.utils.isInViewport and improve gl.utils.animateToElement. Make sure elements share the same scope Hide edit warning element when form reverted. Remove unnecessary styling came from merge conflicts. Fix single note edit form specs. Separate edit form in Changes and Discussions tab. Fix warning styling for responsive design. Fix task list for single edit note widget changes. Fix notes spec. ...
2017-01-05Merge branch 'monkey-patch-comment' into 'master' Rémy Coutable
Explain why we have this monkey-patch See merge request !8329
2017-01-03Moved the members (project_members)option to a single controller called membersJose Ivan Vargas
This controller is going to contain both the project members and groups options for the settings gear. Generated the route and modified the routing to point to the new members setting path
2017-01-03fix pipelines/index.html.haml merge conflictRegis
2016-12-30Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory
2016-12-28Fix 500 error when visit group from admin area if group name contains dotDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-12-27Explain why there is a monkey-patchJacob Vosmaer
2016-12-26Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern
Add more storage statistics See merge request !7754
2016-12-24merge master and fix application.rb conflictRegis
2016-12-23Merge branch 'permit-uploadedfile-scalar' into 'master' Rémy Coutable
Monkey-patch StrongParameters for ::UploadedFile Closes gitlab-ee#1451 See merge request !8299
2016-12-23Monkey-patch StrongParameters for ::UploadedFileJacob Vosmaer
2016-12-22Merge branch '25896-fix-404-katax-fonts' into 'master' Alfredo Sumaran
Resolve "KaTeX fonts 404 on gitlab.com" Closes #25896 See merge request !8228