summaryrefslogtreecommitdiff
path: root/app/views/projects
Commit message (Collapse)AuthorAgeFilesLines
* Clean up issuable listsTaurie Davis2017-06-292-67/+75
|
* Merge branch 'highest-return-on-diff-investment' into 'master'Sean McGivern2017-06-291-1/+1
|\ | | | | | | | | | | | | Bring back branches badge to main project page Closes #34438 See merge request !12548
| * Bring back branches badge to main project pagehighest-return-on-diff-investmentAdam Niedzielski2017-06-291-1/+1
| |
* | Merge branch 'dm-merge-request-creations-controller' into 'master'Sean McGivern2017-06-2925-126/+160
|\ \ | |/ |/| | | | | Split up MergeRequestsController See merge request !12150
| * Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-2825-126/+160
| |
* | Merge branch 'cherry-pick-5ea675be' into 'master'Tim Zallmann2017-06-281-67/+8
|\ \ | |/ |/| | | | | Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch' See merge request !12454
| * Merge branch 'additional-metrics-dashboard' into ↵Phil Hughes2017-06-261-67/+8
| | | | | | | | | | | | | | '28717-additional-metrics-review-branch' Additional metrics dashboard See merge request !11740
* | Merge branch 'dm-commit-row-browse-button' into 'master'Robert Speicher2017-06-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Adjust commit partial cache key to fix browse buttons Closes #26899 See merge request !12393
| * | Adjust commit partial cache key to fix browse buttonsDouwe Maan2017-06-221-1/+1
| | |
* | | Merge branch '34309-drop-gfm-mr-ms' into 'master'Sean McGivern2017-06-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Drop GFM support for the title of Milestone/MergeReuqest in template Closes #34309 See merge request !12451
| * | | Drop GFM support for the title of Milestone/MergeRequest in templateTakuya Noguchi2017-06-271-1/+1
| | |/ | |/|
* | | Merge branch '34320-environment-detail-job' into 'master'Filipa Lacerda2017-06-262-6/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Truncate long job names in environment view; wrap author to next line Closes #34320 See merge request !12455
| * | Truncate long job names in environment view; wrap author to next lineAnnabel Dunstone Gray2017-06-262-6/+9
| | |
* | | Merge branch 'sh-revert-annotate-for-blame' into 'master'Rémy Coutable2017-06-262-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Revert "Annotate" to "Blame" See merge request !12401
| * | | Revert "Annotate" to "Blame"sh-revert-annotate-for-blameStan Hu2017-06-222-2/+2
| | |/ | |/|
* | | Merge branch 'zj-faster-charts-page' into 'master'Grzegorz Bizon2017-06-264-12/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Improve performance for pipeline charts Closes #32407 See merge request !12378
| * | Remove last references to job for pipeline chartszj-faster-charts-pageZ.J. van de Weg2017-06-261-3/+3
| | | | | | | | | | | | | | | This is not ammended to another commit as it will probably have failing tests which I'll fix and amend to this commit.
| * | Remove references to build in pipeline chartsZ.J. van de Weg2017-06-233-4/+4
| | | | | | | | | | | | | | | | | | | | | Being the good boyscouts, but mainly because of [the comment in the review](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12378#note_33302115) the words used for classes and variables are changed to not use builds anymore.
| * | Improve performance for pipeline chartsZ.J. van de Weg2017-06-231-8/+4
| | | | | | | | | | | | | | | Achieved by using another table, which both has better indexes and is smaller. Now the data provided for the user is more valueable too.
* | | Limit the width of commit & snippet comment sectionsPhil Hughes2017-06-232-6/+8
| | |
* | | Limit the width of project READMEsPhil Hughes2017-06-231-1/+1
|/ /
* | Fix mobile environment detail viewAnnabel Dunstone Gray2017-06-231-8/+9
| |
* | Merge branch 'project-settings-container-width' into 'master'Annabel Dunstone Gray2017-06-2311-46/+52
|\ \ | | | | | | | | | | | | Added limited width container to project settings See merge request !12045
| * | Added limited width container to project settingsPhil Hughes2017-06-2011-46/+52
| | |
* | | Merge branch '28717-additional-metrics-review-branch' into 'master'Grzegorz Bizon2017-06-222-0/+49
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Support additional prometheus metrics - review branch Closes #28717 See merge request !11712
| * | Merge remote-tracking branch 'upstream/master' into ↵28717-additional-metrics-review-branchPawel Chojnacki2017-06-2224-170/+197
| |\ \ | | | | | | | | | | | | 28717-additional-metrics-review-branch
| * \ \ Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2017-06-1675-596/+548
| |\ \ \ | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch
| * | | | Fix Additional metrics filteringPawel Chojnacki2017-06-081-1/+0
| | | | | | | | | | | | | | | | | | | | + remove test button that was leftover after a bad merge
| * | | | Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2017-06-0750-178/+247
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch # Conflicts: # app/models/project_services/prometheus_service.rb # app/views/projects/services/_form.html.haml
| * | | | | Use `.text-center` class instead of text-align prop28717-fe-prometheus-additional-metricskushalpandya2017-06-021-2/+2
| | | | | |
| * | | | | Update as per review feedbackkushalpandya2017-06-011-7/+7
| | | | | |
| * | | | | Changes based on UX reviewkushalpandya2017-06-011-2/+2
| | | | | |
| * | | | | Lint: Fix missing new line at EOFkushalpandya2017-05-312-2/+2
| | | | | |
| * | | | | Populate Missing env var panelkushalpandya2017-05-311-4/+11
| | | | | |
| * | | | | Add Prometheus Metrics Bundle, panel for Missing environment variableskushalpandya2017-05-311-4/+21
| | | | | |
| * | | | | Render service extras partial conditionallykushalpandya2017-05-311-0/+4
| | | | | |
| * | | | | Prometheus Metrics Panel Viewkushalpandya2017-05-311-0/+21
| | | | | |
* | | | | | Merge branch 'commits-internationalise' into 'master'Douwe Maan2017-06-222-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added internationalization to commits list Closes #32793 See merge request !12062
| * | | | | | Added internationalization to commits listcommits-internationalisePhil Hughes2017-06-222-8/+8
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Closes #32793
* | | | | | Resolve "Rename settings panel "close" action to "collapse" to avoid confusion"Mike Greiling2017-06-223-3/+3
|/ / / / /
* | | | | File view buttonsAnnabel Dunstone Gray2017-06-223-90/+93
| | | | |
* | | | | Remove registry image delete button if user cant delete itvanadium232017-06-211-7/+8
| | | | |
* | | | | Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'Douwe Maan2017-06-201-14/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Only show 'Edit comment'/'Report as abuse' when user has perms/isnt current_user See merge request !12096
| * | | | | Add view spec for more_actions_dropdown render branchesLuke "Jared" Bennett2017-06-161-18/+17
| | | | | |
| * | | | | [ci skip] Correct rendering more actions dropdown when there are no actions ↵Luke "Jared" Bennett2017-06-161-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | and correct the more actions dropdown divider conditional
| * | | | | Correct 'report as abuse' nesting in _more_actions_dropdown.html.hamlLuke "Jared" Bennett2017-06-161-4/+4
| | | | | |
| * | | | | Update _more_actions_dropdown.html.haml to only show 'Edit comment' when ↵Luke "Jared" Bennett2017-06-161-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | user is allowed to edit the note and only show 'Report as abuse' when the note doesn't belong to current_user
* | | | | | Merge branch 'fix-i18n-helpers' into 'master'Douwe Maan2017-06-203-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some incorrect usage of translation helpers See merge request !12274
| * | | | | | Fix some incorrect usage of translation helpersfix-i18n-helpersRuben Davila2017-06-193-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/projects/pipeline_schedules/_form.html.haml
* | | | | | | Merge branch '33840-revert-sticky-confidential-header' into 'master'confidential-issues-revertClement Ho2017-06-202-7/+7
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert sticky confidential header Closes #33840 See merge request !12307
View Lorry Controller Status