summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Fix Github::Representation::PullRequest#source_branch_exists?Douglas Barbosa Alexandre2017-06-211-1/+1
| | | |
| * | | Fix GitHub importer performance on branch existence checkDouglas Barbosa Alexandre2017-06-213-35/+57
| | |/ | |/|
| * | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-2139-228/+228
| |/
| * Replace invalid chars while seeding environmentsZeger-Jan van de Weg2017-06-211-1/+1
| |
| * Merge branch '33878-fix-edit-deploy-key' into 'master'Rémy Coutable2017-06-211-1/+1
| |\ | | | | | | | | | | | | | | | | | | Fix edit button for deploy keys available from other projects Closes #33878 See merge request !12301
| | * Fix edit button for deploy keys available from other projectsAlexander Randa2017-06-201-1/+1
| | |
| * | Merge branch 'dt/printing-to-api' into 'master'Rémy Coutable2017-06-212-0/+3
| |\ \ | | | | | | | | | | | | | | | | add printing_merge_request_link_enabled to API See merge request !12240
| | * | add printing_merge_request_link_enabled to APIDavid Turner2017-06-192-0/+3
| | | |
| * | | Merge branch 'gitaly-auth-token' into 'master'Sean McGivern2017-06-216-32/+55
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Pass Gitaly token on Ruby gRPC requests See merge request !12228
| | * | | Enable gitaly token auth when testingJacob Vosmaer2017-06-201-2/+3
| | | | |
| | * | | Rubocop and comment fixesJacob Vosmaer2017-06-202-3/+3
| | | | |
| | * | | Send gitaly token to workhorse when neededJacob Vosmaer2017-06-201-3/+8
| | | | |
| | * | | Pass Gitaly token on Ruby gRPC requestsJacob Vosmaer2017-06-194-27/+44
| | | | |
| * | | | Merge branch 'remove-git-commit-attribute' into 'master'Sean McGivern2017-06-211-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unused attr_accessor from Gitlab::Git::Commit See merge request !12311
| | * | | | Remove unused attr_accessor from Gitlab::Git::CommitJacob Vosmaer2017-06-201-1/+1
| | |/ / /
| * | | | Change references from ApplicationSetting to ::ApplicationSetting to make ↵sh-current-settings-autoload-fixStan Hu2017-06-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autoload happier Closes #34047
| * | | | Merge branch 'bugfix/html-email-brackets' into 'master'Douwe Maan2017-06-201-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unwrap links without an href Closes #27645 See merge request !9045
| | * | | | unwrap all links with no hrefhttp://jneen.net/2017-06-191-0/+7
| | | | | |
| * | | | | Merge branch '28517-discover-by-userid' into 'master'Douwe Maan2017-06-201-3/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow discover by userid - issue 28517 Closes #28517 See merge request !12314
| | * | | | | Allow discover by userid - issue 28517Matt Walsh2017-06-201-3/+8
| | | | | | |
| * | | | | | Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-201-12/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor ProjectsFinder#init_collection and GroupProjectsFinder#init_collection Closes #33632 See merge request !12135
| | * | | | | | Refactor ProjectsFinder#init_collectionYorick Peterse2017-06-161-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes ProjectsFinder#init_collection so it no longer relies on a UNION. For example, to get starred projects of a user we used to run: SELECT projects.* FROM projects WHERE projects.pending_delete = 'f' AND ( projects.id IN ( SELECT projects.id FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id INNER JOIN project_authorizations ON projects.id = project_authorizations.project_id WHERE projects.pending_delete = 'f' AND project_authorizations.user_id = 1 AND users_star_projects.user_id = 1 UNION SELECT projects.id FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id WHERE projects.visibility_level IN (20, 10) AND users_star_projects.user_id = 1 ) ) ORDER BY projects.id DESC; With these changes the above query is turned into the following instead: SELECT projects.* FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id WHERE projects.pending_delete = 'f' AND ( EXISTS ( SELECT 1 FROM project_authorizations WHERE project_authorizations.user_id = 1 AND (project_id = projects.id) ) OR projects.visibility_level IN (20,10) ) AND users_star_projects.user_id = 1 ORDER BY projects.id DESC; This query in turn produces a better execution plan and takes less time, though the difference is only a few milliseconds (this however depends on the amount of data involved and additional conditions that may be added).
| * | | | | | | Re-instate is_admin flag in users API is current user is an adminMike Ricketts2017-06-202-3/+6
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' ↵Sean McGivern2017-06-201-1/+15
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Do not enable prometheus metrics when metrics folder is missing See merge request !12263
| | * | | | | use proper `if defined?` check.33823_do_not_enable_defaults_when_metrics_folder_is_missingPawel Chojnacki2017-06-201-2/+5
| | | | | | |
| | * | | | | Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-191-1/+12
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Set defaults correctly only for when not in production or staging + set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru Test prometheus metrics unmemoized
| * | | | | Merge branch 'sh-refactor-current-settings' into 'master'Robert Speicher2017-06-192-20/+53
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | If migrations are pending, make CurrentSettings use existing values and populate missing columns with defaults See merge request !12253
| | * | | | If migrations are pending, make CurrentSettings use existing values and ↵sh-refactor-current-settingsStan Hu2017-06-192-22/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | populate missing columns with defaults master was failing because `ApplicationSetting.create_from_defaults` attempted to write to a column that did not exist in the database. This occurred in a `rake db:migrate` task, which was unable to perform the migration that would have added the missing column in the first place. In 9.3 RC2, we also had a bug where password sign-ins were disabled because there were many pending migrations. The problem occurred because `fake_application_settings` was being returned with an OpenStruct that did not include the predicate method `signup_enabled?`. As a result, the value would erroneously return `nil` instead of `true`. This commit uses the values of the defaults to mimic this behavior. This commit also refactors some of the logic to be clearer.
| | * | | | Revert "Merge branch 'rs-revert-11842' into 'master'"Stan Hu2017-06-191-1/+2
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | This reverts commit ad521bde1bb556709edd39d8a9aa67ee47605b91, reversing changes made to 3a38e5f1ab914bc4eaeecda6e18caaa7ca9ea5a7.
| * | | | Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-192-20/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't display comment on unchanged line on both sides in parallel diff Closes #33864 See merge request !12275
| | * | | | Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-192-20/+20
| | | | | |
| * | | | | Merge branch 'moved-submodules' into 'master'Rémy Coutable2017-06-192-37/+92
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | repository: index submodules by path See merge request !10798
| | * | | | | repository: index submodules by pathDavid Turner2017-06-162-37/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodules have a name in the configuration, but this name is simply the path at which the submodule was initially checked in (by default -- the name is totally arbitrary). If a submodule is moved, it retains its original name, but its path changes. Since we discover submodules inside trees, we have their path but not necessarily their name. Make the submodules() function return the submodule hash indexed by path rather than name, so that renamed submodules can be looked up. Signed-off-by: David Turner <novalis@novalis.org>
| * | | | | | Merge branch 'update-column-in-batches-batch-size' into 'master'Rémy Coutable2017-06-191-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put an upper limit on update batches See merge request !12265
| | * | | | | | Put an upper limit on update batchesupdate-column-in-batches-batch-sizeYorick Peterse2017-06-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using update_column_in_batches the upper limit on the batch size is now 1000. This ensures that for very large tables we don't lock tens of thousands of rows during the update. This in turn should reduce the likelyhood of running into deadlocks.
| * | | | | | | Reduce wait timings for Sidekiq jobsreduce-sidekiq-wait-timingsYorick Peterse2017-06-191-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces the time spent waiting for Sidekiq jobs to complete in JobWaiter, and reduces the sleep interval when trying to acquire the lease for refreshing authorizations. These changes should reduce the time spent just waiting for a lock, which we seem to be spending most time in when running the AuthorizedProjectsWorker.
| * | | | | | Merge branch 'mk-add-project-moved-errors-for-git' into 'master'Douwe Maan2017-06-194-10/+41
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "project was moved" error messages for git See merge request !11259
| | * | | | | | Add “Project moved” error to Git-over-SSHMichael Kozono2017-06-164-10/+41
| | | | | | | |
| * | | | | | | Merge branch 'add-since-and-until-params-to-issuables' into 'master'Rémy Coutable2017-06-192-0/+4
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add created_after and created_before params to issuables Closes #32901 See merge request !12151
| | * | | | | | add since and until params to issuablesKyle Bishop2017-06-182-0/+4
| | | | | | | |
| * | | | | | | Merge branch '26212-upload-user-avatar-trough-api' into 'master'Rémy Coutable2017-06-191-0/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept image for avatar in user API Closes #26212 See merge request !12143
| | * | | | | | Accept image for avatar in user APIvanadium232017-06-161-0/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'issue_33205' into 'master'Sean McGivern2017-06-191-1/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix API bug accepting wrong merge requests parameters Closes #33205 See merge request !12173
| | * | | | | Fix API bug accepting wrong merge requests parametersissue_33205Felipe Artur2017-06-161-1/+1
| | | | | | |
| * | | | | | Partially revert 1e8dbd46Robert Speicher2017-06-161-2/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/33736#note_32561501
| * | | | | Merge branch 'merge-request-diffs-table' into 'master'Douwe Maan2017-06-167-13/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add table for files in merge request diffs See merge request !12047
| | * | | | | Add table for files in merge request diffsSean McGivern2017-06-167-13/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an ID-less table containing one row per file, per merge request diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised currently, with the advantage that we can easily query the attributes of this new table. It does not migrate existing data, so we have fallback code when the legacy st_diffs column is present instead. For a merge request diff to be valid, it should have at most one of: * Rows in this new table, with the correct merge_request_diff_id. * A non-NULL st_diffs column. It may have neither, if the diff is empty.
| * | | | | | Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-161-18/+25
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show private subgroups if member of parent group Closes #32135 See merge request !11764
| | * | | | | Better exception message and some additional code commentToon Claes2017-06-151-1/+3
| | | | | | |
| | * | | | | Subgroups page should show groups authorized through inheritanceToon Claes2017-06-151-18/+23
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user is authorized to a group, they are also authorized to see all the ancestor groups and descendant groups. When a user is authorized to a project, they are authorized to see all the ancestor groups too. Closes #32135 See merge request !11764