summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix lintdiff-noteSimon Knox2017-11-293-5/+3
* add basic component specSimon Knox2017-11-293-3/+63
* remove unused varSimon Knox2017-11-291-1/+0
* clean up diff note avatars template and exportsSimon Knox2017-11-293-16/+23
* convert diff_note_avatar to .vue componentSimon Knox2017-11-292-47/+56
* use icon componentSimon Knox2017-11-292-7/+6
* restrict icon size to valid values, default to common icon sizeSimon Knox2017-11-291-6/+6
* Merge branch 'hashed-storage-attachments-migration-path' into 'master'Nick Thomas2017-11-2814-150/+523
|\
| * Changes to Attachments Migration for EE and Geo compatibilityGabriel Mazetto2017-11-283-8/+22
| * Backport EE changes to make test possible when prepending modulesGabriel Mazetto2017-11-243-6/+18
| * fix exclusive lease specs fro hashed storage migrationGabriel Mazetto2017-11-232-9/+15
| * Changelog and Documentation for storage migration of project attachmentsGabriel Mazetto2017-11-232-13/+89
| * Codestyle changes and Added Exclusive Lease to hashed storage migrationGabriel Mazetto2017-11-233-15/+57
| * when rollingback repository migration, toggle readonly mode backGabriel Mazetto2017-11-233-6/+8
| * Raises error when migration cannot happen so job is cancelledGabriel Mazetto2017-11-232-6/+5
| * attachments migration should move only the base folderGabriel Mazetto2017-11-232-49/+30
| * Improve storage migration rake taskGabriel Mazetto2017-11-232-17/+73
| * WIP Attachments migrationGabriel Mazetto2017-11-234-1/+172
| * Refactor Hashed Storage migration to add additional migration stepsGabriel Mazetto2017-11-234-59/+73
* | Merge branch '40561-environment-scope-value-is-not-trimmed' into 'master'Kamil Trzciński2017-11-283-0/+27
|\ \
| * | Strip leading & trailing whitespaces in CI/CD secret variable keys40561-environment-scope-value-is-not-trimmedRémy Coutable2017-11-273-0/+27
* | | Merge branch 'winh-upgrade-codeclimate' into 'master'Rémy Coutable2017-11-281-1/+1
|\ \ \
| * | | Upgrade codeclimate image to latestWinnie Hellmann2017-11-281-1/+1
|/ / /
* | | Merge branch 'tm/feature/list-runners-jobs-api' into 'master'Kamil Trzciński2017-11-287-7/+327
|\ \ \
| * | | Refactorize jobs finding logicTomasz Maczukin2017-11-284-10/+67
| * | | Update documentationTomasz Maczukin2017-11-281-11/+36
| * | | Use 'set' instead of 'let!' when it's possibleTomasz Maczukin2017-11-281-1/+1
| * | | Modify outputTomasz Maczukin2017-11-282-6/+9
| * | | Allow filtering by 'status'Tomasz Maczukin2017-11-282-5/+54
| * | | Add information about projectTomasz Maczukin2017-11-284-10/+30
| * | | Add CHANGELOG entryTomasz Maczukin2017-11-281-0/+5
| * | | Add new API endpoint - list jobs of a specified runnerTomasz Maczukin2017-11-283-0/+161
* | | | Merge branch 'icon-sizes' into 'master'Tim Zallmann2017-11-282-5/+18
|\ \ \ \
| * | | | limit icon component size to valid valuesicon-sizesSimon Knox2017-11-282-5/+18
* | | | | Merge branch '40568-bump-seed-fu-to-2-3-7' into 'master'Rémy Coutable2017-11-283-2/+7
|\ \ \ \ \
| * | | | | Upgrade seed-fu to 2.3.7Takuya Noguchi2017-11-263-2/+7
* | | | | | Merge branch 'tm/feature/namespace-by-id-api' into 'master'Kamil Trzciński2017-11-2810-14/+361
|\ \ \ \ \ \
| * | | | | | Update policies unit testsTomasz Maczukin2017-11-272-14/+37
| * | | | | | Add some unit tests for lib/api/helpers.rbTomasz Maczukin2017-11-271-0/+109
| * | | | | | Introduce :read_namespace access policy for namespace and groupTomasz Maczukin2017-11-234-11/+52
| * | | | | | Allow request namespace by ID or pathTomasz Maczukin2017-11-234-28/+72
| * | | | | | Add CHANGELOG entryTomasz Maczukin2017-11-231-0/+5
| * | | | | | Add new API endpoint - get a namespace by IDTomasz Maczukin2017-11-233-0/+125
* | | | | | | Merge branch '40226-refactor-the-issuable-s-webhooks-data-architecture' into ...Douwe Maan2017-11-288-39/+58
|\ \ \ \ \ \ \
| * | | | | | | Refactor the way we pass `old associations` to issuable's update services40226-refactor-the-issuable-s-webhooks-data-architectureRémy Coutable2017-11-248-39/+58
* | | | | | | | Merge branch 'backport-disable-autocomplete' into 'master'Fatih Acet2017-11-274-3/+28
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | backport disable autocompletebackport-disable-autocompleteClement Ho2017-11-224-3/+28
* | | | | | | | Merge branch 'pawel/update_prometheus_gem_to_fix_build_on_Rpi' into 'master'Robert Speicher2017-11-272-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Update prometheus gem to fix build on RPiPawel Chojnacki2017-11-272-3/+3
* | | | | | | | | Merge branch 'backport-epic-fullscreen' into 'master'Fatih Acet2017-11-273-68/+91
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status