summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'enable-spec-file-name-cop' into 'master' Robert Speicher2017-04-284-67/+51
|\
| * Enable RSpec/FilePath copenable-spec-file-name-copSean McGivern2017-04-264-67/+51
* | Merge branch 'dz-add-oauth-controller-spec' into 'master' Rémy Coutable2017-04-281-0/+55
|\ \
| * | Add tests for Oauth::AuthorizationsControllerdz-add-oauth-controller-specDmitriy Zaporozhets2017-04-281-0/+55
* | | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"Dosuken shinya2017-04-281-12/+354
* | | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' int...Douwe Maan2017-04-271-4/+45
|\ \ \ | |/ / |/| |
| * | improves test settings for chat notification services for empty projects31138-improve-test-settings-for-services-in-empty-projectsTiago Botelho2017-04-271-4/+45
* | | Merge branch '12910-personal-snippet-prep-2' into 'master' Sean McGivern2017-04-263-0/+38
|\ \ \ | |_|/ |/| |
| * | Support preview_markdown action for personal_snippetsJarka Kadlecova2017-04-263-0/+38
* | | Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' Sean McGivern2017-04-241-0/+15
|\ \ \
| * | | Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-urlStan Hu2017-04-241-0/+15
| | |/ | |/|
* | | Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'Rémy Coutable2017-04-246-12/+0
|\ \ \
| * | | Unnecessary "include WaitForAjax" and "include ApiHelpers"Jacopo2017-04-217-14/+0
* | | | Merge branch 'dz-fix-spec-filenames-ce' into 'master' Sean McGivern2017-04-242-47/+40
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix incorrect spec filenames which were ingored by CIdz-fix-spec-filenames-ceDmitriy Zaporozhets2017-04-242-47/+40
* | | | Refactor add_users method for project and groupdz-cleanup-add-usersDmitriy Zaporozhets2017-04-211-1/+1
|/ / /
* | | Refactor Admin::GroupsController#members_update method and add some specsdz-refactor-admin-group-membersDmitriy Zaporozhets2017-04-201-0/+24
* | | Merge branch 'dz-refactor-create-members' into 'master' Douwe Maan2017-04-201-2/+2
|\ \ \ | |/ / |/| |
| * | Refactor members controller destroy actionDmitriy Zaporozhets2017-04-171-1/+1
| * | Refactor controller code that creates project/group membersDmitriy Zaporozhets2017-04-171-1/+1
* | | Refactor changing files in web UIDouwe Maan2017-04-202-7/+7
* | | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-192-1/+46
|\ \ \ | |_|/ |/| |
| * | Add a new Gitlab::UserActivities class to track user activitiesRémy Coutable2017-04-141-1/+1
| * | Remove user activities table and use redis instead of PG for recording activi...James Lopez2017-04-141-2/+4
| * | Add user activity service and spec. Also added relevant - NOT offline - migra...James Lopez2017-04-141-0/+6
| * | Port 'Add more usage data to EE ping' to CESean McGivern2017-04-141-0/+37
| |/
* | Review changes, used eq instead of matchuse-favicon-full-path-for-pipeline-status-faviconLuke "Jared" Bennett2017-04-173-3/+3
* | Updated specsLuke "Jared" Bennett2017-04-133-3/+3
|/
* Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-073-0/+45
|\
| * Merge branch 'optimise-builds' into 'master' Sean McGivern2017-04-071-0/+33
| |\
| | * Count number of queriesKamil Trzcinski2017-04-071-0/+33
| * | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-072-0/+12
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-063-9/+359
| | |\
| | * | Protected Tags backend review changesJames Edwards-Jones2017-04-062-0/+2
| | * | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0616-27/+516
| | |\ \
| | * | | Clean up non TODO rubocop errorsJames Edwards-Jones2017-04-031-6/+6
| | * | | Protected tags copy/paste from protected branchesJames Edwards-Jones2017-03-311-0/+10
* | | | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-071-0/+96
|\ \ \ \ \ | |/ / / /
| * | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track applica...Paweł Chojnacki2017-04-071-0/+96
| | |_|/ | |/| |
* | | | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-063-9/+359
|\ \ \ \ | |/ / /
| * | | Merge branch 'feature/multi-level-container-registry-images' into 'master' Kamil Trzciński2017-04-061-0/+84
| |\ \ \
| | * \ \ Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-066-1/+171
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-043-1/+33
| | |\ \ \
| | * | | | Fix container registry controller specsGrzegorz Bizon2017-04-041-0/+1
| | * | | | Refactor container registry repository tag stubsGrzegorz Bizon2017-04-031-3/+4
| | * | | | Ensure root container repository when visiting registryGrzegorz Bizon2017-04-031-0/+82
| * | | | | Linking to edit file directlyEric Eastwood2017-04-061-7/+76
| * | | | | rename cache db column with `_cached` suffixAlexis Reigel2017-04-061-2/+2
| * | | | | Rename skip_tfa session variable to skip_two_factorMarkus Koller2017-04-061-1/+1
| * | | | | Rename check_2fa_requirement to check_two_factor_requirementMarkus Koller2017-04-061-2/+2