summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Respect autocrlf setting when creating/updating file through web UIdm-quick-fix-web-edit-new-linesDouwe Maan2017-02-131-0/+8
* Merge branch '28032-tooltips-file-name' into 'master' Annabel Dunstone Gray2017-02-131-3/+3
|\
| * Adds container to tooltip in order to make it work with overflow:hidden in pa...28032-tooltips-file-nameFilipa Lacerda2017-02-121-3/+3
* | Merge branch '28034-icon-in-issue-search-dropdown-still-animates' into 'master'Annabel Dunstone Gray2017-02-132-2/+3
|\ \
| * | Disable animation on avatars inside filter dropdowns28034-icon-in-issue-search-dropdown-still-animatesAlfredo Sumaran2017-02-101-0/+2
| * | Remove animation for icons on filter dropdownAlfredo Sumaran2017-02-101-2/+1
| |/
* | Merge branch '27947-missing-margin-between-loading-icon-and-text-in-merge-req...Annabel Dunstone Gray2017-02-131-2/+6
|\ \
| * | Add margin to loading icon in Merge Request Widget27947-missing-margin-between-loading-icon-and-text-in-merge-request-widgetSam Rose2017-02-101-2/+6
| |/
* | Merge branch 'fix/cycle-analytics-events-limit' into 'master' Sean McGivern2017-02-132-1/+11
|\ \
| * | Fix display logic for warning messagefix/cycle-analytics-events-limitSam Rose2017-02-082-4/+4
| * | Revise tooltip message and warning textSam Rose2017-02-071-4/+5
| * | Display number of shown events on Plan stage of Cycle AnalyticsSam Rose2017-02-072-1/+10
* | | Merge branch '27886_rebasing_fix' into 'master'Sean McGivern2017-02-131-1/+5
|\ \ \
| * | | Mark as WIP based on MR commits onlyJarka Kadlecova2017-02-131-1/+5
* | | | Merge branch 'make-rubocop-happy-again' into 'master'Rémy Coutable2017-02-132-2/+2
|\ \ \ \
| * | | | Use safe navigation operator to make rubocop happywinniehell2017-02-132-2/+2
* | | | | Merge branch '24976-start-of-line-mention' into 'master' Sean McGivern2017-02-135-14/+50
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Create directly_addressed Todos when mentioned in beginning of a lineErshad Kunnakkadan2017-02-085-14/+50
* | | | | Merge branch '27608-fixes-markdown-in-activity-feed-is-light-gray' into 'mast...Filipa Lacerda2017-02-131-1/+0
|\ \ \ \ \
| * | | | | Fixes markdown in activity feed is light gray27608-fixes-markdown-in-activity-feed-is-light-grayNur Rony2017-02-131-1/+0
* | | | | | Merge branch 'issue_25900_2' into 'master' Sean McGivern2017-02-1311-36/+78
|\ \ \ \ \ \
| * | | | | | Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-0911-36/+78
* | | | | | | Merge branch 'zj-drop-ruby-21-tests' into 'master' Rémy Coutable2017-02-1313-35/+25
|\ \ \ \ \ \ \
| * | | | | | | Update Rubocop to ruby 2.3zj-drop-ruby-21-testsZ.J. van de Weg2017-02-0713-35/+25
* | | | | | | | Merge branch 'fix_issue_from_milestone' into 'master'Rémy Coutable2017-02-131-1/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | fix issue creation from milestone doesn't assign the milestonewendy04022017-02-121-1/+9
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rename_files_delete_service' into 'master' Rémy Coutable2017-02-132-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Rename Files::DeleteService to Files::DestroyServicedixpac2017-02-102-5/+5
* | | | | | | | Merge branch '28029-improve-blockquote-formatting-on-emails' into 'master'Annabel Dunstone Gray2017-02-111-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Stylize blockquote in notification emailsAlfredo Sumaran2017-02-101-0/+7
* | | | | | | | | Merge branch 'clean-javascript-vendor-files' into 'master' Filipa Lacerda2017-02-115-5/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | convert js-cookie dependency to an npm moduleclean-javascript-vendor-filesMike Greiling2017-02-113-3/+3
| * | | | | | | | convert timeago.js dependency to an npm moduleMike Greiling2017-02-112-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch '27994-fix-mr-widget-jump' into 'master' Filipa Lacerda2017-02-102-6/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into 27994-fix-mr-widget-jumpFilipa Lacerda2017-02-1023-57/+77
| |\ \ \ \ \ \ \
| * | | | | | | | fixes MR widget jumpNur Rony2017-02-102-6/+6
* | | | | | | | | Add js prefix to right sidebarAnnabel Dunstone Gray2017-02-105-5/+8
* | | | | | | | | Replace accidentally deleted metaclickAnnabel Dunstone Gray2017-02-101-0/+8
* | | | | | | | | Remove right padding from navbar-collapse on large screensAnnabel Dunstone Gray2017-02-101-0/+4
* | | | | | | | | common_utils merge conflictsAnnabel Dunstone Gray2017-02-101-3/+1
* | | | | | | | | Set sidebar height to 100% if at top of pageAnnabel Dunstone Gray2017-02-101-0/+2
* | | | | | | | | Set height of fixed sidebars with jsAnnabel Dunstone Gray2017-02-102-1/+11
* | | | | | | | | Add sticky sidebar on wiki pageAnnabel Dunstone Gray2017-02-102-2/+2
* | | | | | | | | Fix issue boards sidebar alignment and sidebar toggle specAnnabel Dunstone Gray2017-02-101-5/+1
* | | | | | | | | Fix build sidebar scrollingAnnabel Dunstone Gray2017-02-101-16/+0
* | | | | | | | | Refactor JSAnnabel Dunstone Gray2017-02-101-3/+1
* | | | | | | | | Fix pinned sidebar alignmentAnnabel Dunstone Gray2017-02-101-1/+1
* | | | | | | | | Remove navbar height offsetsAnnabel Dunstone Gray2017-02-104-30/+5
* | | | | | | | | Keep sidebars absolute until fixed at top; remove unneeded JSAnnabel Dunstone Gray2017-02-108-17/+21
* | | | | | | | | Fix sidebar scrollingAnnabel Dunstone Gray2017-02-102-2/+12
View Lorry Controller Status