summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'wip-mr-from-commits' into 'master' Sean McGivern2017-01-196-2/+38
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark MR as WIP when pushing WIP commits Closes #25036 See merge request !8124
| * | | | | | | | | | Show a custom WIP help message for MR's with WIP commitsjurre2017-01-193-2/+7
| | | | | | | | | | |
| * | | | | | | | | | Mark MR as WIP when pushing WIP commitsjurre2017-01-193-0/+31
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '23563-document-presenters' into 'master' Dmitriy Zaporozhets2017-01-197-3/+186
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document presenters Closes #23563 See merge request !8480
| * | | | | | | | | | | More improvements to presenters23563-document-presentersRémy Coutable2017-01-186-30/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Fix typos and improve presenters documentationRémy Coutable2017-01-181-39/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Add Presentable concernRémy Coutable2017-01-184-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Improve presenter architectureRémy Coutable2017-01-184-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Handle presenters in BasePolicyRémy Coutable2017-01-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Document presentersRémy Coutable2017-01-183-0/+185
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'milestone-issuable-row-numbers' into 'master' Fatih Acet2017-01-192-3/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some HAML errors on milestone#show Closes #26799 and #26772 See merge request !8560
| * | | | | | | | | | | Replaced `.pull-right` with `.right`milestone-issuable-row-numbersPhil Hughes2017-01-181-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed some HAML errors on milestone#showPhil Hughes2017-01-132-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issuable reference wasn't correctly rendered on the page 2 counts where rendered in the top bar of the panel
* | | | | | | | | | | | Merge branch '26803-typing-then-tab-in-a-comment-doesn-t-select-the-author' ↵Fatih Acet2017-01-191-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fixed highlightFirst and added specs Closes #26803 See merge request !8622
| * | | | | | | | | | | | Fixed highlightFirst and added specs26803-typing-then-tab-in-a-comment-doesn-t-select-the-authorLuke "Jared" Bennett2017-01-181-1/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'input-button-hover' into 'master' Fatih Acet2017-01-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hover state to MR comment reply button See merge request !8541
| * | | | | | | | | | | | | Add hover state to MR comment reply buttoninput-button-hoverAnnabel Dunstone Gray2017-01-121-1/+1
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch ↵Fatih Acet2017-01-196-69/+124
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24032-changed-visibility-level-to-public-but-project-is-not-public' into 'master' Update project visibility level ui to use dropdowns Closes #24296, #24123, and #24032 See merge request !7645
| * | | | | | | | | | | | | Fixed tests24032-changed-visibility-level-to-public-but-project-is-not-publicLuke "Jared" Bennett2016-12-108-31/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grab permissions description from backend Review changes Added unit tests
| * | | | | | | | | | | | | Align permissions optionsAnnabel Dunstone Gray2016-12-103-56/+49
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Created shared/visibility_select and merged with feature permissions uiLuke "Jared" Bennett2016-12-105-59/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed up nested padding and added dynamic text js Added padding and tests
* | | | | | | | | | | | | | Merge branch '26117-sort-pipeline-for-commit' into 'master' Kamil Trzciński2017-01-193-7/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sorting pipelines for a commit Closes #26117 See merge request !8319
| * | | | | | | | | | | | | | Add sorting pipeline for a commitTakuya Noguchi2017-01-193-7/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'fix/external-status-badge-links' into 'master' Kamil Trzciński2017-01-191-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link external commit status badges to target URLs Closes #25662 See merge request !8611
| * | | | | | | | | | | | | | | Add URL validations for generic commit statusesGrzegorz Bizon2017-01-181-0/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Link external commit status badge to a target URLGrzegorz Bizon2017-01-171-0/+6
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using new detailed statuses factory for external commit statuses.
* | | | | | | | | | | | | | | Merge branch 'zj-fix-admin-templates' into 'master' Kamil Trzciński2017-01-192-73/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Slash command templates Closes #26042 See merge request !8320
| * | | | | | | | | | | | | | Add tests for admin service templateszj-fix-admin-templatesZ.J. van de Weg2017-01-061-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix Slash command templatesZ.J. van de Weg2017-01-032-73/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These templates were broken, as the same views didn't have a @project defined. Now I've added checks on the service being a template or not. Fixes #26042
* | | | | | | | | | | | | | | Merge branch '23524-notify-automerge-user-of-failed-build' into 'master' Sean McGivern2017-01-195-10/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notify the user who set auto-merge when merge is not possible Closes #23524 See merge request !8056
| * | | | | | | | | | | | | | | Notify the user who set auto-merge when merge conflict occurstwonegatives2017-01-145-3/+27
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Notify the user who set auto-merge when a build failstwonegatives2016-12-162-7/+10
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'speed-up-dashboard-milestone-index' into 'master' Sean McGivern2017-01-192-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up dashboard milestone index by scoping IssuesFinder to user authorized projects See merge request !8524
| * | | | | | | | | | | | | | | | Speed up dashboard milestone index by scoping IssuesFinder to user ↵speed-up-dashboard-milestone-indexAdam Niedzielski2017-01-162-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authorized projects It improves performance in dashboard milestone index page by passing a hint to "IssuesFinder". "IssuesFinder" generates a more performant query when it is limited to authorized projects for user. In the dashboard we already limit the projects to these authorized for user (see "Dashboard::ApplicationController#projects"), so we can safely pass this option to "IssuesFinder".
* | | | | | | | | | | | | | | | | Merge branch 'current-user-filter-top' into 'master' Sean McGivern2017-01-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shows current user on top of filtered dropdown list Closes #26765 See merge request !8612
| * | | | | | | | | | | | | | | | | Shows current user on top of filtered dropdown listcurrent-user-filter-topPhil Hughes2017-01-171-1/+1
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '26777-scrollbar-in-searchbar-autocomplete-dropdown' into 'master' Annabel Dunstone Gray2017-01-181-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix search bar filter dropdown scrollbars Closes #26777 See merge request !8615
| * | | | | | | | | | | | | | | | | Fix search bar filter dropdown scrollbars26777-scrollbar-in-searchbar-autocomplete-dropdownClement Ho2017-01-171-2/+2
| | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '26667-pipeline-width-for-huge-pipeline' into 'master' Annabel Dunstone Gray2017-01-181-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes big pipeline and small pipeline width problems Closes #26667 See merge request !8593
| * | | | | | | | | | | | | | | | Fixes big pipeline and small pipeline width problems26667-pipeline-width-for-huge-pipelineFilipa Lacerda2017-01-161-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes tooltips text being outside the tooltip Adds MR id to changelog Fix linter error
* | | | | | | | | | | | | | | | | Merge branch 'ui_pipelines_mini_graph' into 'master' Fatih Acet2017-01-181-8/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | better UI fix - simple solution - pipelines#index mini_graph in Vue See merge request !8614
| * | | | | | | | | | | | | | | | use destructuring syntax insteadui_pipelines_mini_graphRegis2017-01-181-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into ui_pipelines_mini_graphRegis2017-01-1828-23/+688
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ui_pipelines_mini_graphRegis2017-01-184-4/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | get rid of logRegis2017-01-171-2/+0
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | fix UI behaviour - only make new calls when button is clicked and dropdown ↵Regis2017-01-171-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is not displayed
| * | | | | | | | | | | | | | | | | Merge branch 'master' into ui_pipelines_mini_graphRegis2017-01-1725-57/+156
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | better UI fix - simple solutionRegis2017-01-171-5/+9
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' Douwe Maan2017-01-189-149/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor cycle analytics stages (1st iteration) See merge request !7647
| * | | | | | | | | | | | | | | | | | fix specfix/refactor-cycle-analytics-stagesJames Lopez2017-01-171-1/+1
| | | | | | | | | | | | | | | | | | |