summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Explain why we have an 'overflow' statelazy-diffsJacob Vosmaer2016-03-031-2/+7
|
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffsJacob Vosmaer2016-03-036-30/+39
|\
| * Merge branch 'issue_4095' into 'master' Dmitriy Zaporozhets2016-03-032-1/+2
| |\ | | | | | | | | | | | | | | | | | | Don't show Issues/MRs from archived projects in Groups view Fixes #4095 See merge request !2980
| | * Don't list issues from archived projects in Group view.Rubén Dávila2016-03-022-1/+2
| | |
| * | Merge branch 'issue_13501' into 'master' Robert Speicher2016-03-021-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add link to open merge requests on label index Closes #13501 See merge request !3057
| | * | Add open_merge_requests_count methodAlfredo Sumaran2016-03-011-0/+4
| | | |
| | * | Add association to merge requestsAlfredo Sumaran2016-03-011-0/+1
| | |/
| * | Merge branch 'issue_13623' into 'master' Douwe Maan2016-03-021-10/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Show days remaining instead of elapsed time for Milestone. Closes #13623 See merge request !2978
| | * | Little refactor for milestone_remaining_days helper from last code review.issue_13623Rubén Dávila2016-03-011-2/+1
| | | |
| | * | Show days remaining instead of elapsed time for Milestone.Rubén Dávila2016-03-011-10/+4
| | |/
| * | Add some specs for Repository#revert.issue_13716Rubén Dávila2016-03-011-1/+1
| | |
| * | Check for conflicts before creating target branch.Rubén Dávila2016-03-011-12/+20
| |/
| * Merge branch 'rs-avatar-validation' into 'master' Douwe Maan2016-03-011-1/+1
| |\ | | | | | | | | | | | | | | | | | | Only validate avatar cropping values when avatar is present AND changed Closes #13905 See merge request !3018
| | * Only validate avatar cropping values when avatar is present AND changedrs-avatar-validationRobert Speicher2016-02-291-1/+1
| | | | | | | | | | | | Closes #13905
| * | Merge branch 'rs-fix-user-namespace_uniq' into 'master' Douwe Maan2016-03-011-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly check for a pre-existing error in `User#namespace_uniq` 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] ``` See merge request !3017
| | * 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] ```
| * | Reset `otp_grace_period_started_at` after disabling 2FARobert Speicher2016-02-291-5/+6
| |/ | | | | | | | | | | Prior, if the user enabled 2FA, then disabled it and came back some time after the grace period expired, they would be forced to enable 2FA immediately.
* | Bring back some deleted code we still needJacob Vosmaer2016-03-031-0/+11
| |
* | Remove write-only MergeRequestDiff statesJacob Vosmaer2016-03-021-11/+0
| |
* | Revert "Remove MergeRequestDiff#state"Jacob Vosmaer2016-03-021-6/+27
| | | | | | | | | | So we use it after all! This reverts commit 08ec73bbdf6269fc2ca2938b97c2a6a5570d8df6.
* | Remove MergeRequestDiff#stateJacob Vosmaer2016-03-021-27/+6
| | | | | | | | We seemed to be only writing it, never reading the field.
* | Use Gitlab::Git::Util.count_linesJacob Vosmaer2016-03-021-1/+1
| |
* | Improve commentsJacob Vosmaer2016-03-021-2/+4
| |
* | Explain why we use "defined?"Jacob Vosmaer2016-03-022-3/+3
| |
* | Remove empty lineJacob Vosmaer2016-03-011-1/+0
| |
* | Fix default valueJacob Vosmaer2016-03-011-1/+1
| |
* | Use efficient line counting helperJacob Vosmaer2016-03-011-1/+1
| |
* | Less 'lines', more 'each_line'Jacob Vosmaer2016-03-011-2/+2
| |
* | Remove options-refresh logicJacob Vosmaer2016-03-011-5/+2
| |
* | Restore nil checkJacob Vosmaer2016-03-011-1/+1
| |
* | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffsJacob Vosmaer2016-03-015-14/+59
|\ \ | |/
| * Revert "Merge branch 'issue_5854' into 'master' "revert-6f85eb38Dmitriy Zaporozhets2016-02-291-4/+2
| | | | | | This reverts merge request !2992
| * Merge branch 'issue_5854' into 'master' Dmitriy Zaporozhets2016-02-291-2/+4
| |\ | | | | | | | | | | | | | | | | | | Add commit message to JIRA's notification payload. Closes #5854 See merge request !2992
| | * Add commit message to JIRA's notification payload.Rubén Dávila2016-02-261-2/+4
| | |
| * | Merge branch '11489-branded-appearance-to-ce' into 'master' Douwe Maan2016-02-291-0/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-0/+9
| | |/ | | | | | | | | | | | | 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 'repository-caching-refactor' into 'master' Robert Speicher2016-02-262-13/+41
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-232-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | This keeps all the cache expiration code in a single file/class instead of spreading it all across the codebase.
| * | | | Add `:with_avatar` trait to User factoryRobert Speicher2016-02-241-1/+1
| | | | |
| * | | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-2315-37/+327
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Minor changes on avatar cropping internalsJohann Pardanaud2016-02-181-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | - 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-171-4/+2
| | | | | | | | | | | | | | | | | | | | on !2773
| * | | | Merge branch 'master' into avatar-croppingJohann Pardanaud2016-02-1612-66/+138
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/user.rb
| * | | | | Fix #7959: Fix avatar stretching by providing a cropping featureJohann Pardanaud2016-02-091-0/+10
| | | | | |
* | | | | | Make #diffs safe (limited) by defaultJacob Vosmaer2016-02-292-15/+3
| | | | | |
* | | | | | RubocopJacob Vosmaer2016-02-261-3/+3
| | | | | |
View Lorry Controller Status