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/app
AgeCommit message (Collapse)Author
2017-06-10Fix bad mergeClement Ho
2017-06-10Resolve inconsistenciesClement Ho
2017-06-09Merge commit 'b1bf6d88fceb24663bfe4be2d9cc111710d9126b' into 9-3-stableClement Ho
2017-06-09Merge commit 'abc61f260074663e5711d3814d9b7d301d07a259' into 9-3-stableClement Ho
2017-06-08Merge branch 'master-security-update' into 'master'Regis Boudinot
Master security update See merge request !12025
2017-06-08Merge remote-tracking branch 'origin/upstream-9-2-security' into ↵DJ Mountney
master-security-update
2017-06-08Merge branch '25426-group-dashboard-ui' into 'master'Douwe Maan
Resolve "Group dashboard UI" Closes #25426 See merge request !11098
2017-06-08Merge branch 'artifacts-keyboard-shortcuts' into 'master'Filipa Lacerda
Enabled keyboard shortcuts on artifacts pages Closes #33184 See merge request !12015
2017-06-08Merge branch 'ce#31853-projects-shared-groups' into 'master'Annabel Dunstone Gray
31853 Remove duplication for sharing projects with groups in project settings Closes #31853 See merge request !11951
2017-06-08Merge branch 'dm-blob-file-type' into 'master'Grzegorz Bizon
Add Blob#file_type convenience method See merge request !11982
2017-06-08Merge branch 'dm-empty-blob-viewer-binary' into 'master'Grzegorz Bizon
Empty blob viewer isn’t binary-only See merge request !11979
2017-06-08Merge branch 'upstream-9-2-security' into master-security-updateDJ Mountney
2017-06-08Merge branch '25934-project-snippet-vis' into 'security-9-2'DJ Mountney
Fix visibility when referencing snippets See merge request !2101
2017-06-08Merge branch 'dz-restrict-autocomplete' into 'security-9-1'DJ Mountney
Allow users autocomplete by author_id only for authenticated users See merge request !2100
2017-06-08Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'DJ Mountney
Escapes html content before appending it to the DOM See merge request !2107
2017-06-08Merge branch 'dm-diff-file-diffable' into 'master'Sean McGivern
Move diffable? method from Repository to Diff::File See merge request !11980
2017-06-08Merge branch 'dm-highlight-diff-file-blob' into 'master'Sean McGivern
Use Diff::File blob methods from diff highlighter See merge request !11978
2017-06-08Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran
2017-06-08Add Blob#file_type convenience methodDouwe Maan
2017-06-08Merge branch '33383_add_bulgarian_translation_of_cycle_analytics_page' into ↵Douwe Maan
'master' Add bulgarian translation of Cycle Analytics Page to I18N Closes #33383 See merge request !11958
2017-06-08Merge branch ↵Douwe Maan
'33334_add_portuguese_brazil_translation_of_cycle_analytics_page' into 'master' Add portuguese brazil translation of Cycle Analytics Page to I18N Closes #33334 See merge request !11920
2017-06-08Use Diff::File blob methods from diff highlighterDouwe Maan
2017-06-08Move diffable? method from Repository to Diff::FileDouwe Maan
2017-06-08Make the uploader use the updated folderBob Van Landuyt
2017-06-08Bring in security changes from the 9.2.5 releaseDJ Mountney
Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue
2017-06-08Merge branch 'allow-reporters-to-promote-group-labels' into 'master'Douwe Maan
Allow group reporters to promote labels See merge request !12006
2017-06-08fixes project_group_links spec by adding click tab eventtauriedavis
2017-06-0831853 Remove duplication for sharing projects with groups in project settingstauriedavis
2017-06-08Merge branch '32720-emoji-spacing' into 'master'Annabel Dunstone Gray
32720 Create equal spacing between emoji buttons and remove unnecessary margin-bottom Closes #32720 See merge request !11889
2017-06-08Merge branch 'zj-i18n-pipeline-schedules' into 'master'Douwe Maan
Allow translation of Pipeline Schedules See merge request !11974
2017-06-08Enabled keyboard shortcuts on artifacts pagesPhil Hughes
Closes #33184
2017-06-08Merge branch 'remove-transition' into 'master'Annabel Dunstone Gray
Remove unnecessary transition Closes #33431 See merge request !11985
2017-06-08Resolve "Jobs page scrollbar and centering"Filipa Lacerda
2017-06-08Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan
Rework project authorizations and nested groups for better performance See merge request !10885
2017-06-08Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon
Blob#load_all_data! doesn’t need an argument See merge request !11977
2017-06-08Merge branch 'clean-up-project-for-merge-conflicts' into 'master'Rémy Coutable
Clean up the Project model to reduce conflicts See merge request !11967
2017-06-08Allow group reporters to promote labelsSean McGivern
They can admin group labels anyway, we weren't checking the more specific permission.
2017-06-08Merge branch '12614-fix-long-message' into 'master'Dmitriy Zaporozhets
Fix long urls in the title of commit Closes #12614 See merge request !10938
2017-06-08Merge branch 'zj-prom-pipeline-count' into 'master'Grzegorz Bizon
Add prometheus metrics on pipeline creation Closes #32624 See merge request !11975
2017-06-08Split Project#reset_cache_and_import_attrs upYorick Peterse
In EE we don't want to remove import data for mirrors. By moving this logic to a separate method we can simply re-define the method in EE using "prepend" and call "super" whenever necessary.
2017-06-08Re-order some methods in ProjectYorick Peterse
This ensures the order of these methods is identical in CE and EE.
2017-06-08Add tests when user has no direct acces to a groupAlfredo Sumaran
2017-06-08Align folder and carets on groups treeAlfredo Sumaran
2017-06-08Update URL when paginating groupsAlfredo Sumaran
2017-06-08Regenerate po and js filesZ.J. van de Weg
2017-06-08Allow translation of Pipeline SchedulesZ.J. van de Weg
2017-06-08Add missing aria-hidden attribute to i tagsAlfredo Sumaran
2017-06-08Fix type casingAlfredo Sumaran
2017-06-08Do not show access type to a group if there’s no accessAlfredo Sumaran
2017-06-08Bring in security changes from the 9.2.5 releaseDJ Mountney
Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue