Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2017-06-12Merge branch ↵Adam Niedzielski
'32995-issue-contents-dynamically-replaced-with-stale-version-after-saving-or-refreshing-relative-external_url-only' into 'master' Fix incorrect ETag cache key when relative instance URL is used Closes #32995 See merge request !11964
2017-06-12Merge branch 'backport_fix_slash_commands_for_multiple_assignee' into 'master'Douwe Maan
Backport from EE: Fix '/unassign' slash command See merge request !11926
2017-06-12Merge branch 'fix/backup-restore-resume' into 'master'James Lopez
Fix backup task to continue on corrupt repositories Closes #31767 See merge request !11962
2017-06-08Merge branch '31556-ci-coverage-paralel-rspec' into 'master'Kamil Trzciński
Return the last coverage in trace stream Closes #31556 See merge request !11128
2017-06-08Merge branch ↵Fatih Acet
'32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone' into 'master' Resolve "Browser notifications for pipeline running in a MR is gone" Closes #32916 See merge request !11734
2017-06-02Merge branch '25934-project-snippet-vis' into 'security-9-2'Douwe Maan
Fix visibility when referencing snippets See merge request !2101
2017-06-02Merge branch 'bvl-move-project-uploads-correctly' into 'security-9-2'Sean McGivern
Move the uploads in the correct folder when moving project/namespace See merge request !2112
2017-05-31Fix incorrect merge in 2c6fc0f.Timothy Andrew
Reference: 3c7c859c359bf5d3955dd300d6861ff33af21ca7
2017-05-31Merge branch 'dz-api-x-frame' into 'security-9-2'Robert Speicher
Restrict API X-Frame-Options to same origin See merge request !2103
2017-05-25Merge branch 'dm-fix-routes' into 'master'Robert Speicher
Fix ambiguous routing issues by teaching router about reserved words See merge request !11570
2017-05-24Merge branch 'sentry-clientside-releases' into 'master'Phil Hughes
Read HEAD commit and use as sentry releases value Closes #32535 See merge request !11565
2017-05-24Merge branch 'fix-notify-post-receive' into 'master'Stan Hu
Prevent errors from non-functional notify_post_receive endpoint See merge request !11509
2017-05-24Merge branch 'zj-fix-pipeline-etag' into 'master'Kamil Trzciński
Fix pipeline etag Closes #32658 See merge request !11615
2017-05-23Merge branch 'fix-backup-raketask' into 'master'Timothy Andrew
Add missing regex to backup manager Closes #32669 See merge request !11635
2017-05-22Resolve migration helper conflictsBob Van Landuyt
From `master`
2017-05-22[ci skip] Conflicts while picking !11396 into 9-2-stableYorick Peterse
2017-05-19Merge branch '9-2-stable-fix-conflicts-for-mr-11298' into '9-2-stable'Douwe Maan
Fix 9.2 conflicts for "Fix conflict resolution from corrupted upstream" See merge request !11533
2017-05-19Merge branch 'disable-usage-ping' into 'master'Robert Speicher
Usage ping updates Closes #31741 and #31453 See merge request !11231
2017-05-19Merge branch 'remove-services-count-from-usage-ping-data' into 'master'Stan Hu
Remove Services count from usage ping payload. Closes gitlab-ee#2241 See merge request !11499
2017-05-19Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'Douwe Maan
Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298 Conflicts: app/models/merge_request.rb spec/models/merge_request_spec.rb
2017-05-19Merge branch 'fixes_for_multiple_issue_assignees' into 'master' Sean McGivern
Fix for Follow-up from "Backport of Multiple Assignees feature Closes #31888 See merge request !11178
2017-05-19Merge branch 'bvl-fix-incorrectly-renamed-routes' into 'master'Douwe Maan
Fixes for the rename reserved paths helpers Closes #32528 See merge request !11492
2017-05-19Merge branch 'dm-catch-uri-errors' into 'master'Robert Speicher
Catch all URI errors in ExternalLinkFilter Closes #32076 See merge request !11494
2017-05-19Merge branch 'reenable-gitaly-ref-name' into 'master'Robert Speicher
Re-enable gitaly migration for ref_name_for_sha after bugfixes See merge request !11310
2017-05-19Merge branch 'dm-no-conflicts-when-branches-are-missing-9-2' into '9-2-stable'Regis Boudinot
Stop MR conflict code from blowing up when branches are missing (9.2) See merge request !11502
2017-05-18Stop MR conflict code from blowing up when branches are missingDouwe Maan
2017-05-18Gitaly reuse stubsAndrew Newdigate
2017-05-12Merge branch 'bvl-fix-dynamic-path-query' into 'master' Douwe Maan
Only rename namespaces and projects with an invalid path See merge request !11338
2017-05-10Use new SnippetsFinder signature in APIBob Van Landuyt
2017-05-10Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan
Use GroupsFinder to find subgroups the user has access to See merge request !2096
2017-05-10Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan
Refactor snippets finder & dont return internal snippets for external users See merge request !2094
2017-05-10Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan
Respect project features in wiki and blob search See merge request !2089
2017-05-10Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'Robert Speicher
(security-9-1) Add correct `rel` attributes to external links when rendering markdown See merge request !2097
2017-05-10Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher
(security-9-1) Render asciidoc & other markup using banzai in a pipeline See merge request !2098
2017-05-10Merge branch 'mr-widget-redesign-review' into 'master'Jacob Schatz
Merge request widget redesign Closes #25424 and #27950 See merge request !10319
2017-05-09Merge branch ↵Sean McGivern
'Add-index_redirect_routes_path_for_link-migration-to-setup_postgresql' into 'master' Add index_redirect_routes_path_for_link migration to setup_postgresql See merge request !11165
2017-05-08Merge branch 'fix/gl-project-id' into 'master'James Lopez
Omit gl_project_id from Import/Export Closes #29813 See merge request !11032
2017-05-08Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master' Robert Speicher
Add support for commit diff ignore_whitespace_change and paths flags Closes gitaly#198 See merge request !11028
2017-05-08Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg
2017-05-08Re-enable Gitaly commit_raw_diff featureAhmad Sherif
2017-05-06Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ↵Kamil Trzciński
'master' Check access to a branch when user triggers manual action Closes #20261 See merge request !10494
2017-05-06Real time pipeline show actionZeger-Jan van de Weg
2017-05-06Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern
Resolve "Redirect to new project link after a rename" Closes #17361 and #30317 See merge request !11136
2017-05-06Merge branch 'fix/fork-spec-mysql' into 'master' Stan Hu
Fix fork_spec failure to do with mySQL Closes #31870 See merge request !11121
2017-05-06Merge branch ↵Sean McGivern
'29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce' into 'master' Generate and handle a gl_repository param to pass around components Closes #29925 See merge request !10992
2017-05-06Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable'Sean McGivern
2017-05-05Merge branch 'mia_backort' into 'master' Jacob Schatz
Backport of Multiple Assignees feature See merge request !11089
2017-05-05Index redirect_routes path for LIKEMichael Kozono
2017-05-05Redirect from redirect routes to canonical routesMichael Kozono
2017-05-05Merge branch 'add-sentry-js-again-with-vue' into 'master' Phil Hughes
Add sentry JS See merge request !6764