summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Properly check for a pre-existing error in `User#namespace_uniq`rs-fix-user-namespace_uniqRobert Speicher2016-02-291-1/+2
| | | | | | | | | | | | | | | Rails adds an empty error to the Errors object even if you just call `#[]` on it: ``` [1] pry(main)> u = User.last [2] pry(main)> u.errors.keys => [] [3] pry(main)> u.errors[:username].present? => false [4] pry(main)> u.errors.keys => [:username] ```
* Merge branch 'master' into issue_13212issue_13212Alfredo Sumaran2016-02-2922-76/+244
|\
| * Merge branch 'issue_13648' into 'master' Dmitriy Zaporozhets2016-02-292-14/+22
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve implementation to check read access to forks and add pagination. Fixes #13648 The following optimizations where made: - Pagination was added. - Code to check for read permissions to forks was optimized, in the past we were doing too many queries for each project. See merge request !2991
| | * Logged in user should be able to read internal forks.Rubén Dávila2016-02-271-1/+1
| | |
| | * Improve implementation to check read access to forks and add pagination.Rubén Dávila2016-02-262-14/+22
| | |
| * | Merge branch 'removed-ngprogress' into 'master' Jacob Schatz2016-02-296-10/+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-296-10/+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 '11489-branded-appearance-to-ce' into 'master' Douwe Maan2016-02-299-10/+199
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-269-10/+199
| | | | | | | | | | | | | | | | | | | | | | | | | 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-291-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 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-221-1/+1
| | | | |
| * | | | Merge branch 'evuez/gitlab-ce-webhook-url-spaces' into 'master' Robert Speicher2016-02-261-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-0/+3
| | | | | |
* | | | | | Comment icon vertically alignedAlfredo Sumaran2016-02-291-0/+1
| | | | | |
* | | | | | Wrap icon with edited timeAlfredo Sumaran2016-02-292-2/+2
| | | | | |
* | | | | | Increase paddingAlfredo Sumaran2016-02-291-1/+1
| | | | | |
* | | | | | Keep edited time on the same line as wellAlfredo Sumaran2016-02-291-1/+1
| | | | | |
* | | | | | Apply nice date when diff page loadsAlfredo Sumaran2016-02-291-0/+1
| | | | | |
* | | | | | Keep date in the same lineAlfredo Sumaran2016-02-291-0/+4
| | | | | |
* | | | | | Prevent content misalignmentAlfredo Sumaran2016-02-291-0/+8
|/ / / / /
* | | | | Merge branch 'repository-caching-refactor' into 'master' Robert Speicher2016-02-267-23/+49
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Refactor Repository Caching Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/13515 See merge request !2936
| * | | | 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-269-5/+129
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ Merge branch 'master' into avatar-croppingavatar-croppingAlfredo Sumaran2016-02-268-73/+50
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs-crowd-form-view-spec' into avatar-croppingAlfredo Sumaran2016-02-244-8/+12
| |\ \ \ \ \ \
| * | | | | | | Add `:with_avatar` trait to User factoryRobert Speicher2016-02-241-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-2418-62/+82
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-23153-1811/+3800
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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-1687-469/+576
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-099-8/+133
| | | | | | | | | | |
* | | | | | | | | | | 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 '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
| * | | | | | | | | | Improve help UI pageDmitriy Zaporozhets2016-02-262-104/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Fix description margin for groups listDmitriy Zaporozhets2016-02-265-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Refactor styles for merge requests listDmitriy Zaporozhets2016-02-263-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Refactor styles for issues listDmitriy Zaporozhets2016-02-264-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Refactor css for groups listDmitriy Zaporozhets2016-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Refactor css for snippets listDmitriy Zaporozhets2016-02-263-28/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Cleanup css for projects listDmitriy Zaporozhets2016-02-265-13/+12
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>