summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Remove Repository#search_filesremove-git-search-filesJacob Vosmaer2017-07-141-89/+0
|
* Merge branch 'gitlab-git-repository-log' into 'master'Sean McGivern2017-07-144-79/+102
|\ | | | | | | | | Gitlab::Git shuffling and Gitaly annotations See merge request !12849
| * Indirectly migrate count_commits_between to GitalyJacob Vosmaer2017-07-131-1/+1
| |
| * More Gitaly annotationsJacob Vosmaer2017-07-133-0/+19
| |
| * Change Git::Repository#log to return CommitsJacob Vosmaer2017-07-132-78/+82
| |
* | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-145-7/+28
|\ \ | | | | | | | | | | | | Fixes needed when GitLab sign-in is not enabled See merge request !12491
| * | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-135-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController
* | | Handle case when BroadcastMessage.current is nilStan Hu2017-07-131-1/+1
| |/ |/| | | | | | | | | | | Somehow Rails.cache.fetch occasionally returns `nil` values, which causes this endpoint to crash. Closes #35094
* | Merge branch 'lib-git-gitaly' into 'master'Sean McGivern2017-07-1322-96/+70
|\ \ | | | | | | | | | | | | Add Gitaly notes to Gitlab::Git, delete diff options See merge request !12814
| * | Try to eliminate unused diff optionsJacob Vosmaer2017-07-121-96/+4
| | |
| * | Add Gitaly notes and annotations to Gitlab::GitJacob Vosmaer2017-07-1221-0/+66
| | |
* | | Merge branch 'migrate-workhorse-send-blob-to-gitaly' into 'master'Robert Speicher2017-07-121-4/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate Workhorse SendBlob to Gitaly Closes gitaly#356 See merge request !12313
| * | | Migrate Workhorse SendBlob to GitalyAhmad Sherif2017-07-111-4/+22
| | | |
* | | | Merge branch 'mr-branch-link-use-tree' into 'master'Robert Speicher2017-07-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR branch link now links to tree instead of commits Closes #34243 See merge request !12763
| * | | | Add namespace for BlobClement Ho2017-07-111-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'backport-ee-2405' into 'master'Douwe Maan2017-07-121-3/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Backport "Automatically link Kerberos users and LDAP people" changes to CE See merge request !12807
| * | | Extract the finder portion of ldap_person so it can be overridden in EENick Thomas2017-07-121-3/+7
| | | |
* | | | Return `is_admin` attribute in the GET /user endpoint for adminsRémy Coutable2017-07-121-1/+10
|/ / / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'rs-issue-34941' into 'master'Stan Hu2017-07-111-8/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make `Redis::Wrapper#_raw_config` and `#fetch_config` more resilient Closes #34941 See merge request !12797
| * | | Make `Redis::Wrapper#_raw_config` and `#fetch_config` more resilientRobert Speicher2017-07-111-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two methods now handle two additional real-world possibilities: 1. `config/resque.yml` not being present 2. `config/resque.yml` being present but not containing YAML Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/34941
* | | | Merge branch 'sh-add-mr-simple-mode' into 'master'Sean McGivern2017-07-112-5/+27
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add a simple mode to merge request API Closes #34920 See merge request !12766
| * | | Use view=simple for simplifying merge requests APIStan Hu2017-07-111-3/+3
| | | |
| * | | Add a simple mode to merge request APIsh-add-mr-simple-modeStan Hu2017-07-112-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current "basic" merge request API still loads too much data. For integrations like the Trello Power-up, we just need the basics. Closes #34920
* | | | Don't reload ActiveRecord objects when building note URLsSean McGivern2017-07-111-5/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | When we build a note URL, and we have the note loaded already, there are two cases: 1. The `noteable` is already loaded. In that case, this is faster as it doesn't build a new AR object from the query. 2. The `noteable` is not already loaded. In that case, this change is no worse than the previous code.
* | | Merge branch 'sh-improve-mr-api' into 'master'Sean McGivern2017-07-111-4/+4
|\ \ \ | | | | | | | | | | | | | | | | Paginate the merge requests API earlier to avoid eager loading every merge request See merge request !12764
| * | | Fix sort ordering with merge request APIsh-improve-mr-apiStan Hu2017-07-101-4/+3
| | | |
| * | | Paginate the merge requests API earlier to avoid eager loading every merge ↵Stan Hu2017-07-101-1/+2
| |/ / | | | | | | | | | | | | | | | request Fixes a performance regression introduced in !12732
* | | Repair Regression caused by - !11573Paul Charlton2017-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | some changes introduced by 4daa6da5407d235cbe4f7a787eaa29304446a870, 26b6e299e1c97b956306572c5c9f6c02f428bfd7, 17898ce021fc365c620d4600df68c3e7d2151619 were regressed during today's merge conflict resolution of !11573. This commit serves to reapply those changes. /cc: @rspeicher @stanhu @mikegreiling
* | | Support multiple Redis instances based on queue typePaul Charlton2017-07-1122-174/+393
| | |
* | | Merge branch 'master' into 'catch-redis-address-error'DJ Mountney2017-07-10109-476/+2521
|\ \ \ | |/ / | | | | | | # Conflicts: # lib/gitlab/current_settings.rb
| * | Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'Sean McGivern2017-07-103-5/+59
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove remaining N+1 queries in merge requests API with emojis and labels Closes #34159 See merge request !12732
| | * | Remove remaining N+1 queries in merge requests API with emojis and labelsStan Hu2017-07-083-5/+59
| | | | | | | | | | | | | | | | Closes #34159
| * | | Merge branch '34728-fix-application-setting-created-when-redis-down' into ↵Stan Hu2017-07-101-6/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Prevent bad data being added to application settings when Redis is unavailable Closes #34728 See merge request !12750
| | * | | Prevent bad data being added to application settings when Redis is unavailableNick Thomas2017-07-101-6/+1
| | | | |
| * | | | Re-add Feature.register_feature_groups which is already documentedRémy Coutable2017-07-101-0/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up for !12362 where this was documented but the code was removed in the last iteration. Since this can still be useful and this is already supported by the API, I think re-adding the code was the best course of action. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-07-101-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Fix gitlab-ee reference in ee_compat_check See merge request !12713
| | * | Fix gitlab-ee reference in ee_compat_checkPedro Moreira da Silva2017-07-071-1/+1
| | | |
| * | | Merge branch 'dm-routing-helpers-fix' into 'master'31331-view-time-tracking-info-in-issue-board-contextual-sidebar29974-real-time-emoji-award-updatesMarin Jankovski2017-07-091-4/+9
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Also inject new route helpers into includers of GitlabRoutingHelper Closes #34859 See merge request !12735
| | * | Also inject new route helpers into includers of GitlabRoutingHelperdm-routing-helpers-fixDouwe Maan2017-07-081-4/+9
| | | |
| * | | Merge branch 'fix/gb/stage-id-reference-background-migration' into 'master'Grzegorz Bizon2017-07-081-0/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add build stage_id reference background migration Closes #34151 See merge request !12513
| | * \ \ Merge branch 'master' into 'fix/gb/stage-id-reference-background-migration'Grzegorz Bizon2017-07-0710-36/+108
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/concerns/each_batch.rb # spec/models/concerns/each_batch_spec.rb
| | * | | | Simplify stage_id migration as we now use relationsGrzegorz Bizon2017-07-071-9/+4
| | | | | |
| | * | | | Schedule stage_id bg migrations in batches of 10Grzegorz Bizon2017-07-071-1/+1
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/active-record-each-batch' into ↵Grzegorz Bizon2017-07-0716-105/+223
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/gb/stage-id-reference-background-migration * origin/active-record-each-batch: (59 commits) Added EachBatch for iterating tables in batches Extend MR tabs a bit to cover up the avatar holder and collapse icon on scroll Update VERSION to 9.4.0-pre. Add CHANGELOG Fix some N+1 queries in the GET /projects API Don't show auxiliary blob viewer for README when there is no wiki Improve & fix the performance bar UI and behavior Remove orphaned haml files Fixed CHANGELOG.md for 9.3.4 release Add table for merge request commits 34727 Remove two columned layout from project member settings Just draw :legacy_builds Re-enable polling for environments Cleanup minor UX issues in the performance dashboard Upgrade GitLab Workhorse to v2.3.0 Added test for the chart legend Use correct field for label name, fix default for unit to be blank Fix shorter route helpers in production environment Encode certificate-authority-data in base64 Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'" ...
| | | * | | | Added EachBatch for iterating tables in batchesYorick Peterse2017-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module provides a class method called `each_batch` that can be used to iterate tables in batches in a more efficient way compared to Rails' `in_batches` method. This commit also includes a RuboCop cop to blacklist the use of `in_batches` in favour of this new method.
| | * | | | | Revert recent changes in migration helpersGrzegorz Bizon2017-07-071-94/+26
| | | | | | |
| | * | | | | Add some comments on new migrations helpersGrzegorz Bizon2017-07-071-0/+38
| | | | | | |
| | * | | | | Schedule stage_id background migration in rangesGrzegorz Bizon2017-07-072-4/+9
| | | | | | |
| | * | | | | Extract `execute_in_batches` migrations helperGrzegorz Bizon2017-07-071-15/+24
| | | | | | |
| | * | | | | Add walk_table_in_batches and refactor migration helpersGrzegorz Bizon2017-07-071-27/+48
| | | | | | |
View Lorry Controller Status