summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'fix-migration' into 'master' Dmitriy Zaporozhets2016-02-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken migration Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For !2927 See merge request !3011
| * | | | | | | | | Fix broken migrationDmitriy Zaporozhets2016-02-291-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'removed-ngprogress' into 'master' Jacob Schatz2016-02-298-13/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed NGProgress In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator Ref #13820 ![loading](/uploads/8b6ed8982e86e4b94803b56b8cd97737/loading.gif) See merge request !3004
| * | | | | | | | | Removed NGProgressremoved-ngprogressPhil Hughes2016-02-298-13/+8
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator Ref #13820
* | | | | | | | | Merge branch 'too-many-changes-btns' into 'master' Jacob Schatz2016-02-291-6/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed too many changes buttons to white Closes #13751 ![Screen_Shot_2016-02-29_at_09.18.41](/uploads/30f5d11d1a4e1785561597feeeb40f09/Screen_Shot_2016-02-29_at_09.18.41.png) See merge request !3002
| * | | | | | | | Changed too many changes buttons to whitetoo-many-changes-btnsPhil Hughes2016-02-291-6/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Closes #13751
* | | | | | | | Merge branch 'improve-todos-css' into 'master' Dmitriy Zaporozhets2016-02-292-35/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small css cleanup for todos feature Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Cleanup for !2817 Fixes #13816 cc @jschatz1 @skyruler @dbalexandre See merge request !2996
| * | | | | | | | Small css cleanup for todos featureimprove-todos-cssDmitriy Zaporozhets2016-02-272-35/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'rs-data-links' into 'master' Douwe Maan2016-02-292-5/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanitize `data` and `vbscript` links Closes #13625 Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660 See merge request !2905
| * | | | | | | | | Sanitize `vbscript:` linksrs-data-linksRobert Speicher2016-02-232-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660
| * | | | | | | | | Sanitize `data:` linksRobert Speicher2016-02-212-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13625
* | | | | | | | | | Merge branch '11489-branded-appearance-to-ce' into 'master' Douwe Maan2016-02-2922-15/+394
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Branded appearance to CE Closes #11489 The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too. TODO: - [x] Copy docs - [x] Make new screenshots - [ ] Remove Custom Welcome message feature? @rymai: I was unsure what labels to add to ping you, so I just ping you like this :wink: /cc @DouweM See merge request !2927
| * | | | | | | | | | Branded login page also in CE11489-branded-appearance-to-ceZeger-Jan van de Weg2016-02-2622-15/+394
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only major difference with the EE version is the change from a light and dark logo to only a header logo The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
* | | | | | | | | | | Merge branch 'issue_13621' into 'master' Douwe Maan2016-02-293-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't repeat labels listed on Labels tab. Fixes #13622 See merge request !2924
| * | | | | | | | | | Don't repeat labels listed on Labels tab.issue_13621Rubén Dávila2016-02-223-1/+8
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'ci_examples' into 'master' Achilleas Pipinellis2016-02-298-75/+89
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve discoverability for CI examples Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13410 See merge request !3008
| * | | | | | | | | | | Link to examples pageAchilleas Pipinellis2016-02-293-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | Reorganize CI sections and give descriptive names to linksAchilleas Pipinellis2016-02-294-65/+65
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ci_examplesAchilleas Pipinellis2016-02-2916-46/+290
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | 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.
| | | * | | | | | | | Move languages to examplesAchilleas Pipinellis2016-02-263-11/+12
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | 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
| | | | | | | | | | | | | | |