summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Don't use global variables.ace-venturaConnor Shea2016-08-182-3/+3
* Only load Ace on Snippets and file edit pages.Connor Shea2016-08-188-17/+38
* Merge branch '3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a...Jacob Schatz2016-08-181-1/+1
|\
| * Fix Ace syntax highlighting with compiled assets3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webuiSean McGivern2016-08-171-1/+1
* | Merge branch '13664-abuse-report-page-should-have-a-maximum-width' into 'mast...Jacob Schatz2016-08-186-24/+115
|\ \
| * | Moved truncation method chain to utility method13664-abuse-report-page-should-have-a-maximum-widthLuke Bennett2016-08-182-2/+5
| * | Review changesLuke Bennett2016-08-142-5/+8
| * | Some more styling tweaks and added jasmine testLuke Bennett2016-08-143-8/+17
| * | Reverted collapsible design for HazelsLuke Bennett2016-08-146-227/+95
| * | Added new but unaccepted design pattern, it is only pushed for future referen...Luke "Jared" Bennett2016-08-143-47/+25
| * | Updated collapsibleLuke "Jared" Bennett2016-08-143-53/+37
| * | Review changesLuke "Jared" Bennett2016-08-142-18/+25
| * | Final table styling changesLuke "Jared" Bennett2016-08-141-4/+7
| * | Started on abuse reports message truncationLuke "Jared" Bennett2016-08-144-1/+209
| * | Altered abuse report UILuke "Jared" Bennett2016-08-142-41/+69
* | | Merge branch '18334-truncate-award-emoji-users' into 'master' Jacob Schatz2016-08-182-27/+41
|\ \ \
| * | | Replace resetTooltip with bootstrap's fixTitleJack Davison2016-08-171-14/+6
| * | | Fix duplicate "me" in award emoji tooltipJack Davison2016-08-171-1/+6
| * | | Award tooltips refer to current user as "You"Jack Davison2016-08-172-10/+10
| * | | Switch to using to_sentence to construct tooltipsJack Davison2016-08-172-7/+16
| * | | Truncates 9-10 users with current user in frontJack Davison2016-08-171-1/+5
| * | | Truncated user list in award emoji tooltipsJack Davison2016-08-172-3/+7
| | |/ | |/|
* | | Merge branch 'boards-spec-improvements' into 'master' Douwe Maan2016-08-181-3/+5
|\ \ \
| * | | Attempted improvement to stop boards spec failingboards-spec-improvementsPhil Hughes2016-08-181-3/+5
* | | | Merge branch '17334-u2f-device-identifiers' into 'master' Robert Speicher2016-08-186-14/+62
|\ \ \ \
| * | | | Address review comments from @smcgivern.17334-u2f-device-identifiersTimothy Andrew2016-08-182-10/+10
| * | | | Allow naming U2F devices.Timothy Andrew2016-08-186-12/+60
* | | | | Merge branch '20454-edit-button-mr' into 'master' Douwe Maan2016-08-182-10/+6
|\ \ \ \ \
| * | | | | edit_blob_link can receive the blob to avoid access to the repository20454-edit-button-mrPaco Guzman2016-08-182-10/+6
| | |/ / / | |/| | |
* | | | | Merge branch 'outlook-email-spacing' into 'master' Douwe Maan2016-08-183-3/+11
|\ \ \ \ \
| * | | | | Fix email line-height in Outlookoutlook-email-spacingSean McGivern2016-08-173-3/+11
| | |_|/ / | |/| | |
* | | | | Rename TodoService#mark_todos_as_done_by_id{,s}Ahmad Sherif2016-08-182-3/+3
* | | | | Implement TodoService#mark_todos_as_done_by_idAhmad Sherif2016-08-182-4/+6
* | | | | Simplify SQL queries of marking a todo as doneAhmad Sherif2016-08-181-4/+2
| |/ / / |/| | |
* | | | Merge branch 'tab-persistance' into 'master' Rubén Dávila Santos2016-08-184-9/+9
|\ \ \ \
| * | | | Refactor to mark Changes tab as active on new MR page.Ruben Davila2016-08-183-9/+3
| * | | | Fix tabs navigation and do not update URL via pushstateAlfredo Sumaran2016-08-173-9/+15
* | | | | Refactor description templates documentationAchilleas Pipinellis2016-08-181-1/+1
|/ / / /
* | | | Merge branch '18141-pipeline-graph' into 'master' Jacob Schatz2016-08-178-11/+262
|\ \ \ \
| * | | | Remove index from pipeline toggles18141-pipeline-graphAnnabel Dunstone2016-08-172-10/+12
| * | | | Merge master into branchAnnabel Dunstone2016-08-1735-63/+1096
| |\ \ \ \
| * | | | | Move deployable conditional to variable; fix pipelines_specAnnabel Dunstone2016-08-171-2/+3
| * | | | | Update CSS selector and play iconAnnabel Dunstone2016-08-173-4/+4
| * | | | | Add deploy btn in graph; fix JS to toggle one graph at a time if multiple pip...Annabel Dunstone2016-08-174-7/+17
| * | | | | Add support for Play and Created jobsKamil Trzcinski2016-08-174-35/+41
| * | | | | Merge branch '18141-pipeline-graph' of gitlab.com:gitlab-org/gitlab-ce into 1...Kamil Trzcinski2016-08-173-23/+75
| |\ \ \ \ \
| | * | | | | Add links to pipeline graphAnnabel Dunstone2016-08-162-1/+5
| | * | | | | Add toggle button to hide graph; set max-heightAnnabel Dunstone2016-08-163-28/+71
| | * | | | | Fix scss lint errorAnnabel Dunstone2016-08-161-2/+2
| | * | | | | Fix graph scrolling bugAnnabel Dunstone2016-08-162-9/+9