summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix broken linkresolvable-discussions-docsLuke "Jared" Bennett2017-04-071-1/+1
* Merge branch 'master' into resolvable-discussions-docsLuke "Jared" Bennett2017-04-071075-7241/+72279
|\
| * Merge branch 'metrics-button-misplaced' into 'master' Annabel Dunstone Gray2017-04-072-1/+5
| |\
| | * Moved the monitoring button inside the show view for the environments pagemetrics-button-misplacedJose Ivan Vargas2017-04-062-1/+5
| * | Merge branch '27580-fix-show-go-back' into 'master' Jacob Schatz2017-04-076-5/+80
| |\ \
| | * | shows go back link only when history is availableNur Rony2017-04-076-5/+80
| |/ /
| * | Merge branch '30587-pipeline-icon-z' into 'master' Annabel Dunstone Gray2017-04-072-0/+5
| |\ \
| | * | sidebar z-index above content area30587-pipeline-icon-zSimon Knox2017-04-072-0/+5
| * | | Merge branch '30056-rename-milestones-empty' into 'master'Robert Speicher2017-04-073-16/+4
| |\ \ \
| | * | | Removed `Milestone#is_empty?`Jacopo2017-04-073-16/+4
| * | | | Merge branch 'dz-hide-zero-counter' into 'master' Dmitriy Zaporozhets2017-04-073-15/+36
| |\ \ \ \
| | * | | | Hide header counters for issue/mr/todos if zerodz-hide-zero-counterDmitriy Zaporozhets2017-04-073-15/+36
| * | | | | Merge branch 'update-droplab-to-webpack-version' into 'master' Jacob Schatz2017-04-0736-1622/+2585
| |\ \ \ \ \
| | * | | | | Update droplabLuke "Jared" Bennett2017-04-0736-1622/+2585
| |/ / / / /
| * | | | | Merge branch 'qa/gb/fix-new-group-button-label' into 'master' Rémy Coutable2017-04-071-1/+1
| |\ \ \ \ \
| | * | | | | Fix new group button label in GitLab QA specsGrzegorz Bizon2017-04-071-1/+1
| * | | | | | Merge branch 'gitaly-repository-message' into 'master' Sean McGivern2017-04-0711-41/+46
| |\ \ \ \ \ \
| | * | | | | | Use Gitlab::Git::Repository#gitaly_... moreJacob Vosmaer2017-04-077-21/+17
| | * | | | | | Remove spacesJacob Vosmaer2017-04-071-3/+3
| | * | | | | | Combine delegations in one lineJacob Vosmaer2017-04-071-2/+1
| | * | | | | | Remove unused codeJacob Vosmaer2017-04-071-4/+0
| | * | | | | | Send more Gitaly::Repository fieldsJacob Vosmaer2017-04-078-26/+40
| * | | | | | | Merge branch 'docs-search' into 'master' Sean Packham (GitLab)2017-04-0711-23/+117
| |\ \ \ \ \ \ \
| | * | | | | | | Doc: Search through GitLabMarcia Ramos2017-04-0711-23/+117
| |/ / / / / / /
| * | | | | | | Merge branch '28574-jira-trigers' into 'master' Sean McGivern2017-04-073-2/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Remove confusing placeholder for JIRA transition_idJarka Kadlecova2017-04-053-2/+6
| * | | | | | | | Merge branch 'feature/service-desk-be-backport' into 'master' Sean McGivern2017-04-073-1/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Backport permissions and multi-line array to CEFelipe Artur2017-04-073-1/+8
| * | | | | | | | | Merge branch '27724-fe-update-trace-handling-code' into 'master' Jacob Schatz2017-04-074-173/+238
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | FE: Resolve "Performance issues when processing large build traces with Ansi2...Filipa Lacerda2017-04-074-173/+238
| |/ / / / / / / /
| * | | | | | | | Merge branch '24240-prometheus_healthz' into 'master' Douwe Maan2017-04-0717-20/+662
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track applica...Paweł Chojnacki2017-04-0717-20/+662
| |/ / / / / / / /
| * | | | | | | | Merge branch '8998_skip_pending_commits_if_not_head' into 'master' Kamil Trzciński2017-04-0735-160/+550
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix bad conflict resolutionLin Jen-Shin2017-04-071-6/+5
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-07208-1080/+2267
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-07246-1551/+6072
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Make sure that's canceledLin Jen-Shin2017-04-071-1/+1
| | * | | | | | | | | Fix test by ignoring auto_canceled_by for jobsLin Jen-Shin2017-04-071-3/+4
| | * | | | | | | | | Fix typoLin Jen-Shin2017-04-071-1/+1
| | * | | | | | | | | Fix rubocop offenses8998_skip_pending_commits_if_not_headLin Jen-Shin2017-04-062-2/+2
| | * | | | | | | | | Bump schema versionLin Jen-Shin2017-04-061-1/+1
| | * | | | | | | | | Use before_transitionLin Jen-Shin2017-04-061-4/+4
| | * | | | | | | | | Add missing tests and update test descriptionLin Jen-Shin2017-04-063-1/+3
| | * | | | | | | | | We don't have to save, transition would save for usLin Jen-Shin2017-04-061-1/+1
| | * | | | | | | | | Also track auto-cancelling in jobs, detail:Lin Jen-Shin2017-04-0614-27/+143
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-06147-214/+1525
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix a view test by using presenterLin Jen-Shin2017-04-061-1/+1
| | * | | | | | | | | | Fix rolling back for MySQLLin Jen-Shin2017-04-064-57/+2
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-06206-891/+54440
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | * | | | | | | | | | Add a test to make sure it's not auto-cancelingLin Jen-Shin2017-04-061-10/+24