summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'assign-to-issuable-opener' into 'master' Jacob Schatz2016-04-152-3/+10
|\
| * Merge branch 'master' into assign-to-issuable-openerZeger-Jan van de Weg2016-04-153-5/+14
| |\
| * \ Merge branch 'master' into assign-to-issuable-openerZeger-Jan van de Weg2016-04-055-24/+21
| |\ \
| * \ \ Merge branch 'master' into assign-to-issuable-openerZeger-Jan van de Weg2016-03-2968-365/+649
| |\ \ \
| * | | | Revert authors ability to assign anyoneZeger-Jan van de Weg2016-02-221-1/+1
| * | | | Fix loading data when no author_id is passedZeger-Jan van de Weg2016-02-221-1/+1
| * | | | Issuable can be assigned to authorZeger-Jan van de Weg2016-02-222-3/+9
* | | | | Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master' Rémy Coutable2016-04-151-0/+5
|\ \ \ \ \
| * | | | | Make /profile/keys/new redirects to /profile/keys for back-compatRémy Coutable2016-04-151-0/+5
* | | | | | Add Sentry program context even without a current userRobert Speicher2016-04-141-8/+10
* | | | | | Merge branch 'auto-fsck' into 'master' Robert Speicher2016-04-142-1/+21
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-137-44/+66
| |\ \ \ \ \ \
| * | | | | | | Clear repository check columns asynchronouslyJacob Vosmaer2016-04-132-7/+3
| * | | | | | | BastaJacob Vosmaer2016-04-122-2/+2
| * | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-1214-25/+91
| |\ \ \ \ \ \ \
| * | | | | | | | Move 'clear checks' button to applicatoin settingsJacob Vosmaer2016-04-122-12/+14
| * | | | | | | | Rename almost all the thingsJacob Vosmaer2016-04-061-9/+9
| * | | | | | | | Rebase repo check MRJacob Vosmaer2016-04-041-1/+23
* | | | | | | | | Merge branch 'fix-group-projects-sort' into 'master' Robert Speicher2016-04-141-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Projects on group page should be sorted by last activity instead of id/create...fix-group-projects-sortDmitriy Zaporozhets2016-04-141-0/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Include GonHelper separately and remove created_at in factoryStan Hu2016-04-142-0/+2
* | | | | | | | | Add spec for deletion of authorized OAuth2 applicationStan Hu2016-04-142-14/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | 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
| |/ / / / / / |/| | | | | |
View Lorry Controller Status