summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Hide issues and MRs in labels list if disabledsophie-h/gitlab-ce-patch-15Sophie Herold2017-12-116-10/+181
* Merge branch 'add-remove-column-cop' into 'master'Rémy Coutable2017-12-1117-0/+118
|\
| * Add cop for use of remove_columnadd-remove-column-copSean McGivern2017-12-1117-0/+118
* | 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 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 releaseWinnie Hellmann2017-12-111-2/+24
|/ /
* | Merge branch 'sh-remove-allocation-tracking-influxdb' into 'master'Yorick Peterse2017-12-115-97/+5
|\ \
| * | 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
* | | Merge branch 'remove_assignee_id' into 'master'Yorick Peterse2017-12-116-4/+90
|\ \ \
| * | | Add spec for removing issues.assignee_idSean McGivern2017-12-113-1/+43
| * | | Improve down step of removing issues.assignee_id columnSean McGivern2017-12-111-1/+9
| * | | Fix specs after removing assignee_id fieldValery Sizov2017-12-113-2/+4
| * | | Remove issues.assignee_id columnValery Sizov2017-12-112-2/+36
* | | | Merge branch '40743-bug-accepting-new-group-members-when-permission-level-dev...Douwe Maan2017-12-115-2/+46
|\ \ \ \
| * | | | Bugfix: User can't change the access level of an access requesterRubén Dávila2017-12-115-2/+46
| | |/ / | |/| |
* | | | Merge branch 'sh-bump-prometheus-gem-properly' into 'master'Robert Speicher2017-12-112-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Properly bump prometheus-client-mmap gem versionssh-bump-prometheus-gem-properlyStan Hu2017-12-092-2/+2
| |/ /
* | | 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' docRémy Coutable2017-12-111-1/+1
* | | | Merge branch 'bvl-circuitbreaker-metrics' into 'master'Douwe Maan2017-12-112-2/+25
|\ \ \ \
| * | | | 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 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
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
| * | | Merge branch 'issue_30663' into 'security-10-2'Sean McGivern2017-12-083-0/+21
| * | | Merge branch 'rs-security-group-api' into 'security-10-2'Douwe Maan2017-12-083-2/+82
| * | | Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'Douwe Maan2017-12-084-28/+60
| * | | Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into ...Douwe Maan2017-12-084-11/+71
| |/ /
* | | 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 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
|\ \ \
| * | | expire todo count calculations to be consistent withbw-todo-count-expirationBrett Walker2017-12-081-2/+2
* | | | Merge branch 'qa_extract_push_to_scenario' into 'master'Grzegorz Bizon2017-12-113-15/+55
|\ \ \ \
| * | | | 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 modeClement Ho2017-12-112-2/+14
|/ / / / /
* | | | | Merge branch 'es-module-compare' into 'master'Filipa Lacerda2017-12-114-86/+73
|\ \ \ \ \
| * | | | | 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
| * | | | | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Remove the need for destroy and add a comment in the specStan Hu2017-12-101-4/+3
View Lorry Controller Status