summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \ \ \ \
| * | | | | | Ported max_pages_size in settings API to CEJames Edwards-Jones2017-02-021-1/+2
| | | | | | |
| * | | | | | Add missing gitlab-pages related vars in init.d/gitlabAchilleas Pipinellis2017-01-311-2/+2
| | | | | | |
| * | | | | | Simplify NGINX server_name regexAchilleas Pipinellis2017-01-312-3/+3
| | | | | | |
| * | | | | | chmod 644 gitlab.default.exampleAchilleas Pipinellis2017-01-311-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to be executable since it is sourced in /etc/init.d/gitlab
| * | | | | | Set pages daemon to falseAchilleas Pipinellis2017-01-311-5/+5
| | | | | | |
| * | | | | | Add missing variables for gitlab-pagesAchilleas Pipinellis2017-01-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Change the pages daemon proxy listen port to 8090Achilleas Pipinellis2017-01-313-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | So as to be consistent with what is set in Omnibus
| * | | | | | Change NGINX pages configs to account for the Pages daemonAchilleas Pipinellis2017-01-312-19/+15
| | | | | | |
| * | | | | | Add init scripts for GitLab Pages daemonAchilleas Pipinellis2017-01-312-7/+78
| | | | | | |
| * | | | | | Fix confusing implementation detail in nginx config about how gitlab-pages ↵Kamil Trzcinski2017-01-312-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | work [ci skip]
| * | | | | | Bring back GitLab Pages SSL configKamil Trzcinski2017-01-312-0/+84
| | | | | | |
View Lorry Controller Status