summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix commits_spec25317-prioritize-author-date-over-commitAnnabel Dunstone Gray2017-12-131-1/+1
|
* Change committed text to authoredAnnabel Dunstone Gray2017-12-131-1/+1
|
* Use author info on commits list page rather than most recent commit dateAnnabel Dunstone Gray2017-12-112-1/+6
|
* Merge branch 'bw-fix-key-count-service-spec' into 'master'ch-test-meNick Thomas2017-12-111-6/+4
|\ | | | | | | | | small change to make less conflict with EE version See merge request gitlab-org/gitlab-ce!15809
| * small change to make less conflict with EE versionBrett Walker2017-12-111-6/+4
|/
* Merge branch 'winh-merge-dev-docs' into 'master'Winnie Hellmann2017-12-111-2/+24
|\ | | | | | | | | Resolve merge conflicts with dev.gitlab.org/master after security release See merge request gitlab-org/gitlab-ce!15851
| * Resolve merge conflicts with dev.gitlab.org/master after security releaseWinnie Hellmann2017-12-111-2/+24
|/
* Merge branch 'sh-remove-allocation-tracking-influxdb' into 'master'Yorick Peterse2017-12-115-97/+5
|\ | | | | | | | | | | | | Remove allocation tracking code from InfluxDB sampler for performance Closes gitlab-com/infrastructure#3250 See merge request gitlab-org/gitlab-ce!15834
| * Remove RubySampler#sample_objects for performance as wellStan Hu2017-12-112-50/+0
| |
| * Remove allocation tracking code from InfluxDB sampler for performancesh-remove-allocation-tracking-influxdbStan Hu2017-12-103-47/+5
| | | | | | | | | | | | | | | | | | On GitLab.com, InfluxSampler#sample_objects appears to take 1.2 s or so to iterate through 1059 objects. This had led to delays of a couple hundred milliseconds in processing in the main thread. Remove this code since it's not really being used. Closes gitlab-com/infrastructure#3250
* | Merge branch 'remove_assignee_id' into 'master'Yorick Peterse2017-12-116-4/+90
|\ \ | | | | | | | | | | | | | | | | | | Remove issues.assignee_id column Closes #30453 See merge request gitlab-org/gitlab-ce!11637
| * | Add spec for removing issues.assignee_idSean McGivern2017-12-113-1/+43
| | | | | | | | | | | | | | | This migration also needs to be a post-deployment migration, as it removes a column.
| * | Improve down step of removing issues.assignee_id columnSean McGivern2017-12-111-1/+9
| | | | | | | | | | | | Using update_column_in_batches means that we can chunk the updates.
| * | Fix specs after removing assignee_id fieldValery Sizov2017-12-113-2/+4
| | |
| * | Remove issues.assignee_id columnValery Sizov2017-12-112-2/+36
| | |
* | | Merge branch ↵Douwe Maan2017-12-115-2/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40743-bug-accepting-new-group-members-when-permission-level-developer' into 'master' Bugfix: User can't change the access level of an access requester Closes #40743 See merge request gitlab-org/gitlab-ce!15832
| * | | Bugfix: User can't change the access level of an access requesterRubén Dávila2017-12-115-2/+46
| | |/ | |/| | | | | | | | | | The endpoint was returning 404 because it was only searching on the current members of a Group or Project and not the access requesters.
* | | Merge branch 'sh-bump-prometheus-gem-properly' into 'master'Robert Speicher2017-12-112-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Properly bump prometheus-client-mmap gem versions See merge request gitlab-org/gitlab-ce!15825
| * | | Properly bump prometheus-client-mmap gem versionssh-bump-prometheus-gem-properlyStan Hu2017-12-092-2/+2
| |/ / | | | | | | | | | Only the Gemfile.lock was updated before.
* | | Merge branch 'docs/fix-header-level' into 'master'Achilleas Pipinellis2017-12-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Remove a header level in the new 'Automatic CE->EE merge' doc See merge request gitlab-org/gitlab-ce!15843
| * | | Remove a header level in the new 'Automatic CE->EE merge' docRémy Coutable2017-12-111-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'bvl-circuitbreaker-metrics' into 'master'Douwe Maan2017-12-112-2/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of the circuit breaker access check timings Closes #39698 See merge request gitlab-org/gitlab-ce!15612
| * | | | Keep track of storage check timingsBob Van Landuyt2017-12-112-2/+25
| | | | |
* | | | | Merge branch 'qa/gb/improve-multi-project-pipeline-omnibus-script' into 'master'Grzegorz Bizon2017-12-111-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Do not raise when downstream pipeline is created Closes #40987 See merge request gitlab-org/gitlab-ce!15837
| * | | | Do not raise when downstream pipeline is createdqa/gb/improve-multi-project-pipeline-omnibus-scriptGrzegorz Bizon2017-12-111-1/+1
| | |/ / | |/| |
* | | | Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-1114-46/+231
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Pick 10.2.4 security fixes into master See merge request gitlab-org/gitlab-ce!15821
| * | | Resolve conflicts in app/models/user.rbmk-pick-10-2-4-security-fixesDouwe Maan2017-12-111-27/+7
| | | |
| * | | Manually add 10.2.4 changelog entriesMichael Kozono2017-12-084-15/+11
| | | |
| * | | Merge branch 'note-preview' into 'security-10-2'Fatih Acet2017-12-082-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent potential XSS when editing comment See merge request gitlab/gitlabhq!2238 (cherry picked from commit 80ed6d25a46c0f70ec8baea78b5777118d63876c) 7480e462 prevent potential XSS when editing comment
| * | | Merge branch 'issue_30663' into 'security-10-2'Sean McGivern2017-12-083-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent creating issues through API without having permissions See merge request gitlab/gitlabhq!2225 (cherry picked from commit c298bbaa88883343dc9cbbb6abec0808fb3b546c) 915b97c5 Prevent creating issues through API without having permissions
| * | | Merge branch 'rs-security-group-api' into 'security-10-2'Douwe Maan2017-12-083-2/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.2] Ensure we expose group projects using GroupProjectsFinder See merge request gitlab/gitlabhq!2234 (cherry picked from commit 072f8f2fd6ec794645375a16ca4ddc1cbeb76d7a) a2240338 Ensure we expose group projects using GroupProjectsFinder
| * | | Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'Douwe Maan2017-12-084-28/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (10.2) Avoid partial partial email adresses for matching See merge request gitlab/gitlabhq!2232 (cherry picked from commit 081aa1e91a777c9acb31be4a1e76b3dd7032fa9a) There are unresolved conflicts in app/models/user.rb. fa85a3fd Don't allow searching for partial user emails
| * | | Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into ↵Douwe Maan2017-12-084-11/+71
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-10-2' Fixes project visibility guidelines See merge request gitlab/gitlabhq!2226 (cherry picked from commit 877c42c0aaf3298d6001614c9706bc366ae4014c) e4fd1c26 Ensure project wiki visibility guidelines are met
* | | Merge branch 'recaptcha_check_if_spammable_ce_backport' into 'master'Sean McGivern2017-12-111-2/+8
|\ \ \ | |_|/ |/| | | | | | | | Add recaptcha_check_if_spammable for issualbes than arent spammables See merge request gitlab-org/gitlab-ce!15817
| * | Add recaptcha_check_if_spammable for issualbes than arent spammablesrecaptcha_check_if_spammable_ce_backportLuke Bennett2017-12-081-2/+8
| | |
* | | Merge branch 'bw-todo-count-expiration' into 'master'Sean McGivern2017-12-111-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Todo count calculations now expired quicker for top bar stats See merge request gitlab-org/gitlab-ce!15794
| * | | expire todo count calculations to be consistent withbw-todo-count-expirationBrett Walker2017-12-081-2/+2
| | | | | | | | | | | | | | | | assigned_open_merge_requests_count and assigned_open_issues_count, which are used in the top header stats. Also important for a Geo secondary, so that the pending todo stat gets updated on the same frequency as the users open issues/merge requests.
* | | | Merge branch 'qa_extract_push_to_scenario' into 'master'Grzegorz Bizon2017-12-113-15/+55
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Turn" push a file" into a scenario See merge request gitlab-org/gitlab-ce!15617
| * | | | Check if user is in project page before performing a pushqa_extract_push_to_scenarioFelipe Artur2017-12-071-0/+7
| | | | |
| * | | | Turn push file into a scenarioFelipe Artur2017-12-073-15/+48
| | | | |
* | | | | Merge branch 'fix-image-view-mode' into 'master'Filipa Lacerda2017-12-112-2/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix image view mode Closes #40945 See merge request gitlab-org/gitlab-ce!15803
| * | | | | Fix image view modeClement Ho2017-12-112-2/+14
|/ / / / /
* | | | | Merge branch 'es-module-compare' into 'master'Filipa Lacerda2017-12-114-86/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Convert Compare and CompareAutocomplete classes into ES module syntax See merge request gitlab-org/gitlab-ce!14857
| * | | | | revert arrow function changees-module-compareMike Greiling2017-11-301-1/+1
| | | | | |
| * | | | | convert CompareAutocomplete from class definition into simple function call, ↵Mike Greiling2017-11-303-65/+56
| | | | | | | | | | | | | | | | | | | | | | | | remove global export
| * | | | | convert Compare class into ES module import/export syntaxMike Greiling2017-11-303-4/+3
| | | | | |
| * | | | | refactor Compare class to ES class syntaxMike Greiling2017-11-301-18/+16
| | | | | |
| * | | | | remove commits.js import form main.js (related to !14735)Mike Greiling2017-11-301-1/+0
| | | | | |
* | | | | | Merge branch 'sh-fix-import-rake-task' into 'master'James Lopez2017-12-115-0/+32
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitlab:import:repos Rake task moving repositories into the wrong location Closes #40765 See merge request gitlab-org/gitlab-ce!15823
| * | | | | Remove the need for destroy and add a comment in the specStan Hu2017-12-101-4/+3
| | | | | |
View Lorry Controller Status