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-02-22Remove "(unreleased)" from CHANGELOGRémy Coutable
[ci skip]
2016-02-22Version 8.5.0v8.5.0Rémy Coutable
2016-02-22Merge branch 'fix-zero-votes-showing-on-issue-list' into 'master' Rémy Coutable
Only show up or down votes icon on issue list if there are any Closes #13649 ![Screen_Shot_2016-02-22_at_10.20.27](/uploads/21477426856dab9731bb110032025867/Screen_Shot_2016-02-22_at_10.20.27.png) See merge request !2909
2016-02-22Version 8.5.0-rc4v8.5.0-rc4Rémy Coutable
2016-02-22Merge branch 'tasks' into 'master' Douglas Barbosa Alexandre
Add Todos Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2425 Tasks: - Prepare database - [X] Create a new table (`todos`) - Tasks Queue view - [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page - [X] Add a chronological list of todos, with the 'Todos' tab active by default - [X] Add a 'Done' button to each todo - [x] Add filters (project, author, type, and action) - Todos generation - [X] When user issue/mr is assgined to someone - [x] When user is mentioned on (issues/mr's/comments) - Mark todo as `done` - [X] When clicks on the 'Done' button - [X] When edit issue/mr - [X] When left/edit a comment - [X] When reassign issue/mr - [X] When add/remove labels to issue/mr - [X] When issue/mr is closed - [X] When mr is merged - [X] When added an emoji - [X] When changed the issue/mr milestone * Screenshot: ![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png) See merge request !2817
2016-02-22Merge branch 'merge-when-succeeded' into 'master' Douwe Maan
Fix bugs in MergeWhenSucceeded 1. This fixes support for merge when succeeded for statuses without ref. 2. This fixes support for merge when succeeded for multiple stages. Stages are created after all builds for previous one are finished. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/9060 https://gitlab.com/gitlab-org/gitlab-ce/issues/8108 https://gitlab.com/gitlab-org/gitlab-ce/issues/12931 https://gitlab.com/gitlab-org/gitlab-ce/issues/13269 /cc @grzesiek @DouweM @rspeicher See merge request !2894
2016-02-21Merge branch 'doc_artifacts_api' into 'master' Achilleas Pipinellis
Fix docs on artifacts API Small fixes for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2893 - Backticks in parameters - Remove headings - Fix curl URL link See merge request !2902
2016-02-21Merge branch 'award-emoji-retina' into 'master' Jacob Schatz
Award emoji supports retina displays Based on discussion in !2800 There is now a retina spritesheet for emojis. It is 2mb, don't know how big an issue that is. Before: ![Screen_Shot_2016-02-19_at_11.07.25](/uploads/ea412579bcaddfd13fce67bf583de61b/Screen_Shot_2016-02-19_at_11.07.25.png) After: ![Screen_Shot_2016-02-19_at_11.07.36](/uploads/9d44c6278ba31987bad03dc1f46edd8b/Screen_Shot_2016-02-19_at_11.07.36.png) Also updated the rake task to make the @2x spritesheet https://gitlab.com/snippets/15348 cc\ @rspeicher @vsizov See merge request !2891
2016-02-21Merge branch 'flush-cache-web-editor' into 'master' Douwe Maan
Flush emptiness caches whenever needed See merge request !2903
2016-02-21Merge branch 'visibletrap/gitlab-ce-label'Douwe Maan
2016-02-21Merge branch '12792-emoji-as-text-diff-comment'Douwe Maan
2016-02-21Merge branch 'builds-artifacts-API' into 'master' Kamil Trzciński
Introduce API for serving the artifacts archive Add API to download build artifacts archive in context of GitLab API /cc @DouweM @grzesiek See merge request !2893
2016-02-20Merge branch 'doc/add-build-email-service' into 'master' Achilleas Pipinellis
Add documentation about build emails service Closes #12497 See merge request !2871
2016-02-20Version 8.5.0-rc3v8.5.0-rc3Rémy Coutable
2016-02-19Merge branch 'issue_3276' into 'master' Jacob Schatz
Labels should be visible in milestone view Closes #3276 See merge request !2599
2016-02-19Merge branch 'commit-status-fix' into 'master' Kamil Trzciński
Fix missing ignored? for GenericCommitStatus This is pretty important fix. We should not release 8.5 without this. It critical error when handling GenericCommitStatus: ``` undefined method `ignored?' for #<GenericCommitStatus:0x007fe1a2a20fe0> ``` cc @grzesiek See merge request !2899
2016-02-19Merge branch 'gitlab-ce-fix/revert-ruby-2.2' into 'master' Robert Speicher
revert back to ruby 2.1 - - - Revert Ruby 2.2 changes - until we solve https://gitlab.com/gitlab-org/gitlab-ce/issues/13514 This also updates Ruby 2.1.7 to 2.1.8 See merge request !2898
2016-02-19Merge branch 'issue_3409' into 'master' Robert Speicher
Add ability to revert changes introduced by Merge Requests or Commits Closes #3409 See merge request !1990
2016-02-19Merge branch 'bugfix/jschatz1/issuable-consistency' into 'master' Rémy Coutable
Consistency in MR and issue header. Fixes: #13550 ![Screen_Shot_2016-02-18_at_11.20.19_AM](/uploads/8327ff045e45029b85b2cbac72c98a7f/Screen_Shot_2016-02-18_at_11.20.19_AM.png)![Screen_Shot_2016-02-18_at_11.20.55_AM](/uploads/f79613ebb23e4a62fb1bdb48d6f7fd2b/Screen_Shot_2016-02-18_at_11.20.55_AM.png) See merge request !2874
2016-02-19Merge branch 'ci/remove-builds' into 'master' Grzegorz Bizon
Make it possible to erase build content (artifacts, trace) This feature makes it possible to remove build content - build artifacts and build traces. - [x] Remove artifacts - [x] Remove metadata - [x] Remove build traces - [x] Wait for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 this to be merged - [x] Fix the permissions after the merge Closes #3421 See merge request !2560
2016-02-19Merge branch 'axil/gitlab-ce-mention-project-in-fork-notice' into 'master' Rémy Coutable
Mention project name in fork notice _Originally opened at !1186 by @axil._ - - - I missed this one in !1070 See merge request !2897
2016-02-19Merge branch 'saml-decoupling' into 'master'Patricio Cano
2016-02-19Merge branch 'ci/api-runners' into 'master' Kamil Trzciński
Add runners API References #4264 See merge request !2640
2016-02-19Merge branch 'issue_11872' into 'master' Jacob Schatz
Put project visibility icon next to title Fixes #11872 See merge request !2885
2016-02-19Merge branch 'web_editor' into 'master' Achilleas Pipinellis
Update web editor documentation Based on https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/1045 Closes #4262 See merge request !2776
2016-02-19Merge branch '12791-hide-project-limit-reached-warning' into 'master' Douwe Maan
Project limit is reached warning is hidden when the projects_limit is zero Fixes #12791 See merge request !2890
2016-02-19Merge branch 'rs-emoji' into 'master' Douwe Maan
Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
2016-02-19Merge branch 'fix/project-forks-page' into 'master' Douwe Maan
workaround for forks with an invalid repo Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13465 The error occurs when a project returns a `nil` commit for a variety of reasons, I assume the repository is corrupt - perhaps as a result of a failed fork. With this MR, we do not show forks with corrupted repos in the list of forks, as this does not seem to work anyway. A better solution is to fix the cause of the issue and/or any data integrity problem... Also fixing Sentry issue: 1180 `undefined method 'already_forked?' for nil:NilClass ` See merge request !2836
2016-02-19Merge branch 'rs-show-owner-label' into 'master' Douwe Maan
Allow `ProjectTeam#human_max_access` to return "Owner" See merge request !2881
2016-02-19Merge branch 'rs-sentry-release-tracking' into 'master' Douwe Maan
Add release tracking for Sentry See merge request !2863
2016-02-19Merge branch 'cache-clear' into 'master' Robert Speicher
Use SCAN during 'rake cache:clear' This allows 'rake cache:clear' to delete millions of keys without choking. It requires Redis 2.8.0 or newer but we needed that already anyway. See merge request !2872
2016-02-19Merge branch 'autocrlf-lazy' into 'master' Robert Speicher
Only set autocrlf when creating/updating files Related issue: gitlab-org/gitlab-ce#13457 Details: 5619a6de1dd6fc1dfd4053810c7b11c677b7a495 See merge request !2859
2016-02-18Merge branch 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master' Dmitriy Zaporozhets
Uses cross browser niceScroll to do scrolling on sidebar. Fixes: #13544 Firefox does not support `-webkit-scrollbar` and there is no alternative for FF. So for example Gmail falls back to no fancy scrollbar. Stuck with jQuery, which is a good solution, since we already use it. This also leaves the default scrollbar as is. ![Screen_Shot_2016-02-18_at_11.02.26_AM](/uploads/1184f06b71a8d9097ef1e3450a0c0ab3/Screen_Shot_2016-02-18_at_11.02.26_AM.png) Also fixes horz scroll issue: ![Screen_Shot_2016-02-18_at_11.09.56_AM](/uploads/63e9a8e824cac69a2745dd4dd84d1dfb/Screen_Shot_2016-02-18_at_11.09.56_AM.png) cc @creamzy @dzaporozhets See merge request !2873
2016-02-18Merge branch 'fix/gitpushservice-complexity-issue' into 'master' Douwe Maan
Reduce code complexity on GitPushService#execute Code complexity for gitlab-ce after this has been refactored: ``` 27.3: GitPushService#execute ``` This still needs to be merged into `gitlab-ee` presumably with conflicts... Perhaps we should create another issue for doing that? I left the code sort of similar to what it was... If I could, I would have refactored most of the code into separate classes, etc. as it breaks probably all SOLID principles. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13327 See merge request !2784
2016-02-18Merge branch 'fix/ci-first-job-allow-failure' into 'master' Kamil Trzciński
Fix CI builds scheduler when first build in stage is allowed to fail This fixes an edge case in CI builds scheduler when first build in stage was marked as allowed to fail. Closes #3192 See merge request !2869
2016-02-18Merge branch 'rs-git-fetch-labels' into 'master' Kamil Trzciński
Fix labels for git clone/git fetch Project CI setting See merge request !2842
2016-02-18Merge branch 'patch-1' into 'master' Kamil Trzciński
Add example of creating build artifacts only for release tags. See merge request !2649
2016-02-18Merge branch 'issue_13539' into 'master' Robert Speicher
Reopened MRs should also be considered as open. Fixes #13539 See merge request !2866
2016-02-18Merge branch 're-add-missing-part-in-update-doc' into 'master' Rémy Coutable
Re-add section about NGINX config and init script updates in 8.4->8.5 update doc These sections were removed by !2766 but: - even if the NGINX config wasn't modified, it might be in future updates so it's better to always have it instead of having to remember to add it depending on the changes - the init script update section must be there since it's a safe command line that should be run on every update This fixes https://github.com/gitlabhq/gitlabhq/issues/10031. /cc @rspeicher @yorickpeterse See merge request !2815
2016-02-18Merge branch 'sqlite_rm_rf' into 'master' Achilleas Pipinellis
Remove remaining sqlite method call Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13535 See merge request !2862
2016-02-18Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan
Add ability to see and sort on vote count from Issues and MR lists Fixes #3763 * Sort options ![Sort Options](/uploads/df6543d574d4df8bf7e4496a876e2930/sort.png) * Most popular ![Most popular](/uploads/bb92cc2fbef7b6b806dcdf8c52778fdd/most-popular.png) * Least popular ![Least popular](/uploads/7988ed451922c81dc228419b5edbd7cd/least-popular.png) See merge request !2781
2016-02-17Version 8.5.0-rc2v8.5.0-rc2Rémy Coutable
2016-02-17Merge remote-tracking branch 'origin/master' into 8-5-stableRémy Coutable
2016-02-17Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRémy Coutable
2016-02-17Merge branch 'bugfix/jschatz1/milestone-icon' into 'master' Rémy Coutable
Correct icon for milestones. See merge request !2856
2016-02-17Merge branch 'fix/13464-order-line-notes-create_at-in-parallel-diff-view' ↵Douwe Maan
into 'master' Sort line notes used in parallel diff by created_at Fixes #13464. See merge request !2858
2016-02-17Merge branch 'fix/13367-redirect-to-project-page-if-no-import' into 'master' Douwe Maan
Redirect /import to project page if no importing at all and repo exists Fixes gitlab-org/gitlab-ce#13367. See merge request !2857
2016-02-17Sort line notes used in parallel diff by created_atRémy Coutable
Fixes #13464.
2016-02-17Merge branch 'rs-issue-13469' into 'master' Douwe Maan
Handle nil commits in Gitlab::PushDataBuilder.build Closes #13469 See merge request !2825
2016-02-17Merge branch 'expire-fork-import-caches' into 'master' Douwe Maan
Expire caches after forking/importing a repository cc @dblessing @DouweM Related issue: gitlab-org/gitlab-ce#13505 See merge request !2838
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 21:03:09 +0300