summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Fix Error 500 after renaming a project pathStan Hu2016-04-051-0/+3
| | |/ | |/|
* | | 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 'fix_remove_fork_link' into 'master' Douwe Maan2016-04-041-1/+1
|\ \
| * | Move unlink fork logic to a serviceBaldinof2016-03-221-1/+1
| * | Merge branch 'master' into fix_remove_fork_linkBaldinof2016-03-147-35/+48
| |\ \
| * | | Close merge requests when removing fork relationBaldinof2016-03-111-1/+1
* | | | 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
* | | | | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-1/+0
* | | | | Merge branch 'precompile-emoji-urls' into 'master' Dmitriy Zaporozhets2016-03-301-12/+1
|\ \ \ \ \
| * | | | | Pre-calculate Emoji digestsprecompile-emoji-urlsYorick Peterse2016-03-301-12/+1
| | |_|_|/ | |/| | |
* | | | | 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/nomethod-error-on-ci' into 'master' Rémy Coutable2016-03-291-1/+9
|\ \ \ \ \
| * | | | | Redirect to root path when visiting `/ci`fix/nomethod-error-on-ciGrzegorz Bizon2016-03-291-0/+4
View Lorry Controller Status