summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add User#nested_groups and User#nested_projects methodsdz-nested-groups-access-improvementsDmitriy Zaporozhets2017-01-246-2/+71
* Refactor Namespace code related to nested groupsDmitriy Zaporozhets2017-01-136-13/+47
* Merge branch 'fix-ruby21-milestone-api-specs' into 'master' Sean McGivern2017-01-131-3/+5
|\
| * Put .gitlab-ci.yml back to only 2.1 on masterSean McGivern2017-01-131-0/+5
| * Only escape the 'No Milestone' paramfix-ruby21-milestone-api-specs-2Sean McGivern2017-01-132-4/+6
| * Fix milestone API specs in Ruby 2.1fix-ruby21-milestone-api-specsSean McGivern2017-01-132-6/+1
* | Merge branch 'fix/git-migration' into 'master' Sean McGivern2017-01-131-4/+11
|\ \ | |/ |/|
| * Add check for new path existenceJames Lopez2017-01-131-4/+11
* | Merge branch 'clipboard-button-text' into 'master' Sean McGivern2017-01-135-7/+10
|\ \
| * | Text for copy to clipboard: URL, personal access token, commands, referenceclipboard-button-textvictorwu2017-01-125-7/+10
* | | Merge branch '23194-fix-no-milestone-option-for-projects-endpoint' into 'mast...Sean McGivern2017-01-134-24/+112
|\ \ \ | |_|/ |/| |
| * | API: Implement project issues iid param with IssuesFinder and add tests23194-fix-no-milestone-option-for-projects-endpointDavid Eisner2017-01-124-24/+110
| * | Adding 'IssueFinder' for 'projects' API endpointPanagiotis Atmatzidis2017-01-121-6/+8
* | | Merge branch '26627-update-gitlab-markup-to-1-5-1-again' into 'master' Robert Speicher2017-01-131-1/+1
|\ \ \
| * | | Update gitlab-markup back to 1.5.1 in Gemfile26627-update-gitlab-markup-to-1-5-1-againRémy Coutable2017-01-121-1/+1
* | | | Merge branch 'move-dashboard-help-spinach-to-rspec' into 'master' Rémy Coutable2017-01-133-30/+17
|\ \ \ \
| * | | | Move dashboard help spinach test to rspecSemyon Pupkov2017-01-043-30/+17
* | | | | Merge branch 'move-dashboard-group-spinach-to-rspec' into 'master' Rémy Coutable2017-01-133-38/+20
|\ \ \ \ \
| * | | | | Move dashboard group spinach test to rspecSemyon Pupkov2017-01-043-38/+20
| |/ / / /
* | | | | Merge branch 'move-dashboard-archived-projects-spinach-to-rspec' into 'master' Rémy Coutable2017-01-134-43/+32
|\ \ \ \ \
| * | | | | Move dashboard archived projects spinach tests to rspecSemyon Pupkov2017-01-044-43/+32
| |/ / / /
* | | | | Merge branch 'move-dashboard-activetab-spinach-to-rspec' into 'master' Rémy Coutable2017-01-133-29/+46
|\ \ \ \ \
| * | | | | Move dashboard active tab spinach test to rspecSemyon Pupkov2017-01-033-29/+46
* | | | | | Merge branch 'remove-double-let' into 'master' Rémy Coutable2017-01-131-1/+0
|\ \ \ \ \ \
| * | | | | | Remove duplicate let in cycle_analytics_specSemyon Pupkov2017-01-031-1/+0
| |/ / / / /
* | | | | | Merge branch 'move-admin-users-spinach-tests-to-rspec' into 'master' Rémy Coutable2017-01-133-264/+141
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Tiny refactoring example in admin users feature specSemyon Pupkov2017-01-021-9/+9
| * | | | | Move admin users spinach tests to rspecSemyon Pupkov2017-01-023-255/+132
* | | | | | Merge branch 'refactor-controller-params' into 'master' Robert Speicher2017-01-122-21/+66
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Refactor authorized params in GroupsControllerRémy Coutable2017-01-121-2/+6
| * | | | | Refactor allowed params in ServiceParamsRémy Coutable2017-01-121-19/+60
* | | | | | Merge branch '24185-legacy-ci-status-reactive-cache' into 'security'Robert Speicher2017-01-1215-311/+457
|/ / / / /
* | | | | Merge branch '26615-pipeline-status-cell' into 'master' Annabel Dunstone Gray2017-01-122-6/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixes pipeline status cell is too wide by adding missing classes in table hea...26615-pipeline-status-cellFilipa Lacerda2017-01-122-6/+10
* | | | | Merge branch 'add-changelog-search-bar-first-iteration' into 'master' Jacob Schatz2017-01-121-0/+4
|\ \ \ \ \
| * | | | | Add changelog for search-bar-first-iterationClement Ho2017-01-121-0/+4
* | | | | | Merge branch 'redundant-parenthesis-removal-in-test' into 'master' Robert Speicher2017-01-121-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fixes the issueTiago Botelho2017-01-121-1/+1
|/ / / / /
* | | | | Merge branch 'use-configured-git' into 'master' Douwe Maan2017-01-125-14/+14
|\ \ \ \ \
| * | | | | Use configured git rather than system gituse-configured-gitRobert Schilling2017-01-055-14/+14
* | | | | | Merge branch 'zj-unadressable-url-variables' into 'master' Douwe Maan2017-01-124-18/+17
|\ \ \ \ \ \
| * | | | | | Add changelog [ci skip]zj-unadressable-url-variablesZ.J. van de Weg2017-01-051-0/+4
| * | | | | | Do not check for valid url for .gitlab-ci.ymlZ.J. van de Weg2017-01-053-18/+13
* | | | | | | Merge branch 'fill-authorized-projects' into 'master' Douwe Maan2017-01-123-0/+52
|\ \ \ \ \ \ \
| * | | | | | | Fill missing authorized projects rowsfill-authorized-projectsYorick Peterse2017-01-113-0/+52
* | | | | | | | Merge branch 'fix-more-orphans-remove-undeleted-groups' into 'master' Douwe Maan2017-01-122-24/+76
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove more orphans when removing stray namespacesfix-more-orphans-remove-undeleted-groupsYorick Peterse2017-01-112-24/+76
* | | | | | | | | Merge branch '26109-preserve-scroll-position-on-autoreload' into 'master' Alfredo Sumaran2017-01-122-2/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use string constant variable for `#down-build-trace`26109-preserve-scroll-position-on-autoreloadKushal Pandya2017-01-121-4/+4
| * | | | | | | | | Use better approach to access hashKushal Pandya2017-01-121-5/+2