summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into ↵Rémy Coutable2016-04-011-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allow temp-oauth-email as notification email Closes #14559 /cc @dblessing @rymai See merge request !3477
| * | | | | Allow temp-oauth-email as notification emailerror-when-ldap-doesn-t-supply-an-email-address-14559Zeger-Jan van de Weg2016-03-311-0/+2
| | | | | |
* | | | | | Merge branch ↵Douwe Maan2016-04-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764' into 'master' Fix Error 500 when searching for a comment in a project snippet Closes #14764. /cc @stanhu, and thank you for the spec! ;) See merge request !3468
| * | | | | | Rename Note#for_project_snippet? to #for_snippet?Rémy Coutable2016-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-2/+0
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857.
* | | | | | Exclude projects pending deletion from all resultsZeger-Jan van de Weg2016-03-311-0/+2
| |/ / / / |/| | | |
* | | | | Merge branch 'fix-todos' into 'master' Rémy Coutable2016-03-311-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroy related todos when an Issue/MR is deleted Closes #14550 Closes #14598 See merge request !3376
| * | | | Destroy related todos when an issue is deletedDouglas Barbosa Alexandre2016-03-301-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'reorder-project-expire-cache' into 'master' Yorick Peterse2016-03-301-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Expire the exists cache before deletion to ensure project dir actually exists See merge request !3413
| * | | | Expire the exists cache before deletion to ensure project dir actually existsStan Hu2016-03-271-0/+2
| | | | | | | | | | | | | | | | | | | | Closes #14659
* | | | | Merge branch 'patch/fix-mergerequest-diff' into 'master' Robert Speicher2016-03-301-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Raw / Rendered diff producing different results on merge requests The raw diff endpoint (`merge_requests/####.diff`) produces a diff based on `target_branch` instead of the original branching point. Same is valid for `merge_requests/####.patch`. Fixes #14680, #3017 See merge request !3450
| * | | | We need `sha` reference from `diff_base_commit` to generate the diffGabriel Mazetto2016-03-291-2/+2
| | | | |
| * | | | Use `diff_base_commit` instead of `target_branch` to generate diffsGabriel Mazetto2016-03-291-4/+4
| | | | |
* | | | | Merge branch 'added-milestone-upcoming' into 'master' Rémy Coutable2016-03-301-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdown bug fixes - Added back upcoming to milestone filter ![Screen_Shot_2016-03-23_at_16.45.22](/uploads/8c31eff7e0984aad17881f6397ff17cd/Screen_Shot_2016-03-23_at_16.45.22.png) - Fixed bug that would cause the currently selected value to disappear on filters - Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past Closes #14536 See merge request !3368
| * | | | Ruby fixesPhil Hughes2016-03-291-1/+1
| | | | |
| * | | | Standardised the output of the JSON to always include the namePhil Hughes2016-03-291-1/+2
| | | | | | | | | | | | | | | | | | | | The frontend will then always use the name as the ID - like previous
* | | | | Merge branch 'fix_wip_in_mr_api' into 'master' Robert Speicher2016-03-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensuring Merge Request API returns boolean values for work_in_progress Fixes #14692. See merge request !3432
| * | | | | Ensuring Merge Request API returns boolean values for work_in_progressAbhi Rao2016-03-281-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Fixes #14692
* | | | | Merge branch 'handle-nil-description-slack-message' into 'master' Robert Speicher2016-03-291-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Handle nil descriptions in Slack issue messages Closes #14676 See merge request !3420
| * | | | Handle nil descriptions in Slack issue messagesStan Hu2016-03-281-1/+1
| |/ / / | | | | | | | | | | | | Closes #14676
* | | | Merge branch 'fix-14607' into 'master' Douwe Maan2016-03-291-15/+41
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Ensure private project snippets are not viewable by unauthorized people Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607 See merge request !1946
| * | | Ensure project snippets have their own access levelRémy Coutable2016-03-251-15/+31
| | | |
| * | | Ensure private project snippets are not viewable by unauthorized peopleRémy Coutable2016-03-251-0/+10
| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/14607.
* | | | Merge branch 'handle-avatar-in-empty-repo' into 'master' Stan Hu2016-03-271-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't attempt to look up an avatar in repo if repo directory does not exist Relates to https://sentry.gitlap.com/gitlab/gitlabcom/issues/3507/ Closes #14580 See merge request !3390
| * | | | Don't attempt to look up an avatar in repo if repo directory does not existStan Hu2016-03-251-0/+2
| |/ / / | | | | | | | | | | | | Closes #14580
* | | | Merge branch 'feature--preferences-dashboard-groups' of ↵Dmitriy Zaporozhets2016-03-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | https://gitlab.com/eliasw/gitlab-ce
| * | | | Implementing 'Groups View' and 'TODOs View' as options for dashboard ↵Elias Werberich2016-03-241-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | preferences. Fixes #14585.
* | | | Merge branch 'ci-setup-info' into 'master' Dmitriy Zaporozhets2016-03-261-0/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add links to CI setup documentation from project settings and builds pages For #14483 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3384
| * | | rescue Rugged::ReferenceError in Repository#gitlab_ci_yml methodci-setup-infoDmitriy Zaporozhets2016-03-251-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Make sure Repository#gitlab_ci_yml is safe to use even when repository is ↵Dmitriy Zaporozhets2016-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | missing Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Use head tree (cached) for file search. Also add some testsDmitriy Zaporozhets2016-03-241-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Detect build setup state based on gitlab_ci.yml presenseDmitriy Zaporozhets2016-03-241-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Rename `Event#proper?` to `Event#visible_to_user?`Douglas Barbosa Alexandre2016-03-241-1/+1
| | | |
* | | | Comments on confidential issues doesn't show in activity feed to non-membersDouglas Barbosa Alexandre2016-03-241-2/+6
|/ / /
* | | Merge branch 'issue_14453' into 'master' Robert Speicher2016-03-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Strip commit title when creating revert commit. Fixes #14453 See merge request !3352
| * | | Sanitize commit title when creating revert commit.issue_14453Rubén Dávila2016-03-221-1/+1
| | | |
* | | | Fix Milestone.upcomingDouwe Maan2016-03-231-1/+1
| | | |
* | | | Make sure we get only two returnsLin Jen-Shin2016-03-231-1/+1
| | | |
* | | | Merge branch 'fix-sorting-by-votes-on-groups-page' into 'master' Douwe Maan2016-03-231-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix sorting issues/mrs by votes on the groups page Closes #14394 The `non_archived` scope applied here https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/concerns/issues_action.rb#L5 overrides the previous `ORDER BY` applied inside the IssuesFinder, with the default scope of the Project model, resulting in SQL errors. ```ruby Issue.reorder(created_at: :desc).joins(:project).to_sql => "SELECT issues.* FROM issues INNER JOIN projects ON projects.id = issues.project_id ORDER BY issues.created_at DESC" Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived).to_sql => "SELECT issues.* FROM issues INNER JOIN projects ON projects.id = issues.project_id WHERE projects.archived = 'f' ORDER BY projects.id DESC" Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived.only(:where)).to_sql => "SELECT issues.* FROM issues INNER JOIN projects ON projects.id = issues.project_id WHERE projects.archived = 'f' ORDER BY issues.created_at DESC" ``` /cc @yorickpeterse See merge request !3333
| * | | | Fix sorting issues/mrs by votes on the groups pagefix-sorting-by-votes-on-groups-pageDouglas Barbosa Alexandre2016-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `non_archived` scope applied here https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/conc erns/issues_action.rb#L5 overrides the previous `ORDER BY` applied inside the IssuesFinder, with the default scope of the Project model, resulting in SQL errors.
* | | | | Merge branch 'notifications-for-subscribers-confidential-issue-labels' into ↵Douwe Maan2016-03-231-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Restrict notifications for confidential issues Closes #14468 /cc @rymai See merge request !3334
| * | | | | Fix issues count on labels pagenotifications-for-subscribers-confidential-issue-labelsDouglas Barbosa Alexandre2016-03-221-4/+4
| | |/ / / | |/| | |
* | | | | Do not allow to move issue if it has not been persistedmove-issue-section-should-not-be-displayed-in-the-new-issue-form-14489Grzegorz Bizon2016-03-231-1/+2
|/ / / /
* | | | Address feedbackDouwe Maan2016-03-222-7/+10
| | | |
* | | | Merge branch 'master' into issue_12658Douwe Maan2016-03-218-15/+67
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
| * | | Merge branch '2489-soft-delete-issues' into 'master' Douwe Maan2016-03-213-2/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Soft delete issuables Fixes #2489 What still needs to happen: research on the indexes, the gem suggests a [lot of changes](https://github.com/rubysherpas/paranoia#about-indexes) though this is probably a good idea to discuss and I'm unsure on the impact of an omnibus upgrade as I suspect creating about 10 new indexes has a large impact on the downtime. TODO: - [x] Also group owners can ***soft*** delete - [x] Button should be hidden See merge request !2982
| | * \ \ Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-216-13/+57
| | |\ \ \
| | * | | | Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-211-2/+2
| | | | | |
| | * | | | Dry destroy action on issuablesZeger-Jan van de Weg2016-03-196-14/+9
| | | | | |
| | * | | | Hide delete botton on edit pageZeger-Jan van de Weg2016-03-192-2/+5
| | | | | |