summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add explicit test to test resolved discussion toggle contentadd-resolve-discussion-testClement Ho2017-10-101-5/+15
|
* Merge branch 'fix-resolved-discussion' into 'master'Filipa Lacerda2017-10-104-10/+6
|\ | | | | | | | | | | | | Fix unable to expand text diff discussion comments Closes #38940 See merge request gitlab-org/gitlab-ce!14792
| * Fix unable to expand text diff discussion commentsClement Ho2017-10-104-10/+6
|/
* Merge branch 'gitaly-0.45.1' into 'master'Rémy Coutable2017-10-103-4/+4
|\ | | | | | | | | Use Gitaly 0.45.1 and gitaly-proto 0.41.0 See merge request gitlab-org/gitlab-ce!14787
| * Fix mysterious rubocop failuregitaly-0.45.1Jacob Vosmaer2017-10-101-2/+2
| |
| * Run bundleJacob Vosmaer2017-10-101-2/+2
| |
| * Use gitaly-proto 0.41.0Jacob Vosmaer2017-10-101-1/+1
| |
| * Use Gitaly 0.45.1Jacob Vosmaer2017-10-101-1/+1
| |
* | Merge branch 'an/use-branch-exists-over-branch-names-include' into 'master'Rémy Coutable2017-10-109-10/+15
|\ \ | | | | | | | | | | | | Stop using `branch_names.include?` and use `branch_exists?` See merge request gitlab-org/gitlab-ce!14778
| * | Stop using `branch_names.include?` and use `branch_exists?`Andrew Newdigate2017-10-109-10/+15
|/ /
* | Merge branch '38869-u2f' into 'master'38968-label-picker-should-be-cleared-upon-selecting-a-labelPhil Hughes2017-10-1010-374/+321
|\ \ | | | | | | | | | | | | Remove u2f from global namespace See merge request gitlab-org/gitlab-ce!14776
| * | Remove u2f from globalnamespace38869-u2fFilipa Lacerda2017-10-0910-374/+321
| | |
* | | Merge branch 'flash-es6-module' into 'master'Filipa Lacerda2017-10-1074-203/+454
|\ \ \ | | | | | | | | | | | | | | | | Flash is now a ES6 module See merge request gitlab-org/gitlab-ce!14626
| * | | removed global eslint for remaining filesflash-es6-modulePhil Hughes2017-10-105-8/+0
| | | |
| * | | fixed notes specsPhil Hughes2017-10-103-13/+33
| | | | | | | | | | | | | | | | | | | | changed how the container class is added onto the text element more specs
| * | | karma spec fixesPhil Hughes2017-10-106-18/+13
| | | |
| * | | fixed eslintPhil Hughes2017-10-102-11/+10
| | | |
| * | | flash testsPhil Hughes2017-10-102-11/+282
| | | | | | | | | | | | | | | | added back in documentation comment to flash file
| * | | spec fixesPhil Hughes2017-10-103-8/+13
| | | |
| * | | Flash is now a ES6 modulePhil Hughes2017-10-1067-179/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduced the technical debt around our JS flash function by making it a module that is imported rather than relying on the global function. The global function still exists mainly for technical debt with how some requests are being completed, but new JS should import the module directly. Also reduces some tech debt in the file by removing the need for jQuery. Instead Flash is now 100% vanilla JS.
* | | | Merge branch 'fix/skip-gitaly-mock-linting-error' into 'master'Rémy Coutable2017-10-101-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix a liniting error introduced by !14652 See merge request gitlab-org/gitlab-ce!14790
| * | | | Fix a liniting error introduced by !14652Ahmad Sherif2017-10-101-2/+2
|/ / / /
* | | | Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'Douwe Maan2017-10-1015-18/+67
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Private Avatars are not CDN compatible" Closes #38245 and gitlab-com/support-forum#2476 See merge request gitlab-org/gitlab-ce!14443
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Tests for these new helper methods
| * | | | 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 note Closes #38941 See merge request gitlab-org/gitlab-ce!14779
| * | | | | 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 programmatic changes. Closes #38441 See merge request gitlab-org/gitlab-ce!14539
| * | | | | | Trigger change event of the markdown textarea to allow Vue catch the ↵acet-fix-paste-on-comment-formFatih Acet2017-09-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | programmatic changes.
* | | | | | | Merge branch 'fix-timestampz-cop' into 'master'Grzegorz Bizon2017-10-106-7/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also warn on timestamp in datetime migration cop See merge request gitlab-org/gitlab-ce!14784
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The types `timestamp` and `datetime` are aliases: https://github.com/rails/rails/blob/v4.2.10/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L362-L364
* | | | | | | | Merge branch '38869-ci-global' into 'master'Phil Hughes2017-10-1010-121/+110
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Remove Build code from global namespace See merge request gitlab-org/gitlab-ce!14744
| * | | | | | | 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
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Migrate Workhorse Send{Diff,Patch} to Gitaly See merge request gitlab-org/gitlab-ce!14652
| * | | | | | 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. See merge request gitlab-org/gitlab-ce!14782
| * | | | | | 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.js See merge request gitlab-org/gitlab-ce!14774
| * | | | | | Remove Api from main.js38869-apiFilipa Lacerda2017-10-091-1/+0
| | |_|_|_|/ | |/| | | |
View Lorry Controller Status