summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add documentation around OAuth/Personal Access Token scopes.25851-document-token-scopesTimothy Andrew2016-12-222-3/+13
* Merge branch 'fix-copy-issues-empty-state' into 'master' Annabel Dunstone Gray2016-12-212-3/+7
|\
| * Simplify copy in issues empty statefix-copy-issues-empty-statePedro Moreira da Silva2016-12-211-1/+1
| * Add changelog for !8202.Pedro Moreira da Silva2016-12-201-0/+4
| * Fix copy in Issue Tracker empty state.Pedro Moreira da Silva2016-12-201-2/+2
* | Merge branch 'multipart-uploaded-file' into 'master' Rémy Coutable2016-12-212-5/+9
|\ \
| * | Inject ::UploadedFile from Multipart middlewareJacob Vosmaer2016-12-212-5/+9
* | | Merge branch '25898-ci-icon-color-mr' into 'master' Jacob Schatz2016-12-212-1/+5
|\ \ \
| * | | Adds CSS class to status icon on MR widget to prevent non-colored iconFilipa Lacerda2016-12-212-1/+5
* | | | Merge branch 'dz-rename-invalid-groups' into 'master' Douwe Maan2016-12-213-2/+88
|\ \ \ \
| * | | | Rename groups with .git in the end of the pathDmitriy Zaporozhets2016-12-213-2/+88
* | | | | Merge branch 'dz-whitelist-dashboard-project-path' into 'master' Douwe Maan2016-12-212-1/+6
|\ \ \ \ \
| * | | | | Allow projects with dashboard as pathDmitriy Zaporozhets2016-12-212-1/+6
| |/ / / /
* | | | | Merge branch 'authentiq-id-oauth-support' into 'master' Rémy Coutable2016-12-2110-3/+91
|\ \ \ \ \
| * | | | | Added support for Authentiq oauth providerAlex2016-12-2110-3/+91
* | | | | | Merge branch '25895-fix-headers-in-ci-api-helpers' into 'master' Kamil Trzciński2016-12-213-1/+10
|\ \ \ \ \ \
| * | | | | | Ensure nil User-Agent doesn't break the CI APIRémy Coutable2016-12-213-1/+10
* | | | | | | Merge branch 'badge-color-on-white-bg' into 'master' Fatih Acet2016-12-2110-22/+32
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'master' into 'badge-color-on-white-bg'Dimitrie Hoekstra2016-12-21546-4050/+15308
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | fixed variable, plus added light text color for light badgesbadge-color-on-white-bgDimitrie Hoekstra2016-12-162-1/+3
| * | | | | | Merge branch 'master' into 'badge-color-on-white-bg'Dimitrie Hoekstra2016-12-161056-4251/+23898
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into 'badge-color-on-white-bg'Dimitrie Hoekstra2016-12-04306-2915/+4767
| |\ \ \ \ \ \ \
| * | | | | | | | created framework for badges, solving duplicate codeDimitrie Hoekstra2016-12-026-21/+18
| * | | | | | | | Added lighter count badge background-color for on white backgroundsDimitrie Hoekstra2016-12-017-8/+16
* | | | | | | | | Merge branch 'fix/import-labels-error' into 'master' Douwe Maan2016-12-213-5/+49
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | add changelogfix/import-labels-errorJames Lopez2016-12-211-0/+4
| * | | | | | | | Fix error importing label priorities and added relevant specJames Lopez2016-12-212-5/+45
* | | | | | | | | Merge branch '25225-fix-inconsistent-merge-button-styles' into 'master' Alfredo Sumaran2016-12-212-44/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Set “Remove branch” button to default sizeAlfredo Sumaran2016-12-211-1/+1
| * | | | | | | | | remove unused helper methodMike Greiling2016-12-211-14/+0
| * | | | | | | | | reduce common code even further to satisfy rake flayMike Greiling2016-12-211-23/+25
| * | | | | | | | | remove button class size alteration from revert and cherry pick linksMike Greiling2016-12-212-4/+4
| * | | | | | | | | factor out common code to satisfy rake flayMike Greiling2016-12-211-18/+16
| * | | | | | | | | homogenize revert and cherry-pick button styles generated by commits_helperMike Greiling2016-12-211-7/+4
| |/ / / / / / / /
* | | | | | | | | Merge branch '25681-network-graph-long-commit-msg' into 'master' Alfredo Sumaran2016-12-211-6/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Respect newlines in commit messages on network graph25681-network-graph-long-commit-msgSam Rose2016-12-161-6/+12
* | | | | | | | | Merge branch 'remove-u2f-error-logging' into 'master' Alfredo Sumaran2016-12-216-5/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Display error code for U2F errors (!7305)winniehell2016-11-076-5/+10
* | | | | | | | | | Merge branch '25835-alert-wrapper-creates-extra-margin' into 'master' Jacob Schatz2016-12-211-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply margin on alert banners only when there is one or more alertsMike Greiling2016-12-201-2/+4
* | | | | | | | | | | Merge branch 'fix/25843' into 'master' Sean McGivern2016-12-2013-27/+24
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Rename MattermostNotificationService back to MattermostServicefix/25843Douglas Barbosa Alexandre2016-12-207-8/+8
| * | | | | | | | | | Rename SlackNotificationService back to SlackServiceDouglas Barbosa Alexandre2016-12-2011-19/+16
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-2030-157/+684
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix stage and pipeline specs and rubocop offenses19703-direct-link-pipelinesGrzegorz Bizon2016-12-204-21/+31
| * | | | | | | | | | Add isolated view spec for pipeline stage partialGrzegorz Bizon2016-12-201-0/+21
| * | | | | | | | | | Move test for HTML stage endpoint to controller specsGrzegorz Bizon2016-12-203-33/+47
| * | | | | | | | | | Fix broken testFilipa Lacerda2016-12-201-1/+1
| * | | | | | | | | | Fix broken testFilipa Lacerda2016-12-204-16/+22
| * | | | | | | | | | Adds tests for the mini pipeline graphFilipa Lacerda2016-12-203-6/+50