summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* prevent nonewline type diff lines from containing unfolding link26829-diff-unfolding-links-erroneously-present-on-no-newline-linesMike Greiling2017-01-181-2/+10
|
* 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
| | | | | | |
| * | | | | | refactored a bunch of stuff based on feedbackJames Lopez2017-01-171-2/+2
| | | | | | |
| * | | | | | a few more fixesJames Lopez2017-01-171-1/+1
| | | | | | |
| * | | | | | big refactor based on MR feedbackJames Lopez2017-01-171-1/+1
| | | | | | |
| * | | | | | few fixes after mergeJames Lopez2017-01-171-1/+3
| | | | | | |
| * | | | | | refactor fetcher and fixed specsJames Lopez2017-01-171-1/+1
| | | | | | |
| * | | | | | refactor cycle analytics - updated based on MR feedbackJames Lopez2017-01-174-21/+15
| | | | | | |
| * | | | | | Fix other spec failuresJames Lopez2017-01-174-21/+24
| | | | | | |
| * | | | | | more refactoring and fixing old specsJames Lopez2017-01-174-17/+25
| | | | | | |
| * | | | | | fix bad mergeJames Lopez2017-01-171-3/+5
| | | | | | |
| * | | | | | added new summary serializers and refactor all of the summary stuff into ↵James Lopez2017-01-175-89/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | separate logical classes
| * | | | | | fixed stage entity and added missing stage specsJames Lopez2017-01-171-2/+2
| | | | | | |
| * | | | | | added analytics stage serializer and moved some info to the stage classes ↵James Lopez2017-01-172-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | from the controller
| * | | | | | WIP - started refactoring cycle analytics median stuff into stagesJames Lopez2017-01-171-40/+7
| | | | | | |
* | | | | | | Merge branch 'time-tracking-api' into 'master' Sean McGivern2017-01-183-23/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time tracking API Closes #25861 See merge request !8483
| * | | | | | | Add some API endpoints for time tracking.Ruben Davila2017-01-183-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New endpoints are: POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/time_estimate" POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/reset_time_estimate" POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/add_spent_time" POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/reset_spent_time" GET :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/time_stats"
* | | | | | | | Merge branch '26773-fix-project-statistics-repository-size' into 'master' Rémy Coutable2017-01-181-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wrong file size on repository page" Closes #26773 See merge request !8616
| * | | | | | | Fix Project#update_repository_size to convert MB to Bytes properly26773-fix-project-statistics-repository-sizeOswaldo Ferreira2017-01-171-1/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | 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 '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
| |_|_|_|_|_|/ / / |/| | | | | | | |
View Lorry Controller Status