summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* bugfix: use `require_dependency` to bring in DeclarativePolicybugfix/declarative-policy-reloadinghttp://jneen.net/2017-06-291-1/+1
|
* Merge branch 'sh-fix-project-destroy-in-namespace' into 'master'Robert Speicher2017-06-291-0/+6
|\ | | | | | | | | Defer project destroys within a namespace in Groups::DestroyService#async_execute See merge request !12435
| * Defer project destroys within a namespace in ↵Stan Hu2017-06-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | Groups::DestroyService#async_execute Group#destroy would actually hard-delete all associated projects even though the acts_as_paranoia gem is used, preventing Projects::DestroyService from doing any work. We first noticed this while trying to log all projects deletion to the Geo log.
* | Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' ↵Robert Speicher2017-06-292-0/+8
|\ \ | |/ |/| | | | | | | | | | | | | into 'master' Allow the feature flags to be enabled/disabled with more granularity Closes #34078 See merge request !12357
| * Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually ↵Rémy Coutable2017-06-272-2/+2
| | | | | | | | | | | | exclusive Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Allow the feature flags to be enabled/disabled with more granularityRémy Coutable2017-06-272-0/+8
| | | | | | | | | | | | | | | | This allows to enable/disable a feature flag for a given user, or a given Flipper group (must be declared statically in the `flipper.rb` initializer beforehand). Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'Sean McGivern2017-06-291-0/+18
|\ \ | | | | | | | | | | | | Added code for defining SHA attributes See merge request !12555
| * | Added code for defining SHA attributesYorick Peterse2017-06-291-0/+18
| | | | | | | | | | | | | | | | | | These attributes are stored in binary in the database, but exposed as strings. This allows one to query/create data using plain SHA1 hashes as Strings, while storing them more efficiently as binary.
* | | Merge branch 'refactor-namespace-default-scope-override' into 'master'Douwe Maan2017-06-291-3/+1
|\ \ \ | | | | | | | | | | | | | | | | Remove Namespace model default scope override and write additional test to Project search See merge request !12546
| * | | Remove Namespace model default scope override and write additional test to ↵refactor-namespace-default-scope-overrideTiago Botelho2017-06-291-3/+1
| | | | | | | | | | | | | | | | Project search
* | | | Merge branch 'revert-12499' into 'master'Douwe Maan2017-06-292-26/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'" Closes #34511 See merge request !12557
| * | | | Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"Adam Niedzielski2017-06-292-26/+3
| | |/ / | |/| | | | | | | | | | | | | | This reverts commit b07c00032b038f40796a28e34b6dd4c622bad012, reversing changes made to 2b97d76d0b08a778710410df910a7601f6b8e9e7.
* | | | Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'Kamil Trzciński2017-06-291-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only count GL pipelines in usage data ping Closes #33172 See merge request !12277
| * | | | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelinesZ.J. van de Weg2017-06-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sending the usage data, it now includes all pipelines. This commit will split the pipelines in two; internal and external. This will lead to historical data being incorrectly marked this way. Fixes gitlab-org/gitlab-ce#33172
* | | | | Merge branch '26125-match-username-on-search' into 'master'Douwe Maan2017-06-291-1/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inserts exact matches of username and email to the top of the user search list Closes #26125 See merge request !12525
| * | | | | Inserts exact matches of username, email and name to the top of the user ↵26125-match-username-on-searchTiago Botelho2017-06-291-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | search list
* | | | | | Merge branch 'refactor/declarative-policy' into 'master'Sean McGivern2017-06-292-50/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor/declarative policy See merge request !10515
| * | | | | | convert the special-case Ability methods to use policieshttp://jneen.net/2017-06-271-34/+10
| | | | | | |
| * | | | | | convert all the policies to DeclarativePolicyhttp://jneen.net/2017-06-272-16/+21
| | | | | | |
* | | | | | | Merge branch 'add-members-count-and-parent-id-data-on-namespaces-api' into ↵Douwe Maan2017-06-291-0/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add group members counting related data on namespaces API See merge request !12497
| * | | | | | Add "members_count" and "parent_id" data on namespaces APIOswaldo Ferreira2017-06-281-0/+6
| | | | | | |
* | | | | | | Merge branch 'fix-34417' into 'master'Sean McGivern2017-06-291-17/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform housekeeping only when an import of a fresh project is completed Closes #34417 See merge request !12529
| * | | | | | | Perform housekeeping only when an import of a fresh project is completedDouglas Barbosa Alexandre2017-06-281-17/+10
| |/ / / / / /
* | | | | | | Merge branch 'feature/sm/34314-add-hasvariable-concern' into 'master'Kamil Trzciński2017-06-292-17/+25
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement `HasVariable` concern Closes #34314 See merge request !12448
| * | | | | | DecuplinShinya Maeda2017-06-282-17/+25
| | |/ / / / | |/| | | |
* | | | | | Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master'Douwe Maan2017-06-293-5/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactors Project#search namespace join Closes #30708 See merge request !12091
| * | | | | | Removes redundant pending delete checks30708-stop-using-deleted-at-to-filter-namespacesTiago Botelho2017-06-282-3/+4
| | | | | | |
| * | | | | | Fix current feature related specsTiago Botelho2017-06-282-2/+2
| | | | | | |
| * | | | | | Removes pending delete from filter scopesTiago Botelho2017-06-281-3/+2
| | | | | | |
| * | | | | | refactors Project#search namespace joinTiago Botelho2017-06-281-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'Robert Speicher2017-06-282-3/+26
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop default ORDER scope when calling a find method on a Sortable model Closes #23079 and #34412 See merge request !12499
| * | | | | Drop default ORDER scope when calling a find method on a Sortable modelDouwe Maan2017-06-282-3/+26
| | |/ / / | |/| | |
* | | | | Add ProjectWiki#ensure_repositoryport-changes-ee-2467Douglas Barbosa Alexandre2017-06-281-0/+4
| | | | |
* | | | | Add Project#ensure_repositoryDouglas Barbosa Alexandre2017-06-281-0/+4
| |/ / / |/| | |
* | | | Merge branch 'submodules-private' into 'master'Sean McGivern2017-06-281-16/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Make Gitlab::Git::Repository#submodules private See merge request !12479
| * | | Make Gitlab::Ggit::Repository#submodules privateJacob Vosmaer2017-06-271-16/+0
| | | |
* | | | Merge branch '34276-fix-dashboard-page-when-last-activity-at-is-nil' into ↵Robert Speicher2017-06-271-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix application error when Project#last_activity_at is nil Closes #34276 See merge request !12443
| * | | Fix application error when Project#last_activity_at is nil34276-fix-dashboard-page-when-last-activity-at-is-nilRuben Davila2017-06-261-1/+1
| | | |
* | | | Merge branch 'gitlab-git-find-commits' into 'master'Sean McGivern2017-06-271-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Clean up Gitlab::Git::Commit.find_all See merge request !12476
| * | | Remove Gitlab::Git::Repository#find_allJacob Vosmaer2017-06-271-1/+1
| | | |
* | | | 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 'pat-alert-when-signin-disabled' into 'master'Rémy Coutable2017-06-271-1/+7
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Provide hint to create a personal access token for Git over HTTP See merge request !12105
| * | | | Provide hint to create a personal access token for Git over HTTPRobin Bobbitt2017-06-261-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If internal auth is disabled and user is not an LDAP user, present the user with an alert to create a personal access token if he does not have one already.
* | | | | Merge branch '34052-store-mr-ref-fetched-in-database' into 'master'Sean McGivern2017-06-271-1/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 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-1/+8
| | |_|/ | |/| | | | | | | | | | Closes #34052
* | | | Merge branch '33933-fix-deployment-indicator-date' into 'master'Robert Speicher2017-06-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where Service `created_at` time was used instead of deployment time. Closes #33933 See merge request !12395
| * | | | Fix bug where Service `created_at` time was used instead of deployment time.33933-fix-deployment-indicator-datePawel Chojnacki2017-06-221-1/+1
| |/ / /
* | | | Merge branch 'feature/add-new-services' into 'master'Sean McGivern2017-06-261-7/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add additional user and email services See merge request !12125
| * | | | fix spec failuresJames Lopez2017-06-251-2/+2
| | | | |
View Lorry Controller Status