summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add hotfix that allows to access build artifacts created before 8.3fix/missing-ci-build-tracesGrzegorz Bizon2015-12-292-9/+36
* Hotfix for builds trace data integrityGrzegorz Bizon2015-12-281-1/+22
* Merge branch 'rs-bump-brakeman' into 'master' Dmitriy Zaporozhets2015-12-281-1/+1
|\
| * Prevent an XSS warning from the updated Brakemanrs-bump-brakemanRobert Speicher2015-12-271-1/+1
* | Do not show frequently used emojis when emptyValery Sizov2015-12-281-6/+7
|/
* Merge branch 'mention-all' into 'master' Robert Speicher2015-12-272-2/+2
|\
| * Merge branch 'master' into mention-allDouwe Maan2015-12-2414-35/+181
| |\
| * | Only allow group/project members to mention `@all`Douwe Maan2015-12-242-2/+2
* | | Merge branch 'close-open-ajax-issue' into 'master' Robert Speicher2015-12-253-10/+41
|\ \ \
| * | | removes unused `alert` from issue spec. Requires flash in the *implementation...close-open-ajax-issueJacob Schatz2015-12-231-0/+1
| * | | adds test for issue close/reopen failureJacob Schatz2015-12-231-2/+3
| * | | resolves conflicts with new buttonsJacob Schatz2015-12-2364-254/+1980
| |\ \ \
| * | | | changes `issue-box` to `status-box` since html was changed as wellJacob Schatz2015-12-211-9/+9
| * | | | adds alerts for when http request errors out in some way.Jacob Schatz2015-12-211-0/+2
| * | | | removes console logsJacob Schatz2015-12-211-1/+0
| * | | | changes `data-url` to `href` for javascript url grabbingJacob Schatz2015-12-212-3/+4
| * | | | removes `console.log`sJacob Schatz2015-12-211-2/+0
| * | | | open and close issue via ajax request. With testsJacob Schatz2015-12-213-9/+38
* | | | | Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets2015-12-254-9/+29
|\ \ \ \ \
| * | | | | add sorting of awardsValery Sizov2015-12-252-1/+13
| * | | | | revert back vote buttons to issue and MR pagesValery Sizov2015-12-252-8/+16
* | | | | | Merge branch 'rs-opengraph' into 'master' Douwe Maan2015-12-259-8/+115
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add link to twitter docsDouwe Maan2015-12-251-1/+2
| * | | | | Add more twitter metatags.Douwe Maan2015-12-251-0/+6
| * | | | | Add og:site_nameDouwe Maan2015-12-251-2/+2
| * | | | | Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-245-4/+39
| * | | | | Use `request.fullpath` for `og:url` tagRobert Speicher2015-12-241-1/+1
| * | | | | Truncate page_description to 30 wordsRobert Speicher2015-12-241-2/+2
| * | | | | Account for `@project.description` being nilRobert Speicher2015-12-231-1/+1
| * | | | | Add page descriptions and imagesRobert Speicher2015-12-236-9/+70
| * | | | | Add gitlab_logo.png, remove brand_logo.pngRobert Speicher2015-12-232-0/+0
| * | | | | Add Open Graph meta tagsRobert Speicher2015-12-231-1/+5
| | |/ / / | |/| | |
* | | | | Fixed codestyle and added 2FA documentationfeature/force-tfaGabriel Mazetto2015-12-242-3/+5
* | | | | Add to application_settings forced TFA optionsGabriel Mazetto2015-12-242-0/+14
* | | | | specs for forced two-factor authentication and grace periodGabriel Mazetto2015-12-242-8/+11
* | | | | Grace period support for TFAGabriel Mazetto2015-12-244-3/+44
* | | | | WIP require two factor authenticationGabriel Mazetto2015-12-243-26/+47
* | | | | Enable "Add key" button when user fills in a proper keyStan Hu2015-12-241-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Speicher2015-12-241-8/+8
|\ \ \ \
| * \ \ \ Merge pull request #9915 from huacnlee/avoid-ability-methods-allocationsDmitriy Zaporozhets2015-12-241-8/+8
| |\ \ \ \
| | * | | | Avoid allocations in Ability class.Jason Lee2015-12-161-8/+8
* | | | | | Merge branch 'ldap-special-chars-fix' into 'master' Douwe Maan2015-12-241-0/+1
|\ \ \ \ \ \
| * | | | | | Fix identity and user retrieval when special characters are usedPatricio Cano2015-12-221-0/+1
* | | | | | | Merge branch 'emoji_picker_frequently_used' into 'master' Valery Sizov2015-12-241-1/+27
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | added default for frequently used emojisValery Sizov2015-12-241-7/+9
| * | | | | | fix of frequently used emojisValery Sizov2015-12-241-3/+3
| * | | | | | Merge branch 'emoji-picker-search' into emoji_picker_frequently_usedValery Sizov2015-12-2438-312/+611
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'emoji-picker-search'into emoji_picker_frequently_usedemoji_picker_frequently_usedValery Sizov2015-12-24116-667/+1113
| |\ \ \ \ \ \ \
| * | | | | | | | add frequently used category to emoji pickerValery Sizov2015-12-221-0/+26
| * | | | | | | | TYPO in the commentValery Sizov2015-12-221-1/+1
View Lorry Controller Status