summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dz-nested-groups-api' into 'master' Dmitriy Zaporozhets2017-02-092-0/+2
|\ | | | | | | | | Nested groups API See merge request !9034
| * Add nested groups to the APIdz-nested-groups-apiDmitriy Zaporozhets2017-02-082-0/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'rename_delete_services' into 'master'Rémy Coutable2017-02-083-3/+3
|\ \ | | | | | | | | | | | | Fix inconsistent naming for services that delete things See merge request !5803
| * | Fix inconsistent naming for services that delete thingsdixpac2017-02-083-3/+3
| | | | | | | | | | | | | | | | | | * Changed name of delete_user_service and worker to destroy * Move and change delete_group_service to Groups::DestroyService * Rename Notes::DeleteService to Notes::DestroyService
* | | Merge branch '23104-remove-public-param-for-projects' into 'master' Douwe Maan2017-02-081-15/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | API: remove `public` param for projects Closes #23104 See merge request !8736
| * | | API: remove `public` param for projectsToon Claes2017-02-071-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The create and edit actions for projects had these parameters: - `public` (optional) - if true same as setting `visibility_level = 20` - `visibility_level` (optional) Remove the `public` parameter to avoid contradiction.
* | | | Merge branch 'feature/gb/paginated-environments-api' into 'master'Rémy Coutable2017-02-082-1/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Expose paginated environments list API endpoint See merge request !8928
| * \ \ \ Merge branch 'master' into feature/gb/paginated-environments-apiFilipa Lacerda2017-02-0727-219/+1431
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | Add specs for standalone pagination for serializersGrzegorz Bizon2017-02-061-0/+9
| | | | |
| * | | | Move serializers pagination class to separate moduleGrzegorz Bizon2017-02-061-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | This helps to avoid conflicts with `Paginator` class that seems to be used by some bundled libs.
| * | | | Rename `Gitlab::Serialize` module to reuse it laterGrzegorz Bizon2017-02-061-1/+1
| | | | |
* | | | | Merge branch 'jej-lint-scripts-and-config' into 'master'dz-nested-groups-docsDouwe Maan2017-02-081-0/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Syntax linting for init scripts Closes #27787 See merge request !9054
| * | | | | CI runs lint on shell scripts in lib/supportjej-lint-scripts-and-configJames Edwards-Jones2017-02-071-0/+25
| | | | | |
* | | | | | Use stricter regex anchorsroute-map-string-sourceDouwe Maan2017-02-071-1/+1
| | | | | |
* | | | | | Support a string source in the route mapDouwe Maan2017-02-071-17/+15
| | | | | |
* | | | | | Merge branch 'route-map' into 'master' Robert Speicher2017-02-072-0/+66
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Add 'View on [env]' link to blobs and individual files in diffs See merge request !8867
| * | | | | Address feedbackDouwe Maan2017-02-061-2/+0
| | | | | |
| * | | | | Improve performance of finding last deployed environmentDouwe Maan2017-02-061-0/+14
| | | | | |
| * | | | | Add testsDouwe Maan2017-02-061-0/+2
| | | | | |
| * | | | | Validate route mapDouwe Maan2017-02-061-0/+52
| | | | | |
* | | | | | Merge branch 'jej-fix-backup-rake-color' into 'master'Sean McGivern2017-02-071-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed backup.rake colorize method following Pages -> CE See merge request !9031
| * | | | | | Fixed backup.rake colorize method following Pages -> CEjej-fix-backup-rake-colorConnor Shea2017-02-071-6/+6
| | | | | | | | | | | | | | | | | | | | | Cherry-picked 'Remove colorize methods that weren't in CE.'
* | | | | | | Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-071-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use reCaptcha when an issue identified as spam Closes #21518 See merge request !8846
| * | | | | | | Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-071-0/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'remove-deploy-key-endpoint' into 'master' Rémy Coutable2017-02-073-89/+206
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deploy key endpoint Closes #20569 See merge request !8716
| * | | | | | Remove /projects/:id/keys/.. endpointsRobert Schilling2017-02-073-89/+206
| | | | | | |
* | | | | | | Merge branch '27785-fix-init-script-after-pages-to-ce' into 'master' Douwe Maan2017-02-071-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix syntax error in init.d/gitlab after Pages -> CE Closes #27785 See merge request !9026
| * | | | | | Fix syntax error in init.d/gitlab after Pages -> CEDrew Blessing2017-02-071-1/+1
| | |/ / / / | |/| | | | | | | | | | Cherry-picked ‘Fix syntax error in conditional statement’
* | | | | | Merge branch 'api-remove-snippets-expires-at' into 'master'Sean McGivern2017-02-077-74/+223
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated 'expires_at' from project snippets API Closes #14156 See merge request !8723
| * | | | | Split V3 entities into a separate fileapi-remove-snippets-expires-atRobert Schilling2017-02-076-93/+95
| | | | | |
| * | | | | Remove deprecated 'expires_at' from project snippets APIRobert Schilling2017-02-073-3/+150
| | | | | |
* | | | | | Merge branch 'fix/import-group-members' into 'master' Rémy Coutable2017-02-074-3/+34
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing group members from Import/Export Closes #25124 See merge request !8923
| * | | | | Add missing group members to export for I/Efix/import-group-membersJames Lopez2017-02-074-3/+34
| | |_|_|/ | |/| | |
* | | | | added missed commit in rebaseJames Lopez2017-02-071-3/+1
| | | | |
* | | | | update Grape routes to work with current version of GrapeJames Lopez2017-02-071-1/+7
| | | | |
* | | | | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-071-1/+13
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!998 See merge request !8984
| * | | | List all groups/projects for admins on explore pagesDouwe Maan2017-02-061-1/+13
| |/ / /
* | | | Merge branch 'fix-references-header-parsing' into 'master' Sean McGivern2017-02-062-6/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix References header parser for Microsoft Exchange Closes #26567 See merge request !8620
| * | | | No strong reasons to freeze themLin Jen-Shin2017-02-071-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22868713
| * | | | Freeze regexp and add a commentfix-references-header-parsingLin Jen-Shin2017-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_21590440
| * | | | Use references variableLin Jen-Shin2017-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22020035
| * | | | Use message_id_regexp variable for the regexpLin Jen-Shin2017-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22021001
| * | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-02-03103-473/+1174
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-references-header-parsing * upstream/master: (574 commits) remove dateFormat global exception fix relative paths to xterm.js within fit.js use setFixtures instead of fixture.set prevent u2f tests from triggering a form submission while testing simplify test for focus state preload projects.json fixture preload projects.json fixture rework tests which rely on teaspoon-specific behavior Only render hr when user can't archive project. use setFixtures instead of fixture.set ensure helper classes and constants are exposed globally preload projects.json fixture fix fixture references in environments_spec allow console.xxx in tests, reorder eslint rules alphabetically remove redundant "data-toggle" attribute so Vue doesn't complain fix broken reference to formatDate in a CommonJS environment fix errors within gl_dropdown_spec.js when running in Karma fix intermittant errors in merge_commit_message_toggle_spec.rb Update installation docs to include Docker, others ignore node_modules in rubocop ...
| * | | | | Specify that iOS app would also do thisLin Jen-Shin2017-01-201-1/+3
| | | | | |
| * | | | | Fix References header parser for Microsoft ExchangeLin Jen-Shin2017-01-202-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Microsoft Exchange would append a comma and another message id into the References header, therefore we'll need to fallback and parse the header by ourselves. Closes #26567
* | | | | | Merge branch 'fix/gb/backwards-compatibility-coverage-ci-yml' into 'master' Douwe Maan2017-02-061-4/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove coverage entry from global CI/CD options See merge request !8981
| * | | | | | Remove coverage entry from global CI/CD optionsGrzegorz Bizon2017-02-041-4/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jej-pages-to-ce' into 'master' Douwe Maan2017-02-0611-39/+269
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding GitLab Pages to CE Closes #14605, gitlab-com/infrastructure#1058, gitlab-ee#1333, and #323 See merge request !8463
| * | | | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-0615-50/+525
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-0344-222/+618
| |\ \ \ \ \
View Lorry Controller Status