summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix Grammer as reported by a user :Parihantar-master-patch-23493Arihant2018-04-241-1/+1
* Merge branch '4950-unassign-slash-command-preview-fix' into 'master'Sean McGivern2018-04-242-2/+9
|\
| * Fix unassign slash command previewAthar Hameed2018-04-242-2/+9
|/
* Merge branch '43111-controller-projects-mergerequestscontroller-index-execute...Grzegorz Bizon2018-04-243-19/+40
|\
| * Fix an N+1 for MRs from forks on the MR index pageSean McGivern2018-04-243-19/+40
* | Merge branch 'show-runners-description-on-jobs-page' into 'master'Kamil Trzciński2018-04-243-2/+7
|\ \
| * | Add CHANGELOG entryTomasz Maczukin2018-04-241-0/+5
| * | Show Runner's description on job's pageTomasz Maczukin2018-04-242-2/+2
|/ /
* | Merge branch '10244-add-project-ci-cd-settings' into 'master'Kamil Trzciński2018-04-2412-1/+178
|\ \ | |/ |/|
| * Merge branch 'master' into 10244-add-project-ci-cd-settingsDylan Griffith2018-04-24834-5239/+12263
| |\
| * | Introduce new ProjectCiCdSetting10244-add-project-ci-cd-settingsYorick Peterse2018-04-1612-2/+179
* | | Merge branch 'fj-45057-improve-ssrf-documentation' into 'master'Douwe Maan2018-04-243-3/+15
|\ \ \
| * | | Improve documentation of SSRF protectionFrancisco Javier López2018-04-243-3/+15
|/ / /
* | | Merge branch 'jej/refactor-omniauth-controller' into 'master'Douwe Maan2018-04-2420-115/+497
|\ \ \
| * | | Auth::User classes refactor adds should_save?James Edwards-Jones2018-04-234-18/+10
| * | | Replace define_method with alias_method in Omniauth ControllersJames Edwards-Jones2018-04-233-16/+12
| * | | Unify Saml::IdentityLinker and OAuth::IdentityLinkerJames Edwards-Jones2018-04-236-69/+53
| * | | Show error on failed OAuth account linkJames Edwards-Jones2018-04-224-4/+46
| * | | Refactor OmniauthCallbacksController to remove duplicationJames Edwards-Jones2018-04-2219-106/+474
* | | | Merge branch 'bvl-warn-if-move-fails-on-mountpoint' into 'master'Douwe Maan2018-04-247-37/+108
|\ \ \ \
| * | | | Describe workaround when restore fails because of `Errno::EBUSY`Bob Van Landuyt2018-04-235-0/+44
| * | | | Suggest place for data-directories on mountpointsBob Van Landuyt2018-04-232-37/+64
| |/ / /
* | | | Merge branch 'ide-file-finder' into 'master'Filipa Lacerda2018-04-2426-55/+1112
|\ \ \ \
| * \ \ \ Merge branch 'master' into ide-file-finderPhil Hughes2018-04-23292-1598/+1789
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'master' into ide-file-finderPhil Hughes2018-04-1967-529/+1941
| |\ \ \ \
| * | | | | moved keycodes constants to common lib filePhil Hughes2018-04-196-13/+16
| * | | | | Merge branch 'master' into ide-file-finderPhil Hughes2018-04-1978-474/+959
| |\ \ \ \ \
| * | | | | | fixed scss lintPhil Hughes2018-04-181-7/+4
| * | | | | | Merge branch 'master' into ide-file-finderPhil Hughes2018-04-18323-2394/+7950
| |\ \ \ \ \ \
| * | | | | | | fixed up scrolling to items in finder dropdownPhil Hughes2018-04-182-3/+22
| * | | | | | | fixed dropdown not being scrollablePhil Hughes2018-04-181-5/+1
| * | | | | | | disable hover styles correctly in file finder dropdownPhil Hughes2018-04-182-9/+11
| * | | | | | | fix mouseOver & arrow keys working at same timePhil Hughes2018-04-181-3/+16
| * | | | | | | created constants filePhil Hughes2018-04-166-89/+175
| * | | | | | | fixed eslint & karma specsPhil Hughes2018-04-162-2/+2
| * | | | | | | remove v-html & use vdom insteadPhil Hughes2018-04-161-18/+31
| * | | | | | | fixed item specPhil Hughes2018-04-161-0/+3
| * | | | | | | order files by lastOpenedAt date even after filteringPhil Hughes2018-04-163-6/+45
| * | | | | | | added specs to stores allBlobs getterPhil Hughes2018-04-161-0/+20
| * | | | | | | added specs to storePhil Hughes2018-04-167-7/+101
| * | | | | | | fixed eslintPhil Hughes2018-04-162-9/+10
| * | | | | | | fixes the sort to correctly order the arrayPhil Hughes2018-04-162-10/+9
| * | | | | | | removed output that wasn't meant to be there :see_no_evil:Phil Hughes2018-04-161-1/+0
| * | | | | | | added specsPhil Hughes2018-04-167-10/+423
| * | | | | | | added ChangedFileIcon component to rowsPhil Hughes2018-04-161-0/+10
| * | | | | | | moved CSS into SCSS filePhil Hughes2018-04-164-39/+40
| * | | | | | | added keymap to editor to open file finderPhil Hughes2018-04-164-2/+56
| * | | | | | | small performance improvement by caching the computed propPhil Hughes2018-04-162-7/+10
| * | | | | | | correctly show the dropdown with `t` keypressPhil Hughes2018-04-169-59/+194
| * | | | | | | Added fuzzy file finder to web IDEPhil Hughes2018-04-167-1/+157