summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix diff of requirements.txt file by not matching newlines as part of ↵dm-dependency-linker-newlinesDouwe Maan2017-06-271-1/+1
| | | | package names
* Merge branch 'gitlab-git-find-commits' into 'master'Sean McGivern2017-06-272-80/+70
|\ | | | | | | | | Clean up Gitlab::Git::Commit.find_all See merge request !12476
| * Remove 'contains' option from Commit.find_allJacob Vosmaer2017-06-271-6/+1
| |
| * Remove Gitlab::Git::Repository#find_allJacob Vosmaer2017-06-272-80/+75
| |
* | Merge branch 'zj-review-apps-usage-data' into 'master'Grzegorz Bizon2017-06-271-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Add review apps to usage ping Closes #33171 See merge request !12185
| * | Add in_review_folder to usage pingzj-review-apps-usage-dataZ.J. van de Weg2017-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | As its hard to reliably check how many review apps there are on the clients machine, we start by checking where the type is `review`. This means the folder is called that way. This will lead to a seq scan on the table. However, this is done once a week, so the benefit of adding an index seems not to apply here.
* | | Merge branch '34324-gitlab-db-seed-is-broken' into 'master'Rémy Coutable2017-06-271-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Resolve "GitLab DB seed is broken" Closes #34324 See merge request !12464
| * | Fix Gitlab::Database.bulk_insert for non-UTF-8 data34324-gitlab-db-seed-is-brokenSean McGivern2017-06-261-1/+1
| | |
* | | Merge branch '34052-store-mr-ref-fetched-in-database' into 'master'Sean McGivern2017-06-271-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Store merge request ref_fetched status in the database Closes #34052 See merge request !12424
| * | | Store merge request ref_fetched status in the database34052-store-mr-ref-fetched-in-databaseAdam Niedzielski2017-06-261-0/+1
| | | | | | | | | | | | | | | | Closes #34052
* | | | Fix optional args for POST :id/variablesLin Jen-Shin2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | Always use declared_params(include_missing: false) so that we don't give nils for optional arguments
* | | | Merge branch '33600-fix-uncaught-throw-in-ee_compat_check' into 'master'Robert Speicher2017-06-261-4/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an uncaught throw in the ee_compat_check job Closes #33600 See merge request !12123
| * | | | Fix an uncaught throw in the ee_compat_check jobRémy Coutable2017-06-211-4/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'remove-unused-argument' into 'master'Sean McGivern2017-06-261-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unused Gitlab::Git::Commit#to_diff argument See merge request !12466
| * | | | | Remove unused Gitlab::Git::Commit#to_diff argumentJacob Vosmaer2017-06-261-2/+2
| | | | | |
* | | | | | Merge branch ↵Douwe Maan2017-06-261-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34286_add_esperanto_translations_for_cycle_analytics_and_project_and_repository_pages' into 'master' Add Esperanto translations for Cycle Analytics, Project, and Repository pages Closes #34286 See merge request !12442
| * | | | | Add Esperanto translations for Cycle Analytics, Project, and Repository pages黄涛2017-06-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix #34286
* | | | | | Merge branch 'backport-renew-exclusive-lease' into 'master'Douwe Maan2017-06-261-1/+18
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Backport from EE: Introduce #renew for ExclusiveLease See merge request !12436
| * | | | | Introduce #renew for ExclusiveLeasebackport-renew-exclusive-leaseGabriel Mazetto2017-06-241-1/+18
| |/ / / /
* | | | | Merge branch 'feature/add-new-services' into 'master'Sean McGivern2017-06-265-16/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add additional user and email services See merge request !12125
| * | | | | fix spec failuresJames Lopez2017-06-241-1/+1
| | | | | |
| * | | | | fix spec failuresJames Lopez2017-06-231-4/+4
| | | | | |
| * | | | | update code based on feedbackJames Lopez2017-06-231-2/+4
| | | | | |
| * | | | | refactor update user service not to do auth checksJames Lopez2017-06-235-5/+5
| | | | | |
| * | | | | fix spec failuresJames Lopez2017-06-231-4/+6
| | | | | |
| * | | | | more refactoring based on feedbackJames Lopez2017-06-232-5/+5
| | | | | |
| * | | | | refactor emails serviceJames Lopez2017-06-231-8/+0
| | | | | |
| * | | | | update missing email actionsJames Lopez2017-06-231-6/+4
| | | | | |
| * | | | | fix specsJames Lopez2017-06-231-2/+2
| | | | | |
| * | | | | update to use emails destroy serviceJames Lopez2017-06-231-2/+3
| | | | | |
| * | | | | fixed specsJames Lopez2017-06-231-1/+1
| | | | | |
| * | | | | added service in the rest of controllers and classesJames Lopez2017-06-233-4/+5
| | | | | |
| * | | | | fix api and controller issuesJames Lopez2017-06-231-2/+7
| | | | | |
| * | | | | update notification settings, fix api specsJames Lopez2017-06-232-2/+7
| | | | | |
| * | | | | use update service on ldap call and updated specs and serviceJames Lopez2017-06-231-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'zj-faster-charts-page' into 'master'Grzegorz Bizon2017-06-261-9/+9
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Improve performance for pipeline charts Closes #32407 See merge request !12378
| * | | | Remove references to build in pipeline chartsZ.J. van de Weg2017-06-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Being the good boyscouts, but mainly because of [the comment in the review](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12378#note_33302115) the words used for classes and variables are changed to not use builds anymore.
| * | | | Improve performance for pipeline chartsZ.J. van de Weg2017-06-231-5/+5
| |/ / / | | | | | | | | | | | | | | | | Achieved by using another table, which both has better indexes and is smaller. Now the data provided for the user is more valueable too.
* | | | Merge branch 'dm-requirements-txt-tilde' into 'master'Grzegorz Bizon2017-06-231-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't match tilde and exclamation mark as part of requirements.txt package name Closes #34166 See merge request !12431
| * | | | Don't match tilde and exclamation mark as part of requirements.txt package namedm-requirements-txt-tildeDouwe Maan2017-06-231-1/+1
| | | | |
* | | | | Merge branch 'tc-refactor-projects-finder-init-collection' into 'master'Douwe Maan2017-06-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add User#full_private_access? to check if user has access to all private groups & projects Closes #31745 See merge request !12373
| * | | | | Add User#full_private_access? to check if user has Private accesstc-refactor-projects-finder-init-collectionToon Claes2017-06-231-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CE only the admin has access to all private groups & projects. In EE also an auditor can have full private access. To overcome merge conflicts, or accidental incorrect access rights, abstract this out in `User#full_private_access?`. `User#admin?` now only should be used for admin-only features. For private access-related features `User#full_private_access?` should be used. Backported from gitlab-org/gitlab-ee!2199
* | | | | Merge branch 'fix/gb/improve-updating-column-in-batches-helper' into 'master'Yorick Peterse2017-06-231-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Improve `update_column_in_batches` migration helper Closes #34064 See merge request !12350
| * | | | Merge branch 'master' into fix/gb/improve-updating-column-in-batches-helperGrzegorz Bizon2017-06-2246-265/+361
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (56 commits) File view buttons Don't reset the session when the example failed, because we need capybara-screenshot to have access to it Resolve "MR comment + system note highlight don't have the same width" Add feature spec for dashboard state filter tabs Wording of Mysql support. a new feature checklist and more elaborate documentation requirements Filter archived project in API v3 only if param present Revert to using links instead of buttons in Issuable Index tabs. Do not run the codeclimate job on docs-only changes Only show gray footer space if environment actions exist Migrate Gitlab::Git::Blob.find to Gitaly Backport filtered search lazy token consistent state fix Add a comment explaining how the branch clean up happens Fix Github::Representation::PullRequest#source_branch_exists? Add CHANGELOG Fix GitHub importer performance on branch existence check Rebuild the dynamic path before validating it Rename stage ref migration specs to match a class name Enable Style/DotPosition Rubocop :cop: Revert "Merge branch 'winh-merge-request-related-issues' into 'master'" ... Conflicts: db/post_migrate/20170526185921_migrate_build_stage_reference.rb
| * | | | Raise if updating columns in batches within a transactionGrzegorz Bizon2017-06-211-0/+6
| | | | |
* | | | | Merge branch '33940-cache-flipper_gate-query' into 'master'Robert Speicher2017-06-221-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the Flipper::Middleware::Memoizer middleware Closes #33940 See merge request !12359
| * | | | | Fix Style/EmptyLines violation in lib/feature.rb33940-cache-flipper_gate-queryRobert Speicher2017-06-221-1/+0
| | | | | |
| * | | | | Add the Flipper::Middleware::Memoizer middlewareRémy Coutable2017-06-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures we make maximum one call per feature per request. See https://github.com/jnunemaker/flipper/blob/v0.10.2/docs/Optimization.md#memoizing-middleware Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'fix/properly-encode-gitaly-diffs' into 'master'Robert Speicher2017-06-222-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode Gitaly diff patches properly See merge request !12368
| * | | | | | Encode Gitaly diff patches properlyfix/properly-encode-gitaly-diffsAhmad Sherif2017-06-222-2/+5
| | | | | | |
View Lorry Controller Status