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
2015-08-20Refactor sidebar navigation for dashboardDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-20Merge branch '2fa-message-improvement' into 'master'Sytse Sijbrandij
Improved 2FA warning message about lost codes Fixes internal issue: https://dev.gitlab.org/gitlab/gitlabhq/issues/2472 The warning message now clearly states that access will be lost of the 2FA recovery codes are not saved. /cc @sytses @JobV See merge request !1175
2015-08-20Improved 2FA warning message about lost codesPatricio Cano
2015-08-19Merge pull request #9551 from Telekom-PD/feature/search-for-archived-projectsDouwe Maan
Feature/search for archived projects
2015-08-19Spinach testsArtem Sidorenko
2015-08-19Show colored icons like in the admin listingArtem Sidorenko
2015-08-19Show label on archived projectsArtem Sidorenko
2015-08-19Allow listing of archived projectsArtem Sidorenko
Resolves #9285
2015-08-19Merge branch 'security' into 'master'Job van der Voort
Added note about backing up recovery codes Several people have tried to recover their 2FA codes. I think we could be more clear about it in the docs. This is why I added a section about it at the top, so they read it before enabling them. https://twitter.com/deathgreps/status/632006221814464512 https://twitter.com/benniemosher/status/633768429313372160 See merge request !1923
2015-08-19Merge branch 'remove-satellites'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets
2015-08-19Merge pull request #9567 from bigsurge/bigsurge-patch-1Stan Hu
add CommitNote field expose :created_at
2015-08-19Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRobert Schilling
2015-08-19Time for 8.0.0.preRobert Schilling
2015-08-19add CommitNote field expose :created_atbigsurge
add CommitNote field expose :created_at
2015-08-19Merge branch 'wip-blog-post' into 'master'Sytse Sijbrandij
Make sure blog post MR has WIP keyword cc @sytses @rspeicher See merge request !1172
2015-08-19added note about backing up recovery codeskaren Carias
2015-08-18Merge branch 'rs-help-path-traversal' into 'master'Douwe Maan
Fix path traversal in HelpController Closes #2543 See merge request !1922
2015-08-18Use File.join instead of Rails.root.join in HelpControllerRobert Speicher
2015-08-18Merge branch 'fix-authhash-infinite-loop' into 'master'Robert Speicher
Fix infinite loop when SAML was incorrectly configured. See merge request !1170
2015-08-18Merge branch 'fix-rake-info' into 'master'Robert Speicher
Fix gitlab:env:info rake task. Found doing QA. See merge request !1169
2015-08-18Make sure blog post MR has WIP keywordDmitriy Zaporozhets
2015-08-18Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu
2015-08-18Merge branch 'mr-source-branch-clear-cache' into 'master'Dmitriy Zaporozhets
Clear cache to prevent listing deleted branches after MR removes source branch Closes #2272 See merge request !1160
2015-08-18Merge pull request #9564 from bbodenmiller/robots.txtStan Hu
disallow irrelevant pages by defaults in robots
2015-08-18Merge pull request #9436 from bbodenmiller/patch-4Stan Hu
capitalize URL in "Home page URL"
2015-08-18capitalize URL in "Home page URL"Ben Bodenmiller
2015-08-18disallow irrelevant pages by default in robotsBen Bodenmiller
Update default robots.txt rules to disallow irrelevant pages that search engines should not care about. This will still allow important pages like the files, commit details, merge requests, issues, comments, etc. to be crawled.
2015-08-18Fix incorrect CHANGELOG versionStan Hu
2015-08-18Merge branch 'bump-gitlab-git' into 'master'Stan Hu
Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules Closes #2262 See merge request !1171
2015-08-18Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodulesStan Hu
Closes #2262
2015-08-18Merge branch 'rs-remove-gfm_with_options' into 'master'Douwe Maan
Remove the `gfm_with_options` helper It was redundant because `gfm` also took options. See merge request !1152
2015-08-18Fix infinite loop when SAML was incorrectly configured.Douwe Maan
2015-08-18Merge branch 'fix-backslashes-inline-diff' into 'master'Douwe Maan
Fix bug where backslashes in inline diffs could be dropped This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input: ``` input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip ``` The second backslash is dropped in the second `sub` statement: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/16e513894f7ecda1b111fe7d43e7f388/image.png) With this fix, it looks like: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/90fd635a937a68f1b2403740ebc75e3a/image.png) Closes #2253 See merge request !1143
2015-08-18Merge branch 'code-import-error-ui-improvements' into 'master'Douwe Maan
Improve error message display when project fails to import Follow-up to !1134. New screenshot: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/c1a8ffa30ab3b78010e16cf65c2ff438/image.png) See merge request !1138
2015-08-17Merge pull request #9565 from gitlabhq/revert-9528-Fixed_alignment_issueDmitriy Zaporozhets
Revert "Fix for #9527"
2015-08-17Revert "Fix for #9527"Dmitriy Zaporozhets
2015-08-17Merge branch 'installation-update-guides' into 'master'Dmitriy Zaporozhets
Installation and update guides for 7.14 cc @rspeicher See merge request !1168
2015-08-17Create update guides for 7.14Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17Update installation guide with 7.14Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17Fix gitlab:env:info rake task.Douwe Maan
2015-08-17Merge branch 'master' into remove-satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17Merge branch 'pre-receive-wo-satellites' into 'remove-satellites'Dmitriy Zaporozhets
Add support of pre-receive hooks without satellites Implement commit transaction with pre-receive and post-receive hooks for web editor and merge Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1154
2015-08-17Fix typo in text when raise pre-receive exceptionDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17save repo empty state into variable for proper resultDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-16Merge branch 'rs-check-ruby-version' into 'master'Robert Speicher
Require Ruby 2.1.0 in `gitlab:app:check` task See merge request !1165
2015-08-16Require Ruby 2.1.0 in `gitlab:app:check` taskRobert Speicher
[ci skip]
2015-08-16Merge branch 'changelog-1124' into 'master'Robert Schilling
Update changelog for MR !1124 @dzaporozhets See merge request !1164
2015-08-16Update changelog for MR !1124Sven Strickroth
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-08-15Merge branch 'rs-gem-security' into 'master'Robert Speicher
Bump omniauth-saml to 1.4.1 Updates a vulnerable `ruby-saml` dependency. - https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448 - https://github.com/onelogin/ruby-saml/pull/247 See merge request !1162