summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'search-results-filter-dropdown' into 'master' Jacob Schatz2016-03-112-17/+31
|\
| * Increased dropdown max heightPhil Hughes2016-03-111-1/+1
| * Improved search results filter dropdownPhil Hughes2016-03-111-16/+30
* | Merge branch 'award-emoji-design-update' into 'master' Jacob Schatz2016-03-118-151/+188
|\ \
| * | Added 'surprise' animationaward-emoji-design-updatePhil Hughes2016-03-112-9/+34
| * | Fixed bug with emoji search stylingPhil Hughes2016-03-111-2/+2
| * | CoffeeScript style improv.Phil Hughes2016-03-111-2/+3
| * | Award emoji button paddingPhil Hughes2016-03-111-0/+2
| * | Renamed variables & removed some for award emojiPhil Hughes2016-03-112-10/+6
| * | Moved method calls to separate linesPhil Hughes2016-03-111-6/+11
| * | Moved SCSS values into variablesPhil Hughes2016-03-113-11/+28
| * | Updated award emoji testsPhil Hughes2016-03-111-1/+1
| * | Updated UI of award emojiPhil Hughes2016-03-117-140/+131
| |/
* | Merge branch 'fix-issue-toggle-button-mobile' into 'master' Jacob Schatz2016-03-115-9/+8
|\ \
| * | Removed deprecated bootstrap classesfix-issue-toggle-button-mobilePhil Hughes2016-03-112-2/+2
| * | Fixes issue with issue sidebar toggle button not workingPhil Hughes2016-03-105-9/+8
* | | Merge branch 'account-settings' into 'master' Jacob Schatz2016-03-116-158/+202
|\ \ \
| * | | Used standard variable coloursaccount-settingsPhil Hughes2016-03-112-14/+4
| * | | Added back 2fa configure later buttonPhil Hughes2016-03-111-0/+1
| * | | Moved 2fa into separate viewPhil Hughes2016-03-115-104/+64
| * | | Fixed issue with 2fa not enablingPhil Hughes2016-03-114-25/+22
| * | | Fixed heading weight issuePhil Hughes2016-03-112-5/+17
| * | | Fixed failing testsPhil Hughes2016-03-111-1/+1
| * | | Account settingsPhil Hughes2016-03-116-116/+200
| | |/ | |/|
* | | Merge branch 'comment-discard-button' into 'master' Jacob Schatz2016-03-114-17/+62
|\ \ \
| * | | Correctly uses a variable with the textcomment-discard-buttonPhil Hughes2016-03-111-1/+1
| * | | Fixed tests for comment formsPhil Hughes2016-03-042-1/+6
| * | | Added discard button to comment formPhil Hughes2016-03-044-17/+57
* | | | Merge branch 'comment-error' into 'master' Dmitriy Zaporozhets2016-03-111-0/+7
|\ \ \ \
| * | | | Add error for ajax:error when submitting commentsJacob Schatz2016-03-101-0/+7
| | |_|/ | |/| |
* | | | Merge branch 'build-scroll-controls-position' into 'master' Jacob Schatz2016-03-113-5/+33
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed missing variablesPhil Hughes2016-03-111-2/+2
| * | | Changed variable namesbuild-scroll-controls-positionPhil Hughes2016-03-101-3/+3
| * | | Removed CiBuild in favour of already available CiBuild classPhil Hughes2016-03-103-16/+13
| * | | Affix the build scroll controlsPhil Hughes2016-03-074-5/+36
* | | | Merge branch 'webhooks' into 'master' Robert Speicher2016-03-104-9/+9
|\ \ \ \
| * | | | Fix help_autocomplete alignmentwebhooksRobert Speicher2016-03-101-1/+1
| * | | | web hooks to webhooksashleys2016-03-104-9/+9
* | | | | Merge branch 'issue_13987' into 'master' Jacob Schatz2016-03-102-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use full URL to reference issuesAlfredo Sumaran2016-03-102-2/+2
| * | | | Prevent `.max-width-marker` to break layout on mobileAlfredo Sumaran2016-03-101-0/+1
| * | | | Avoid blinking of editor area on iOSAlfredo Sumaran2016-03-101-0/+1
* | | | | Merge branch 'issue-mr-build-status-placement' into 'master' Robert Speicher2016-03-102-3/+3
|\ \ \ \ \
| * | | | | Changed named argumentPhil Hughes2016-03-102-3/+3
| * | | | | Correct ruby codeissue-mr-build-status-placementPhil Hughes2016-03-101-1/+1
| * | | | | Moves build status tooltip on issuesPhil Hughes2016-03-102-4/+4
* | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into expirin...Jacob Vosmaer2016-03-1015-24/+807
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-filtered-pagination' into 'master' Douwe Maan2016-03-102-5/+5
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Allow filtered dashboard/explore results to be paged. Fixes #14104fix-filtered-paginationJosh Frye2016-03-092-5/+5
| | |/ / / /
| * | | | | Merge branch 'issue_14011' into 'master' Jacob Schatz2016-03-101-0/+4
| |\ \ \ \ \
View Lorry Controller Status