| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Handle an undefined ci_id: this was keeping projects from being destroyedhandle-nil-ci-id | Stan Hu | 2016-04-06 | 1 | -0/+2 |
| | | | | | Closes #15005 | ||||
| * | Merge branch 'anti-memoizer-mr-fix' into 'master' | Robert Speicher | 2016-04-07 | 2 | -1/+9 |
| |\ | | | | | | | | | | | | | Reset merge request widget options Fixes #14986 See merge request !3582 | ||||
| | * | Reset MR optsanti-memoizer-mr-fix | Jacob Schatz | 2016-04-06 | 2 | -1/+9 |
| |/ | |||||
| * | Merge branch 'saml-external-groups' into 'master' | Robert Speicher | 2016-04-07 | 8 | -102/+207 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Implemented suggested fixes | Patricio Cano | 2016-04-06 | 5 | -33/+21 |
| | | | |||||
| | * | Added CHANGELOG itemsaml-external-groups | Patricio Cano | 2016-04-06 | 2 | -1/+1 |
| | | | |||||
| | * | Added documentation | Patricio Cano | 2016-04-06 | 2 | -0/+73 |
| | | | |||||
| | * | Fix error that was causing only one group to be returned and corrected specs ↵ | Patricio Cano | 2016-04-06 | 2 | -2/+9 |
| | | | | | | | | | to use the proper attribute type | ||||
| | * | Removed extra LDAP tests and added tests for the external groups feature | Patricio Cano | 2016-04-05 | 1 | -22/+46 |
| | | | |||||
| | * | Changed config syntax and improved how chaanges in group memberships are ↵ | Patricio Cano | 2016-04-05 | 2 | -29/+14 |
| | | | | | | | | | handled when external groups is set up | ||||
| | * | Avoid saving again if the user attributes haven't changed | Patricio Cano | 2016-04-04 | 1 | -1/+1 |
| | | | |||||
| | * | Config examples | Patricio Cano | 2016-04-04 | 1 | -0/+2 |
| | | | |||||
| | * | Remove unnecessary LDAP tests from SAML tests | Patricio Cano | 2016-04-04 | 1 | -59/+7 |
| | | | |||||
| | * | Prepare SAML for group retrieval | Patricio Cano | 2016-04-04 | 3 | -2/+80 |
| | | | |||||
| * | | Merge branch 'patch/fix-markdown-preview-wikis' into 'master' | Robert Speicher | 2016-04-07 | 10 | -18/+105 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | little refactor and improvements on specs | Gabriel Mazetto | 2016-04-06 | 3 | -13/+6 |
| | | | | |||||
| | * | | Ensure correct filter order to validate with our markdown specpatch/fix-markdown-preview-wikis | Gabriel Mazetto | 2016-04-06 | 3 | -4/+8 |
| | | | | |||||
| | * | | Fix a few edited references from WikiLinkFilter and specs | Gabriel Mazetto | 2016-04-06 | 3 | -6/+12 |
| | | | | |||||
| | * | | Fixed WikiPipeline and specs | Gabriel Mazetto | 2016-04-06 | 2 | -4/+7 |
| | | | | |||||
| | * | | Added WikiLinkFilter | Gabriel Mazetto | 2016-04-01 | 2 | -2/+56 |
| | | | | |||||
| | * | | Fixed Gollum pages link url expansion to render correctly in preview | Gabriel Mazetto | 2016-03-30 | 2 | -6/+14 |
| | | | | |||||
| | * | | Add specific markdown_preview route for Wikis | Gabriel Mazetto | 2016-03-30 | 3 | -1/+20 |
| | | | | |||||
| * | | | Merge branch 'issue_14952' into 'master' | Jacob Schatz | 2016-04-06 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not add location badge when creating a group or project Closes #14952   See merge request !3555 | ||||
| | * \ \ | Merge branch 'master' into issue_14952 | Alfredo Sumaran | 2016-04-06 | 24 | -135/+399 |
| | |\ \ \ | |||||
| | * | | | | Use .new_record? instead | Alfredo Sumaran | 2016-04-06 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Do not add location badge when creating a group or projectissue_14952 | Alfredo Sumaran | 2016-04-05 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge branch '14866-url-overflow' into 'master' | Jacob Schatz | 2016-04-06 | 5 | -3/+14 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap code blocks to next line Closes #14866  See merge request !3573 | ||||
| | * | | | | | Change word-break to word-wrap | Annabel Dunstone | 2016-04-06 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Horizontally scroll code blocks instead of wrapping14866-url-overflow | Annabel Dunstone | 2016-04-06 | 6 | -5/+15 |
| | | | | | | | |||||
| | * | | | | | Wrap code blocks to next line | Annabel Dunstone | 2016-04-06 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'doc-missing-ticks' into 'master' | Achilleas Pipinellis | 2016-04-06 | 1 | -2/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing entries in permission matrix [ci skip] Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14882 See merge request !3580 | ||||
| | * | | | | | | Fix missing entries in permission matrix [ci skip] | Robert Schilling | 2016-04-06 | 1 | -2/+3 |
| | | | | | | | | |||||
| | * | | | | | | Fix missing entries in permission matrix [ci skip] | Robert Schilling | 2016-04-06 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'patch/fix-ldap-unblock-user-logic' into 'master' | Robert Speicher | 2016-04-06 | 2 | -2/+30 |
| |\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unblocks user when active_directory is disabled and it can be found We implemented a specific block state to handle user blocking that originates from LDAP filtering rules / directory state in !2242. That introduced a regression in LDAP authentication when Active Directory support was disabled. You could have a scenario where the user would not be temporarily found (like a filtering rule), that would mark the user as `ldap_blocked`, but will never unblock it automatically when that state changed. Fixes #14253, #13179, #13259, #13959 See merge request !3550 | ||||
| | * | | | | | | Unblocks user when active_directory is disabled and it can be foundpatch/fix-ldap-unblock-user-logic | Gabriel Mazetto | 2016-04-05 | 2 | -2/+30 |
| | | |_|_|/ / | |/| | | | | |||||
| * | | | | | | Merge branch 'issue_14800' into 'master' | Jacob Schatz | 2016-04-06 | 5 | -35/+64 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search Design fixes Closes #14800 - Use colors according to design - Fix width of search input   See merge request !3475 | ||||
| | * | | | | | | Do not fire blur event when clicking a suggestion | Alfredo Sumaran | 2016-04-06 | 1 | -2/+4 |
| | | | | | | | | |||||
| | * | | | | | | Display clear button only if input has a value | Alfredo Sumaran | 2016-04-06 | 2 | -11/+12 |
| | | | | | | | | |||||
| | * | | | | | | Change approach, do not use timeouts | Alfredo Sumaran | 2016-04-06 | 2 | -20/+14 |
| | | | | | | | | |||||
| | * | | | | | | Do not create input if fieldName is not defined | Alfredo Sumaran | 2016-04-05 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into issue_14800 | Alfredo Sumaran | 2016-04-04 | 158 | -732/+1768 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/stylesheets/framework/variables.scss | ||||
| | * | | | | | | Bring back search context when chosing the same project/group | Alfredo Sumaran | 2016-03-31 | 1 | -2/+23 |
| | | | | | | | | |||||
| | * | | | | | | Return selected object if toggleLabel option is not defined | Alfredo Sumaran | 2016-03-31 | 1 | -0/+2 |
| | | | | | | | | |||||
| | * | | | | | | Add current element and event as params to clicked callback | Alfredo Sumaran | 2016-03-31 | 1 | -2/+3 |
| | | | | | | | | |||||
| | * | | | | | | Skip default behaviour if we are clicking a result for the same location | Alfredo Sumaran | 2016-03-31 | 2 | -1/+9 |
| | | | | | | | | |||||
| | * | | | | | | CSS tweaks | Alfredo Sumaran | 2016-03-31 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use colors according to design - Fix search input' width | ||||
| * | | | | | | | Merge branch 'fix-markdown-rendering' into 'master' | Douwe Maan | 2016-04-06 | 2 | -1/+9 |
| |\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix header link rendering when containing numbers This fixes the problem where Markdown such as: ### 31st Would get rendered as a link tag pointing to issue number 31 inside a header tag. See gitlab-org/gitlab-ce#14936 for more information. cc @rspeicher See merge request !3568 | ||||
| | * | | | | | | Fix header link rendering when containing numbersfix-markdown-rendering | Yorick Peterse | 2016-04-06 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the problem where Markdown such as: ### 31st Would get rendered as a link tag pointing to issue number 31 inside a header tag. See gitlab-org/gitlab-ce#14936 for more information. | ||||
| * | | | | | | | Fix wrong changelog item | Robert Schilling | 2016-04-06 | 1 | -1/+0 |
| | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | | Merge branch 'revert-api-retrieve-tag' into 'master' | Robert Schilling | 2016-04-06 | 3 | -64/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "API: Ability to retrieve a single tag" This reverts commit 7f287c9136d5d1cdda8df170c6e772ca82aad1e9. See merge request !3575 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |