summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Clarify puppiesshared-file-accessJacob Vosmaer2015-10-261-2/+2
|
* Start putting shared files in "shared"Jacob Vosmaer2015-10-265-1/+43
|
* Merge branch 'rs-clipboard-js' into 'master' Dmitriy Zaporozhets2015-10-238-5/+683
|\ | | | | | | | | | | | | Add "Copy to clipboard" buttons See #2855 See merge request !1494
| * Remove unused argument from clipboard_button helperRobert Speicher2015-10-231-1/+1
| |
| * Add clipboard buttons to each step of "How to merge"Robert Speicher2015-10-232-2/+14
| |
| * Add "Copy to clipboard" buttonsRobert Speicher2015-10-233-3/+14
| | | | | | | | | | Adds buttons to the commit list SHAs and the cross-project reference data on issuables.
| * Add styling for cross-project-reference clipboard buttonRobert Speicher2015-10-231-0/+13
| |
| * Add copy_to_clipboard JSRobert Speicher2015-10-231-0/+21
| |
| * Vendor clipboard.jsRobert Speicher2015-10-231-0/+621
| |
* | Merge branch 'git-follow' into 'master' Dmitriy Zaporozhets2015-10-232-2/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Use git follow flag for commits page when retrieve history for file or directory This can be really helpful when you want commit history for file that was moved recently Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1680
| * | Refactor git follow option setgit-followDmitriy Zaporozhets2015-10-231-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Use git follow flag for commits page when retrieve history for file or directoryDmitriy Zaporozhets2015-10-232-2/+6
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix-ci-regressions' into 'master' Robert Speicher2015-10-2313-31/+58
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI regressions This MR fixes a couple of small CI regressions - Allow developer to manage builds - On CI Admin page show only projects that are present in GitLab - On Runner CI Admin page show only projects that are present in GitLab - Refresh build log only when status changes - Show the oldest builds on top when viewing Builds - it most cases it shows running builds on top - Fix Lint rendering - Fix number of other builds in build widget Fixes #3164 Fixes #3161 Fixes gitlab-org/gitlab-ci#343 See merge request !1679
| * | Fixed nesting for Allowed to failfix-ci-regressionsKamil Trzcinski2015-10-231-1/+1
| | |
| * | Fail builds that also have empty stringKamil Trzcinski2015-10-232-1/+6
| | |
| * | Fix broken Runners admin pageKamil Trzcinski2015-10-232-12/+19
| | |
| * | On CI Admin page show only projects that are present in GitLabKamil Trzcinski2015-10-231-0/+1
| | |
| * | Allow developer to manage buildsKamil Trzcinski2015-10-233-10/+17
| | |
| * | Fix small CI UI regressionsKamil Trzcinski2015-10-236-8/+15
| | |
* | | Merge branch 'fix-wiki-clone-over-http' into 'master' Robert Speicher2015-10-233-1/+25
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Fix cloning Wiki repositories via HTTP Cloning a project Wiki over HTTP would end up cloning the main repository since the .wiki extension was being stripped. Closes #3106 See merge request !1676
| * | Add spec for cloning Wiki over HTTPStan Hu2015-10-221-0/+16
| | |
| * | Fix cloning Wiki repositories via HTTPStan Hu2015-10-222-1/+9
| | | | | | | | | | | | | | | | | | | | | Cloning a project Wiki over HTTP would end up cloning the main repository since the .wiki extension was being stripped. Closes #3106
* | | Merge branch 'update-fonts' into 'master' Dmitriy Zaporozhets2015-10-2312-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update SourceSansPro fonts Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1678
| * | | Update SourceSansPro fontsupdate-fontsDmitriy Zaporozhets2015-10-2112-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'comments_fix' into 'master' Dmitriy Zaporozhets2015-10-234-2/+9
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork https://dev.gitlab.org/gitlab/gitlabhq/issues/2535 See merge request !1675
| * | | Fix: Inability to reply to code comments in the MR view, if the MR comes ↵comments_fixValery Sizov2015-10-224-2/+9
| | | | | | | | | | | | | | | | from a fork
* | | | Merge pull request #9762 from ↵Stan Hu2015-10-224-16/+16
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | huacnlee/fix/api-helpers-bad-autoload-name-for-master Fix API::APIHelpers -> API::Helpers again for master
| * | | Fix API::APIHelpers -> API::Helpers;Jason Lee2015-10-234-16/+16
| | | | | | | | | | | | | | | | Rails Autoload find file to require is use , APIHelpers -> api_helpers.rb, not helpers.rb;
* | | | Merge branch 'readme-extra-padding' into 'master' Dmitriy Zaporozhets2015-10-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add extra padding to README block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler See merge request !1671
| * | | | Add extra padding to README blockDmitriy Zaporozhets2015-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'cleanup-css' into 'master' Dmitriy Zaporozhets2015-10-222-17/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve css code quality for projects.scss Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1674
| * | | | | Improve css code quality for projects.scssDmitriy Zaporozhets2015-10-222-17/+16
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'rs-issuable-filter-count-style' into 'master' Dmitriy Zaporozhets2015-10-223-5/+16
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of the filter counter for Issuables ## Before: ![Screen_Shot_2015-10-22_at_4.00.15_PM](/uploads/5f54faf3b056c1b3e2cb1b6d5c27614b/Screen_Shot_2015-10-22_at_4.00.15_PM.png) ## After: ![Screen_Shot_2015-10-22_at_3.58.04_PM](/uploads/127a90795aed7d41c053a735bbee0e3b/Screen_Shot_2015-10-22_at_3.58.04_PM.png) See merge request !1667
| * | | | Fix alignment of the filter counter for Issuablesrs-issuable-filter-count-styleRobert Speicher2015-10-223-5/+16
| | | | |
* | | | | Remove bad css styleDmitriy Zaporozhets2015-10-221-5/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'compact-file-list' into 'master' Dmitriy Zaporozhets2015-10-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make file list more compact Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1669
| * | | | | Make file list more compactcompact-file-listDmitriy Zaporozhets2015-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'project-readme-edit' into 'master' Dmitriy Zaporozhets2015-10-222-6/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore edit button in project readme Also make sure edit button can actually be clicked, like !1668. See merge request !1670
| * | | | | Restore edit button in project readmeproject-readme-editDouwe Maan2015-10-222-6/+12
| | | | | |
* | | | | | Merge branch 'hanloong/gitlab-ce-add-dates-snippets-show' into 'master' Dmitriy Zaporozhets2015-10-2220-138/+171
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update style of snippets pages ![Screen_Shot_2015-10-18_at_13.04.13](/uploads/95d58b64fa81aa4e75568d2d7b4a6b08/Screen_Shot_2015-10-18_at_13.04.13.png) ![Screen_Shot_2015-10-21_at_11.11.10](/uploads/106371d718a07a9ccdad9148812211fd/Screen_Shot_2015-10-21_at_11.11.10.png) Replaces !1567. Fixes #1767 and #2538. See merge request !1637
| * | | | | Change dashboard snippet index menu class to match testhanloong/gitlab-ce-add-dates-snippets-showDouwe Maan2015-10-221-1/+1
| | | | | |
| * | | | | Restyle dashboard snippets visibility level tabs.Douwe Maan2015-10-214-31/+19
| | | | | |
| * | | | | Merge branch 'master' into hanloong/gitlab-ce-add-dates-snippets-showDouwe Maan2015-10-21162-904/+1994
| |\ \ \ \ \
| * | | | | | Fix specDouwe Maan2015-10-181-1/+1
| | | | | | |
| * | | | | | Restore dashboard snippets tabs.Douwe Maan2015-10-182-3/+25
| | | | | | |
| * | | | | | Update style of snippets pagesDouwe Maan2015-10-186-44/+15
| | | | | | |
| * | | | | | Update style of snippet detail pageDouwe Maan2015-10-185-79/+83
| | | | | | |
| * | | | | | Merge branch 'master' into add-dates-snippets-showHan Loong Liauw2015-10-17204-1154/+2604
| |\ \ \ \ \ \
| * | | | | | | fix spinach features to use new button wordingsHan Loong Liauw2015-10-155-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed an accidental deletion of pratial
| * | | | | | | change capitalisation in buttonsHan Loong Liauw2015-10-154-6/+11
| | | | | | | |
View Lorry Controller Status