summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix unable to expand text diff discussion commentsfix-resolved-discussionClement Ho2017-10-103-4/+4
* Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'Douwe Maan2017-10-1015-18/+67
|\
| * Changed Group Icon URL Back to try option38245-private-avatars-are-not-cdn-compatibleTim Zallmann2017-10-101-5/+1
| * Fix for Lint Error + Upload TestTim Zallmann2017-10-092-2/+1
| * Based on MR simplified the logicTim Zallmann2017-10-093-17/+5
| * Removed 2 uncommented linesTim Zallmann2017-10-061-2/+0
| * Fixed Linting ErrorTim Zallmann2017-10-051-8/+0
| * Another Change for cleanupTim Zallmann2017-10-051-6/+0
| * Updates based on MR commentsTim Zallmann2017-10-053-16/+19
| * Fixed TestsTim Zallmann2017-10-043-8/+9
| * Fixed TestTim Zallmann2017-10-042-5/+4
| * Fixed Linting errors + testsTim Zallmann2017-10-044-14/+13
| * Created group_icon and group_icon_urlTim Zallmann2017-10-0412-17/+79
| * Making private project avatars use local paths + Some Group IconsTim Zallmann2017-10-044-9/+27
* | Merge branch '38941-lock-note-fix' into 'master'Sean McGivern2017-10-103-3/+41
|\ \
| * | Fix text for the merge request lock system noteJarka Kadlecova2017-10-103-3/+41
* | | Merge branch 'acet-fix-paste-on-comment-form' into 'master'Filipa Lacerda2017-10-101-1/+4
|\ \ \
| * | | Trigger change event of the markdown textarea to allow Vue catch the programm...acet-fix-paste-on-comment-formFatih Acet2017-09-271-1/+4
* | | | Merge branch 'fix-timestampz-cop' into 'master'Grzegorz Bizon2017-10-106-7/+43
|\ \ \ \
| * | | | Ignore existing Migration/Datetime cop offendersSean McGivern2017-10-104-0/+4
| * | | | Also warn on timestamp in datetime migration copfix-timestampz-copSean McGivern2017-10-102-7/+39
* | | | | Merge branch '38869-ci-global' into 'master'Phil Hughes2017-10-1010-121/+110
|\ \ \ \ \
| * | | | | Remove Build code from global namespaceFilipa Lacerda2017-10-1010-121/+110
|/ / / / /
* | | | | Merge branch 'feature/migrate-workhorse-send-git-diff-patch-to-gitaly' into '...Robert Speicher2017-10-103-22/+92
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Migrate Workhorse Send{Diff,Patch} to Gitalyfeature/migrate-workhorse-send-git-diff-patch-to-gitalyAhmad Sherif2017-10-093-22/+92
* | | | | Merge branch 'ee-38771-ce-backport' into 'master'Douwe Maan2017-10-105-2/+52
|\ \ \ \ \
| * | | | | Backports EE 38771 changes to CE.Tiago Botelho2017-10-105-2/+52
| | |/ / / | |/| | |
* | | | | Merge branch '38869-api' into 'master'Phil Hughes2017-10-101-1/+0
|\ \ \ \ \
| * | | | | Remove Api from main.js38869-apiFilipa Lacerda2017-10-091-1/+0
* | | | | | Merge branch 'winh-clarify-naming-imports-docs' into 'master'Filipa Lacerda2017-10-101-4/+26
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Make naming imports more clearwinh-clarify-naming-imports-docswinh-clarify-naming-importsWinnie Hellmann2017-10-091-4/+26
* | | | | | Merge branch '38574-superfluous-export-in-advanced-settings-of-project-settin...Tim Zallmann2017-10-101-1/+1
|\ \ \ \ \ \
| * | | | | | fix incorrect description for advanced settings section of project settings38574-superfluous-export-in-advanced-settings-of-project-settingsMike Greiling2017-10-091-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch '34841-todos' into 'master'Phil Hughes2017-10-105-52/+69
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix bad type checking to prevent 0 count badge to be shownFilipa Lacerda2017-10-105-52/+69
|/ / / / /
* | | | | Merge branch 'wiki-empty-page-heading' into 'master'Filipa Lacerda2017-10-091-1/+1
|\ \ \ \ \
| * | | | | Fix wiki empty page translation namespace not being removedwiki-empty-page-headingPhil Hughes2017-10-091-1/+1
| |/ / / /
* | | | | Merge branch 'rc/rename-codeclimate-to-codequality' into 'master'Kamil Trzciński2017-10-091-1/+1
|\ \ \ \ \
| * | | | | Rename the `codeclimate` job to `codequality`rc/rename-codeclimate-to-codequalityRémy Coutable2017-10-091-1/+1
* | | | | | Merge branch '34284-add-changes-to-issuable-webhook-data' into 'master'Douwe Maan2017-10-0922-137/+659
|\ \ \ \ \ \
| * | | | | | Introduce new hook data builders for Issue and MergeRequest34284-add-changes-to-issuable-webhook-dataRémy Coutable2017-10-0913-224/+423
| * | | | | | Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-0913-150/+369
| * | | | | | Include the changes in issuable webhook payloadsRémy Coutable2017-10-0914-53/+157
| |/ / / / /
* | | | | | Merge branch '38534-minigraph' into 'master'Phil Hughes2017-10-093-4/+14
|\ \ \ \ \ \
| * | | | | | Fixes mini graph in commit view38534-minigraphFilipa Lacerda2017-10-093-4/+14
* | | | | | | Merge branch 'jk-assignees-todos-fix' into 'master'Sean McGivern2017-10-093-5/+30
|\ \ \ \ \ \ \
| * | | | | | | Don't create todos for old issue assigneesJarka Kadlecova2017-10-093-5/+30
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '23888-fix-unsubscription-link-for-snippet-notification' into 'm...Sean McGivern2017-10-094-234/+390
|\ \ \ \ \ \ \
| * | | | | | | Don't show an "Unsubscribe" link in snippet comment notificationsRémy Coutable2017-10-094-234/+390
| |/ / / / / /
* | | | | | | Merge branch 'rs-qa-sandbox-group' into 'master'Grzegorz Bizon2017-10-098-14/+138
|\ \ \ \ \ \ \
View Lorry Controller Status