summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Remove tab stop from "Write", "Preview", "Go full screen" linksrs-markdown-preview-tabindexRobert Speicher2016-04-091-3/+3
* Merge branch '14400-diff-redesign' into 'master' Jacob Schatz2016-04-0917-72/+117
|\
| * Remove comment count & icon from side by side view14400-diff-redesignAnnabel Dunstone2016-04-071-6/+0
| * Diff touch upsAnnabel Dunstone2016-04-074-11/+7
| * Fix lint errorsAnnabel Dunstone2016-04-073-8/+6
| * Remove comment count & iconAnnabel Dunstone2016-04-071-3/+0
| * Diff design updatesAnnabel Dunstone2016-04-0712-60/+84
| * Merge conflict fixesAnnabel Dunstone2016-04-071-15/+15
| * Update diff colors and iconsAnnabel Dunstone2016-04-076-14/+28
| * Move diff colors to variablesAnnabel Dunstone2016-04-073-14/+24
| * Change reply button to text fieldAnnabel Dunstone2016-04-072-7/+19
* | Merge branch 'efficient-emoji-loading' into 'master' Robert Speicher2016-04-092-10/+25
|\ \
| * | Add "sprite" parameter to emoji_icon helperconnorshea2016-04-082-10/+25
| |/
* | Add a missing Oxford comma in some text on the Activity graph.connorshea2016-04-081-1/+1
* | Use meta key to open todo in new tab15078-todo-rowAnnabel Dunstone2016-04-081-2/+7
|/
* Merge branch 'code-wrapping' into 'master' Jacob Schatz2016-04-072-0/+6
|\
| * Fix side-by-side code format & commit message wrapcode-wrappingAnnabel Dunstone2016-04-072-0/+6
* | Revert "Merge branch 'new-navigation-prototype' into 'master'"Jacob Schatz2016-04-0711-98/+100
* | Revert "Merge branch 'fix-sidebar-exapnd' into 'master'"revert-5e8740eeJacob Schatz2016-04-071-1/+1
|/
* Merge branch 'indentation-bug' into 'master' Jacob Schatz2016-04-071-3/+3
|\
| * Indentation updateindentation-bugAnnabel Dunstone2016-04-071-2/+0
| * Preserve white spaceAnnabel Dunstone2016-04-071-1/+3
* | Merge branch 'fix-number-of-todos-sidebar-is-not-updated' into 'master' Jacob Schatz2016-04-071-1/+1
|\ \
| * | Update number of Todos in the sidebar when it's marked as "Done"Douglas Barbosa Alexandre2016-04-071-1/+1
| |/
* | Merge branch 'issue_14012' into 'master' Rémy Coutable2016-04-073-6/+35
|\ \ | |/ |/|
| * Implement review suggestionsFelipe Artur2016-04-072-6/+4
| * Improve codeFelipe Artur2016-04-052-16/+21
| * Improve codeFelipe Artur2016-04-051-7/+15
| * Fix problem when creating milestones in groups without projectsFelipe Artur2016-04-051-5/+23
* | Merge branch 'dont-assign-me-if-you-arent-allow' into 'master' Rémy Coutable2016-04-071-6/+8
|\ \
| * | Remove duplication. Remove JS data attributesJacob Schatz2016-04-071-6/+6
| * | Hide "assign to me" link if not alloweddont-assign-me-if-you-arent-allowJacob Schatz2016-04-071-5/+7
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqGrzegorz Bizon2016-04-071-6/+9
|\ \ \
| * \ \ Merge branch 'fix/2fa-authentication-spoofing' into 'master' Rémy Coutable2016-04-071-6/+9
| |\ \ \
| | * | | Fix 2FA authentication spoofing vulnerabilityGrzegorz Bizon2016-04-071-6/+9
* | | | | Merge branch 'fix-project-404-cache-issue' into 'master' Yorick Peterse2016-04-071-0/+2
|\ \ \ \ \
| * | | | | Expire caches after project creation to ensure a consistent stateStan Hu2016-04-071-0/+2
* | | | | | Merge branch 'update_main_lang_if_unset' into 'master' Rémy Coutable2016-04-071-5/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Only update main language if it is not already setupdate_main_lang_if_unsetDrew Blessing2016-04-061-5/+5
* | | | | | Merge branch 'feature/expose-builds-badge' into 'master' Rémy Coutable2016-04-074-2/+40
|\ \ \ \ \ \
| * | | | | | Use default branch when displaying list of badgesGrzegorz Bizon2016-04-061-1/+1
| * | | | | | Change name of badge variable in badges controllerGrzegorz Bizon2016-04-062-4/+4
| * | | | | | Remove obsolete badge code from project viewGrzegorz Bizon2016-04-061-3/+0
| * | | | | | Expose project badges in project settings menuGrzegorz Bizon2016-04-062-1/+8
| * | | | | | Make it possible to switch ref in badges viewGrzegorz Bizon2016-04-062-0/+4
| * | | | | | Add project header title in project badges viewGrzegorz Bizon2016-04-061-0/+2
| * | | | | | Use highlight helper to render badges code syntaxGrzegorz Bizon2016-04-061-4/+4
| * | | | | | Improve view with list of badgesGrzegorz Bizon2016-04-061-7/+12
| * | | | | | Extend build status badge, add html/markdown methodsGrzegorz Bizon2016-04-062-3/+5
| * | | | | | Add project badges view prototypeGrzegorz Bizon2016-04-063-1/+22
View Lorry Controller Status