summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add long polling diagramssh-add-polling-imagesStan Hu2017-03-313-0/+48
| | | | [ci skip]
* Merge branch '30236-fix-capybara-timeouts' into 'master' Douwe Maan2017-04-013-13/+12
|\ | | | | | | | | | | | | Increase Capybara's timeout Closes #30236 See merge request !10337
| * Properly eagerly-load the Capybara server for JS feature specs onlyRémy Coutable2017-03-313-4/+9
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Eager-load the Capybara server to prevent timeoutsRémy Coutable2017-03-313-3/+3
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Increase Capybara's timeoutRémy Coutable2017-03-313-9/+3
| | | | | | | | | | | | | | | | Also disabled assets warming for Capybara/RSpec and remove a check to skip assets warming when ./tmp/cache/assets/test exists because assets are now served by webpack-dev-server. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch ↵Douwe Maan2017-03-316-20/+75
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '25556-prevent-users-from-disconnecting-gitlab-account-from-cas' into 'master' Prevent users from disconnecting gitlab account from CAS Closes #25556 See merge request !10282
| * | Prevent users from disconnecting gitlab account from CASTiago Botelho2017-03-316-20/+75
| | |
* | | Merge branch 'add-download-attr' into 'master' Alfredo Sumaran2017-03-316-5/+6
|\ \ \ | | | | | | | | | | | | | | | | Add download attribute to download links See merge request !10318
| * | | Add download attribute to download linksClement Ho2017-03-296-5/+6
| | | |
* | | | Merge branch '30276-move-top-badges' into 'master' Annabel Dunstone Gray2017-03-312-9/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30276 Move issue, mr, todos next to profile dropdown in top nav Closes #30276 See merge request !10347
| * | | | 30276 Move issue, mr, todos next to profile dropdown in top navtauriedavis2017-03-312-9/+13
| | | | |
* | | | | Merge branch 'doc-upgrade-8.2-to-8.3' into 'master' Achilleas Pipinellis2017-03-311-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Updating documentation to include a missing step in the update procedure See merge request !10373
| * | | | | Updating documentation to include a missing step in the update procedurePaschalis Korosoglou2017-03-311-0/+8
| | |_|_|/ | |/| | |
* | | | | Merge branch 'nav-weird-gap-fix' into 'master' Annabel Dunstone Gray2017-03-311-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Fixed a gap underneath the scrolling inner page links See merge request !10325
| * | | | Fixed a gap underneath the scrolling inner page linksPhil Hughes2017-03-301-0/+8
| | | | |
* | | | | Merge branch '28812-refactor-search-controller-show' into 'master' Rémy Coutable2017-03-317-72/+408
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor SearchController#show Closes #28812 See merge request !9655
| * | | | | Refactor SearchController#showDongqing Hu2017-03-317-72/+408
|/ / / / /
* | | | | Merge branch 'forked-subquery-order' into 'master' Yorick Peterse2017-03-312-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery See merge request !10334
| * | | | | Remove unnecessary ORDER BY clause from `forked_to_project_id` subquerymhasbini2017-03-302-2/+8
| | | | | |
* | | | | | Merge branch '29929-jira-doc' into 'master' Sean McGivern2017-03-312-1/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to Jira service documentation Closes #29929 See merge request !10366
| * | | | | Fix link to Jira service documentationJarka Kadlecova2017-03-312-1/+5
| | | | | |
* | | | | | Merge branch '29341-add-metrics-button-env-overview' into 'master' Filipa Lacerda2017-03-3114-16/+163
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add metrics button to Environment Overview page Closes #29341 See merge request !10234
| * | | | | | Add metrics button to Environment Overview pageKushal Pandya2017-03-3114-16/+163
|/ / / / / /
* | | | | | Merge branch 'docs/ci-dpl-example' into 'master' Achilleas Pipinellis2017-03-311-29/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dpl CI example Closes #3129 See merge request !9872
| * | | | | | Update dpl CI exampleAchilleas Pipinellis2017-03-301-29/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'sh-fix-unnecessary-queries' into 'master' Rémy Coutable2017-03-311-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate unnecessary queries that add ~500 ms of load time for a large issue See merge request !10365
| * | | | | | | Eliminate unnecessary queries that add ~500 ms of load time for a large issueStan Hu2017-03-301-0/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looking at the SQL log, we see useless queries such as: ``` D, [2017-03-22T03:25:00.726710 #2629] DEBUG -- : (235.9ms) SELECT MAX("project_authorizations"."access_level") AS maximum_access_level, "project_authorizations"."user_id" AS project_authorizations_user_id FROM "project_authorizations" WHERE "project_authorizations"."project_id" = 13083 AND 1=0 GROUP BY "project_authorizations"."user_id" [["project_id", 13083]] ```
* | | | | | | Merge branch 'fix_admin_monitoring_background' into 'master' Sean McGivern2017-03-314-4/+16
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix issue #30083 handle parsing OpenBSD ps output properly to display sidekiq Closes #30083 See merge request !10303
| * | | | | | Handle parsing OpenBSD ps output properly to display sidekiqSebastian Reitenbach2017-03-314-4/+16
|/ / / / / / | | | | | | | | | | | | | | | | | | infos on admin->monitoring->background
* | | | | | Merge branch '24861-stringify-group-member-details' into 'master'Clement Ho2017-03-302-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide form inputs for group member without editing rights Closes #24861 See merge request !7816
| * | | | | | Remove unnecessary variableKushal Pandya2017-02-281-2/+1
| | | | | | |
| * | | | | | Remove author nameKushal Pandya2017-02-271-1/+1
| | | | | | |
| * | | | | | Changelog entry for issue #24861Kushal Pandya2017-02-271-0/+4
| | | | | | |
| * | | | | | Hide form inputs for user without accessKushal Pandya2017-02-271-2/+3
| | | | | | |
* | | | | | | Merge branch '30289-allow-users-to-import-github-projects-to-subgroups' into ↵Robert Speicher2017-03-303-1/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allow users to import GitHub projects to subgroups Closes #30289 and #30148 See merge request !10344
| * | | | | | | Allow users to import GitHub projects to subgroupsDouglas Barbosa Alexandre2017-03-303-1/+19
|/ / / / / / /
* | | | | | | Merge branch 'fix-docs-check-links' into 'master' Achilleas Pipinellis2017-03-301-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the docs:check:links job See merge request !10340
| * | | | | | | Fix the docs:check:links jobRémy Coutable2017-03-301-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '30284-fix-repo-clean-rules' into 'master' Robert Speicher2017-03-301-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't clean up the gitlab-test-fork_bare repo Closes #30284 See merge request !10342
| * | | | | | | Don't clean up the gitlab-test-fork_bare repoNick Thomas2017-03-301-2/+2
| | | | | | | |
* | | | | | | | Merge branch '29883-retry-button' into 'master' Annabel Dunstone Gray2017-03-301-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds container option for tooltip to prevent the button from losing round corners Closes #29883 See merge request !10317
| * | | | | | | Adds container option for tooltip to prevent the button from losing round ↵Filipa Lacerda2017-03-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corners
* | | | | | | | Merge branch 'allow-multiple-paths-in-repository-log' into 'master' Robert Speicher2017-03-302-5/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support >1 path in Gitlab::Git::Repository#log See merge request !10291
| * | | | | | | | Support >1 path in Gitlab::Git::Repository#logSean McGivern2017-03-302-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is analogous to `git log -- foo bar baz`, but not the same as `Gitlab::Git::Repository#log(path: 'foo bar baz')`, which would run `git log -- 'foo bar baz'`.
* | | | | | | | | Merge branch 'ipython-notebook-viewer-improvements' into 'master' Jacob Schatz2017-03-302-2523/+2540
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added worksheets support to notebook viewer See merge request !10307
| * | | | | | | | | Added worksheets support to notebook viewerPhil Hughes2017-03-302-2523/+2540
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Updated some Ruby code based on comments
* | | | | | | | | Merge branch '30063-builds-sidebar-stutter' into 'master' Filipa Lacerda2017-03-301-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add subnav height to sidebar scroll calculation Closes #30063 See merge request !10262
| * | | | | | | | | Add subnav height to sidebar scroll calculationAnnabel Dunstone Gray2017-03-281-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'patch-15' into 'master' Achilleas Pipinellis2017-03-301-0/+18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tip about `CI_JOB_TOKEN` clone abilities with "new job permissions model" See merge request !10221
| * | | | | | | | | | Add tip about general git clone authentication.Johan Brandhorst2017-03-291-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CI_JOB_TOKEN post 8.12 allows the cloning of any repositories that are accessible by the triggering user. This was not documented anywhere, and the documentation was in particular very specific on git submodule dependency management. This commit adds a tip about cloning arbitrary repository paths.