summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'award-emoji-fixes' into 'master' Jacob Schatz2016-06-094-12/+10
|\
| * Minor MR comment fixes.Fatih Acet2016-06-101-6/+6
| * Ignore frequent emojis in search.award-emoji-fixesFatih Acet2016-06-091-2/+2
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-0910-96/+123
| |\
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-098-16/+97
| |\ \
| * | | Move award_menu_url variable into gon object.Fatih Acet2016-06-092-4/+1
| * | | Render frequent emoji block once.Fatih Acet2016-06-091-1/+3
| * | | Instantiate awardsHandler in application main script.Fatih Acet2016-06-092-2/+1
* | | | Merge branch 'milestone-tooltip' into 'master' Jacob Schatz2016-06-095-6/+43
|\ \ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipmilestone-tooltipFatih Acet2016-06-0910-96/+123
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0929-47/+330
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0932-73/+112
| |\ \ \ \
| * | | | | Fixes for MR comments.Fatih Acet2016-06-094-5/+5
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-08117-1043/+1726
| |\ \ \ \ \
| * | | | | | Copy changes for milestone due dates.Fatih Acet2016-06-083-3/+3
| * | | | | | Revert milestone_remaining_days helper.Fatih Acet2016-06-081-10/+5
| * | | | | | Use title attribute instead of data-original-title.Fatih Acet2016-06-082-4/+4
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0694-528/+1390
| |\ \ \ \ \ \
| * | | | | | | Favor the ternary operator. :police_car:Fatih Acet2016-06-061-1/+1
| * | | | | | | Show milestone remaining tooltip in right sidebar.Fatih Acet2016-06-033-9/+27
| * | | | | | | Added a new common util called $.timefor.Fatih Acet2016-06-031-0/+24
* | | | | | | | Checks based on whether data is loaded not undefinedPhil Hughes2016-06-091-1/+4
* | | | | | | | Checks for undefined when inserting autocomplete into textareaPhil Hughes2016-06-091-1/+1
* | | | | | | | Merge branch 'dz-improve-ui-consistency-2' into 'master' Jacob Schatz2016-06-0917-82/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove icons from button on wiki pages. Also consistent padding between butto...dz-improve-ui-consistency-2Dmitriy Zaporozhets2016-06-086-11/+2
| * | | | | | | | Improve buttons size and paddings in the listsDmitriy Zaporozhets2016-06-085-14/+17
| * | | | | | | | Use responsive top-area on project branches and tags pagesDmitriy Zaporozhets2016-06-082-27/+26
| * | | | | | | | Use default button size in the content list controlsDmitriy Zaporozhets2016-06-081-1/+3
| * | | | | | | | Improve button margin for btn-grouped css classDmitriy Zaporozhets2016-06-084-30/+24
* | | | | | | | | Merge branch 'due-date-field-ux-improv' into 'master' Jacob Schatz2016-06-094-19/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improved the UX of issue & milestone date pickerPhil Hughes2016-06-094-19/+34
* | | | | | | | | | Merge branch 'remove-chart' into 'master' Jacob Schatz2016-06-092-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Only load Chart.js when necessary.Connor Shea2016-06-072-1/+1
* | | | | | | | | | | Merge branch 'issue_17607' into 'master' Jacob Schatz2016-06-096-5/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update method name for better understandingAlfredo Sumaran2016-06-091-2/+2
| * | | | | | | | | | | Add tests for dates on tooltipsAlfredo Sumaran2016-06-091-2/+2
| * | | | | | | | | | | Fix local timeago on user dashboardAlfredo Sumaran2016-06-095-3/+22
* | | | | | | | | | | | Merge branch 'input-padding' into 'master' Jacob Schatz2016-06-093-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Improve input padding, fix #18237.Connor Shea2016-06-063-1/+3
* | | | | | | | | | | | | Merge branch 'merge-conflicts-icon-color' into 'master' Jacob Schatz2016-06-092-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Use warning color merge conflicts icon in MR status widget.merge-conflicts-icon-colorFatih Acet2016-06-062-2/+7
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'note-edit-background-color' into 'master' Jacob Schatz2016-06-091-11/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Edit form background color on highlighted notenote-edit-background-colorPhil Hughes2016-06-021-11/+2
* | | | | | | | | | | | Merge branch 'toggling-task-should-not-generate-todo' into 'master' Robert Speicher2016-06-091-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Toggling a task in a description with mentions doesn't creates a TodoDouglas Barbosa Alexandre2016-06-091-2/+9
* | | | | | | | | | | | | Merge branch 'button-focus-state' into 'master' Jacob Schatz2016-06-091-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into button-focus-statebutton-focus-stateFatih Acet2016-06-06121-584/+1561
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Blur button tags when clicked. Fixes #17748.Fatih Acet2016-06-011-0/+4
* | | | | | | | | | | | | Merge branch 'labels-ui-fix' into 'master' Jacob Schatz2016-06-095-81/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Updated subscribe iconPhil Hughes2016-06-093-4/+27
View Lorry Controller Status