summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
| |/ / /
* | | | Merge branch 'project-deploy-keys-ui' into 'master' Jacob Schatz2016-04-285-96/+107
|\ \ \ \ | |_|/ / |/| | |
| * | | Updated tests for deploy keysproject-deploy-keys-uiPhil Hughes2016-04-251-6/+4
| * | | Project deploy keys updated UIPhil Hughes2016-04-255-97/+110
* | | | Merge branch 'updated-triggers-ui' into 'master' Jacob Schatz2016-04-283-66/+63
|\ \ \ \
| * | | | Updated triggers UIupdated-triggers-uiPhil Hughes2016-04-273-66/+63
| | |/ / | |/| |
* | | | Merge branch 'project-group-ui' into 'master' Jacob Schatz2016-04-289-62/+89
|\ \ \ \
| * | | | Changed settings icon color variableproject-group-uiPhil Hughes2016-04-272-2/+1
| * | | | Fixed failing testsPhil Hughes2016-04-251-4/+2
| * | | | Updated select box to match designPhil Hughes2016-04-252-1/+21
| * | | | Updated project group sharing UIPhil Hughes2016-04-258-62/+72
| | |/ / | |/| |
* | | | Merge branch 'navigation-redesign' into 'master' Dmitriy Zaporozhets2016-04-283-7/+26
|\ \ \ \
| * | | | Reuse more popular colorsDmitriy Zaporozhets2016-04-282-4/+4
| * | | | Make layout navigation gray and fluidnavigation-redesignDmitriy Zaporozhets2016-04-282-4/+23
| * | | | Make application header light grayDmitriy Zaporozhets2016-04-281-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'fix/ci-skipped-status' into 'master' Rémy Coutable2016-04-281-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Render canceled status if any of the jobs canceledGrzegorz Bizon2016-04-271-1/+1
* | | | Merge branch 'add-js-prefix-to-user-tab-classes' into 'master' Jacob Schatz2016-04-272-4/+4
|\ \ \ \
| * | | | Add JS prefix to user tab classesKarlo Soriano2016-04-262-4/+4
* | | | | Merge branch 'sidebar-label-link' into 'master' Jacob Schatz2016-04-272-2/+2
|\ \ \ \ \
| * | | | | Updated label links to work correctly for filteringsidebar-label-linkPhil Hughes2016-04-262-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'esc-close-dropdown' into 'master' Jacob Schatz2016-04-271-0/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |