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-14Fix specs againcomment-award-emojiZeger-Jan van de Weg
2016-04-14Notes that are award emoji are posted as suchZeger-Jan van de Weg
2016-04-07Award Emoji are also copied to the new location when movedZeger-Jan van de Weg
2016-04-07Fix (most) broken testsZeger-Jan van de Weg
2016-04-07Merge branch 'master' into comment-award-emojiZeger-Jan van de Weg
2016-04-07Merge branch 'backend-comment-emoji-award' into comment-award-emojiZeger-Jan van de Weg
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
2016-04-07Merge branch 'issue_14952' into 'master' Jacob Schatz
Do not add location badge when creating a group or project Closes #14952 ![](/uploads/778d0cbccffc717d601a91528ca8eb3c/Screen_Shot_2016-04-05_at_5.34.10_PM.png) ![](/uploads/dbd9eb06b510a6ac091dcf2e3fcb9c88/Screen_Shot_2016-04-05_at_5.34.21_PM.png) See merge request !3555
2016-04-07Merge branch '14866-url-overflow' into 'master' Jacob Schatz
Wrap code blocks to next line Closes #14866 ![Screen_Shot_2016-04-06_at_9.27.06_AM](/uploads/8bed5c17b17c9d15fe34dc7161d31e09/Screen_Shot_2016-04-06_at_9.27.06_AM.png) See merge request !3573
2016-04-07Merge branch 'doc-missing-ticks' into 'master' Achilleas Pipinellis
Fix missing entries in permission matrix [ci skip] Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14882 See merge request !3580
2016-04-07Merge branch 'patch/fix-ldap-unblock-user-logic' into 'master' Robert Speicher
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
2016-04-07Fix missing entries in permission matrix [ci skip]Robert Schilling
2016-04-07Change word-break to word-wrapAnnabel Dunstone
2016-04-07Merge branch 'master' into issue_14952Alfredo Sumaran
2016-04-07Use .new_record? insteadAlfredo Sumaran
2016-04-07Fix missing entries in permission matrix [ci skip]Robert Schilling
2016-04-07Merge branch 'issue_14800' into 'master' Jacob Schatz
Search Design fixes Closes #14800 - Use colors according to design - Fix width of search input ![Screen_Shot_2016-04-05_at_11.12.33_AM](/uploads/83681ccd90a1a1542c056fd6dbc974d0/Screen_Shot_2016-04-05_at_11.12.33_AM.png) ![Screen_Shot_2016-04-05_at_11.11.54_AM](/uploads/f7557bea2ae055f3550b89751fd7d371/Screen_Shot_2016-04-05_at_11.11.54_AM.png) See merge request !3475
2016-04-07Added CHANGELOG itemPatricio Cano
2016-04-07Merge branch 'fix-markdown-rendering' into 'master' Douwe Maan
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
2016-04-07Added documentationPatricio Cano
2016-04-07Fix error that was causing only one group to be returned and corrected specs ↵Patricio Cano
to use the proper attribute type
2016-04-06Fix wrong changelog itemRobert Schilling
2016-04-06Horizontally scroll code blocks instead of wrappingAnnabel Dunstone
2016-04-06Wrap code blocks to next lineAnnabel Dunstone
2016-04-06Rename Emoji Award to Emoji AwardZeger-Jan van de Weg
To make this work lib/award_emoji had to be namespaced under Gitlab, over private channels DouweM mentioned this could later maybe combined with the model
2016-04-06Merge branch 'revert-api-retrieve-tag' into 'master' Robert Schilling
Revert "API: Ability to retrieve a single tag" This reverts commit 7f287c9136d5d1cdda8df170c6e772ca82aad1e9. See merge request !3575
2016-04-06Do not fire blur event when clicking a suggestionAlfredo Sumaran
2016-04-06Merge branch 'dropdown-enter-select-fix' into 'master' Jacob Schatz
Fixed issue with enter key not selecting correct value in dropdown See merge request !3563
2016-04-06Merge branch 'delete-icon-color' into 'master' Jacob Schatz
Fixed delete comment button color ![Screen_Shot_2016-04-06_at_09.55.38](/uploads/526c03db67b0fc7dc9876439f4be2b6b/Screen_Shot_2016-04-06_at_09.55.38.png) See merge request !3562
2016-04-06Merge branch '14342-merge-button' into 'master' Jacob Schatz
Update shades of red Closes #14342 Before: ![Screen_Shot_2016-04-05_at_12.11.44_PM](/uploads/58cf841fe9527a222bcf70c64f93e2fc/Screen_Shot_2016-04-05_at_12.11.44_PM.png) Fixed: ![Screen_Shot_2016-04-05_at_12.10.56_PM](/uploads/98358b6a20aaee2ca777eee87075085e/Screen_Shot_2016-04-05_at_12.10.56_PM.png) See merge request !3549
2016-04-06Revert "API: Ability to retrieve a single tag"Robert Schilling
This reverts commit 7f287c9136d5d1cdda8df170c6e772ca82aad1e9.
2016-04-06Display clear button only if input has a valueAlfredo Sumaran
2016-04-06Create award emoji through a serviceZeger-Jan van de Weg
2016-04-06Change approach, do not use timeoutsAlfredo Sumaran
2016-04-06Merge branch 'fix_missing_filters_on_status_tab_change' into 'master' Jacob Schatz
Fix missing filters on status tab when user swithches to another state closes #14769 ![fixi](/uploads/7733ec714b70b2157104af4b039953c3/fixi.gif) See merge request !3482
2016-04-06Merge branch 'metrics-measure-block' into 'master' Robert Speicher
Support for measuring Ruby blocks using GitLab performance monitoring This adds support for measuring timings of arbitrary Ruby blocks. Fixes #14710 See merge request !3515
2016-04-06Merge branch 'api-user-location' into 'master' Rémy Coutable
Expose user location in API * Closes #14720 See merge request !3558
2016-04-06Merge branch ↵Rémy Coutable
'buildsemailservice-should-filter-out-blank-email-addresses-14883' into 'master' Ensure empty recipients are rejected in BuildsEmailService Fixes #14883. See merge request !3543
2016-04-06Merge branch 'ci-tags' into 'master' Kamil Trzciński
Optimise .gitlab-ci.yml Not sure who should I assign. See merge request !3542
2016-04-06Ensure empty recipients are rejected in BuildsEmailServiceRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-06Optimise .gitlab-ci.ymlKamil Trzcinski
2016-04-06Expose user location in APIRobert Schilling
2016-04-06Merge branch 'feature/margin-bottom-for-empty-repos' into 'master' Jeroen van Baarsen
Added bottom margin to CLI instructions The CLI instructions block in the empty project page is missing a margin-bottom style property. I added it, you can review the only line I edited to add this. This only fixes a UX bug (to me), related to the "Remove project" button that is not correctly padded. Now I believe that part look better :) I attach screenshots. ### before ![Selezione_009](/uploads/f46b2a26c192a0b1994ff2f037f50e6c/Selezione_009.png) ### after ![Selezione_008](/uploads/33a9451bbe8bfd9abd300f9c6eb4005f/Selezione_008.png) See merge request !3505
2016-04-06Merge branch 'api-retrieve-tag' into 'master' Jeroen van Baarsen
API: Ability to retrieve a single tag * Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14330 /cc @dblessing See merge request !3567
2016-04-06Added dev guide for measuring Ruby blocksYorick Peterse