summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'revert-2c879643' into 'master'Sean McGivern2017-07-042-3/+26
|\
| * Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643Douwe Maan2017-07-042-3/+26
* | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' into 'master'Rémy Coutable2017-07-041-2/+5
|\ \ | |/ |/|
| * chaining the methods in ref_slugStefan Hanreich2017-06-241-3/+4
| * using bang method for gsubStefan Hanreich2017-06-181-2/+2
| * updated regex to use beginning / ending of string metacharactersStefan Hanreich2017-06-181-1/+1
| * no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Fixes #32035Stefan Hanreich2017-06-181-1/+3
* | Merge branch 'tc-namespace-license-checks--multiple-assignees' into 'master'Douwe Maan2017-07-042-1/+17
|\ \
| * | Make MergeRequest respond to assignee_ids & assignee_ids=Toon Claes2017-06-202-6/+10
| * | Backport issuable for assignee slash commands from EEToon Claes2017-06-201-0/+12
* | | Don't resolve fork relationships for projects pending deleteNick Thomas2017-07-041-2/+2
* | | Merge branch 'sh-allow-force-repo-create' into 'master'Sean McGivern2017-07-031-10/+10
|\ \ \
| * | | Change the force flag to a keyword argumentsh-allow-force-repo-createDouglas Barbosa Alexandre2017-07-031-2/+2
| * | | Make Project#ensure_repository force create a repoStan Hu2017-06-301-10/+10
* | | | Merge remote-tracking branch 'upstream/master' into add-ci_variables-environm...add-ci_variables-environment_scopeLin Jen-Shin2017-07-0412-42/+56
|\ \ \ \
| * \ \ \ Merge branch 'fix-2801' into 'master'Sean McGivern2017-07-032-2/+11
| |\ \ \ \
| | * | | | Reset @full_path to nil when cache expiresDouglas Barbosa Alexandre2017-07-031-0/+1
| | * | | | Expires full_path cache after project is renamedDouglas Barbosa Alexandre2017-06-292-2/+10
| * | | | | Improve support for external issue referencesadam-external-issue-references-spikeAdam Niedzielski2017-06-305-10/+8
| |/ / / /
| * | | | 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_exe...Stan Hu2017-06-291-0/+6
| | |/ / /
| * | | | Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' into...Robert Speicher2017-06-292-0/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually ...Rémy Coutable2017-06-272-2/+2
| | * | | Allow the feature flags to be enabled/disabled with more granularityRémy Coutable2017-06-272-0/+8
| * | | | Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'Sean McGivern2017-06-291-0/+18
| |\ \ \ \
| | * | | | Added code for defining SHA attributesYorick Peterse2017-06-291-0/+18
| * | | | | 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 Pr...refactor-namespace-default-scope-overrideTiago Botelho2017-06-291-3/+1
| * | | | | | Merge branch 'revert-12499' into 'master'Douwe Maan2017-06-292-26/+3
| |\ \ \ \ \ \
| | * | | | | | Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"Adam Niedzielski2017-06-292-26/+3
| | | |/ / / / | | |/| | | |
* | | | | | | Merge remote-tracking branch 'upstream/master' into add-ci_variables-environm...Lin Jen-Shin2017-06-2915-112/+137
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'Kamil Trzciński2017-06-291-0/+5
| |\ \ \ \ \ \
| | * | | | | | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelinesZ.J. van de Weg2017-06-271-0/+5
| * | | | | | | Merge branch '26125-match-username-on-search' into 'master'Douwe Maan2017-06-291-1/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Inserts exact matches of username, email and name to the top of the user sear...26125-match-username-on-searchTiago Botelho2017-06-291-1/+10
| * | | | | | | | Merge branch 'refactor/declarative-policy' into 'master'Sean McGivern2017-06-292-50/+31
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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 'm...Douwe Maan2017-06-291-0/+6
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | 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 completedDouglas Barbosa Alexandre2017-06-281-17/+10
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'feature/sm/34314-add-hasvariable-concern' into 'master'Kamil Trzciński2017-06-292-17/+25
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | DecuplinShinya Maeda2017-06-282-17/+25
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master'Douwe Maan2017-06-293-5/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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
| | | |_|/ / / / / | | |/| | | | | |