summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'merge-when-succeeded' into 'master' Douwe Maan2016-02-223-15/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-5/+10
| | |
| * | Fix Merge When Succeeded for multiple stagesKamil Trzcinski2016-02-192-10/+15
| | | | | | | | | | | | 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
| | | |
* | | | Flush emptiness caches whenever neededYorick Peterse2016-02-201-0/+4
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'visibletrap/gitlab-ce-label'Douwe Maan2016-02-1915-17/+60
|\ \ \
| * | | 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
| | | |
| * | | Label description and Label rowTap2016-02-1714-23/+49
| | | | | | | | | | | | | | | | | | | | - Add label description - Show label row when filtering issues or merge requests by label
* | | | Merge branch 'rs-blob' into 'master' Douwe Maan2016-02-205-17/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-185-17/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '12792-emoji-as-text-diff-comment'Douwe Maan2016-02-192-3/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Improve #set_award! on the Note model12792-emoji-as-text-diff-commentZeger-Jan van de Weg2016-02-191-4/+1
| | | | |
| * | | | Emoji reponses on diffs aren't award emojiZeger-Jan van de Weg2016-02-192-2/+6
| | |_|/ | |/| |
* | | | Merge branch 'issue_3276' into 'master' Jacob Schatz2016-02-199-45/+147
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Labels should be visible in milestone view Closes #3276 See merge request !2599
| * | | | More styling updates.issue_3276Rubén Dávila2016-02-171-6/+8
| | | | |
| * | | | Decrease padding of labels for Milestone's issues tab.Rubén Dávila2016-02-171-8/+2
| | | | | | | | | | | | | | | | | | | | * Also get rid of no longer required CSS.
| * | | | Some refactor for CSS after code review.Rubén Dávila2016-02-034-22/+30
| | | | |
| * | | | Remove no longer required class.Rubén Dávila2016-02-021-1/+1
| | | | |
| * | | | Add specs.Rubén Dávila2016-02-021-0/+1
| | | | |
| * | | | Add link to open/closed issues plus some minor updates.Rubén Dávila2016-02-022-17/+9
| | | | |
| * | | | Adjust label height on Issues tab.Rubén Dávila2016-02-021-1/+1
| | | | |
| * | | | Remove gray background from detail.Rubén Dávila2016-02-022-1/+6
| | | | |
| * | | | Adjust Issues tab to new design.Rubén Dávila2016-02-023-8/+28
| | | | |
| * | | | Show buttons based on current tab.Rubén Dávila2016-02-023-25/+25
| | | | |
| * | | | Align Milestone's issue counter.Rubén Dávila2016-02-023-7/+20
| | | | |
| * | | | Add little spacing between milestone stats.Rubén Dávila2016-02-022-10/+21
| | | | |
| * | | | Show labels in Issues tab.Rubén Dávila2016-02-022-1/+15
| | | | |
| * | | | Change style of Delete button.Rubén Dávila2016-02-021-1/+1
| | | | |
| * | | | Add elpased time.Rubén Dávila2016-02-023-0/+16
| | | | |
| * | | | Change format of Milestone stats.Rubén Dávila2016-02-021-6/+9
| | | | |
| * | | | Add labels tab to milestone detail view.Rubén Dávila2016-02-025-0/+23
| | | | |
* | | | | Merge branch 'commit-status-fix' into 'master' Kamil Trzciński2016-02-192-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Fix missing ignored? for GenericCommitStatuscommit-status-fixKamil Trzcinski2016-02-192-4/+4
| | | | | |
* | | | | | Merge branch 'issue_3409' into 'master' Robert Speicher2016-02-1918-30/+321
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to revert changes introduced by Merge Requests or Commits Closes #3409 See merge request !1990
| * | | | | | Use the adequate success path on the JSON endpoint.Rubén Dávila2016-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I forgot to update this and some spinach specs were failing.
| * | | | | | More updates from the last code review.Rubén Dávila2016-02-197-19/+20
| | | | | | |
| * | | | | | Don't use `self` when looking for cross-references!Rubén Dávila2016-02-191-1/+1
| | | | | | |
| * | | | | | Some updates from last code review.Rubén Dávila2016-02-199-34/+29
| | | | | | |
| * | | | | | Refactor RevertService.Rubén Dávila2016-02-191-30/+24
| | | | | | |
| * | | | | | Make #commit_with_hooks return the new obj id plus some other fixes.Rubén Dávila2016-02-194-11/+20
| | | | | | |
| * | | | | | Don't show revert button if commit/MR has already been reverted.Rubén Dávila2016-02-195-10/+35
| | | | | | |
| * | | | | | Refactor revert_commit_link helper.Rubén Dávila2016-02-194-10/+4
| | | | | | |
View Lorry Controller Status