summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix small button alignment issuesbutton-alignmentAnnabel Dunstone Gray2017-01-182-2/+1
|
* 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-1852-50/+1494
| |\
| * \ Merge branch 'master' into ui_pipelines_mini_graphRegis2017-01-188-5/+51
| |\ \
| * | | 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-1757-121/+779
| |\ \ \
| * | | | better UI fix - simple solutionRegis2017-01-171-5/+9
| | | | |
* | | | | Merge branch 'correct_robots_txt' into 'master' Rémy Coutable2017-01-182-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct User-agent placement in robots.txt Closes #26807 See merge request !8623
| * | | | | add changelog yml fileeric sabelhaus2017-01-181-0/+4
| | | | | |
| * | | | | correct User_agent placement in robots.txteric sabelhaus2017-01-181-2/+3
| | | | | |
* | | | | | Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' Douwe Maan2017-01-1874-541/+830
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor cycle analytics stages (1st iteration) See merge request !7647
| * | | | | | fix specfix/refactor-cycle-analytics-stagesJames Lopez2017-01-172-3/+3
| | | | | | |
| * | | | | | refactored a bunch of stuff based on feedbackJames Lopez2017-01-1712-48/+54
| | | | | | |
| * | | | | | fix serializerJames Lopez2017-01-171-1/+1
| | | | | | |
| * | | | | | fix bug retrieving mediansJames Lopez2017-01-171-1/+1
| | | | | | |
| * | | | | | fix specsJames Lopez2017-01-175-25/+10
| | | | | | |
| * | | | | | refactored metrics fetcher - merged into stage and eventsJames Lopez2017-01-1716-121/+119
| | | | | | |
| * | | | | | fix refactor of production event fetcherJames Lopez2017-01-172-17/+17
| | | | | | |
| * | | | | | a few more fixesJames Lopez2017-01-173-19/+2
| | | | | | |
| * | | | | | fix missing refactor in metrics fetcherJames Lopez2017-01-171-2/+2
| | | | | | |
| * | | | | | fix plan stage issue and some spec failuresJames Lopez2017-01-173-3/+9
| | | | | | |
| * | | | | | fix specs, refactor missing bits from events stuffJames Lopez2017-01-1713-44/+29
| | | | | | |
| * | | | | | big refactor based on MR feedbackJames Lopez2017-01-1732-129/+136
| | | | | | |
| * | | | | | fix spec failures after mergeJames Lopez2017-01-175-9/+14
| | | | | | |
| * | | | | | few fixes after mergeJames Lopez2017-01-174-6/+15
| | | | | | |
| * | | | | | refactor fetcher and fixed specsJames Lopez2017-01-1713-67/+49
| | | | | | |
| * | | | | | refactor cycle analytics - updated based on MR feedbackJames Lopez2017-01-1720-85/+107
| | | | | | |
| * | | | | | fix tricky test failure to do with private methodJames Lopez2017-01-171-6/+6
| | | | | | |
| * | | | | | Fix other spec failuresJames Lopez2017-01-172-10/+10
| | | | | | |
| * | | | | | Fix other spec failuresJames Lopez2017-01-1720-131/+128
| | | | | | |
| * | | | | | more refactoring and fixing old specsJames Lopez2017-01-1714-49/+50
| | | | | | |
| * | | | | | fix bad mergeJames Lopez2017-01-171-3/+5
| | | | | | |
| * | | | | | added new summary serializers and refactor all of the summary stuff into ↵James Lopez2017-01-1712-89/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | separate logical classes
| * | | | | | fixed stage entity and added missing stage specsJames Lopez2017-01-1710-3/+93
| | | | | | |
| * | | | | | added analytics stage serializer and moved some info to the stage classes ↵James Lopez2017-01-1710-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | from the controller
| * | | | | | WIP - started refactoring cycle analytics median stuff into stagesJames Lopez2017-01-1719-59/+118
| | | | | | |
* | | | | | | Merge branch 'time-tracking-api' into 'master' Sean McGivern2017-01-1818-45/+608
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time tracking API Closes #25861 See merge request !8483
| * | | | | | | Add some API endpoints for time tracking.Ruben Davila2017-01-1818-45/+608
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'rs-repository-project-trait' into 'master' Rémy Coutable2017-01-1820-33/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `:repository` trait to the `:empty_project` factory See merge request !8605
| * | | | | | | | Remove repository trait from factories that don't need it in featuresrs-repository-project-traitRobert Speicher2017-01-178-13/+13
| | | | | | | | |
| * | | | | | | | Add the `:repository` trait to `:project` factories in Cucumber stepsRobert Speicher2017-01-1719-33/+33
| | | | | | | | |
| * | | | | | | | Add a `:repository` trait to the `:empty_project` factoryRobert Speicher2017-01-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now this is a no-op. We're going to add it as a trait argument to all existing usages of the `:project` factory, so that later we can flip `:empty_project` to just be `:project`, forcing developers to opt-in to the slower option when their tests truly require it.
* | | | | | | | | Merge branch '26773-fix-project-statistics-repository-size' into 'master' Rémy Coutable2017-01-183-2/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-173-2/+7
| |/ / / / / / / /
* | | | | | | | | Merge branch 'rs-data_attribute-cleanup' into 'master' Douwe Maan2017-01-181-3/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Correct documentation for `data_attribute` method See merge request !8603
| * | | | | | | | Correct documentation for `data_attribute` methodrs-data_attribute-cleanupRobert Speicher2017-01-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also break up a long line, just 'cause.
* | | | | | | | | Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-1852-50/+1494
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | Backport timetracking to CE See merge request !8195
| * | | | | | | Fix scss variable refs.backport-time-tracking-ceBryce Johnson2017-01-152-3/+4
| | | | | | | |
View Lorry Controller Status