summaryrefslogtreecommitdiff
path: root/app/controllers/projects
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-121-0/+16
|\ \
| * | 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
* | | | 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
| | |_|/ | |/| |
* | | | 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
* | | 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
| |/ /
* | | Return status code 303 after a branch DELETE operation to avoid project deletionStan Hu2016-04-062-2/+4
* | | 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
* | | 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
* | | Check permissions when importing project membersGrzegorz Bizon2016-04-051-2/+7
* | | Merge branch 'build-updates' into 'master' Douwe Maan2016-04-031-4/+12
|\ \ \
| * | | Merge request title is in the notificationPhil Hughes2016-03-181-1/+2
| * | | Commit SHA comes from JSONPhil Hughes2016-03-181-1/+2
| * | | Fix code style issues.Jacob Schatz2016-03-181-3/+3
| * | | Removes name from fileJacob Schatz2016-03-181-2/+2
| * | | Adds notifications API to MR page.Jacob Schatz2016-03-181-15/+13
| * | | 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
|\ \ \ \
| * | | | 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 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
| |/ / |/| |
* | | Merge branch 'fix-14607' into 'master' Douwe Maan2016-03-291-1/+5
|\ \ \
| * | | 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
| |/ /
* | | Edit button leaves modal openJacob Schatz2016-03-251-1/+1
View Lorry Controller Status