Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Handle removed source projects in MR CI commitsfix-merge-requests-without-source-projects | Yorick Peterse | 2015-11-20 | 2 | -1/+26 |
| | | | | | | | | When calling MergeRequest#ci_commit the code would previously raise an error if the source project no longer existed (e.g. because the user removed their fork). See #3599 for more information. | ||||
* | Merge branch 'fix-scss-syntax-error' into 'master' | Stan Hu | 2015-11-20 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | fix syntax error in common.scss Fix a syntax error. See merge request !1857 | ||||
| * | fix syntax error in common.scss | Greg Smethells | 2015-11-20 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'fix-drone-service-hook' into 'master' | Stan Hu | 2015-11-20 | 1 | -0/+2 |
|\ \ | |/ |/| | | | | | | | | | | | | | Fix Drone web hook URL not being updated Fixes regression of !1774: fixes Drone Web hook for both service templates and project services. See merge request !1856 | ||||
| * | Fix Drone web hook URL not being updated | Stan Hu | 2015-11-20 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'workhorse-version' into 'master' | Jacob Vosmaer | 2015-11-20 | 4 | -5/+4 |
|\ \ | | | | | | | | | | | | | | | | | | | Bump GitLab Workhorse version to 0.4.2 See merge request !1830 | ||||
| * | | Update gitlab-workhorse docs to 0.4.2workhorse-version | Robert Schilling | 2015-11-19 | 2 | -3/+3 |
| | | | |||||
| * | | Bump GitLab Workhorse version to 0.4.2 | Kamil Trzcinski | 2015-11-19 | 2 | -2/+1 |
| | | | |||||
* | | | Merge branch 'lfs-batch-download' into 'master' | Marin Jankovski | 2015-11-20 | 3 | -283/+419 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for batch download operation - Drops Accept for all download requests, - Allows to do batch download for public projects and non-authorized users - Returns 501 for legacy API with message to upgrade the client /cc @marin @jacobvosmaer @yorickpeterse See merge request !1842 | ||||
| * | | | Error 501 when client is using deprecated API. | Marin Jankovski | 2015-11-20 | 3 | -195/+49 |
| | | | | |||||
| * | | | Fix upload tests, reformat code and make rubocop happy | Kamil Trzcinski | 2015-11-20 | 2 | -122/+110 |
| | | | | |||||
| * | | | Part of tests done [ci skip] | Kamil Trzcinski | 2015-11-20 | 2 | -104/+338 |
| | | | | |||||
| * | | | Add support for batch download operationlfs-batch-download | Kamil Trzcinski | 2015-11-19 | 3 | -36/+96 |
| | | | | |||||
* | | | | Merge branch 'notes_fix_stable' into 'master' | Dmitriy Zaporozhets | 2015-11-20 | 4 | -4/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for Emoji See merge request !1849 | ||||
| * | | | | Fix for Emojinotes_fix_stablenotes_fix | Valery Sizov | 2015-11-20 | 4 | -4/+6 |
| | | | | | |||||
* | | | | | Merge branch 'lfs_default_and_backup' into 'master' | Dmitriy Zaporozhets | 2015-11-20 | 7 | -9/+47 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lfs default and backup Part of gitlab-org/gitlab-ce#2955 See merge request !1823 | ||||
| * | | | | | Add lfs to backup specs.lfs_default_and_backup | Marin Jankovski | 2015-11-19 | 1 | -5/+9 |
| | | | | | | |||||
| * | | | | | Backup LFS objects same as any upload. | Marin Jankovski | 2015-11-19 | 4 | -2/+36 |
| | | | | | | |||||
| * | | | | | Lfs on by default. | Marin Jankovski | 2015-11-19 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'update-docs' into 'master' | Achilleas Pipinellis | 2015-11-20 | 4 | -9/+7 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More GitLab spellings. No dedicated CI in omnibus See merge request !1838 | ||||
| * | | | | | More GitLab spellings. No dedicated CI in omnibus [ci skip]update-docs | Robert Schilling | 2015-11-19 | 4 | -9/+7 |
| | | | | | | |||||
* | | | | | | Merge branch 'update-lfs-docs' into 'master' | Marin Jankovski | 2015-11-20 | 1 | -3/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update LFS docs for cloning Cloning the repo already downloads the LFS tracked files. See merge request !1839 | ||||
| * | | | | | | Update LFS docs for cloning [ci skip]update-lfs-docs | Robert Schilling | 2015-11-19 | 1 | -3/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rs-mr-reference-copy' into 'master' | Robert Speicher | 2015-11-20 | 1 | -2/+4 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | Add clipboard button to merge request cross-project reference See merge request !1847 | ||||
| * | | | | | Add clipboard button to merge request cross-project reference | Robert Speicher | 2015-11-19 | 1 | -2/+4 |
|/ / / / / | |||||
* | | | | | Merge branch 'rs-safari-clipboard-fallback' into 'master' | Robert Speicher | 2015-11-19 | 1 | -5/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a fallback for Safari copy-to-clipboard Also, hide the tooltip in a less stupid way. Closes #3547 See merge request !1844 | ||||
| * | | | | | Add a fallback for Safari copy-to-clipboardrs-safari-clipboard-fallback | Robert Speicher | 2015-11-19 | 1 | -5/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, hide the tooltip in a less stupid way. Closes #3547 | ||||
* | | | | | | Merge branch 'ci-yaml-validation' into 'master' | Kamil Trzciński | 2015-11-19 | 6 | -22/+33 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commits without .gitlab-ci.yml are marked as skipped - Commits without .gitlab-ci.yml are marked as skipped - Save detailed error when YAML syntax This also fixes: #3521 #3546 /cc @jacobvosmaer See merge request !1827 | ||||
| * | | | | | | Don't rescue Exception, but StandardErrorci-yaml-validation | Kamil Trzcinski | 2015-11-19 | 2 | -8/+5 |
| | | | | | | | |||||
| * | | | | | | Fix tests | Kamil Trzcinski | 2015-11-19 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Since GitLab CI is enabled by default, remove enabling it by pushing ↵ | Kamil Trzcinski | 2015-11-19 | 2 | -12/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | .gitlab-ci.yml | ||||
| * | | | | | | Fix tests | Kamil Trzcinski | 2015-11-19 | 2 | -20/+20 |
| | | | | | | | |||||
| * | | | | | | Commits without .gitlab-ci.yml are marked as skipped | Kamil Trzcinski | 2015-11-19 | 3 | -3/+28 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | - Save detailed error when YAML syntax | ||||
* | | | | | | Merge branch 'emoji_votes' into 'master' | Dmitriy Zaporozhets | 2015-11-19 | 33 | -438/+431 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Award Emoji This it first iteration of award emoji feature. We have plan to extend emoji picker by the next release. For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker. See merge request !1825 | ||||
| * | | | | | | fox testsemoji_votes | Valery Sizov | 2015-11-19 | 2 | -28/+27 |
| | | | | | | | |||||
| * | | | | | | adressing comments | Valery Sizov | 2015-11-19 | 5 | -20/+21 |
| | | | | | | | |||||
| * | | | | | | added specs | Valery Sizov | 2015-11-19 | 3 | -0/+73 |
| | | | | | | | |||||
| * | | | | | | added spinach tests | Valery Sizov | 2015-11-19 | 7 | -96/+83 |
| | | | | | | | |||||
| * | | | | | | Few minor improvements to emoji awards UI | Dmitriy Zaporozhets | 2015-11-19 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | Improve UI for emoji awards | Dmitriy Zaporozhets | 2015-11-19 | 3 | -21/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | satisfy rubocop | Valery Sizov | 2015-11-19 | 3 | -8/+8 |
| | | | | | | | |||||
| * | | | | | | fix schema | Valery Sizov | 2015-11-19 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | add changelog | Valery Sizov | 2015-11-19 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | addressing comments | Valery Sizov | 2015-11-19 | 5 | -9/+15 |
| | | | | | | | |||||
| * | | | | | | improve style | Valery Sizov | 2015-11-19 | 2 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | better regexp | Valery Sizov | 2015-11-19 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Emoji: fix image of emoji when it is submitted via comment | Valery Sizov | 2015-11-19 | 6 | -9/+17 |
| | | | | | | | |||||
| * | | | | | | fix | Valery Sizov | 2015-11-19 | 1 | -10/+9 |
| | | | | | | | |||||
| * | | | | | | Emoji: refactoring | Valery Sizov | 2015-11-19 | 3 | -1/+11 |
| | | | | | | | |||||
| * | | | | | | award for merge requests[ci skip] | Valery Sizov | 2015-11-19 | 3 | -10/+6 |
| | | | | | | |