summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Marks pending tasks for an user as done when he edit an issueDouglas Barbosa Alexandre2016-02-207-14/+130
| |
| * Remove task abilities, since we will only ever show the user their ownDouglas Barbosa Alexandre2016-02-202-19/+0
| |
| * Add feature spec for task queue list pageDouglas Barbosa Alexandre2016-02-204-0/+102
| |
| * Add pending tasks badge on top right next to the new and logout buttonDouglas Barbosa Alexandre2016-02-205-6/+25
| |
| * Allow user to mark each task as done manuallyDouglas Barbosa Alexandre2016-02-205-1/+43
| |
| * Does not create a task for new issue when assignee is the current userDouglas Barbosa Alexandre2016-02-202-1/+5
| |
| * Create a pending task when an issue is assigned to someoneDouglas Barbosa Alexandre2016-02-207-2/+141
| |
| * Fix task queue list page titleDouglas Barbosa Alexandre2016-02-201-2/+2
| |
| * Add tasks queue list pageDouglas Barbosa Alexandre2016-02-208-0/+211
| |
| * Add task modelDouglas Barbosa Alexandre2016-02-206-1/+95
| |
* | Merge branch 'merge-when-succeeded' into 'master' Douwe Maan2016-02-225-21/+87
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Discover branches for commit statuses ref-less when doing merge when succeededmerge-when-succeededKamil Trzcinski2016-02-193-11/+41
| | |
| * | Fix Merge When Succeeded for multiple stagesKamil Trzcinski2016-02-194-10/+46
| | | | | | | | | | | | Use around_transition to trigger build creation for next stages
* | | Merge branch 'award-emoji-retina' into 'master' Jacob Schatz2016-02-203-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | updated retina media query based on ↵award-emoji-retinaPhil Hughes2016-02-191-4/+6
| | | | | | | | | | | | | | | | https://css-tricks.com/snippets/css/retina-display-media-query/
| * | | Lowercase webkit prefixPhil Hughes2016-02-191-1/+1
| | | |
| * | | Crushed file size of emoji spritesheetsPhil Hughes2016-02-192-0/+0
| | | |
| * | | Award emoji supports retina displaysPhil Hughes2016-02-193-0/+8
| | | |
* | | | Merge branch 'flush-cache-web-editor' into 'master' Douwe Maan2016-02-202-0/+18
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Flush emptiness caches whenever needed See merge request !2903
| * | | Flush emptiness caches whenever neededYorick Peterse2016-02-202-0/+18
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the emptiness cache (used for Repository#empty? and Repository#has_visible_content?) is flushed after comitting changes (using the web editor, API or Git) for new repositories. Once a repository is no longer empty there's no need to explicitly flush the cache for Repository#empty?. The cache for Repository#has_visible_content? in turn is already flushed whenever needed. Fixes gitlab-org/gitlab-ce#13387
* | | Merge branch 'doc_artifacts_api' into 'master' Achilleas Pipinellis2016-02-201-11/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix docs on artifacts APIAchilleas Pipinellis2016-02-201-11/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | - Backticks in parameters - Remove headings - Fix curl URL link [ci skip]
* | | Merge branch 'visibletrap/gitlab-ce-label'Douwe Maan2016-02-1918-19/+70
|\ \ \
| * | | Missing @ in @labelsTap2016-02-191-1/+1
| | | |
| * | | Pull right side of label row outTap2016-02-192-11/+11
| | | |
| * | | Find label in issues_finderTap2016-02-193-4/+20
| | | |
| * | | Fix label - description spacingTap2016-02-191-1/+2
| | | |
| * | | Remove unnecessary .present?Tap2016-02-191-1/+1
| | | |
| * | | Add my name to the changelogTap2016-02-191-2/+2
| | | |
| * | | Label description and Label rowTap2016-02-1717-25/+59
| | | | | | | | | | | | | | | | | | | | - Add label description - Show label row when filtering issues or merge requests by label
* | | | Merge branch 'rs-move-controller-specs' into 'master' Douwe Maan2016-02-205-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move a few controller specs to their correct locations See merge request !2889
| * | | | Move a few controller specs to their correct locationsrs-move-controller-specsRobert Speicher2016-02-185-0/+0
| | | | |
* | | | | Merge branch 'rs-blob' into 'master' Douwe Maan2016-02-206-17/+118
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `Blob` model that wraps `Gitlab::Git::Blob` This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG. See merge request !2887
| * | | | | Add a `Blob` model that wraps `Gitlab::Git::Blob`rs-blobRobert Speicher2016-02-186-17/+118
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG.
* | | | | Merge branch 'refactor-scan' into 'master' Douwe Maan2016-02-201-6/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve readability of 'rake cache:clear' code See merge request !2892
| * | | | | Improve readability of 'rake cache:clear' coderefactor-scanJacob Vosmaer2016-02-191-6/+5
| | | | | |
* | | | | | Merge branch '12792-emoji-as-text-diff-comment'Douwe Maan2016-02-194-5/+15
|\ \ \ \ \ \
| * | | | | | Improve #set_award! on the Note model12792-emoji-as-text-diff-commentZeger-Jan van de Weg2016-02-192-5/+5
| | | | | | |
| * | | | | | Emoji reponses on diffs aren't award emojiZeger-Jan van de Weg2016-02-194-4/+14
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'builds-artifacts-API' into 'master' Kamil Trzciński2016-02-198-51/+162
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Fix documentationbuilds-artifacts-APIKamil Trzcinski2016-02-191-2/+2
| | | | | |
| * | | | | Fix ci_build trace traitKamil Trzcinski2016-02-193-5/+5
| | | | | |
| * | | | | Fix APIKamil Trzcinski2016-02-191-2/+2
| | | | | |
| * | | | | Fix API implementationKamil Trzcinski2016-02-192-4/+2
| | | | | |
| * | | | | Fix specsKamil Trzcinski2016-02-192-60/+77
| | | | | |
| * | | | | Introduce API for serving the artifacts archiveKamil Trzcinski2016-02-195-0/+96
| | | | | |
* | | | | | Merge branch 'doc/add-build-email-service' into 'master' Achilleas Pipinellis2016-02-194-4/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation about build emails service Closes #12497 See merge request !2871
| * | | | | | Move builds emails service to its own documentAchilleas Pipinellis2016-02-194-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Add documentation about build emails servicedoc/add-build-email-serviceGrzegorz Bizon2016-02-181-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #12497
* | | | | | | Merge branch 'issue_3276' into 'master' Jacob Schatz2016-02-1911-45/+223
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Labels should be visible in milestone view Closes #3276 See merge request !2599
View Lorry Controller Status