Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use destructuring syntax insteadui_pipelines_mini_graph | Regis | 2017-01-18 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into ui_pipelines_mini_graph | Regis | 2017-01-18 | 28 | -23/+688 |
|\ | |||||
| * | Merge branch 'backport-time-tracking-ce' into 'master' | Douwe Maan | 2017-01-18 | 28 | -23/+688 |
| |\ | | | | | | | | | | | | | Backport timetracking to CE See merge request !8195 | ||||
| | * | Fix scss variable refs.backport-time-tracking-ce | Bryce Johnson | 2017-01-15 | 2 | -3/+4 |
| | | | |||||
| | * | Fix haml-lint complain. | Ruben Davila | 2017-01-15 | 1 | -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 Davila | 2017-01-15 | 1 | -14/+12 |
| | | | |||||
| | * | Prevent including Vue twice | Alfredo Sumaran | 2017-01-15 | 1 | -3/+0 |
| | | | |||||
| | * | Backport backend work for time tracking. | Ruben Davila | 2017-01-15 | 10 | -1/+205 |
| | | | |||||
| | * | Backport timetracking frontend to CE. | Bryce Johnson | 2017-01-15 | 17 | -5/+470 |
| | | | |||||
* | | | Merge branch 'master' into ui_pipelines_mini_graph | Regis | 2017-01-18 | 4 | -4/+13 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'i-#25814-500-error' into 'master' | Sean McGivern | 2017-01-18 | 1 | -1/+10 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix Compare page throws 500 error when any branch/reference is not selected Closes #25814 See merge request !8523 | ||||
| | * | | refactor rubocop suggestion | Martin Cabrera | 2017-01-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into i-#25814-500-error | Martin Cabrera | 2017-01-16 | 28 | -72/+223 |
| | |\ \ | |||||
| | * | | | Refactored ‘from’ and ‘to’ variable preservation | Martin Cabrera | 2017-01-16 | 1 | -10/+6 |
| | | | | | |||||
| | * | | | from or to get variables gets preserved if the other one is missing | Martin Cabrera | 2017-01-15 | 1 | -2/+9 |
| | | | | | |||||
| | * | | | Merge branch 'master' into i-#25814-500-error | Martin Cabrera | 2017-01-15 | 22 | -210/+246 |
| | |\ \ \ | |||||
| | * | | | | Changed alert message character: from & to and | Martin Cabrera | 2017-01-15 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into i-#25814-500-error | Martin Cabrera | 2017-01-12 | 35 | -77/+2316 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into i-#25814-500-error | Martin Cabrera | 2017-01-11 | 10 | -18/+93 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Fix Compare page throws 500 error when any branch/reference is not selected | Martin Cabrera | 2017-01-10 | 1 | -1/+6 |
| | | | | | | | | |||||
| * | | | | | | | Update clipboard_button text: Copy commit SHA to clipboardclipboard-button-commit-sha | victorwu | 2017-01-17 | 3 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | get rid of log | Regis | 2017-01-17 | 1 | -2/+0 |
| | | | | | | | | |||||
* | | | | | | | | fix UI behaviour - only make new calls when button is clicked and dropdown ↵ | Regis | 2017-01-17 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is not displayed | ||||
* | | | | | | | | Merge branch 'master' into ui_pipelines_mini_graph | Regis | 2017-01-17 | 25 | -57/+156 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'mr-tabs-alignment-sidebar-open' into 'master' | Annabel Dunstone Gray | 2017-01-17 | 1 | -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-open | Phil Hughes | 2017-01-16 | 1 | -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 McGivern | 2017-01-17 | 11 | -7/+84 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support `/merge` slash command for MRs Closes #24915 See merge request !7746 | ||||
| | * | | | | | | | Address MR comments | Jarka Kadlecova | 2017-01-13 | 5 | -6/+15 |
| | | | | | | | | | |||||
| | * | | | | | | | refresh merge widget after using /merge command | Jarka Kadlecova | 2017-01-11 | 3 | -0/+24 |
| | | | | | | | | | |||||
| | * | | | | | | | support `/merge` slash comand for MRs | Jarka Kadlecova | 2017-01-11 | 7 | -7/+51 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'reduce-queries-milestone-index' into 'master' | Sean McGivern | 2017-01-17 | 2 | -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-index | Adam Niedzielski | 2017-01-10 | 2 | -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 McGivern | 2017-01-17 | 2 | -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-visibility | Grzegorz Bizon | 2017-01-16 | 109 | -361/+3829 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (579 commits) Conflicts: spec/models/build_spec.rb | ||||
| | * | | | | | | | | | | Add method that checks for expiring build artifacts | Grzegorz Bizon | 2017-01-09 | 2 | -2/+6 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Do not show artifacts keep button if not allowed | Grzegorz Bizon | 2017-01-09 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'issue_25017' into 'master' | Sean McGivern | 2017-01-17 | 4 | -21/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show 'too many changes' message for merge request Closes #25017 See merge request !8444 | ||||
| | * | | | | | | | | | | | Show 'too many changes' message for merge requestissue_25017 | Felipe Artur | 2017-01-12 | 5 | -22/+20 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Mark Commit persistedpmq20/gitlab-ce-psvr/persisted | P.S.V.R | 2017-01-16 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | | | | | Synchronize all project authorization refreshingrefresh-authorizations-tighter-lease | Yorick Peterse | 2017-01-16 | 1 | -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 Sumaran | 2017-01-16 | 2 | -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-filters | Eric Eastwood | 2017-01-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fix group/project filters on search page | Eric Eastwood | 2017-01-16 | 1 | -0/+6 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | better UI fix - simple solution | Regis | 2017-01-17 | 1 | -5/+9 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'pipeline_index_mini_graph_fix' into 'master' | Fatih Acet | 2017-01-16 | 1 | -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_fix | Regis | 2017-01-15 | 1 | -49/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | static page for now | ||||
| * | | | | | | | | | | | | works in browsers without sourceCapabilities API | Regis | 2017-01-15 | 1 | -1/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | update commented documentation to reflect new changes | Regis | 2017-01-15 | 1 | -2/+3 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into pipeline_index_mini_graph_fix | Regis | 2017-01-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | fix clicking url bar, browser UI, dev tools collapsing the mini_graph | Regis | 2017-01-15 | 1 | -1/+3 |
| | | | | | | | | | | | | |