summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'signout-rel-url' into 'master' Robert Speicher2016-05-041-1/+1
|\
| * Use sign out path only if not emptyArtem Sidorenko2016-05-031-1/+1
* | Improve the Two-factor Authentication sign-in text [ci skip]connorshea2016-05-031-2/+2
|/
* Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-0213-66/+96
|\
| * Prevent privilege escalation via notes APIRobert Speicher2016-04-261-0/+11
| * Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-04-2612-66/+85
| |\
| | * Merge branch '15591-fix-project-leak-in-new-mr-view' into 'master' Robert Speicher2016-04-251-0/+3
| | |\
| | | * Prevent private project name and namespace from leaking in the new MR viewRémy Coutable2016-04-251-0/+3
| | * | Merge branch 'fix-impersonation-issue' into 'master' Robert Speicher2016-04-255-46/+42
| | |\ \
| | | * | Store original user in variableDouwe Maan2016-04-221-2/+2
| | | * | Remove unused methodDouwe Maan2016-04-221-4/+0
| | | * | Fix issue with impersonationDouwe Maan2016-04-225-46/+46
| | * | | Merge branch 'fix-private-snippet-api' into 'master' Robert Speicher2016-04-251-1/+1
| | |\ \ \
| | | * | | Prevent private snippets in public/internal projects from being leaked via APIStan Hu2016-04-251-1/+1
| | | | |/ | | | |/|
| | * | | Ensure URL in all Service subclasses are validRémy Coutable2016-04-255-19/+39
| | |/ /
* | | | Support e-mail notifications for comments on project snippetsStan Hu2016-05-024-0/+19
* | | | Merge branch '15527-fix-wiki-page-creation-issue' into 'master' Robert Speicher2016-05-022-3/+4
|\ \ \ \
| * | | | Fix error when trying to create a wiki pageRémy Coutable2016-04-292-3/+4
* | | | | Merge branch 'feature/backport-safewebhooks' into 'master' Robert Speicher2016-05-028-15/+49
|\ \ \ \ \
| * | | | | Added UI to define secret_token for webhook and systemhookfeature/backport-safewebhooksGabriel Mazetto2016-05-024-6/+31
| * | | | | Backported minimal safewebhook implementation to GitLab CEGabriel Mazetto2016-04-304-9/+18
* | | | | | Merge branch 'fix/handle-issue-move-access' into 'master' Robert Speicher2016-04-301-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Handle issue move access instead of raising errorfix/handle-issue-move-accessGrzegorz Bizon2016-04-301-0/+2
* | | | | | Tweak checking branches in Project#open_branchesYorick Peterse2016-04-291-9/+7
* | | | | | Use a query in Project#protected_branch?Yorick Peterse2016-04-291-1/+1
* | | | | | Merge branch 'dz-small-ui-fixes' into 'master' Jacob Schatz2016-04-294-20/+24
|\ \ \ \ \ \
| * | | | | | Move modal css to separate file and fix danger text for confirmation modalDmitriy Zaporozhets2016-04-294-20/+24
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'duplicate-label-dropdown' into 'master' Jacob Schatz2016-04-291-2/+38
|\ \ \ \ \ \
| * | | | | | Removes duplicates from the label dropdownPhil Hughes2016-04-291-2/+38
| |/ / / / /
* | | | | | Merge branch 'notification-email-badge-alignment' into 'master' Jacob Schatz2016-04-291-1/+1
|\ \ \ \ \ \
| * | | | | | Updated spacing between notification label and buttonnotification-email-badge-alignmentPhil Hughes2016-04-281-1/+1
* | | | | | | Merge branch 'emoji_award_coffee_refactoring' into 'master' Jacob Schatz2016-04-293-94/+102
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | awards_handler: single quotesemoji_award_coffee_refactoringValery Sizov2016-04-261-64/+64
| * | | | | | AwardsHandler follows code style conventionsValery Sizov2016-04-263-42/+50
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'gitattributes' into 'master' Rémy Coutable2016-04-294-13/+33
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Support supressing text file diffs on the default branch with .gitattributesMatt Oakes2016-04-294-13/+33
* | | | | | Merge branch 'fix/remove-deprecated-ci-helper' into 'master' Rémy Coutable2016-04-291-13/+0
|\ \ \ \ \ \
| * | | | | | Remove deprecated CI badge helperGrzegorz Bizon2016-04-291-13/+0
| |/ / / / /
* | | | | | Merge branch 'change_message_for_newly_created_milestone' into 'master' Rémy Coutable2016-04-292-3/+6
|\ \ \ \ \ \
| * | | | | | Use a better message when milestone is newly createdchange_message_for_newly_created_milestoneArinde Eniola2016-04-292-3/+6
| |/ / / / /
* | | | | | Merge branch 'dz-update-outdated-colors' into 'master' Jacob Schatz2016-04-292-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Replace outdated bluish colors with default bg colordz-update-outdated-colorsDmitriy Zaporozhets2016-04-282-3/+3
* | | | | | Merge branch 'zj-large-files-no-highlight' into 'master' Robert Speicher2016-04-285-12/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Properly handle bigger filesZeger-Jan van de Weg2016-04-285-12/+34
* | | | | | Merge branch 'async-new-branch-button' into 'master' Jacob Schatz2016-04-284-6/+53
|\ \ \ \ \ \
| * | | | | | Load the "New Branch" button asynchronouslyYorick Peterse2016-04-284-6/+53
| |/ / / / /
* | | | | | Merge branch 'protected-branches-ui' into 'master' Jacob Schatz2016-04-283-59/+72
|\ \ \ \ \ \
| * | | | | | Protected branches UIprotected-branches-uiPhil Hughes2016-04-265-59/+77
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'project-webhooks-ui' into 'master' Jacob Schatz2016-04-283-85/+101
|\ \ \ \ \ \
| * | | | | | Project webhooks updated UIPhil Hughes2016-04-263-85/+101
| |/ / / / /