summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-06429-3652/+9106
|\
| * Merge branch 'pms-lowercase-system-notes' into 'master'Sean McGivern2017-02-063-14/+22
| |\
| | * Add changelog filepms-lowercase-system-notesOswaldo Ferreira2017-02-061-0/+4
| | * Update system_note_service_spec.rbPedro Moreira da Silva2017-02-061-5/+5
| | * Remove noteable object in time tracking system notes [ci-skip]Pedro Moreira da Silva2017-02-061-8/+8
| | * Make all system notes lowercasePedro Moreira da Silva2017-02-061-8/+12
| * | Merge branch 'redesign-searchbar-admin-project-26794' into 'master'Jacob Schatz2017-02-063-9/+10
| |\ \
| | * | fixes mobile viewredesign-searchbar-admin-project-26794Nur Rony2017-01-311-1/+1
| | * | adds changelogNur Rony2017-01-311-0/+4
| | * | hides search buttonNur Rony2017-01-311-0/+1
| | * | layout rearrangedNur Rony2017-01-301-8/+4
| * | | Merge branch '27602-fix-avatar-border-flicker-mention-dropdown' into 'master'Jacob Schatz2017-02-063-0/+26
| |\ \ \
| | * | | adds changelog27602-fix-avatar-border-flicker-mention-dropdownNur Rony2017-02-031-0/+4
| | * | | fixes flickers in avatar mention dropdownNur Rony2017-02-032-0/+22
| * | | | Merge branch 'babel-all-the-things' into 'master' Fatih Acet2017-02-063-4/+11
| |\ \ \ \
| | * | | | add CHANGELOG entry for !8988babel-all-the-thingsMike Greiling2017-02-061-0/+5
| | * | | | transpile all javascript files with babelMike Greiling2017-02-061-2/+2
| | * | | | add npm run webpack commandMike Greiling2017-02-061-2/+4
| * | | | | Merge branch 'fix-ace-editor-modules' into 'master' Fatih Acet2017-02-061-8/+17
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | lazy-load ace config so that we can ensure window.gon existsfix-ace-editor-modulesMike Greiling2017-02-051-10/+17
| | * | | | fix ace editor modules to include asset digest in productionMike Greiling2017-02-051-2/+4
| | |/ / /
| * | | | Merge branch 'terminal-max-session-time' into 'master' Kamil Trzciński2017-02-0616-13/+107
| |\ \ \ \
| | * | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-0616-13/+107
| | |/ / /
| * | | | Merge branch '22007-unify-projects-search' into 'master' Rémy Coutable2017-02-069-65/+1910
| |\ \ \ \
| | * | | | Adjust V3 projects typo on spec22007-unify-projects-searchOswaldo Ferreira2017-02-031-1/+1
| | * | | | Update V3 to V4 docsOswaldo Ferreira2017-02-022-0/+11
| | * | | | Remain V3 endpoint unchangedOswaldo Ferreira2017-01-304-3/+1895
| | * | | | Unify projects search by removing /projects/:search endpointOswaldo Ferreira2017-01-303-62/+4
| * | | | | Merge branch 'api-fix-files' into 'master' Rémy Coutable2017-02-064-1/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Ensure the right content is served for the build artifacts APIapi-fix-filesRobert Schilling2017-02-052-0/+6
| | * | | | API: Fix file downloadingRobert Schilling2017-02-032-1/+5
| * | | | | Merge branch 'sh-add-index-for-label-count' into 'master' Yorick Peterse2017-02-052-1/+13
| |\ \ \ \ \
| | * | | | | Add index to labels for `type` and project_id`sh-add-index-for-label-countStan Hu2017-02-042-1/+13
| * | | | | | Merge branch 'slash-commands-typo' into 'master' Grzegorz Bizon2017-02-052-1/+5
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fixed typoJason Aquino2017-02-042-1/+5
| * | | | | | Merge branch 'fix-rack-proxy' into 'master' Douwe Maan2017-02-041-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | fix rack-proxy dependency in productionfix-rack-proxyMike Greiling2017-02-041-2/+2
| * | | | | | Merge branch 'ux-guide-button-placement' into 'master' Achilleas Pipinellis2017-02-041-0/+14
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | [ci skip] UX Guide: Button placement in groupsux-guide-button-placementAllison Whilden2017-02-031-0/+14
| * | | | | | Merge branch 'go-go-gadget-webpack' into 'master' Jacob Schatz2017-02-04204-985/+2780
| |\ \ \ \ \ \
| | * | | | | | fix failing testgo-go-gadget-webpackMike Greiling2017-02-031-1/+1
| | * | | | | | fix Vue warnings for missing elementMike Greiling2017-02-031-2/+2
| | * | | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-03100-1992/+2066
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-03287-2144/+3741
| | |\ \ \ \ \ \ \
| | * | | | | | | | consistently use single quotesMike Greiling2017-02-021-3/+3
| | * | | | | | | | allow application.js to require other scripts which start with application*Mike Greiling2017-02-021-1/+1
| | * | | | | | | | DRY with Gitlab.config.webpack.dev_server referenceswebpackMike Greiling2017-02-021-10/+12
| | * | | | | | | | Merge branch 'master' into webpackMike Greiling2017-02-02154-612/+1805
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | disable webpack proxy in rspec environment due to conflicts with webmock gemMike Greiling2017-02-021-12/+20
| | * | | | | | | | | remove changes to ProcfileMike Greiling2017-02-011-1/+0