summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master'Douwe Maan2017-06-292-2/+4
|\ | | | | | | | | | | | | refactors Project#search namespace join Closes #30708 See merge request !12091
| * Fix current feature related specsTiago Botelho2017-06-282-2/+4
| |
* | Merge branch 'gitaly-encodings' into 'master'Robert Speicher2017-06-283-11/+20
|\ \ | | | | | | | | | | | | | | | | | | Fix gitaly ref encoding bugs Closes #34156 See merge request !12522
| * | Fix gitaly ref encoding bugsJacob Vosmaer2017-06-283-11/+20
| |/
* | Merge branch 'dm-dependency-linker-newlines' into 'master'Robert Speicher2017-06-281-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix diff of requirements.txt file by not matching newlines as part of package names Closes #34321 See merge request !12495
| * | 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 'bvl-fix-ldap-login' into 'master'Douwe Maan2017-06-281-1/+1
|\ \ \ | |_|/ |/| | | | | | | | Fix setting `last_credential_check_at` on LDAP-login See merge request !12507
| * | Fix setting `last_credential_check` on LDAP-loginbvl-fix-ldap-loginBob Van Landuyt2017-06-281-1/+1
| | |
* | | Merge branch 'submodules-private' into 'master'Sean McGivern2017-06-281-21/+26
|\ \ \ | |/ / |/| | | | | | | | Make Gitlab::Git::Repository#submodules private See merge request !12479
| * | Make Gitlab::Ggit::Repository#submodules privateJacob Vosmaer2017-06-271-21/+26
| | |
* | | Merge branch 'fix-head-pipeline-for-commit-status' into 'master'Grzegorz Bizon2017-06-271-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix head pipeline stored in merge request for external pipelines Closes #34130 See merge request !12478
| * | | Fix head pipeline stored in merge request for external pipelinesfix-head-pipeline-for-commit-statusKamil Trzcinski2017-06-271-0/+3
| |/ /
* | | Merge branch 'backport-system-check-fix' into 'master'Douwe Maan2017-06-271-0/+2
|\ \ \ | |_|/ |/| | | | | | | | Make the SimpleExecutor rescue exceptions in the executing Checks See merge request !12487
| * | Make the SimpleExecutor rescue exceptions in the executing ChecksGabriel Mazetto2017-06-271-0/+2
| | |
* | | 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.
View Lorry Controller Status