summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow usage of any_projects? with an Arrayfix-any-projects-arrayYorick Peterse2017-08-152-3/+11
| | | | | | | In some cases we pass an Array to this method which would previously fail since Array does not respond to "limit_value". Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3646
* Merge branch 'docs-jira' into 'master'Douwe Maan2017-08-152-2/+6
|\ | | | | | | | | JIRA docs update See merge request !13514
| * Replace jira_service_page.pngdocs-jiraVictor Wu2017-08-111-0/+0
| |
| * JIRA docsVictor Wu2017-08-111-2/+6
| |
* | Merge branch 'malformed-submodule' into 'master'Douwe Maan2017-08-157-4/+16
|\ \ | | | | | | | | | | | | Handle missing .gitmodules when getting submodule urls See merge request !13509
| * | Handle missing .gitmodules when getting submodule urlsmalformed-submoduleJacob Vosmaer2017-08-147-4/+16
| | |
* | | Merge branch 'winh-gpg-status-spinners' into 'master'Phil Hughes2017-08-156-2/+79
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Display GPG status loading spinner only when Ajax request is made Closes #35699 See merge request !13526
| * | | Display GPG status loading spinner only when Ajax request is madeWinnie Hellmann2017-08-156-2/+79
|/ / /
* | | Merge branch 'fix-broadcast-messages-migration' into 'master'Douwe Maan2017-08-151-1/+13
|\ \ \ | | | | | | | | | | | | | | | | Remove invalid broadcast messages before migrating See merge request !13538
| * | | Remove invalid broadcast messages before migratingfix-broadcast-messages-migrationYorick Peterse2017-08-141-1/+13
| | | | | | | | | | | | | | | | | | | | This prevents the migration from failing to set "NOT NULL" constraints when some rows contain NULL values that are no longer allowed.
* | | | Merge branch 'forks-count-cache' into 'master'Douwe Maan2017-08-1514-1/+141
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Cache the number of forks of a project See merge request !13535
| * | | | Cache the number of forks of a projectforks-count-cacheYorick Peterse2017-08-1414-1/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The number of forks of a project doesn't change very frequently and running a COUNT(*) every time this information is requested can be quite expensive. We also end up running such a COUNT(*) query at least twice on the homepage of a project. By caching this data and refreshing it when necessary we can reduce project homepage loading times by around 60 milliseconds (based on the timings of https://gitlab.com/gitlab-org/gitlab-ce).
* | | | | Merge branch '36398-update-our-auto-deploy-docs-to-include-monitoring-docs' ↵Achilleas Pipinellis2017-08-153-1/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add auto-monitoring docs to auto-deploy page Closes #36398 See merge request !13522
| * | | | | Add auto-monitoring docs to auto-deploy pageJoshua Lambert2017-08-153-1/+26
|/ / / / /
* | | | | Merge branch 'fix-edit-merge-request-button-case' into 'master'Phil Hughes2017-08-156-13/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix edit merge request button inconsistent letter casing Closes #34086 See merge request !13548
| * | | | | Fix edit merge request button inconsistent letter casingClement Ho2017-08-156-13/+18
|/ / / / /
* | | | | Merge branch '34533-speed-up-group-project-authorizations' into 'master'Douwe Maan2017-08-156-10/+88
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up Group#user_ids_for_project_authorizations Closes #36182 See merge request !13508
| * | | | | Speed up Group#user_ids_for_project_authorizationsNick Thomas2017-08-146-10/+88
| | | | | |
* | | | | | Merge branch '34371-pipeline-schedule-vue-files' into 'master'Phil Hughes2017-08-155-52/+67
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move callout to vue file and remove svg from data function to improve performance See merge request !13539
| * | | | | | Adds line to the end of the file34371-pipeline-schedule-vue-filesFilipa Lacerda2017-08-141-1/+1
| | | | | | |
| * | | | | | Move callout to vue file and remove svg from data function to improve ↵Filipa Lacerda2017-08-145-52/+67
| | |_|/ / / | |/| | | | | | | | | | | | | | | | performance
* | | | | | Merge branch 'docs-correct-filetree' into 'master'Achilleas Pipinellis2017-08-1528-213/+187
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs correct filetree Closes #36428 See merge request !13545
| * | | | | | update remaining links for add-user.mddocs-correct-filetreeMarcia Ramos2017-08-142-3/+3
| | | | | | |
| * | | | | | add file finder to repo indexMarcia Ramos2017-08-141-0/+6
| | | | | | |
| * | | | | | delete duplicate contentMarcia Ramos2017-08-143-47/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | delete old doc, update links to the current doc
| * | | | | | move "share projects with groups" docsMarcia Ramos2017-08-149-49/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - correct the file tree - remove duplicate doc - move to project/members/ - move images - update links
| * | | | | | link file moved to members/index from project's indexMarcia Ramos2017-08-141-1/+5
| | | | | | |
| * | | | | | move doc from /workflow/ to /project/Marcia Ramos2017-08-1415-114/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fix the file tree
* | | | | | | Merge branch 'update-vue-docs' into 'master'Stan Hu2017-08-151-0/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs with Javascript accord. See merge request !13440
| * | | | | | | Update docs with Javascript accord.Jacob Schatz2017-08-151-0/+17
|/ / / / / / /
* | | | | | | Merge branch 'repo-fixes-e' into 'master'Jacob Schatz2017-08-1415-116/+149
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repo fixes part E See merge request !13472
| * | | | | | | Add shared getFileExtension helper methodrepo-fixes-eEric Eastwood2017-08-142-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146854
| * | | | | | | Remove unused repo store keysEric Eastwood2017-08-142-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37147332
| * | | | | | | Add comment about why we need to stop parsing JSONEric Eastwood2017-08-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146815 See https://gitlab.slack.com/archives/C0GQHHPGW/p1501779964878178
| * | | | | | | Use single js- wrapper class to show/hideEric Eastwood2017-08-144-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146360
| * | | | | | | Scroll total scroll width instead of fixed valueEric Eastwood2017-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed value could potentially be not enough Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145886
| * | | | | | | Switch single fa icon generation to inlineEric Eastwood2017-08-141-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145729
| * | | | | | | Remove duplicate setting of variableEric Eastwood2017-08-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145640
| * | | | | | | Reset monacoLoading on failureEric Eastwood2017-08-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37144070
| * | | | | | | Remove overflow tabs logic (no longer used)Eric Eastwood2017-08-143-26/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143794
| * | | | | | | Remove loading state from repo_tabEric Eastwood2017-08-142-23/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143710
| * | | | | | | Make close/changed icon more accessibleEric Eastwood2017-08-141-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143527
| * | | | | | | Use promise syntax with Helper.getContentEric Eastwood2017-08-143-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143217
| * | | | | | | Split out linkClicked and add testsEric Eastwood2017-08-142-24/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143174
| * | | | | | | Use v-else instead of duplicating logicEric Eastwood2017-08-142-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix http://192.168.1.135:3000/gitlab-org/gitlab-ce/blob/master/app/assets/javascripts/broadcast_message.js
| * | | | | | | Move syntax highlighting into a methodEric Eastwood2017-08-101-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37142936
* | | | | | | | Merge branch 'bvl-use-no-wrap-for-pot-file' into 'master'Rubén Dávila2017-08-1417-221/+167
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove newlines in translations See merge request !13531
| * | | | | | | | Remove `\n` from translationsbvl-use-no-wrap-for-pot-fileBob Van Landuyt2017-08-1417-221/+167
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They seem to confuse some translation tools and aren't rendered in HTML anyway.
* | | | | | | | Merge branch '36378-error-raising-expectation-in-spec-fix' into 'master'Robert Speicher2017-08-141-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix positive raise_error expectation without specifying the error type expected… Closes #36378 See merge request !13542
| * | | | | | | | Fix positive raise_error expectation without specifying the error type ↵36378-error-raising-expectation-in-spec-fixTiago Botelho2017-08-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expected in Project::DestroyService specs