summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-0413-68/+161
|\
| * Merge branch 'sh-allow-force-repo-create' into 'master'Sean McGivern2017-07-031-1/+14
| |\
| | * Change the force flag to a keyword argumentsh-allow-force-repo-createDouglas Barbosa Alexandre2017-07-031-1/+1
| | * Make Project#ensure_repository force create a repoStan Hu2017-06-301-0/+13
| * | Merge remote-tracking branch 'upstream/master' into add-ci_variables-environm...add-ci_variables-environment_scopeLin Jen-Shin2017-07-049-36/+92
| |\ \
| | * \ Merge branch 'fix-2801' into 'master'Sean McGivern2017-07-032-0/+15
| | |\ \
| | | * | Reset @full_path to nil when cache expiresDouglas Barbosa Alexandre2017-07-031-3/+4
| | | * | Expires full_path cache after project is renamedDouglas Barbosa Alexandre2017-06-292-0/+14
| | * | | Improve support for external issue referencesadam-external-issue-references-spikeAdam Niedzielski2017-06-302-5/+5
| | * | | Set the GL_REPOSITORY env variable on Gitlab::Git::Hook34502-gitlab-git-hook-should-set-the-gl_repository-environment-variableAlejandro Rodríguez2017-06-291-10/+5
| | |/ /
| | * | Merge branch 'sh-fix-project-destroy-in-namespace' into 'master'Robert Speicher2017-06-291-0/+11
| | |\ \
| | | * | Defer project destroys within a namespace in Groups::DestroyService#async_exe...Stan Hu2017-06-291-0/+11
| | | |/
| | * | Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' into...Robert Speicher2017-06-291-0/+19
| | |\ \ | | | |/ | | |/|
| | | * Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually ...Rémy Coutable2017-06-272-14/+19
| | | * Allow the feature flags to be enabled/disabled with more granularityRémy Coutable2017-06-271-0/+14
| | * | Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'Sean McGivern2017-06-291-0/+27
| | |\ \
| | | * | Added code for defining SHA attributesYorick Peterse2017-06-291-0/+27
| | * | | Merge branch 'refactor-namespace-default-scope-override' into 'master'Douwe Maan2017-06-291-0/+10
| | |\ \ \
| | | * | | Remove Namespace model default scope override and write additional test to Pr...refactor-namespace-default-scope-overrideTiago Botelho2017-06-291-0/+10
| | * | | | Merge branch 'revert-12499' into 'master'Douwe Maan2017-06-291-21/+0
| | |\ \ \ \
| | | * | | | Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"Adam Niedzielski2017-06-291-21/+0
| | | | |/ / | | | |/| |
| * | | | | We no longer test the presence of the keyLin Jen-Shin2017-06-291-1/+0
| * | | | | Merge remote-tracking branch 'upstream/master' into add-ci_variables-environm...Lin Jen-Shin2017-06-2913-90/+235
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'Kamil Trzciński2017-06-291-0/+6
| | |\ \ \ \
| | | * | | | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelinesZ.J. van de Weg2017-06-271-0/+6
| | * | | | | Merge branch '26125-match-username-on-search' into 'master'Douwe Maan2017-06-291-25/+32
| | |\ \ \ \ \
| | | * | | | | Inserts exact matches of username, email and name to the top of the user sear...26125-match-username-on-searchTiago Botelho2017-06-291-25/+32
| | * | | | | | Merge branch 'refactor/declarative-policy' into 'master'Sean McGivern2017-06-291-4/+7
| | |\ \ \ \ \ \
| | | * | | | | | update the specs to not require a set to be returnedhttp://jneen.net/2017-06-271-4/+7
| | | |/ / / / /
| * | | | | | | Merge remote-tracking branch 'upstream/master' into add-ci_variables-environm...Lin Jen-Shin2017-06-277-5/+217
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Add environment_scope column to ci_variables tableLin Jen-Shin2017-06-211-6/+8
* | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-2982-738/+1770
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'add-members-count-and-parent-id-data-on-namespaces-api' into 'm...Douwe Maan2017-06-291-0/+19
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Add "members_count" and "parent_id" data on namespaces APIOswaldo Ferreira2017-06-281-0/+19
| * | | | | | | Merge branch 'fix-34417' into 'master'Sean McGivern2017-06-291-0/+34
| |\ \ \ \ \ \ \
| | * | | | | | | Add tests for project import state transition: [:started] => [:finished]fix-34417Douglas Barbosa Alexandre2017-06-281-0/+34
| | |/ / / / / /
| * | | | | | | Merge branch 'feature/sm/34314-add-hasvariable-concern' into 'master'Kamil Trzciński2017-06-292-39/+44
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Improve small thingsfeature/sm/34314-add-hasvariable-concernShinya Maeda2017-06-282-4/+2
| | * | | | | | Remove PoC specShinya Maeda2017-06-281-34/+0
| | * | | | | | Add a test for checking validates :key does not override by concernShinya Maeda2017-06-281-0/+34
| | * | | | | | DecuplinShinya Maeda2017-06-282-39/+46
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master'Douwe Maan2017-06-291-9/+0
| |\ \ \ \ \ \
| | * | | | | | Fix current feature related specsTiago Botelho2017-06-281-9/+0
| | |/ / / / /
| * | | | | | Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'Robert Speicher2017-06-281-0/+21
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Drop default ORDER scope when calling a find method on a Sortable modelDouwe Maan2017-06-281-0/+21
| | |/ / / /
| * | | | | Add ProjectWiki#ensure_repositoryport-changes-ee-2467Douglas Barbosa Alexandre2017-06-281-0/+18
| * | | | | Add Project#ensure_repositoryDouglas Barbosa Alexandre2017-06-281-0/+31
| |/ / / /
| * | | | Merge branch 'bugfix/ruby2.4-compat' into 'master'Douwe Maan2017-06-274-20/+23
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | rm use of deprecated webmock api in teamcity_service_spechttp://jneen.net/2017-06-261-2/+4
| | * | | rm use of deprecated webmock api in campfire_service_spechttp://jneen.net/2017-06-261-5/+6