summaryrefslogtreecommitdiff
path: root/config/README.md
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-02-07 11:31:44 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-02-07 11:31:44 +0000
commit14bf5c10097a788b9971b7660c6104475fdc48fb (patch)
tree7ad67a85c61dec0a01602a4415eaeb435ae396f4 /config/README.md
parenta7420b77bd9b7038af3702d3665faab317048d3a (diff)
parenta965edb89d3c260394ffc987832a469e7740415d (diff)
downloadgitlab-ce-14bf5c10097a788b9971b7660c6104475fdc48fb.tar.gz
Merge branch 'master' into feature/gb/paginated-environments-api
* master: (301 commits) added missed commit in rebase update Grape routes to work with current version of Grape adds changelog fixes cursor issue on pipeline pagination Use random group name to prevent conflicts List all groups/projects for admins on explore pages Fix indentation More backport Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory Fixed variables_controller_spec.rb test Backport of the frontend view, including tests Updated the #create action to render the show view in case of a form error Improved code styling on the variables_controller_spec Added tests for the variables controller #update action Added a variable_controller_spec test to test for flash messages on the #create action Modified redirection logic in the variables cont. Added redirections to the index actions for the variables and triggers controllers Added a flash message to the creation of triggers Fixed tests, renamed files and methods Changed the controller/route name to 'ci/cd' and renamed the corresponding files ...
Diffstat (limited to 'config/README.md')
0 files changed, 0 insertions, 0 deletions