summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* Load related MRs/branches asynchronouslyYorick Peterse2016-04-131-10/+30
| | | | | | | | | | | | Currently this works by loading the HAML partials via XHR. While this is not the nicest setup it _is_ the easiest setup using the tools we currently have. Loading this data asynchronously doesn't make loading the related MRs/branches itself faster, it merely ensures that loading the issue itself is not slowed down. Fixes gitlab-org/gitlab-ce#14949
* Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets2016-04-131-1/+0
|\ | | | | | | | | | | | | Move RepositoryArchiveCacheWorker to sidekiq-cron Closes #15105 See merge request !3663
| * Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cronRobert Speicher2016-04-121-1/+0
| | | | | | | | Closes #15105
* | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-121-0/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple membership and notifications This allow you to have notification setting per project even if you are member of group. It also creates background for having notification settings in project you are not member of. - [x] Make it work - [x] Migrations - [x] CHANGELOG - [x] More tests - [x] API For #3359 After this merge request there is still some work to be done: * create migration that remove duplicates in notification settings table and create uniq index (8.8 probably) * remove notification_level field from Member model in 9.0 * make proper API for notification settings * use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) * maybe more tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3421
| * | Simplify Projects::NotificationSettingsControllerDouglas Barbosa Alexandre2016-04-121-7/+0
| | |
| * | Requires user to be signed in when changing notification settingsDouglas Barbosa Alexandre2016-04-111-0/+2
| | |
| * | Reuse `User#notification_settings_for` when it's possibleDouglas Barbosa Alexandre2016-04-111-4/+3
| | |
| * | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-111-3/+3
| |\ \ | | |/
| * | Simplify query to retrieve NotificationSetting on controllersDouglas Barbosa Alexandre2016-04-081-1/+1
| | |
| * | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-087-15/+54
| |\ \
| * | | Create NotificationSettings object only when user change value in dropdownDmitriy Zaporozhets2016-03-301-0/+22
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'build-notification-fixes' into 'master' Jacob Schatz2016-04-121-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build notification null check Cancels build notification interval on page change See merge request !3540
| * | | | Rubocop fixPhil Hughes2016-04-111-1/+1
| | | | |
| * | | | Preparing build statusPhil Hughes2016-04-111-0/+2
| | |_|/ | |/| |
* | | | Fix code review issuesRobert Schilling2016-04-121-1/+1
| | | |
* | | | Delete notes via APIRobert Schilling2016-04-121-3/+2
|/ / /
* | | Merge branch 'mr-ui-update' into 'master' Jacob Schatz2016-04-111-3/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Updated UI for new merge request Closes #2540 ![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png) ![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png) See merge request !3228
| * | Fixed target project updatePhil Hughes2016-04-061-3/+1
| | |
| * | Updated UI for new merge requestPhil Hughes2016-04-061-0/+2
| | | | | | | | | | | | Closes #2540
* | | Merge branch 'feature/expose-builds-badge' into 'master' Rémy Coutable2016-04-072-1/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose badges This MR exposes badge somewhere in visible place. ![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png) Closes #13801 See merge request !3326
| * | | Use default branch when displaying list of badgesGrzegorz Bizon2016-04-061-1/+1
| | | |
| * | | Change name of badge variable in badges controllerGrzegorz Bizon2016-04-061-1/+1
| | | |
| * | | Expose project badges in project settings menuGrzegorz Bizon2016-04-061-0/+2
| | | |
| * | | Make it possible to switch ref in badges viewGrzegorz Bizon2016-04-061-0/+2
| | | |
| * | | Extend build status badge, add html/markdown methodsGrzegorz Bizon2016-04-061-0/+2
| | | |
| * | | Add project badges view prototypeGrzegorz Bizon2016-04-061-1/+4
| |/ /
* | | Return status code 303 after a branch DELETE operation to avoid project deletionStan Hu2016-04-062-2/+4
| | | | | | | | | | | | Closes #14994
* | | Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-071-0/+14
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Wiki preview URL converting problem [via Markdown] Current implementation when rendering the preview, thinks relative links are for project repository files. We are creating a new preview route that will define correct context data to render for wikis instead. Fixes #2380, #1184 See merge request !3461
| * | Add specific markdown_preview route for WikisGabriel Mazetto2016-03-301-0/+14
| | |
* | | Respond 404 when unauthorized user imports membersfix/permissions-when-importing-membersGrzegorz Bizon2016-04-051-1/+1
| | |
* | | Do not leak project exists when importing membersGrzegorz Bizon2016-04-051-4/+4
| | | | | | | | | | | | | | | | | | When importing members, and user does not have permissions to read members in a source project, do not leak information about source project existence. Notifiy user that project has not been found instead.
* | | Check permissions when importing project membersGrzegorz Bizon2016-04-051-2/+7
| | | | | | | | | | | | Closes #14899
* | | Merge branch 'build-updates' into 'master' Douwe Maan2016-04-031-4/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build updates Fixes #10851 ![build-updates](/uploads/52e09e679ca457f3d818f9a12fd8382b/build-updates.gif) See merge request !2604
| * | | Merge request title is in the notificationPhil Hughes2016-03-181-1/+2
| | | | | | | | | | | | | | | | Short commit instead of long commit sha
| * | | Commit SHA comes from JSONPhil Hughes2016-03-181-1/+2
| | | | | | | | | | | | | | | | Removed page refresh - instead clicking takes to the builds tab
| * | | Fix code style issues.Jacob Schatz2016-03-181-3/+3
| | | |
| * | | Removes name from fileJacob Schatz2016-03-181-2/+2
| | | | | | | | | | | | | | | | Changes `:not_found` to `nil`
| * | | Adds notifications API to MR page.Jacob Schatz2016-03-181-15/+13
| | | | | | | | | | | | | | | | | | | | When a build status changes a notification will popup. Fixes #10851
| * | | Adds JSON callback, which is currently not working.Jacob Schatz2016-03-181-2/+9
| | | |
| * | | initial ajax buildJacob Schatz2016-03-181-1/+2
| | | |
* | | | Merge branch 'patch/fix-mergerequest-diff' into 'master' Robert Speicher2016-03-301-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Use `diff_base_commit` instead of `target_branch` to generate diffsGabriel Mazetto2016-03-291-2/+2
| | | | |
* | | | | Merge branch 'refactor/project-badges-interface' into 'master' Robert Speicher2016-03-301-2/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor builds badge, encapsulate inside a class This merge requests attempts to introduce interface for all badges. Currently we only have a build badge, but other badges are in plans, like coverage badge. See merge request !3403
| * | | | Refactor builds badge, encapsulate inside a classGrzegorz Bizon2016-03-291-2/+3
| | | | |
* | | | | Add json response for user avatar in merge requestJacob Schatz2016-03-301-1/+1
| |_|_|/ |/| | |
* | | | Standardised the output of the JSON to always include the namePhil Hughes2016-03-291-1/+1
| |/ / |/| | | | | | | | The frontend will then always use the name as the ID - like previous
* | | Merge branch 'fix-14607' into 'master' Douwe Maan2016-03-291-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | |
| * | | Ensure private project snippets are not viewable by unauthorized peopleRémy Coutable2016-03-251-1/+5
| |/ / | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/14607.
* | | Edit button leaves modal openJacob Schatz2016-03-251-1/+1
| | | | | | | | | | | | Add user avatar to user selection
View Lorry Controller Status