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-10Merge branch 'redesign_labels_page' into 'master' Jacob Schatz
Redesign labels page closes #14227 ## Desktop ![Screen_Shot_2016-04-05_at_7.19.37_PM](/uploads/a52b764565b6e2739fb6932178f8bde5/Screen_Shot_2016-04-05_at_7.19.37_PM.png) ## Mobile ![Screen_Shot_2016-04-04_at_6.40.57_PM](/uploads/9804b074126fcdb6755918e9f4c472a7/Screen_Shot_2016-04-04_at_6.40.57_PM.png) See merge request !3507
2016-04-10Enable asset compression in production.connorshea
`config.assets.compress` needed to be explicitly enabled. Follow-up to !3544. Resolves #14344.
2016-04-09Merge branch 'efficient-emoji-loading' into 'master' Robert Speicher
Only load emoji spritesheet when necessary On a normal issue where the only award emoji displayed by default are the thumbs-up and thumbs-down emoji, this decreases the page load by 670KB or 250KB depending on pixel density. Resolves #14334. See merge request !3449
2016-04-09Add "sprite" parameter to emoji_icon helperconnorshea
The emoji_icon helper used to display the award emoji in Issue and Merge Request views. By default the spritesheet is used, but passing `sprite: false` to the `emoji_icon` helper makes the emoji render as separate images. For award emoji displayed by default (e.g. thumbs-up, thumbs-down, and any that have been awarded to the issue/MR) the independent images are used. Only when the full emoji menu is opened does the full spritesheet load. On a normal issue this change decreases the page load by 670KB or 250KB depending on pixel density. Resolves #14334.
2016-04-08Merge branch 'api-expose-subscribed' into 'master' Rémy Coutable
API: Expose subscribed? on issues and merge requests This is the first start for the new `subscribable` API. It exposes the `subscribed` field for issues and merge requests. Related to #6024 See merge request !3611
2016-04-08API: Expose subscribed? on issuesRobert Schilling
2016-04-08Merge branch 'revert-missing-changelog' into 'master' Jacob Schatz
Remove changelog entry for new navigation sidebar. See merge request !3608
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-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-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-07Implement review suggestionsFelipe Artur
2016-04-07CHANGELOGJacob Schatz
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-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-07Return status code 303 after a branch DELETE operation to avoid project deletionStan Hu
Closes #14994
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-07Added CHANGELOG itemPatricio Cano
2016-04-06Fix wrong changelog itemRobert Schilling
2016-04-06Only update main language if it is not already setDrew Blessing
2016-04-06finish up the design and add info to the changelogArinde Eniola
2016-04-06Improve coding and doc styleRobert Schilling
2016-04-06API: Ability to filter milestones by stateRobert Schilling
2016-04-06Fix Changelog entries after rebaseGrzegorz Bizon
2016-04-06Add Changelog entry for project badges in settingsGrzegorz Bizon
2016-04-06Fixes #14638.PotHix
The SQL query was ambiguous and in this case we want to filter projects.
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-06Ensure empty recipients are rejected in BuildsEmailServiceRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-06Expose user location in APIRobert Schilling
2016-04-06API: Ability to retrieve a single tagRobert Schilling
2016-04-06Merge branch 'fix-project-path-rename' into 'master' Stan Hu
Fix Error 500 after renaming a project path Renaming the path of a project would result in an Error 500 due to `@repository` being memoized with the old path. An Error 500 would result: ``` Started GET "/testing2/test1" for 127.0.0.1 at 2016-04-04 12:42:30 +0000 Processing by ProjectsController#show as HTML Parameters: {"namespace_id"=>"testing2", "id"=>"test1"} Completed 200 OK in 637ms (Views: 194.2ms | ActiveRecord: 111.8ms) Started GET "/testing2/test1/edit" for 127.0.0.1 at 2016-04-04 12:42:33 +0000 Processing by ProjectsController#edit as HTML Parameters: {"namespace_id"=>"testing2", "id"=>"test1"} Completed 200 OK in 594ms (Views: 183.8ms | ActiveRecord: 87.4ms) Started PATCH "/testing2/test1" for 127.0.0.1 at 2016-04-04 12:42:41 +0000 Processing by ProjectsController#update as HTML Parameters: {"utf8"=>"✓", "authenticity_token"=>"[FILTERED]", "project"=>{"nam e"=>"test123", "path"=>"test123"}, "namespace_id"=>"testing2", "id"=>"test1"} Completed 500 Internal Server Error in 1852ms (ActiveRecord: 124.0ms) ActionView::Template::Error (no repository for such path): 2: %legend 3: Builds: 4: 5: - unless @repository.gitlab_ci_yml 6: .form-group 7: .col-sm-offset-2.col-sm-10 8: %p Builds need to be configured before you can begin using Contin uous Integration. app/models/repository.rb:59:in `block in empty?' lib/repository_cache.rb:19:in `fetch' app/models/repository.rb:59:in `empty?' app/models/repository.rb:471:in `gitlab_ci_yml' app/views/projects/_builds_settings.html.haml:5:in `_app_views_projects__build s_settings_html_haml__782034335636359229_73397600' app/views/projects/edit.html.haml:87:in `block in _app_views_projects_edit_htm l_haml___2388082585934859365_47390860' app/views/projects/edit.html.haml:8:in `_app_views_projects_edit_html_haml___2 388082585934859365_47390860' app/controllers/projects_controller.rb:54:in `block (2 levels) in update' app/controllers/projects_controller.rb:43:in `update' lib/gitlab/middleware/go.rb:16:in `call' ``` Closes #14885 See merge request !3528
2016-04-06Update CHANGELOG for 8.3.5 and 8.3.6Robert Speicher
[ci skip]
2016-04-05Fix Error 500 after renaming a project pathStan Hu
Closes #14885
2016-04-05Merge branch 'fix/permissions-when-importing-members' into 'master' Douwe Maan
Check permissions when importing project members Closes #14899 See merge request !3535
2016-04-05Add 8.4.6 and 8.4.7 CHANGELOG itemsRémy Coutable
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-05Add 8.5.9 CHANGELOG itemRémy Coutable
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-05Added CHANGELOG for build notificationsPhil Hughes
[ci skip]
2016-04-05Merge branch 'missing-changelog' into 'master' Jacob Schatz
Add missing changelog item about improving navigation sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For !3494 and #14838 See merge request !3527
2016-04-05Check permissions when importing project membersGrzegorz Bizon
Closes #14899
2016-04-05Wrap images in discussions and wikis with a link to the image source using ↵connorshea
ImageLinkFilter. Resolves #14411. See merge request !3464
2016-04-05Add missing changelog item about improving navigation sidebarDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-04Merge branch 'fix_remove_fork_link' into 'master' Douwe Maan
Remove fork link closes all merge requests opened on source project Currently, if you: - create a fork - open a merge request on the source project - remove the fork link The created MR cannot be closed. With this MR, all pending MR is closed when the fork link is removed. See merge request !3189
2016-04-04Add 8.6.4 changelog itemRémy Coutable
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-04Merge branch 'fix-mr-for-orphaned-branches' into 'master' Rémy Coutable
Fix creation of merge requests for orphaned branches with images When attempting to create a merge request from an orphaned branch (e.g. this happens for the first commit of any repo) that contained images, GitLab would fail with a Error 500. This MR fixes that problem. Closes #14875 See merge request !3511
2016-04-04Fix creation of merge requests for orphaned branchesStan Hu
Closes #14875
2016-04-04Added CHANGELOG entry for Markdown performanceYorick Peterse
2016-04-03Merge branch 'add-ability-to-archive-a-project-via-api-14296' into 'master' Douwe Maan
Add endpoints for archiving and unarchiving Closes #14296 See merge request !3372