summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Adjust encoding helper spec to have real binary stringbvl-fix-encoding-errors-when-validating-pathsBob Van Landuyt2017-05-301-1/+1
* Avoid crash when trying to match with invalid UTF-8 sequenceBob Van Landuyt2017-05-302-0/+27
* Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-2963-472/+1198
|\
| * Added CHANGELOG entry for nested groups changesrework-authorizations-performance-mysqlrework-authorizations-performanceYorick Peterse2017-05-171-0/+6
| * Document nested groups not working on MySQLYorick Peterse2017-05-171-0/+9
| * Index project_group_links.group_idYorick Peterse2017-05-172-0/+21
| * Convert nested groups to regular ones for MySQLYorick Peterse2017-05-172-0/+189
| * Hide nested group UI/API support for MySQLYorick Peterse2017-05-1712-17/+33
| * Use CTEs for nested groups and authorizationsYorick Peterse2017-05-1751-464/+949
* | Merge branch '27439-memory-usage-info' into 'master'Filipa Lacerda2017-05-295-14/+104
|\ \
| * | Add performance deltas between app deployments on Merge Request widgetKushal Pandya2017-05-295-14/+104
|/ /
* | Merge branch 'dz-codeclimate-yml' into 'master'Douwe Maan2017-05-291-0/+38
|\ \
| * | Add codeclimate.ymldz-codeclimate-ymlDmitriy Zaporozhets2017-05-291-0/+38
* | | Merge branch '32977-user-autocomplete-per_page-does-not-work' into 'master'Douwe Maan2017-05-292-1/+15
|\ \ \
| * | | Add per page to user autocomplete32977-user-autocomplete-per_page-does-not-workClement Ho2017-05-262-1/+15
* | | | Merge branch 'fix/cohorts-tab-nav' into 'master'Sean McGivern2017-05-291-1/+1
|\ \ \ \
| * | | | Add missing cohorts to tab navJames Lopez2017-05-291-1/+1
* | | | | Merge branch 'fix-up-notes-technical-debt' into 'master'Fatih Acet2017-05-292-109/+115
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix up some notes tech debtfix-up-notes-technical-debtEric Eastwood2017-05-262-109/+115
* | | | | Merge branch '32918-enable-ee-trigger' into 'master'Marin Jankovski2017-05-291-1/+2
|\ \ \ \ \
| * | | | | Pass EE variable if needed32918-enable-ee-triggerBalasankar C2017-05-251-1/+2
* | | | | | Merge branch 'fix_duplicated_assignees_on_milestone_page' into 'master'Sean McGivern2017-05-292-1/+14
|\ \ \ \ \ \
| * | | | | | Fix: Milestone - Participants list is showing duplicate assigneesfix_duplicated_assignees_on_milestone_pageValery Sizov2017-05-292-1/+14
* | | | | | | Merge branch 'sh-fix-issue-33011' into 'master'Grzegorz Bizon2017-05-291-10/+16
|\ \ \ \ \ \ \
| * | | | | | | Improve pipelines API specs related to special parametersGrzegorz Bizon2017-05-291-9/+15
| * | | | | | | Simplify pipeline spec by using order instead of sort_bysh-fix-issue-33011Stan Hu2017-05-281-1/+1
| * | | | | | | Fix failing spec in spec/requests/api/pipelines_spec.rbStan Hu2017-05-281-5/+5
| |/ / / / / /
* | | | | | | Merge branch 'gitaly-init-default' into 'master'Douwe Maan2017-05-291-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Duplicate gitaly init variables in 'default' fileJacob Vosmaer2017-05-261-0/+2
* | | | | | | Merge branch 'patch-23' into 'master'Kamil Trzciński2017-05-271-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Replace "build" with "job"Fabio Busatto2017-05-261-3/+3
* | | | | | | | Merge branch 'add-relevant-ee-spec' into 'master'Stan Hu2017-05-271-0/+25
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update spec to match latest EE changesStan Hu2017-05-261-2/+7
| * | | | | | | Add missing project import job example from gitlab-eeAlejandro Rodríguez2017-05-261-0/+20
* | | | | | | | Merge branch 'apply-same-responsive-notes-to-parallel-diff' into 'master'Annabel Dunstone Gray2017-05-264-33/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Apply responsive note styles to parallel diffsapply-same-responsive-notes-to-parallel-diffEric Eastwood2017-05-264-33/+42
* | | | | | | | | Merge branch 'enable-duplicate-property-scss-lint' into 'master'Clement Ho2017-05-2610-9/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enable DuplicateProperty scss-lintAnnabel Dunstone Gray2017-05-2610-9/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-a...Fatih Acet2017-05-2611-12/+102
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Update MWPS feature spec per change to remove source branch default.32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-projectBryce Johnson2017-05-251-2/+2
| * | | | | | | | Fallback to false when remove_source_branch is null.Bryce Johnson2017-05-251-1/+1
| * | | | | | | | Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-a...Bryce Johnson2017-05-252-1/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Expose remove_source_branch boolean/nullOswaldo Ferreira2017-05-242-1/+3
| * | | | | | | | | Update shouldRemoveSourceBranch against API entity changes.Bryce Johnson2017-05-251-3/+1
| |/ / / / / / / /
| * | | | | | | | Set up merge request from fork more simply.Bryce Johnson2017-05-241-10/+2
| * | | | | | | | Remove spec from created_from_fork_spec.Bryce Johnson2017-05-241-15/+0
| * | | | | | | | Move spec and add one for merge button not disabled.Bryce Johnson2017-05-241-0/+29
| * | | | | | | | Add spec for disabled Remove source branch checkbox.Bryce Johnson2017-05-231-0/+15
| * | | | | | | | Set merge params to force_remove_source_branch by default.Bryce Johnson2017-05-231-2/+4
| * | | | | | | | Update spinach specs to explicitly check Remove Source Branch.Bryce Johnson2017-05-232-2/+7