summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-0310-36/+71
|\
| * Ensure branch cleanup regardless of whether the import process succeedsgh-branch-cleanupDouglas Barbosa Alexandre2016-06-021-2/+2
| |
| * Merge branch 'style/enable-semicolon-rubocop-cop' into 'master' Robert Speicher2016-06-011-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/Semicolon rubocop style cop Don't use semicolons to terminate expressions. See #17478. See merge request !4351
| | * Enable Style/Semicolon rubocop style copstyle/enable-semicolon-rubocop-copGrzegorz Bizon2016-06-011-1/+1
| | | | | | | | | | | | See #17478
| * | Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-012-11/+42
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate reference gathering from rendering This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query. cc @rspeicher @DouweM See merge request !3969
| | * | Split Markdown rendering & reference gatheringYorick Peterse2016-05-261-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This splits the Markdown rendering and reference extraction phases into two distinct code bases. The reference extraction phase no longer relies on the html-pipeline Gem (and any related code) and allows for extracting of references from multiple HTML nodes in a single pass. This means that if you want to extract user references from 200 comments you no longer need to run 200 times N number of queries, instead only a handful of queries may be needed.
| | * | Added Gitlab::LazyYorick Peterse2016-05-261-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This class can be used to lazy-evaluate blocks of code the first time they're called. This can be useful when a method performs a certain heavy operation (e.g. a SQL query) that you only want to perform whenever the result is used for the first time.
| * | | Merge branch 'current-settings-use-request-store-during-request'Douwe Maan2016-06-011-9/+13
| |\ \ \
| | * | | Try and use cache for application settings even when the db is not connectedcurrent-settings-use-request-store-during-requestDJ Mountney2016-05-291-2/+2
| | | | |
| | * | | Only use RequestStore for current_application_settings during a requestDJ Mountney2016-05-271-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where the RequestStore was being populated with the settings in the unicorn master during the rails initializers. Each forked worker would then start their first request with an uncleaned RequestStore.
| * | | | Merge branch 'issue_15557' into 'master' Rémy Coutable2016-06-012-8/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error 500 when sorting issues by milestone due date and filtering by labels fixes #15557 See merge request !4327
| | * | | | Add leading comment space copissue_15557Felipe Artur2016-05-312-8/+8
| | |/ / /
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-011-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Add Application Setting to configure Container Registry token expire delay ↵Kamil Trzcinski2016-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | (default 5min)
| * | | | Merge branch 'data_leak' into 'master' Robert Speicher2016-05-311-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Confidential notes data leak Fixes part of https://gitlab.com/gitlab-org/gitlab-ee/issues/575 See merge request !1967
| | * | | Confidential notes data leakValery Sizov2016-05-311-1/+1
| | |/ /
| * | | Merge branch 'rubocop/enable-literal-in-condition-cop' into 'master' Robert Speicher2016-05-301-3/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Lint/LiteralInCondition rubocop cop Detects literals used in conditions. See #17478 See merge request !4354
| | * | | Enable Lint/LiteralInCondition rubocop coprubocop/enable-literal-in-condition-copGrzegorz Bizon2016-05-301-3/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | Checks of literals used in conditions. See #17478
| * | | Enable Style/WhileUntilDo rubocop style copstyle/enable-while-until-do-rubocop-style-copGrzegorz Bizon2016-05-301-1/+1
| |/ / | | | | | | | | | See #17478
* | | Incorportate feedbackZ.J. van de Weg2016-06-011-8/+10
| | |
* | | Merge branch 'master' into awardablesZJ van de Weg2016-05-305-5/+36
|\ \ \ | |/ /
| * | Merge branch 'fix/gitlab-importer-issue' into 'master' Robert Speicher2016-05-261-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitlab importer issue Fixed credentials not being called correctly - probably some bad refactoring or search & replace... Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565 See merge request !4301
| | * | fix bad refactoring of import data credentialsJames Lopez2016-05-261-3/+3
| | |/
| * | Merge branch 'measure-proxy-timing' into 'master' Yorick Peterse2016-05-261-0/+24
| |\ \ | | |/ | |/| | | | | | | Measure proxy flight time See merge request !4278
| | * Rename metric to 'rails queue duration'Jacob Vosmaer2016-05-261-2/+2
| | |
| | * Align class name with field nameJacob Vosmaer2016-05-251-1/+1
| | |
| | * Send data to InfluxDB instead of stdoutJacob Vosmaer2016-05-251-4/+6
| | |
| | * Measure proxy timing: needs influxdb codeJacob Vosmaer2016-05-241-0/+22
| | |
| * | Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz2016-05-251-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POC: Updated contrib calendar In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it? ![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png) cc. @jschatz1 See merge request !3944
| | * | Group the contributing calendar by dayPhil Hughes2016-05-161-1/+1
| | | | | | | | | | | | | | | | This aligns the boxes correctly with the day on the left side of the calendar
| * | | Merge branch 'fix/import-url-uri-issue' into 'master' Douwe Maan2016-05-251-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for import URL URI problem when URL contains a space Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17559 Prevents an already encoded URL to be encoded again - preventing %20 => %25%20 See merge request !4180
| | * | | fix changelog and mergefix/import-url-uri-issueJames Lopez2016-05-231-1/+1
| | | | |
| * | | | Fix forks creation when visibility level is restrictedissue_10725Felipe Artur2016-05-251-0/+7
| | |_|/ | |/| |
* | | | Merge branch 'master' into awardablesZJ van de Weg2016-05-258-100/+338
|\ \ \ \ | |/ / /
| * | | Enable Performance/RangeInclude cop and fix single offensers-range-includeRobert Speicher2016-05-231-1/+1
| |/ /
| * | Extend comment for migrations helper MySQL fixGrzegorz Bizon2016-05-221-1/+8
| | |
| * | Add MySQL compatibility fix in migration helpersGrzegorz Bizon2016-05-221-1/+2
| | |
| * | Merge branch 'zj-gitignore-dropdown'Douwe Maan2016-05-201-0/+56
| |\ \
| | * | Update API and fetching taskZeger-Jan van de Weg2016-05-201-26/+14
| | | |
| | * | Backend for a gitignores dropdownZeger-Jan van de Weg2016-05-201-0/+68
| | | |
| * | | Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'Douwe Maan2016-05-201-7/+29
| |\ \ \ | | |/ / | |/| | | | | | | | | | # Conflicts: # app/services/system_note_service.rb
| | * | Reuse existing SCSS variablesadambutler/gitlab-ce-feature/support-diff-of-issue-title-renameRémy Coutable2016-05-181-2/+12
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler2016-05-181-7/+19
| | | | | | | | | | | | | | | | Gitlab::Diff::InlineDiff
| * | | Merge branch '17464-backport-email-syntax-highlighting' into 'master' Douwe Maan2016-05-191-1/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Syntax-highlight diffs in push emails ![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png) Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !4147
| | * | | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlightingSean McGivern2016-05-171-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
| * | | | Removed outdated comment from migration helpersfix-migration-helper-commentYorick Peterse2016-05-191-1/+1
| | | | |
| * | | | Merge branch 'migration-helpers' into 'master' Robert Speicher2016-05-191-0/+134
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added helper methods for database migrations These helpers can ultimately be used to write migrations that don't require downtime. See #15464 for more information. See merge request !3860
| | * | | | Remove left-over use of strip_heredocYorick Peterse2016-05-191-1/+1
| | | | | |
| | * | | | Removed stray strip_heredoc from migration helpersYorick Peterse2016-05-131-1/+1
| | | | | |
| | * | | | Fixed styling per Rubocop pedanticsYorick Peterse2016-05-121-1/+3
| | | | | |
View Lorry Controller Status