summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | Allow admins to push to empty reposBob Van Landuyt2018-04-243-9/+12
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Only show push-to-master authorized usersBob Van Landuyt2018-04-242-11/+20
| | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide the push to master instructions for users that are not allowed to do that. Also hide buttons that would direct them to commit directly in master
| * | | | | | | | | | | | | | | Merge branch '30998-add-babel-rewire-plugin' into 'master'Clement Ho2018-04-248-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add some way to mock and spy on default ES modules" Closes #30998 See merge request gitlab-org/gitlab-ce!18116
| | * | | | | | | | | | | | | | add default exports to prevent rewire plugin from breaking vuexMike Greiling2018-04-238-0/+24
| | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix unassign slash command previewAthar Hameed2018-04-241-2/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch ↵Grzegorz Bizon2018-04-241-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43111-controller-projects-mergerequestscontroller-index-executes-more-than-100-sql-queries' into 'master' Resolve "Controller Projects::MergeRequestsController#index executes more than 100 SQL queries" Closes #43111 See merge request gitlab-org/gitlab-ce!18561
| | * | | | | | | | | | | | | | Fix an N+1 for MRs from forks on the MR index pageSean McGivern2018-04-241-2/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Show Runner's description on job's pageTomasz Maczukin2018-04-241-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ide-relative-url-fix' of gitlab.com:gitlab-org/gitlab-ceNick Thomas2018-04-262-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fixed JS service request sending to wrong URLPhil Hughes2018-04-251-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed web IDE not working with relative URLsPhil Hughes2018-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #45649
* | | | | | | | | | | | | | | | Merge branch '10244-add-project-ci-cd-settings' into 'master'Kamil Trzciński2018-04-242-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new ProjectCiCdSettings model with group_runners_enabled See merge request gitlab-org/gitlab-ce!18144
| * | | | | | | | | | | | | | | Merge branch 'master' into 10244-add-project-ci-cd-settingsDylan Griffith2018-04-24220-1924/+3514
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Introduce new ProjectCiCdSetting10244-add-project-ci-cd-settingsYorick Peterse2018-04-162-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This model and the corresponding table will be used for storing settings specific to CI/CD, starting with the "group_runners_enabled" boolean. The model is called ProjectCiCdSetting and not ProjectCiCdSettings. The project exporter doesn't like plural model names as it uses "classify" which turns those into singular (so "ProjectCiCdSettings" becomes "ProjectCiCdSetting", producing an error if said class is undefined). The initial work in this commit was done by Dylan Griffith, with most of the migration work being done by Yorick Peterse.
* | | | | | | | | | | | | | | | Merge branch 'jej/refactor-omniauth-controller' into 'master'Douwe Maan2018-04-243-84/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor OmniauthCallbacksController to remove duplication Closes #26559 See merge request gitlab-org/gitlab-ce!16694
| * | | | | | | | | | | | | | | | Replace define_method with alias_method in Omniauth ControllersJames Edwards-Jones2018-04-232-15/+11
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Unify Saml::IdentityLinker and OAuth::IdentityLinkerJames Edwards-Jones2018-04-231-2/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Show error on failed OAuth account linkJames Edwards-Jones2018-04-221-0/+6
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Refactor OmniauthCallbacksController to remove duplicationJames Edwards-Jones2018-04-223-81/+89
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves LDAP to its own controller with tests Provides path forward for implementing GroupSaml
* | | | | | | | | | | | | | | | Merge branch 'ide-file-finder' into 'master'Filipa Lacerda2018-04-2417-55/+548
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added fuzzy file finder to web IDE Closes #44841 See merge request gitlab-org/gitlab-ce!18323
| * | | | | | | | | | | | | | | Merge branch 'master' into ide-file-finderPhil Hughes2018-04-2348-257/+625
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'master' into ide-file-finderPhil Hughes2018-04-1934-325/+927
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | moved keycodes constants to common lib filePhil Hughes2018-04-195-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated markup to use buttons instead of links
| * | | | | | | | | | | | | | | Merge branch 'master' into ide-file-finderPhil Hughes2018-04-1939-237/+402
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fixed scss lintPhil Hughes2018-04-181-7/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into ide-file-finderPhil Hughes2018-04-18131-968/+1813
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | 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-164-85/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added specs for ide.vue Mousetrap binds
| * | | | | | | | | | | | | | | | | fixed eslint & karma specsPhil Hughes2018-04-161-2/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | remove v-html & use vdom insteadPhil Hughes2018-04-161-18/+31
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | order files by lastOpenedAt date even after filteringPhil Hughes2018-04-163-6/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added stopCallback to allow toggling with cmd+p when finder is open changed implementation of mouseover
| * | | | | | | | | | | | | | | | | added specs to storePhil Hughes2018-04-163-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added clear button to search input
| * | | | | | | | | | | | | | | | | 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-165-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | order initial dropdown by lastOpenedAt date
| * | | | | | | | | | | | | | | | | added ChangedFileIcon component to rowsPhil Hughes2018-04-161-0/+10
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | moved CSS into SCSS filePhil Hughes2018-04-164-39/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added ellipsis to path but not name
| * | | | | | | | | | | | | | | | | added keymap to editor to open file finderPhil Hughes2018-04-164-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear file finder on close esc closes the file finder
| * | | | | | | | | | | | | | | | | small performance improvement by caching the computed propPhil Hughes2018-04-162-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed eslint there are still some performance issues with larger lists. Need to investigate whether this is a Vue issue or a fuzzaldrin issue
| * | | | | | | | | | | | | | | | | correctly show the dropdown with `t` keypressPhil Hughes2018-04-169-59/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added arrow key navigation in the dropdown enter & click open the file highlight occurrences of the searched text in the drppdown item fixed some performance issues when rendering limit the dropdown items to a maximum of 20 - this may change to more depending on other performance changes
| * | | | | | | | | | | | | | | | | Added fuzzy file finder to web IDEPhil Hughes2018-04-165-1/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #44841
* | | | | | | | | | | | | | | | | | Merge branch '3064-group-burndown-chart' into 'master'Sean McGivern2018-04-241-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Backport] EE's Burndown chart for group milestone common code See merge request gitlab-org/gitlab-ce!18511
| * | | | | | | | | | | | | | | | | [Backport] Burndown chart for group milestoneOswaldo Ferreira2018-04-231-0/+8
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '44447-expose-deploy-token-to-ci-cd' into 'master'Grzegorz Bizon2018-04-243-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose Deploy Token info as environment variables to CI/CD jobs Closes #44447 See merge request gitlab-org/gitlab-ce!18414
| * | | | | | | | | | | | | | | | | | Refactor deploy token methods on Ci::BuildMayra Cabrera2018-04-203-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also include a class method for retriving the gitlab_deploy_token on DeployTokens
| * | | | | | | | | | | | | | | | | | Ensure deploy tokens variables are not available in the context of only/exceptMayra Cabrera2018-04-201-3/+5
| | | | | | | | | | | | | | | | | | |