summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Load related MRs/branches asynchronouslyYorick Peterse2016-04-131-10/+30
* Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets2016-04-131-1/+0
|\
| * Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cronRobert Speicher2016-04-121-1/+0
* | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-124-33/+48
|\ \
| * | Simplify Projects::NotificationSettingsControllerDouglas Barbosa Alexandre2016-04-121-7/+0
| * | Requires user to be signed in when changing notification settingsDouglas Barbosa Alexandre2016-04-112-0/+4
| * | Reuse `User#notification_settings_for` when it's possibleDouglas Barbosa Alexandre2016-04-112-5/+4
| * | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-112-3/+13
| |\ \ | | |/
| * | Add method to return the user notification setting for a group, or a projectDouglas Barbosa Alexandre2016-04-081-1/+1
| * | Use default_value_for to set default NotificationSetting#levelDouglas Barbosa Alexandre2016-04-081-1/+0
| * | Simplify query to retrieve NotificationSetting on controllersDouglas Barbosa Alexandre2016-04-082-2/+2
| * | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-0813-42/+96
| |\ \
| * | | Change how notification settings in profile are rendered and updatedDmitriy Zaporozhets2016-03-302-22/+20
| * | | Create NotificationSettings object only when user change value in dropdownDmitriy Zaporozhets2016-03-302-1/+24
| * | | Fix few bugs related to recent notifications refactoringDmitriy Zaporozhets2016-03-301-1/+0
| * | | Refactor creating notification setting with defaultsDmitriy Zaporozhets2016-03-301-6/+1
| * | | Introduce NotificationSetting to user interfaceDmitriy Zaporozhets2016-03-302-13/+18
* | | | Merge branch 'build-notification-fixes' into 'master' Jacob Schatz2016-04-121-0/+2
|\ \ \ \
| * | | | Rubocop fixPhil Hughes2016-04-111-1/+1
| * | | | Preparing build statusPhil Hughes2016-04-111-0/+2
| | |_|/ | |/| |
* | | | Merge branch 'fix-missing-saml-error-handling' into 'master' Robert Speicher2016-04-121-10/+16
|\ \ \ \
| * | | | Add missing proper nil and error handling to SAML login process.Patricio Cano2016-04-071-10/+16
| | |_|/ | |/| |
* | | | 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
|\ \ \
| * | | Fixed target project updatePhil Hughes2016-04-061-3/+1
| * | | Updated UI for new merge requestPhil Hughes2016-04-061-0/+2
* | | | Add a `program` tag to Sentry Raven contextrs-sidekiq-sentry-contextRobert Speicher2016-04-091-0/+10
| |/ / |/| |
* | | Merge branch 'issue_14012' into 'master' Rémy Coutable2016-04-071-5/+26
|\ \ \
| * | | Implement review suggestionsFelipe Artur2016-04-071-5/+3
| * | | Improve codeFelipe Artur2016-04-051-16/+13
| * | | Improve codeFelipe Artur2016-04-051-7/+15
| * | | Fix problem when creating milestones in groups without projectsFelipe Artur2016-04-051-5/+23
* | | | Merge branch 'fix/2fa-authentication-spoofing' into 'master' Rémy Coutable2016-04-071-6/+9
|\ \ \ \
| * | | | Fix 2FA authentication spoofing vulnerabilityGrzegorz Bizon2016-04-071-6/+9
| | |/ / | |/| |
* | | | Merge branch 'feature/expose-builds-badge' into 'master' Rémy Coutable2016-04-072-1/+10
|\ \ \ \
| * | | | 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
| |/ / /
* | | | Merge branch 'fix_14638' into 'master' Rémy Coutable2016-04-071-1/+1
|\ \ \ \
| * | | | Fixes #14638.PotHix2016-04-061-1/+1
| |/ / /
* | | | Return status code 303 after a branch DELETE operation to avoid project deletionStan Hu2016-04-062-2/+4
* | | | Merge branch 'saml-external-groups' into 'master' Robert Speicher2016-04-071-1/+1
|\ \ \ \
| * | | | Avoid saving again if the user attributes haven't changedPatricio Cano2016-04-041-1/+1
| | |/ / | |/| |
* | | | Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-071-0/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | Add specific markdown_preview route for WikisGabriel Mazetto2016-03-301-0/+14
* | | | Merge branch 'fix-project-path-rename' into 'master' Stan Hu2016-04-051-0/+3
|\ \ \ \
View Lorry Controller Status