summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix markdown table in API Issues docsdocs/fix-md-table-in-api-issuesAchilleas Pipinellis2017-04-061-63/+29
* Merge branch 'user-page-horizontal-scrolling' into 'master' Annabel Dunstone Gray2017-04-061-0/+8
|\
| * Fixed user profile tabs causing the page to scrolluser-page-horizontal-scrollingPhil Hughes2017-04-031-0/+8
* | Merge branch '30024-owner-can-t-initialize-git-repo-for-new-project-in-group'...Sean McGivern2017-04-063-0/+23
|\ \
| * | Fix RuboCop for removing index30024-owner-can-t-initialize-git-repo-for-new-project-in-groupSean McGivern2017-04-061-0/+1
| * | Disable invalid service templates (again)Sean McGivern2017-04-062-0/+22
* | | Merge branch 'ee-mrs-on-freeze-date' into 'master' Douwe Maan2017-04-061-1/+46
|\ \ \
| * | | Link to docs site for file in doc/ee-mrs-on-freeze-dateSean McGivern2017-04-061-1/+1
| * | | Large features by the 1st, small ones by the 3rdSean McGivern2017-04-051-0/+23
| * | | Ask people to create EE MRs on the 7thSean McGivern2017-04-051-1/+23
* | | | Merge branch 'dz-inherit-create-group-permission' into 'master' Douwe Maan2017-04-062-8/+47
|\ \ \ \
| * | | | Add more tests for subgroups featuredz-inherit-create-group-permissionDmitriy Zaporozhets2017-04-052-8/+47
* | | | | Merge branch '29807-improve-triggers-edit-and-delete-buttons-alignment' into ...Annabel Dunstone Gray2017-04-061-0/+2
|\ \ \ \ \
| * | | | | Prevent Trigger action buttons from wrapping29807-improve-triggers-edit-and-delete-buttons-alignmentSam Rose2017-03-231-0/+2
* | | | | | Merge branch 'award-emoji-button-smiley-animation' into 'master' Annabel Dunstone Gray2017-04-0610-8/+111
|\ \ \ \ \ \
| * | | | | | Award emoji button smiley animationDimitrie Hoekstra2017-04-0610-8/+111
|/ / / / / /
* | | | | | Merge branch 'add-error-empty-states' into 'master' Jacob Schatz2017-04-0610-36/+213
|\ \ \ \ \ \
| * | | | | | Introduced empty/error UX states to environments monitoring.Jose Ivan Vargas Lopez2017-04-0610-36/+213
|/ / / / / /
* | | | | | Merge branch 'feature/gh-rake-task' into 'master' Sean McGivern2017-04-063-0/+244
|\ \ \ \ \ \
| * | | | | | Github import rake taskJames Lopez2017-04-063-0/+244
|/ / / / / /
* | | | | | Merge branch '30291-reopen-mr' into 'master'Sean McGivern2017-04-063-1/+32
|\ \ \ \ \ \
| * | | | | | Search for opened MRs - include reopened MRs30291-reopen-mrJarka Kadlecova2017-04-063-1/+32
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'pdf-js-spec-loading-wait' into 'master' Jacob Schatz2017-04-062-9/+17
|\ \ \ \ \ \
| * | | | | | Wait for the PDF to be loaded before doing anythingPhil Hughes2017-04-062-9/+17
* | | | | | | Merge branch '30493-env-deploy-tooltip' into 'master' Jacob Schatz2017-04-062-1/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix html structure to prevent tooltip from not hidding30493-env-deploy-tooltipFilipa Lacerda2017-04-052-1/+6
* | | | | | | Merge branch 'fix/gh-import-status-check' into 'master' Sean McGivern2017-04-0613-5/+129
|\ \ \ \ \ \ \
| * | | | | | | remove unnecessary lease as cron jobfix/gh-import-status-checkJames Lopez2017-04-061-13/+0
| * | | | | | | fix project authorizations migration issueJames Lopez2017-04-051-1/+3
| * | | | | | | attempt to fix migrationJames Lopez2017-04-052-1/+1
| * | | | | | | Revert schema.rbJames Lopez2017-04-051-1/+1
| * | | | | | | attempt to fix db failureJames Lopez2017-04-051-1/+1
| * | | | | | | Periodically mark projects that are stuck in importing as failedJames Lopez2017-04-0512-3/+138
* | | | | | | | Merge branch 'add_remove_concurrent_index_to_database_helper' into 'master' Yorick Peterse2017-04-0655-21/+284
|\ \ \ \ \ \ \ \
| * | | | | | | | Add remove_concurrent_index to database helperblackst0ne2017-04-0655-21/+284
* | | | | | | | | Merge branch '12818-ci-status-as-favicon' into 'master' Jacob Schatz2017-04-0621-3/+109
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Show CI status as Favicon on Pipelines, Job and MR pagesKushal Pandya2017-04-0621-3/+109
|/ / / / / / / / /
* | | | | | | | | Merge branch '28810-projectfinder-should-handle-more-options' into 'master' Rémy Coutable2017-04-0629-143/+370
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ProjectsFinder should handle more optionsJacopo2017-04-0629-143/+370
* | | | | | | | | | Merge branch '30021-api-deploy_keys-can_push-is-not-honoured' into 'master' Rémy Coutable2017-04-064-0/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enable creation of deploy keys with write access via the APIMark Fletcher2017-04-054-0/+18
* | | | | | | | | | | Merge branch '3d-file-viewer' into 'master' Jacob Schatz2017-04-0611-1/+318
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | STL file viewerPhil Hughes2017-04-0611-1/+318
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'tc-fix-pipeline-recipient' into 'master' Kamil Trzciński2017-04-068-29/+242
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clearly show who triggered the pipeline in emailtc-fix-pipeline-recipientToon Claes2017-04-067-29/+231
| * | | | | | | | | | Make it possible to preview pipeline success/failed emailsToon Claes2017-04-061-0/+11
|/ / / / / / / / / /
* | | | | | | | | | Merge remote-tracking branch 'dev/master'DJ Mountney2017-04-0528-43/+219
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'open-redirect-fix-continue-to' into 'security' Sean McGivern2017-04-053-1/+13
| * | | | | | | | | | Merge branch 'open-redirect-host-fix' into 'security' Sean McGivern2017-04-057-3/+37
| * | | | | | | | | | Merge branch 'path-disclosure-proj-import-export' into 'security' DJ Mountney2017-04-053-1/+17