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
AgeCommit message (Collapse)Author
2016-04-13Add docs [ci skip]add-raw-file-endpoint-to-api-3934Zeger-Jan van de Weg
2016-04-08Download raw files through the APIZeger-Jan van de Weg
2016-04-08Merge branch 'revert-missing-changelog' into 'master' Jacob Schatz
Remove changelog entry for new navigation sidebar. See merge request !3608
2016-04-08Merge branch 'code-wrapping' into 'master' Jacob Schatz
Fix side-by-side code format & commit message wrap ![Screen_Shot_2016-04-07_at_1.31.28_PM](/uploads/bad00284e4dfbec1fdd75220c34f4a98/Screen_Shot_2016-04-07_at_1.31.28_PM.png) ![Screen_Shot_2016-04-07_at_1.32.23_PM](/uploads/7cd344765025e93d0035934a473b4bb3/Screen_Shot_2016-04-07_at_1.32.23_PM.png) See merge request !3605
2016-04-08Merge branch 'revert-2ed6cd9e' into 'master' Jacob Schatz
Revert "Merge branch 'new-navigation-prototype' into 'master'" This reverts merge request !3494 See merge request !3607
2016-04-08Update CHANGELOG for 8.6.5, 8.5.10, 8.4.8, and 8.3.7Robert Speicher
[ci skip]
2016-04-08Remove changelog entry for new navigation sidebar.Jacob Schatz
2016-04-08Revert "Merge branch 'new-navigation-prototype' into 'master'"Jacob Schatz
This reverts merge request !3494
2016-04-08Merge branch 'revert-5e8740ee' into 'master' Jacob Schatz
Revert "Merge branch 'fix-sidebar-exapnd' into 'master'" This reverts merge request !3520 See merge request !3606
2016-04-07Revert "Merge branch 'fix-sidebar-exapnd' into 'master'"Jacob Schatz
This reverts merge request !3520
2016-04-07Fix side-by-side code format & commit message wrapAnnabel Dunstone
2016-04-07Merge branch 'indentation-bug' into 'master' Jacob Schatz
Preserve white space See merge request !3602
2016-04-07Merge branch 'fix-number-of-todos-sidebar-is-not-updated' into 'master' Jacob Schatz
Update number of Todos in the sidebar when it's marked as "Done" Closes #15002 See merge request !3600
2016-04-07Update CHANGELOGDouglas Barbosa Alexandre
2016-04-07Indentation updateAnnabel Dunstone
2016-04-07Preserve white spaceAnnabel Dunstone
2016-04-07Update number of Todos in the sidebar when it's marked as "Done"Douglas Barbosa Alexandre
2016-04-07Merge branch 'issue_14012' into 'master' Rémy Coutable
Fix problem when creating milestones in groups without projects Fixes #14012 See merge request !3481
2016-04-07Merge branch 'regex-for-colons' into 'master' Douwe Maan
Add optional colon. See merge request !3591
2016-04-07Merge branch 'no-gc-auto' into 'master' Yorick Peterse
Disable git gc --auto See merge request !3572
2016-04-07Merge branch 'dont-assign-me-if-you-arent-allow' into 'master' Rémy Coutable
Hide "assign to me" link if not allowed Fixes #14996 See merge request !3590
2016-04-07Implement review suggestionsFelipe Artur
2016-04-07CHANGELOGJacob Schatz
2016-04-07Remove dumb debug statement and add many tests.Jacob Schatz
2016-04-07Remove duplication. Remove JS data attributesJacob Schatz
2016-04-07Add optional colon.Jacob Schatz
2016-04-07Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqGrzegorz Bizon
* 'master' of dev.gitlab.org:gitlab/gitlabhq: Make sessions controller specs more explicit Fix 2FA authentication spoofing vulnerability Add specs for sessions controller including 2FA
2016-04-07Merge branch 'fix/2fa-authentication-spoofing' into 'master' Rémy Coutable
Fix 2FA authentication spoofing ## Summary This is security fix for vulnerability described at https://gitlab.com/gitlab-org/gitlab-ce/issues/14900. Attacker was able to bypass password authentication of users that have 2FA enabled, and consequently sign is as a different user, without knowing his password, if he managed to guess 2FA One Time Password for that user. It was also possible to enumerate users and check if they have 2FA enabled, because GitLab responded with different error for each case. ## Fix This MR attempts to change default user search scope if `otp_user_id` session variable has been set. If it is present, it means that user has 2FA enabled, and has already been verified with login and password. In this case we should look for user with `otp_user_id` first, before picking it up by `login`. Both, 2FA authentication spoofing and 2FA discovery have been covered by specs. ## Further work Current 2FA code is a bit tricky, so it probably needs some refactoring. See merge request !1947
2016-04-07Make sessions controller specs more explicitGrzegorz Bizon
2016-04-07Hide "assign to me" link if not allowedJacob Schatz
2016-04-07Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into no-gc-autoJacob Vosmaer
2016-04-07Merge branch 'fix-project-404-cache-issue' into 'master' Yorick Peterse
Expire caches after project creation to ensure a consistent state See merge request !3586
2016-04-07Merge branch 'update_main_lang_if_unset' into 'master' Rémy Coutable
Only update main language if it is not already set Related to gitlab-org/gitlab-ce#14937 (but does not fully fix) This is a temporary fix so performance isn't affected so much. cc @yorickpeterse @ayufan how does this look? See merge request !3556
2016-04-07Fix 2FA authentication spoofing vulnerabilityGrzegorz Bizon
This commit attempts to change default user search scope if otp_user_id session variable has been set. If it is present, it means that user has 2FA enabled, and has already been verified with login and password. In this case we should look for user with otp_user_id first, before picking it up by login.
2016-04-07Merge branch 'api-filter-milestone' into 'master' Rémy Coutable
API: Ability to filter milestones by state Ability to filter milestones by `active` and `closed` state. * Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14931 See merge request !3566
2016-04-07Merge branch 'feature/expose-builds-badge' into 'master' Rémy Coutable
Expose badges This MR exposes badge somewhere in visible place. ![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png) Closes #13801 See merge request !3326
2016-04-07Merge branch 'fix_14638' into 'master' Rémy Coutable
Fixes #14638. The SQL query was ambiguous and in this case we want to filter projects. See merge request !3462
2016-04-07Merge branch 'return-303-for-branch-deletion' into 'master' Rémy Coutable
Return status code 303 after a branch DELETE operation to avoid project deletion Closes #14994 See merge request !3583
2016-04-07Expire caches after project creation to ensure a consistent stateStan Hu
Closes #14961
2016-04-07Merge branch 'update-coveralls' into 'master' Jeroen van Baarsen
Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2 This removes a few dependencies! It was also rude to be using coveralls 0.8.9, considering 0.8.12 introduced support for GitLab CI :) Also paves the way for updating mime-types to 3.0. Coveralls Changelog: https://github.com/lemurheavy/coveralls-ruby/releases Simplecov Changelog: https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md See merge request !3584
2016-04-07Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Schilling
2016-04-07Merge branch 'patch-1' into 'master' Robert Schilling
Fix typo in .gitlab-ci.yml doc. [ci skip] See merge request !3581
2016-04-07Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2connorshea
This removes a few dependencies! It was also rude to be using coveralls 0.8.9, considering 0.8.12 introduced support for GitLab CI :) Also paves the way for updating mime-types to 3.0. Coveralls Changelog: https://github.com/lemurheavy/coveralls-ruby/releases Simplecov Changelog: https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md
2016-04-07Return status code 303 after a branch DELETE operation to avoid project deletionStan Hu
Closes #14994
2016-04-07Merge branch 'anti-memoizer-mr-fix' into 'master' Robert Speicher
Reset merge request widget options Fixes #14986 See merge request !3582
2016-04-07Reset MR optsJacob Schatz
2016-04-07Merge branch 'saml-external-groups' into 'master' Robert Speicher
Allow SAML to identify external users and set them as such Related to #4009 Fixes #14577 This allows SAML to retrieve group information form the `SAML Response` and match that to a setting that will flag all matching users as external. See merge request !3530
2016-04-07Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher
Wiki preview URL converting problem [via Markdown] Current implementation when rendering the preview, thinks relative links are for project repository files. We are creating a new preview route that will define correct context data to render for wikis instead. Fixes #2380, #1184 See merge request !3461
2016-04-07Implemented suggested fixesPatricio Cano
2016-04-07little refactor and improvements on specsGabriel Mazetto