summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| | | | | | |
| * | | | | | Rename pages namespace or project path when changedKamil Trzcinski2017-01-313-29/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move UploadsTransfer to ProjectTransfer and inherit from this to UploadsTransfer and PagesTransfer
| * | | | | | Revert "Store pages in shared/pages/fqdn/fqdn/public or ↵Kamil Trzcinski2017-01-312-87/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shared/pages/fqdn/subpath/public - makes it simpler to implement CNAMEs in future" This reverts commit 86a2a78f0d13a678899460638add6b862059433e.
| * | | | | | Store pages in shared/pages/fqdn/fqdn/public or ↵Kamil Trzcinski2017-01-312-4/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | shared/pages/fqdn/subpath/public - makes it simpler to implement CNAMEs in future
| * | | | | | Fix specsKamil Trzcinski2017-01-311-1/+1
| | | | | | |
| * | | | | | Add GitLab PagesKamil Trzcinski2017-01-313-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The pages are created when build artifacts for `pages` job are uploaded - Pages serve the content under: http://group.pages.domain.com/project - Pages can be used to serve the group page, special project named as host: group.pages.domain.com - User can provide own 403 and 404 error pages by creating 403.html and 404.html in group page project - Pages can be explicitly removed from the project by clicking Remove Pages in Project Settings - The size of pages is limited by Application Setting: max pages size, which limits the maximum size of unpacked archive (default: 100MB) - The public/ is extracted from artifacts and content is served as static pages - Pages asynchronous worker use `dd` to limit the unpacked tar size - Pages needs to be explicitly enabled and domain needs to be specified in gitlab.yml - Pages are part of backups - Pages notify the deployment status using Commit Status API - Pages use a new sidekiq queue: pages - Pages use a separate nginx config which needs to be explicitly added
* | | | | | | Remove deprecated MR and Issue endpoints and preserve V3 namespace9-0-api-changesOswaldo Ferreira2017-02-065-146/+644
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'terminal-max-session-time' into 'master' Kamil Trzciński2017-02-064-4/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce maximum session time for terminal websocket connection Closes #26263 See merge request !8413
| * | | | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-064-4/+7
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Store the value in application settings. Expose the value to Workhorse.
* | | | | | Merge branch '22007-unify-projects-search' into 'master' Rémy Coutable2017-02-063-17/+464
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify projects search by removing /projects/:search endpoint Closes #22007 See merge request !8877
| * | | | | | Remain V3 endpoint unchangedOswaldo Ferreira2017-01-302-1/+464
| | | | | | |
| * | | | | | Unify projects search by removing /projects/:search endpointOswaldo Ferreira2017-01-301-16/+0
| | | | | | |
* | | | | | | Merge branch 'api-fix-files' into 'master' Rémy Coutable2017-02-061-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | API: Fix file downloading See merge request !8953
| * | | | | | API: Fix file downloadingRobert Schilling2017-02-031-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-0319-21/+81
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (181 commits) Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Fixed modal lists dropdown not updating when list is deleted Fixed remove btn error after creating new issue in list Removed duplicated test Removed Masonry, instead uses groups of data Uses mixins for repeated functions Fixed up specs Props use objects with required & type values Removes labels instead of closing issue when clicking remove button Fixed JS lint errors Fixed issue card spec Added webkit CSS properties Fixed bug with empty state showing after search Fixed users href path being incorrect Fixed bug where 2 un-selected issues would stay on selected tab Fixed DB schema Changed how components are added in objects Added remove button Add optional id property to the issue schema Fixed issue link href Disabled add issues button if no lists exist ...
View Lorry Controller Status