summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'style/enable-semicolon-rubocop-cop' into 'master' Robert Speicher2016-06-011-1/+1
|\
| * Enable Style/Semicolon rubocop style copstyle/enable-semicolon-rubocop-copGrzegorz Bizon2016-06-011-1/+1
* | Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-012-11/+42
|\ \
| * | Split Markdown rendering & reference gatheringYorick Peterse2016-05-261-11/+8
| * | Added Gitlab::LazyYorick Peterse2016-05-261-0/+34
* | | 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
* | | | Merge branch 'issue_15557' into 'master' Rémy Coutable2016-06-012-8/+8
|\ \ \ \
| * | | | 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 (d...Kamil Trzcinski2016-05-311-0/+1
* | | | Merge branch 'data_leak' into 'master' Robert Speicher2016-05-311-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | 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 coprubocop/enable-literal-in-condition-copGrzegorz Bizon2016-05-301-3/+2
| |/ /
* | | Enable Style/WhileUntilDo rubocop style copstyle/enable-while-until-do-rubocop-style-copGrzegorz Bizon2016-05-301-1/+1
|/ /
* | Merge branch 'fix/gitlab-importer-issue' into 'master' Robert Speicher2016-05-261-3/+3
|\ \
| * | 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
|\ \ | |/ |/|
| * 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
|\ \
| * | Group the contributing calendar by dayPhil Hughes2016-05-161-1/+1
* | | Merge branch 'fix/import-url-uri-issue' into 'master' Douwe Maan2016-05-251-1/+1
|\ \ \
| * | | 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
| |_|/ |/| |
* | | 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
|\ \ \ | |/ / |/| |
| * | Reuse existing SCSS variablesadambutler/gitlab-ce-feature/support-diff-of-issue-title-renameRémy Coutable2016-05-181-2/+12
| * | Create DiffFilter and change SystemNoteService#change_title to use Gitlab::Di...Adam Butler2016-05-181-7/+19
* | | Merge branch '17464-backport-email-syntax-highlighting' into 'master' Douwe Maan2016-05-191-1/+6
|\ \ \
| * | | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlightingSean McGivern2016-05-171-1/+6
* | | | 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
|\ \ \ \
| * | | | 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
| * | | | Added helper methods for database migrationsYorick Peterse2016-05-121-0/+132
* | | | | Fix warning messages with SVG ALLOWED_ELEMENTSStan Hu2016-05-192-89/+89
* | | | | Merge branch 'issue_17560' into 'master' Robert Speicher2016-05-191-2/+15
|\ \ \ \ \
| * | | | | Mask credentials from URL when import of project has failed.Rubén Dávila2016-05-181-2/+15
| | |/ / / | |/| | |
* | | | | Merge branch 'docker-registry-view' into 'master' Kamil Trzciński2016-05-181-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |