summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* fixes part1 of files to start using active tensetiagonbotelho2016-08-0975-321/+322
* Merge branch 'fix-rubocop' into 'master' Hannes Rosenögger2016-08-091-1/+0
|\
| * remove offending empty linewinniehell2016-08-091-1/+0
* | Merge branch 'duduribeiro/gitlab-ce-current_password_when_auto_set'Rémy Coutable2016-08-091-0/+45
|\ \ | |/ |/|
| * Avoid to show the original password field when password is automatically setedCarlos Ribeiro2016-08-081-0/+45
* | Merge branch 'rubocop/enable-more-cops-for-empty-lines' into 'master' Robert Speicher2016-08-085-8/+0
|\ \
| * | Remove empty context from CI config processor specsrubocop/enable-more-cops-for-empty-linesGrzegorz Bizon2016-08-051-3/+0
| * | Enable some Rubocop cops related to new linesGrzegorz Bizon2016-08-036-6/+0
* | | Merge branch 'zj-enable-deploy-keys-api' into 'master' Douwe Maan2016-08-084-111/+188
|\ \ \
| * | | Namespace EnableDeployKeyService under ProjectsZ.J. van de Weg2016-08-081-2/+2
| * | | Create service for enabling deploy keysZ.J. van de Weg2016-08-052-5/+35
| * | | Move deploy_key tests to deploy_key_spec.rbZ.J. van de Weg2016-08-042-73/+75
| * | | Use Grape DSL for deploy keys endpointsZ.J. van de Weg2016-08-031-1/+0
| * | | Endpoints to enable and disable deploy keysZ.J. van de Weg2016-08-032-38/+84
| |/ /
* | | Merge branch 'git-http-push-check' into 'master' Robert Speicher2016-08-082-11/+11
|\ \ \
| * | | Fix ArgumentError in GitAccess specsJacob Vosmaer2016-08-041-6/+6
| * | | Stop 'git push' over HTTP earlyJacob Vosmaer2016-08-031-5/+5
| |/ /
* | | Merge branch 'rubocop/SpaceAroundEqualsInParameterDefault' into 'master' Douwe Maan2016-08-082-5/+5
|\ \ \ | |_|/ |/| |
| * | Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-062-5/+5
* | | Merge branch 'fix/import-pending-user' into 'master' Rémy Coutable2016-08-081-0/+20
|\ \ \
| * | | Support pending invitation project members importing projectsJames Lopez2016-08-081-0/+20
| |/ /
* | | Merge branch 'faster-cache-keys' into 'master' Rémy Coutable2016-08-081-0/+17
|\ \ \
| * | | Added concern for a faster "cache_key" methodfaster-cache-keysYorick Peterse2016-08-081-0/+17
| |/ /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-08-086-33/+143
|\ \ \
| * | | Wrap param with parens for consistencyAlfredo Sumaran2016-08-051-1/+1
| * | | Add custom css class to each dropdown to fix failing specAlfredo Sumaran2016-08-051-3/+3
| * | | Update layout and JS for create protected branch.Alfredo Sumaran2016-08-051-4/+4
| |/ /
| * | Merge branch 'date-time-to-day-tests' into 'master' Jacob Schatz2016-08-051-0/+31
| |\ \
| | * | Added tests to dateTime utility getDayName methoddate-time-to-day-testsPhil Hughes2016-07-181-0/+31
| * | | Merge branch 'ref-switcher-enter-submit' into 'master' Jacob Schatz2016-08-051-0/+29
| |\ \ \
| | * \ \ Merge branch 'master' into ref-switcher-enter-submitPhil Hughes2016-08-03199-4444/+7144
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Added ref switcher enter key testsPhil Hughes2016-07-191-0/+29
| * | | | Merge branch '19752-pipelines-finished-at' into 'master' Jacob Schatz2016-08-051-2/+15
| |\ \ \ \
| | * | | | Update timeago to shorter representation19752-pipelines-finished-atAnnabel Dunstone2016-08-041-2/+15
| * | | | | Merge branch 'leading-slashes-relative-links' into 'master' Rémy Coutable2016-08-051-0/+5
| |\ \ \ \ \
| | * | | | | Add failing test for #7032winniehell2016-08-051-0/+5
| | |/ / / /
| * | | | | Merge branch 'side-by-side-unfold' into 'master' Douwe Maan2016-08-051-24/+56
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-041-24/+56
* | | | | | Merge branch '14898-protected-branches-developer-can-not-push-without-permiss...Douwe Maan2016-08-052-12/+132
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | changes default_branch_protection to allow devs_can_merge protection option a...tiagonbotelho2016-08-042-50/+34
| * | | | | developer cannot push to protected branch when project is empty or he has not...tiagonbotelho2016-08-022-11/+147
* | | | | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-08-041-0/+11
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '20527-fork-commits-have-impact-on-original-project' into 'master' Rémy Coutable2016-08-041-0/+11
| |\ \ \ \ \ \
| | * | | | | | Don’t close issues on original project from a forkPaco Guzman2016-08-041-0/+11
* | | | | | | | Merge branch '20512-fix-rename-add-users-into-project-to-add-users-to-project...Rémy Coutable2016-08-041-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix Rename `add_users_into_project` and `projects_ids`Herminio Torres2016-08-041-2/+2
* | | | | | | | Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-041-0/+64
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix specJames Lopez2016-08-041-1/+1
| * | | | | | | using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-041-0/+64
* | | | | | | | Merge branch 'devise-deprecations' into 'master' Rémy Coutable2016-08-042-2/+2
|\ \ \ \ \ \ \ \