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/CHANGELOG
AgeCommit message (Collapse)Author
2015-08-19Allow listing of archived projectsArtem Sidorenko
Resolves #9285
2015-08-19Merge branch 'remove-satellites'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19Time for 8.0.0.preRobert Schilling
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 '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-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-18Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodulesStan Hu
Closes #2262
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-17Merge branch 'master' into remove-satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-16Update changelog for MR !1124Sven Strickroth
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-08-14Merge branch 'fix/redirect_after_sign_in' into 'master'Stan Hu
Fix redirection after sign in when using auto_sign_in_with_provider Logic for redirect path moved to a filter. This allows it to run properly when the auto_sign_in_with_provider filter takes control. See merge request !1146
2015-08-14Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu
2015-08-14Update Flowdock integration to support new Flowdock APIBoyan Tabakov
Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
2015-08-14Clear cache to prevent listing deleted branches after MR removes source branchStan Hu
Closes #2272
2015-08-14Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'Dmitriy Zaporozhets
Disable internal issue tracker if external tracker in use ### What does this MR do? This MR disables routes to the internal issue tracker if an external issue tracker (e.g. Redmine) is in use. A 404 page is returned if a user attempts to access any of the issue routes. ### Why was this MR needed? Enabling the external issue tracker would still keep the internal one active, which would lead to odd behavior where users could create issues but not close them. ### What are the relevant issue numbers? Closes #2006 See merge request !993
2015-08-14Add CHANGELOG itemDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14Merge branch 'respect_filters' into 'master'Dmitriy Zaporozhets
Fix: User search feature in admin area does not respect filters https://dev.gitlab.org/gitlab/gitlabhq/issues/2482 See merge request !1155
2015-08-13Fix: User search feature in admin area does not respect filtersValery Sizov
2015-08-13Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu
2015-08-13Merge branch 'improve-hipchat-service-test' into 'master'Dmitriy Zaporozhets
Provide more feedback what went wrong if HipChat service failed test This MR adds support for displaying the error message during HipChat service test. Before an Error 500 would be displayed with no helpful remarks. Screenshot: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/10f82eb02db138f9680e69cdb3d3ed82/image.png) Issue gitlab-com/support-forum#213 See merge request !1144
2015-08-13update chnagelogValery Sizov
2015-08-13Fix changelogAndrea Ruggiero
2015-08-13Merge branch 'more-markdown-extensions' into 'master'Stan Hu
markup_helper: detect .mkd and .mkdn as markdown See merge request !1148
2015-08-12markup_helper: detect .mkd and .mkdn as markdownBen Boeckel
2015-08-12Merge branch 'mr-merge-manually-2' into 'master' Dmitriy Zaporozhets
Move merge manually text below merge widget Replace !1121 Screenshot: #### Before ![Screenshot_2015-08-10_18.25.22](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ac7df8dd03104b3b44c61b3bff709653/Screenshot_2015-08-10_18.25.22.png) #### After ![Screenshot_2015-08-10_18.28.30](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c92b8eaeadb842705577dba1f52b67e5/Screenshot_2015-08-10_18.28.30.png) See merge request !1141
2015-08-12Fix redirection after sign in when using auto_sign_in_with_providerAlex Lossent
Logic for redirect path moved to a filter.
2015-08-12Provide more feedback what went wrong if HipChat service failed testStan Hu
Issue gitlab-com/support-forum#213
2015-08-12Fix bug where backslashes in inline diffs could be droppedStan Hu
Closes #2253
2015-08-12Add merged label on branches pageFlorent (HP)
2015-08-11Merge branch 'master' into remove-satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Fix changelogDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Merge branch 'check-out-branch-button' into 'master' Dmitriy Zaporozhets
Add "Check out branch" button to the MR page. I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well. Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120. ![Screen_Shot_2015-08-08_at_22.10.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fd185df012e9759dfea198ed9fa3f80f/Screen_Shot_2015-08-08_at_22.10.19.png) It looks even better in combination with !1121, which gets rid of the "If you want to ..." line: ![Screen_Shot_2015-08-08_at_22.10.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3fa469d0e2bd4e3ec4992ffa5864c718/Screen_Shot_2015-08-08_at_22.10.55.png) cc @dzaporozhets @rspeicher See merge request !1116
2015-08-11Merge branch 'mr-widget-text' into 'master' Dmitriy Zaporozhets
Improve text of MR merge widget and manual merge modal Modal with manual merge instructions: ![Screen_Shot_2015-08-08_at_21.30.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bffe42e9ad76afd02efbe5816027767/Screen_Shot_2015-08-08_at_21.30.23.png) Archived: ![archived](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e1efa1d54ce7ead8de6e88ca34095c09/archived.png) WIP: ![wip](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14a831458d0946722559ec643f91678c/wip.png) Missing target branch: ![missing_branch](https://gitlab.com/gitlab-org/gitlab-ce/uploads/340083bbacbc234906e58cf76c586a9e/missing_branch.png) Missing source branch: ![missing_branch_source](https://gitlab.com/gitlab-org/gitlab-ce/uploads/72f80ed58efed88b2bbcf403b55b1a01/missing_branch_source.png) Nothing to merge: ![nothing](https://gitlab.com/gitlab-org/gitlab-ce/uploads/85b0d9da87acacd53cffd0df58d8eed4/nothing.png) Checking ability to merge: ![check](https://gitlab.com/gitlab-org/gitlab-ce/uploads/32d75322e622025610c446e8ca7d892d/check.png) Conflicts when allowed to merge: ![conflicts](https://gitlab.com/gitlab-org/gitlab-ce/uploads/23fdb2c60a27d873b3cc8a008203eb59/conflicts.png) Conflicts when not allowed to merge: ![conflicts_not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/113462a80fc65bf48b20dc0efd808363/conflicts_not_allowed.png) Mergeable when allowed to merge: ![accept](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1b3bb1a71df21728fe9318e7a083bfba/accept.png) Mergeable when not allowed to merge: ![not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d38fa5c96f8f9d7223bb6bc7ad36f29d/not_allowed.png) Merge in progress: ![locked](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b60dcf5eb70e6032b0e8aac766018df3/locked.png) Merge failed: ![failed_2](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3713b9a10298183935b028b658271ac9/failed_2.png) Merged: ![merged](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7f68a48dd197a71351c9a80c59c8ecbe/merged.png) Closed: ![closed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d5ce040449b7db943bd2fbfffb607a10/closed.png) cc @dzaporozhets @rspeicher See merge request !1120
2015-08-11Merge branch 'optimize-haml-textarea-rendering' into 'master'Dmitriy Zaporozhets
Bump Haml to 4.0.7 to speed up textarea rendering The current regexp caused long load times when textarea blocks were surrounded by whitespace. This fix has been submitted to the Haml library and passes tests there: https://github.com/haml/haml/pull/850 Closes #1987 See merge request !984
2015-08-11Merge branch 'master' into 'master'Dmitriy Zaporozhets
Link username to profile on Group Members page When browsing a GitLab group, a user may want to view a particular user's other contributions or profile information. This link helps make that process seamless. See merge request !1099
2015-08-11Update CHANGELOGDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets
This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
2015-08-11Merge branch 'revert-satellites' into 'master' Dmitriy Zaporozhets
Revert satellites Return satellites to master for 7.14 We remove satellites in next release (8.0) See merge request !1136
2015-08-11Remove changelog itemsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Revert "Merge branch 'mr-widget-text' into 'master' "Dmitriy Zaporozhets
This reverts commit 151d9fb35fd66a161cf0e1f95d7b0f0448ca8034, reversing changes made to 819d110cabfc2791e0e84bd89b9f87aef570c1db.
2015-08-11Merge branch 'fix-broken-code-import' into 'master'Douwe Maan
Fix broken code import and display error messages if something went wrong with creating project Clicking "Import" in Bitbucket import status page would result in: ``` Rendered import/base/create.js.haml (38.3ms) Completed 500 Internal Server Error in 1362ms (ActiveRecord: 20.2ms) NoMethodError - undefined method `namespace_projects_path' for #<#<Class:0x007fd6c0f29498>:0x007fd6c0cf09d8>: actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:142:in `polymorphic_url' actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:148:in `polymorphic_path' actionview (4.1.11) lib/action_view/routing_url_for.rb:87:in `url_for' turbolinks (2.5.3) lib/turbolinks/xhr_url_for.rb:12:in `url_for_with_xhr_referer' actionview (4.1.11) lib/action_view/helpers/url_helper.rb:181:in `link_to' app/views/import/base/create.js.haml:23:in `_app_views_import_base_create_js_haml__1092746368522631377_70280180507700' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:161:in `instrument' actionview (4.1.11) lib/action_view/template.rb:339:in `instrument' actionview (4.1.11) lib/action_view/template.rb:143:in `render' rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method' actionview (4.1.11) lib/action_view/renderer/template_renderer.rb:55:in `block (2 levels) in render_template' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' ``` Also, if the project failed to save for some reason, the user was never informed. Screenshot of new error message dump: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/afc15aa6b0cde0080976eab3199cf18b/image.png) Closes #2241 See merge request !1134
2015-08-11Fix broken code import and display error messages if something went wrong ↵Stan Hu
with creating project Clicking "Import" in Bitbucket import status page would result in: ``` Rendered import/base/create.js.haml (38.3ms) Completed 500 Internal Server Error in 1362ms (ActiveRecord: 20.2ms) NoMethodError - undefined method `namespace_projects_path' for #<#<Class:0x007fd6c0f29498>:0x007fd6c0cf09d8>: actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:142:in `polymorphic_url' actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:148:in `polymorphic_path' actionview (4.1.11) lib/action_view/routing_url_for.rb:87:in `url_for' turbolinks (2.5.3) lib/turbolinks/xhr_url_for.rb:12:in `url_for_with_xhr_referer' actionview (4.1.11) lib/action_view/helpers/url_helper.rb:181:in `link_to' app/views/import/base/create.js.haml:23:in `_app_views_import_base_create_js_haml__1092746368522631377_70280180507700' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:161:in `instrument' actionview (4.1.11) lib/action_view/template.rb:339:in `instrument' actionview (4.1.11) lib/action_view/template.rb:143:in `render' rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method' actionview (4.1.11) lib/action_view/renderer/template_renderer.rb:55:in `block (2 levels) in render_template' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' ``` Closes #2241
2015-08-10Disable turbolinks when linking to Bitbucket import statusStan Hu
Turbolinks was causing issues with the Bitbucket Javascript/display because it was trying to intercept /import/bitbucket/status even when a 302 redirection occured. Closes #2241
2015-08-10Add dropzone upload progress to CHANGELOGNikita Verkhovin
2015-08-10Bump Haml to 4.0.7 to speed up textarea renderingStan Hu
Closes #1987
2015-08-10Merge branch 'disable-autocrlf-for-binary-files' into 'master'Stan Hu
Fix corrupted binary files when using API files endpoint Closes #2219 See merge request !1123
2015-08-10Link username to profile on Group Members pageTom Webster
When browsing GitLab, a user may want to view a particular user's other contributions or profile information. This link helps make that process seamless.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 15:39:30 +0300