summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve commit status API specsfix/commit-status-api-improvementGrzegorz Bizon2016-03-011-30/+19
|
* Check if commit exists first in commit status APIGrzegorz Bizon2016-03-011-1/+1
|
* Add Changelog entry for commit status API changesGrzegorz Bizon2016-02-291-0/+1
|
* Improve commit status API specs (refactoring)Grzegorz Bizon2016-02-291-41/+76
|
* Return empty array when commit has no statuses in APIGrzegorz Bizon2016-02-292-41/+75
| | | | | | | This makes API endpoint for Commit Statuses return empty array instead of 404 when commit exists, but has no statuses. Closes #3080
* Merge branch 'rs-development-docs' into 'master' Douwe Maan2016-02-292-5/+109
|\ | | | | | | | | | | | | | | | | | | Add "Gotchas" to development docs Also: - Alphabetizes the "Developer" index page - Fixes the broken `db_dump.md` link See merge request !2846
| * Update Gotchas docrs-development-docsRobert Speicher2016-02-171-8/+7
| | | | | | | | [ci skip]
| * Add "Gotchas" development docRobert Speicher2016-02-162-0/+105
| |
| * Fix the "How to dump production data" linkRobert Speicher2016-02-161-1/+1
| | | | | | | | [ci skip]
| * Alphabetize Development doc indexRobert Speicher2016-02-161-5/+5
| | | | | | | | [ci skip]
* | Update CHANGELOGRobert Speicher2016-02-271-3/+4
| | | | | | | | [ci skip]
* | Merge branch '13679-fix' into 'master' Achilleas Pipinellis2016-02-272-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust documentation of permissions ## What does this MR do? This MR improves the documentation of the permissions by mentioning that internal projects do not enforce the Guest role. ## Are there points in the code the reviewer needs to double check? No code was touched - only the documentation was adjusted. ## Why was this MR needed? Without this adjustment it might not be clear how you can set up an internal project to be pullable by everyone whilst having the issue tracker and labels managed by permitted people only. ## What are the relevant issue numbers? #13679 See merge request !2925
| * | Adjust documentation of permissionsThomas Schmidt2016-02-272-1/+2
|/ / | | | | | | [ci skip]
* | Merge branch 'rs-fix-issue-filter-spec' into 'master' Robert Speicher2016-02-271-2/+2
|\ \ | | | | | | | | | | | | Fix issue milestone filter spec See merge request !2990
| * | Fix issue milestone filter specrs-fix-issue-filter-specRobert Speicher2016-02-261-2/+2
| | |
* | | Merge branch 'evuez/gitlab-ce-webhook-url-spaces' into 'master' Robert Speicher2016-02-264-10/+18
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strip leading and trailing spaces in URL validator _Originally opened at !2914 by @evuez._ It makes URLs in webhooks valid even if they contain leading and/or trailing spaces. Spaces are hard to notice in input fields, this helps users by accepting leading and trailing spaces in webhooks URLs. Fixes #13652 See merge request !2939
| * | Allow webhooks URL to have leading and trailing spacesevuez/gitlab-ce-webhook-url-spacesevuez2016-02-264-10/+18
| | |
* | | Merge branch 'repository-caching-refactor' into 'master' Robert Speicher2016-02-268-25/+155
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Refactor Repository Caching Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/13515 See merge request !2936
| * | Added specs for the various Repository hooksrepository-caching-refactorYorick Peterse2016-02-251-2/+106
| | |
| * | Moved exists condition in Repository#before_deleteYorick Peterse2016-02-251-6/+4
| | | | | | | | | | | | | | | This is only needed when calling the "expire_cache" method as the other expiration methods don't depend on Git data.
| * | Move Repository#expire_all_caches to before_deleteYorick Peterse2016-02-231-10/+5
| | |
| * | Moved cache expiration code to Repository hooksYorick Peterse2016-02-237-14/+47
| | | | | | | | | | | | | | | This keeps all the cache expiration code in a single file/class instead of spreading it all across the codebase.
* | | Merge branch 'avatar-cropping' into 'master' Jacob Schatz2016-02-2621-17/+3525
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix avatar stretching by providing a cropping feature Originally by @nesk at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2773 Fixes #7959 See merge request !2951
| * | | Update CHANGELOGAlfredo Sumaran2016-02-261-0/+1
| | | |
| * | | Merge branch 'master' into avatar-croppingavatar-croppingAlfredo Sumaran2016-02-2621-80/+93
| |\ \ \
| * \ \ \ Merge branch 'rs-crowd-form-view-spec' into avatar-croppingAlfredo Sumaran2016-02-249-44/+103
| |\ \ \ \
| * | | | | Fix Profile Avatar feature stepsRobert Speicher2016-02-241-6/+14
| | | | | |
| * | | | | Add `:with_avatar` trait to User factoryRobert Speicher2016-02-247-7/+26
| | | | | |
| * | | | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-2425-66/+133
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-23321-4053/+26568
| |\ \ \ \ \ \
| * | | | | | | Minor changes on avatar cropping internalsJohann Pardanaud2016-02-182-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avoid multiple calls to `validates` for the avatar attributes. - In a cropping process, don't check if the model inherits `User`, check if it responds to `:avatar_crop_size`.
| * | | | | | | Improve avatar cropping internals, based on suggestions made by @rspeicher ↵Johann Pardanaud2016-02-174-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on !2773
| * | | | | | | Merge branch 'master' into avatar-croppingJohann Pardanaud2016-02-16189-1269/+3026
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/user.rb
| * | | | | | | | Improve user experience for avatar croppingJohann Pardanaud2016-02-162-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avoid incomprehensible errors on non-integer cropping values - Set the default cropping area to 80%
| * | | | | | | | Fix failing tests introduced in commit 6d58088Johann Pardanaud2016-02-101-2/+4
| | | | | | | | |
| * | | | | | | | Fix #7959: Fix avatar stretching by providing a cropping featureJohann Pardanaud2016-02-0913-8/+3489
| | | | | | | | |
* | | | | | | | | Merge branch 'sidebar-hide-class' into 'master' Rémy Coutable2016-02-263-26/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created helper class to hide content in issue sidebar when collapsed ![Screen_Shot_2016-02-25_at_10.38.39](/uploads/ca49cc230edf7e71b7726e905f523092/Screen_Shot_2016-02-25_at_10.38.39.png) Closes #13764 See merge request !2968
| * | | | | | | | | Created helper class to hide content in issue sidebar when collapsedsidebar-hide-classPhil Hughes2016-02-253-26/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13764
* | | | | | | | | | Merge branch 'feature/slacky-builds-v2' into 'master' Kamil Trzciński2016-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add builds URL to gitlab-ci script Add builds URL to gitlab-ci script Related to: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2681 See merge request !2962
| * | | | | | | | | | update gitlab-ci script syntaxJames Lopez2016-02-261-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/feature/slacky-builds-v2' into ↵James Lopez2016-02-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/slacky-builds-v2 # Conflicts: # .gitlab-ci.yml
| | * | | | | | | | | | Update URL syntaxJames Lopez2016-02-251-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | update gitlab-ci script syntaxJames Lopez2016-02-261-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | gemfile random updateJames Lopez2016-02-241-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-02-242-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | feature/slacky-builds-v2
| * | | | | | | | | | | updated gitlab-ci script to include builds URLJames Lopez2016-02-242-3/+286
| | | | | | | | | | | |
| * | | | | | | | | | | testJames Lopez2016-02-241-5/+1
| | | | | | | | | | | |
| * | | | | | | | | | | make build failJames Lopez2016-02-241-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | testing scriptJames Lopez2016-02-241-285/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'refactor-lists' into 'master' Dmitriy Zaporozhets2016-02-2617-171/+171
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor html/css for lists and improve help UI page * dry lists html/css removing a lot of style duplicates * fix snippets list to match common style * fix extra bottom margin for groups list * improve help page ui so it looks clean Fixes #11873 See merge request !2977