summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| | | | | | | |
| * | | | | | | New snippet design for projectsHan Loong Liauw2015-10-147-67/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split out header into shared partial Used action partials to have unique actions for shared and personal snippets changed back to created date in list view Switched to using existing color classes
| * | | | | | | include created_at date in headingHan Loong Liauw2015-10-141-3/+9
| | | | | | | |
| * | | | | | | Merge branch 'master' into add-dates-snippets-showHan Loong Liauw2015-10-14126-859/+1605
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed fixes to btn-sm as they have appears to be already merged into master
| * | | | | | | | Updated the style of the snippets header in #showHan Loong Liauw2015-10-142-28/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should now more closly match the styles used in issues and merge requests with some small tweaks to be more relevant to snippets
| * | | | | | | | Adds modified date to snippets#show #1767Han Loong Liauw2015-10-124-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed a bug with .btn-sm padding. - Changed created_at to modified_at for snippets#index as it seems to be more relevant.
* | | | | | | | | Merge branch 'project-path-case-sensitivity' into 'master' Robert Speicher2015-10-224-12/+35
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer project with exact path to differently cased one when both exist. Fixes #3113. See merge request !1649
| * | | | | | | | Only postgres does case sensitive comparesproject-path-case-sensitivityDouwe Maan2015-10-221-1/+1
| | | | | | | | |
| * | | | | | | | Fix Gitlab::Database#mysql?Douwe Maan2015-10-221-1/+1
| | | | | | | | |
| * | | | | | | | Don't load entire spec with MySQLDouwe Maan2015-10-211-8/+10
| | | | | | | | |
| * | | | | | | | Disable case sensitive spec for MySQL.Douwe Maan2015-10-211-0/+3
| | | | | | | | |
| * | | | | | | | Move case sensitivity check to find_with_namespace.Douwe Maan2015-10-212-11/+4
| | | | | | | | |
| * | | | | | | | Prefer project with exact path to differently cased one when both exist.Douwe Maan2015-10-203-13/+38
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-ci-services-editing' into 'master' Robert Speicher2015-10-222-4/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 when editing CI services Fixes #3090 See merge request !1663
| * | | | | | | | | Fix 500 when editing CI servicesKamil Trzcinski2015-10-222-4/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fail-on-empty-job-name' into 'master' Robert Speicher2015-10-223-15/+38
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require jobs to be named This properly presents error for .gitlab-ci.yml having empty job name. See merge request !1662
| * | | | | | | | | | Require jobs to be namedfail-on-empty-job-nameKamil Trzcinski2015-10-223-15/+38
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix-css-for-runner' into 'master' Robert Speicher2015-10-222-27/+26
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CSS class for runner status Fixes #3117 See merge request !1665
| * | | | | | | | | Fix CSS class for runner statusKamil Trzcinski2015-10-222-27/+26
|/ / / / / / / / /
* | | | | | | | | Update CHANGELOGRobert Speicher2015-10-221-5/+5
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'bozaro-empty-repo'Douwe Maan2015-10-223-1/+15
|\ \ \ \ \ \ \ \