summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-1828-23/+688
| |\ | | | | | | | | | | | | Backport timetracking to CE See merge request !8195
| | * Fix scss variable refs.backport-time-tracking-ceBryce Johnson2017-01-152-3/+4
| | |
| | * Fix haml-lint complain.Ruben Davila2017-01-151-1/+1
| | | | | | | | | | | | app/views/shared/issuable/_sidebar.html.haml:79 [W] SpaceInsideHashAttributes: Hash attribute should end with one space before the closing brace
| | * Bring changes that were present only in EE.Ruben Davila2017-01-151-14/+12
| | |
| | * Prevent including Vue twiceAlfredo Sumaran2017-01-151-3/+0
| | |
| | * Backport backend work for time tracking.Ruben Davila2017-01-1510-1/+205
| | |
| | * Backport timetracking frontend to CE.Bryce Johnson2017-01-1517-5/+470
| | |
* | | Merge branch 'master' into ui_pipelines_mini_graphRegis2017-01-184-4/+13
|\ \ \ | |/ /
| * | Merge branch 'i-#25814-500-error' into 'master' Sean McGivern2017-01-181-1/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Compare page throws 500 error when any branch/reference is not selected Closes #25814 See merge request !8523
| | * | refactor rubocop suggestionMartin Cabrera2017-01-161-1/+1
| | | |
| | * | Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-1628-72/+223
| | |\ \
| | * | | Refactored ‘from’ and ‘to’ variable preservationMartin Cabrera2017-01-161-10/+6
| | | | |
| | * | | from or to get variables gets preserved if the other one is missingMartin Cabrera2017-01-151-2/+9
| | | | |
| | * | | Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-1522-210/+246
| | |\ \ \
| | * | | | Changed alert message character: from & to and Martin Cabrera2017-01-151-1/+2
| | | | | |
| | * | | | Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-1235-77/+2316
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-1110-18/+93
| | |\ \ \ \ \
| | * | | | | | Fix Compare page throws 500 error when any branch/reference is not selectedMartin Cabrera2017-01-101-1/+6
| | | | | | | |
| * | | | | | | Update clipboard_button text: Copy commit SHA to clipboardclipboard-button-commit-shavictorwu2017-01-173-3/+3
| | | | | | | |
* | | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'mr-tabs-alignment-sidebar-open' into 'master' Annabel Dunstone Gray2017-01-171-1/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly keeps merge request tabs in place when editting value in See merge request !8595
| | * | | | | | | Correctly keeps merge request tabs in place when editting value inmr-tabs-alignment-sidebar-openPhil Hughes2017-01-161-1/+5
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collapsed sidebar Previously the CSS would presume the sidebar is open, which it is but as an overlay so the CSS was pushing the tabs when it shouldnt of been
| * | | | | | | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-1711-7/+84
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support `/merge` slash command for MRs Closes #24915 See merge request !7746
| | * | | | | | | Address MR commentsJarka Kadlecova2017-01-135-6/+15
| | | | | | | | |
| | * | | | | | | refresh merge widget after using /merge commandJarka Kadlecova2017-01-113-0/+24
| | | | | | | | |
| | * | | | | | | support `/merge` slash comand for MRsJarka Kadlecova2017-01-117-7/+51
| | | | | | | | |
| * | | | | | | | Merge branch 'reduce-queries-milestone-index' into 'master' Sean McGivern2017-01-172-3/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use cached values to compute total issues count in milestone index pages See merge request !8518
| | * | | | | | | | Use cached values to compute total issues count in milestone index pagesreduce-queries-milestone-indexAdam Niedzielski2017-01-102-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Milestoneish#issues_visible_to_user caches only the ActiveRecord relation, not the actual result. Introduce Milestoneish#total_issues_count that relies on the cached method Milestoneish#count_issues_by_state to reduce the number of queries.
| * | | | | | | | | Merge branch 'fix/keep-artifacts-button-visibility' into 'master' Sean McGivern2017-01-172-2/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show artifacts keep button if not allowed Closes #26357 See merge request !8501
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibilityGrzegorz Bizon2017-01-16109-361/+3829
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (579 commits) Conflicts: spec/models/build_spec.rb
| | * | | | | | | | | | Add method that checks for expiring build artifactsGrzegorz Bizon2017-01-092-2/+6
| | | | | | | | | | | |
| | * | | | | | | | | | Do not show artifacts keep button if not allowedGrzegorz Bizon2017-01-091-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'issue_25017' into 'master' Sean McGivern2017-01-174-21/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show 'too many changes' message for merge request Closes #25017 See merge request !8444
| | * | | | | | | | | | | Show 'too many changes' message for merge requestissue_25017Felipe Artur2017-01-125-22/+20
| | | | | | | | | | | | |
| * | | | | | | | | | | | Mark Commit persistedpmq20/gitlab-ce-psvr/persistedP.S.V.R2017-01-162-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Synchronize all project authorization refreshingrefresh-authorizations-tighter-leaseYorick Peterse2017-01-161-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously a lease would only be obtained to update data. This could lead to duplicate data being inserted, triggering a UNIQUE constraint error. To work around this we now acquire a lease before performing _any_ project authorization work, releasing it at the very end. Fixes #25987
| * | | | | | | | | | | | Merge branch '26616-fix-search-group-project-filters' into 'master' Alfredo Sumaran2017-01-162-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix search group/project filtering to show results Closes #26616 See merge request !8565
| | * | | | | | | | | | | Fix dropdown filter input value after blur26616-fix-search-group-project-filtersEric Eastwood2017-01-161-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fix group/project filters on search pageEric Eastwood2017-01-161-0/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | better UI fix - simple solutionRegis2017-01-171-5/+9
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'pipeline_index_mini_graph_fix' into 'master' Fatih Acet2017-01-161-13/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipeline Index Mini Graph Fix See merge request !8542
| * | | | | | | | | | | | phil said this is good - no need to dynamically update since this is a ↵pipeline_index_mini_graph_fixRegis2017-01-151-49/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | static page for now
| * | | | | | | | | | | | works in browsers without sourceCapabilities APIRegis2017-01-151-1/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | update commented documentation to reflect new changesRegis2017-01-151-2/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into pipeline_index_mini_graph_fixRegis2017-01-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | fix clicking url bar, browser UI, dev tools collapsing the mini_graphRegis2017-01-151-1/+3
| | | | | | | | | | | | |