summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Pending delete projects should not show in deploy keys35338-deploy-keys-should-not-show-pending-delete-projectsTiago Botelho2017-07-253-2/+8
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '31129-jira-project-key-elim' into 'master'Sean McGivern2017-07-268-46/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove project_key from the JIRA configuration Closes #31129 See merge request !12050
| * | | | | | | | Remove project_key from the Jira configurationJarka Kadlecova2017-07-258-46/+20
| | | | | | | | |
* | | | | | | | | Merge branch 'bump-omniauth-ldap-gem-version' into 'master'Sean McGivern2017-07-263-9/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps Gitlab Omniauth LDAP version See merge request !13059
| * | | | | | | | | Bumps Gitlab Omniauth LDAP versionbump-omniauth-ldap-gem-versionTiago Botelho2017-07-253-9/+13
| | | | | | | | | |
* | | | | | | | | | Merge branch 'docs-new-topic-user' into 'master'Job van der Voort2017-07-264-13/+210
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs new topic "user/index" See merge request !12155
| * | | | | | | | | Docs new topic "user/index"Marcia Ramos2017-07-264-13/+210
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/remove-outdated-label-from-contributing-guide' into 'master'Robert Speicher2017-07-251-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove outdated ~Frontend label in CONTRIBUTING.md See merge request !13087
| * | | | | | | | | Remove outdated ~Frontend label in CONTRIBUTING.mdRémy Coutable2017-07-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'fix-conflict-pluralized' into 'master'Clement Ho2017-07-251-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FIX #35027 : conflict pluralized Closes #35027 See merge request !13051
| * | | | | | | | | fix conflict pluralizedEmilien Mottet2017-07-241-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '35204-doc-api-ci-lint-typo' into 'master'Rémy Coutable2017-07-252-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to doc/api/ci/lint.md Closes #35204 See merge request !12914
| * | | | | | | | | Add link to doc/api/ci/lint.mdTakuya Noguchi2017-07-172-0/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'upgrade_re2' into 'master'Rémy Coutable2017-07-252-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade re2 to support seperate CXX and CC passing See merge request !13064
| * | | | | | | | | | Upgrade re2 to support seperate CXX and CC passingFrank Groeneveld2017-07-252-3/+3
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'patch-23' into 'master'Drew Blessing2017-07-251-2/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add instructions for enabling the `pg_trgm` during HA setup. See merge request !13057
| * | | | | | | | | | Add instructions for enabling the `pg_trgm` extension in the production db. ↵Chenjerai Katanda2017-07-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a workaround to [a fault during HA setup](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/2501).
* | | | | | | | | | | Merge branch '2971-multiproject-grah-ce-port' into 'master'Phil Hughes2017-07-252-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix vertical alignment in firefox and safari for pipeline mini graph See merge request !13071
| * | | | | | | | | | | Fix vertical alignment in firefox and safari for pipeline mini graph2971-multiproject-grah-ce-portFilipa Lacerda2017-07-252-1/+6
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement "Block pipelines on protected branches" Closes #30634, #34616, and #33130 See merge request !11910
* \ \ \ \ \ \ \ \ \ \ \ Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-2538-176/+575
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement "Block pipelines on protected branches" Closes #30634, #34616, and #33130 See merge request !11910
| * | | | | | | | | | | Extract validationsLin Jen-Shin2017-07-211-24/+24
| | | | | | | | | | | |
| * | | | | | | | | | | Add a note that schedules could be deactivatedLin Jen-Shin2017-07-211-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when lacking permissions too.
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-20302-866/+6952
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (130 commits) Change auto-retry count to a correct value in docs Fix background migration cleanup specs Fix CI/CD job auto-retry specs Fix JS; make buttons sr accessibile; fix overlay remove redundant changelog entries Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3' Merge branch '33303-404-for-unauthorized-project' into 'security-9-3' Merge branch '33359-pers-snippet-files-location' into 'security-9-3' Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3' Hide description about protected branches to non-member Update CHANGELOG.md for 9.0.11 Update CHANGELOG.md for 9.1.8 Update CHANGELOG.md for 8.17.7 Update CHANGELOG.md for 9.2.8 Update CHANGELOG.md for 9.3.8 Respect blockquote line breaks in markdown 35209 Add wip message to new navigation preference section Add github imported projects count to usage data Add versions to Prometheus metrics doc Add Bulgarian translations of Pipeline Schedules ...
| * | | | | | | | | | | | Use struct instead of hashLin Jen-Shin2017-07-205-19/+20
| | | | | | | | | | | | |
| * | | | | | | | | | | | Make permission checks easier to understandLin Jen-Shin2017-07-201-6/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use hash to return multiple objectsLin Jen-Shin2017-07-205-25/+25
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix tests and fine tweak permission error messageLin Jen-Shin2017-07-192-7/+9
| | | | | | | | | | | | |
| * | | | | | | | | | | | Eliminate N+1 queries on checking different protected refsLin Jen-Shin2017-07-192-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I realized where the N+1 queries were actually coming from project.protected_branches, but how come we cannot preload this, or cache this at all? Then I found that this is somehow a Rails limitation. What we're doing before, eventually come to: project.protected_branches.matching But why it's not cached? (project.protected_branches.loaded? is always false) It's because matching is a class method, which is called on the proxy. In this case, Rails cannot cache the result. I don't know if this is possible to implement or not, because clearly this would require some tricks to implement class methods on associations. So instead, we could just pass project.protected_branches to ProtectedRef.matching, then it would work regularly. With this change, there's no more N+1 queries.
| * | | | | | | | | | | | Add a test for checking queries with different refLin Jen-Shin2017-07-191-6/+27
| | | | | | | | | | | | |
| * | | | | | | | | | | | Try to merge permission checks into oneLin Jen-Shin2017-07-191-10/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | Instead of adding master, stub_not_protect_default_branchLin Jen-Shin2017-07-1814-29/+66
| | | | | | | | | | | | |
| * | | | | | | | | | | | Rename :user_cannot_update to :protected_refLin Jen-Shin2017-07-182-4/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Unify build policy tests and pipeline policy testsLin Jen-Shin2017-07-182-13/+32
| | | | | | | | | | | | |
| * | | | | | | | | | | | Rename can_push_or_merge_to_branch? to can_update_branch?Lin Jen-Shin2017-07-184-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make sure pipeline would also check against tag as well
| * | | | | | | | | | | | Restore some tests from masterLin Jen-Shin2017-07-181-5/+33
| | | | | | | | | | | | |
| * | | | | | | | | | | | Remove old request store wrapLin Jen-Shin2017-07-182-167/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-1850-231/+533
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (25 commits) Remove unneeded asserts and add tests for inactive RequestStore Rename the methods to make it fit with current name Follow feedback on the merge request Make sure it checks against the tag only when it's a tag Renamed Gitaly services fix transient rspec failure due to Poll.js race condition Refactor variables initialization in dropzone_input.js cache the cache key... avoid #respond_to? in Cache.id_for cache DeclarativePolicy.class_for at the class level Update 9.3-to-9.4.md fix padding on filtered search dropdown. Styles should only apply to li in list Cache Note#notable for commits and fix tests Add changelog entry Update the comments for the new functionality Use RequestStoreWrap for Commit#author Skip dead jobs queue for web hooks and project services Add RequestStoreWrap to cache via RequestStore Don't track cached queries in Gitlab::PerformanceBar::PeekQueryTracker Add changelog entry ...
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-171668-10027/+20733
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (638 commits) Simplify background migrations stealing code Expire cached user IDs that can see the performance after 5 minutes Promote visibility level helpers from Group to Namespace Fix off-by-one error in background migration retries Recover from all exceptions when stealing bg migration Fix label creation from new list for subgroup projects move click handler to button. when on the icon it wasn't triggered in firefox Fix incorrect AWS ELB metrics. Fix wrong link to docs in docs styleguide Update issue-related docs Refactor groups docs Add subgroups limitations to Pages docs Update Google launcher details Split docs on IP whitelist for monitoring access Update health check docs Bump fog-core to 1.44.3 and fog providers' plugins to latest Introduce have_gitlab_http_status Remove Repository#search_files Update Pipeline's badge count in Merge Request and Commits view to match real-time content Fixes the user order being overriden in the autocomplete controller ...
| * | | | | | | | | | | | | | Make message and code more clearLin Jen-Shin2017-07-061-2/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge allowed_to_create? into CreatePipelineServiceLin Jen-Shin2017-07-056-128/+122
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-0595-496/+2706
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (67 commits) Revert "Merge branch 'revert-12499' into 'master'" Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion Document that GitLab 9.3 requires the TRIGGER permission on MySQL Instrument Unicorn with Ruby exporter Remove group modal like remove project modal. Closes #33130 Update prometheus client gem Enables the option in user preferences to turn on the new navigation Simplify authentication logic in the v4 users API for !12445. wait_for_requests is not needed when AJAX is not in play Don't resolve fork relationships for projects pending delete Clean up the ForkedProjectLink specs Remove unnecessary clear_stubs calls Add test for GitalyClient::Ref#find_ref_name DeleteMergedBranchesService should not delete protected branches Optimize creation of commit API by using Repository#commit instead of Repository#commits Update CHANGELOG.md for 9.3.4 Make autosize fields more performant and remove broken autosize handle Update GITLAB_SHELL_VERSION to 5.1.1 Fixed the y_label not setting correctly for each graph on the monitoring dashboard Refactor and copyedit "Using Docker images" docs ...
| * | | | | | | | | | | | | | | Don't extend from struct as rubocop suggestsLin Jen-Shin2017-07-041-1/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add test for RequestStoreWrapLin Jen-Shin2017-07-041-0/+99
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Make sure that retryable_builds would preload projectLin Jen-Shin2017-07-041-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Introduce Gitlab::Cache::RequestStoreWrapLin Jen-Shin2017-07-043-3/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that we cache the result of UserAccess#can_push_or_merge_to_branch? in RequestStore, avoiding querying ProtectedBranch over and over for the list of pipelines (i.e. in PipelineSerializer) I don't think this is ideal because I don't like the idea of RequestStore in general, but this is the easiest way to cache it without changing the architecture. In the future we should cache more explicitly rather than this kind of global store.
| * | | | | | | | | | | | | | | Update tests due to permission changesLin Jen-Shin2017-07-0414-46/+51
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix bad conflict resolutionLin Jen-Shin2017-07-044-19/+21
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-04281-2168/+5780
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (119 commits) Speed up operations performed by gitlab-shell Change the force flag to a keyword argument add image - issue boards - moving card copyedit == ee !2296 Reset @full_path to nil when cache expires Replace existing runner links with icons and tooltips, move into btn-group. add margin between captcha and register button Eagerly create a milestone that is used in a feature spec Adjust readme repo width Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails" Set force_remove_source_branch default to false. Fix rubocop offenses Make entrypoint and command keys to be array of strings Add issuable-list class to shared mr/issue lists to fix new responsive layout New navigation breadcrumbs Restore timeago translations in renderTimeago. Fix curl example paths (missing the 'files' segment) Automatically hide sidebar on smaller screens Fix typo in IssuesFinder comment Make Project#ensure_repository force create a repo ...
| * | | | | | | | | | | | | | | | Consistently check permission for creating pipelines,Lin Jen-Shin2017-07-046-42/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating builds and updating pipelines. We check against being able to merge or push if the ref is protected.