summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix missed colorize methods.Connor Shea2016-06-061-1/+1
* Merge branch 'issue_3359' into 'master' Yorick Peterse2016-06-061-3/+3
|\
| * change add_concurrent_index function argumentsissue_3359Felipe Artur2016-06-061-7/+3
| * Add index to notification settingsFelipe Artur2016-06-031-1/+5
* | Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-061-1/+1
* | Merge branch 'rubocop/enable-ambiguous-operator-rubocop-lint' into 'master' Robert Speicher2016-06-052-6/+6
|\ \
| * | Enable Lint/AmbiguousOperator rubocop coprubocop/enable-ambiguous-operator-rubocop-lintGrzegorz Bizon2016-06-032-6/+6
* | | Replace colorize gem with rainbow.Connor Shea2016-06-0319-220/+220
* | | Merge branch 'rubocop/enable-empty-lines-around-access-modifier-cop' into 'ma...Robert Speicher2016-06-031-0/+1
|\ \ \
| * | | Enable Style/EmptyLinesAroundAccessModifier rubocop coprubocop/enable-empty-lines-around-access-modifier-copGrzegorz Bizon2016-06-031-0/+1
| |/ /
* | | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-0345-319/+687
|\ \ \ | | |/ | |/|
| * | Merge branch 'gh-branch-cleanup' into 'master' Douwe Maan2016-06-031-2/+2
| |\ \
| | * | Ensure branch cleanup regardless of whether the import process succeedsgh-branch-cleanupDouglas Barbosa Alexandre2016-06-021-2/+2
| | |/
| * | Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' Douwe Maan2016-06-031-0/+5
| |\ \
| | * | fixup! Add `sha` parameter to MR accept APISean McGivern2016-06-021-1/+1
| | * | Add `sha` parameter to MR accept APISean McGivern2016-06-011-0/+5
| * | | Merge branch 'banzai-user-filter-queries'Douwe Maan2016-06-032-2/+34
| |\ \ \ | | |_|/ | |/| |
| | * | Reduce Namespace queries in UserReferenceFilterbanzai-user-filter-queriesYorick Peterse2016-06-021-2/+27
| | * | Added ReferenceFilter#nodesYorick Peterse2016-06-021-0/+5
| | * | Returning enums in ReferenceFilter#each_nodeYorick Peterse2016-06-021-0/+2
| | |/
| * | Fix serious performance bug with rendering Markdown with InlineDiffFilterStan Hu2016-06-011-4/+8
| |/
| * 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-0129-276/+596
| |\ \
| | * | Split Markdown rendering & reference gatheringYorick Peterse2016-05-2628-276/+562
| | * | 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 'fix-404-labels-in-todos' into 'master' Douwe Maan2016-06-011-1/+3
| |\ \ \ \
| | * | | | Fix 404 page when viewing TODOs that contain milestones or labels in differen...Stan Hu2016-05-311-1/+3
| | | |_|/ | | |/| |
| * | | | Merge branch 'issue_15557' into 'master' Rémy Coutable2016-06-012-8/+8
| |\ \ \ \
| | * | | | Add leading comment space copissue_15557Felipe Artur2016-05-313-9/+9
| | | |/ / | | |/| |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-013-1/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Create the specified remote directory during backuprs-create-remote-backup-folderRobert Speicher2016-05-311-1/+1
| | * | | Add Application Setting to configure Container Registry token expire delay (d...Kamil Trzcinski2016-05-312-0/+2
| * | | | 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-negatedif-style-cop' into 'master' Robert Speicher2016-05-301-1/+1
| |\ \ \
| | * | | Enable Style/NegatedIf Rubocop coprubocop/enable-negatedif-style-copGrzegorz Bizon2016-05-301-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
| | |/ /
| * | | Merge branch 'style/enable-rubocop-indent-assignment-cop' into 'master' Robert Speicher2016-05-301-7/+7
| |\ \ \
| | * | | Enable Style/IndentAssignment Rubocop style copstyle/enable-rubocop-indent-assignment-copGrzegorz Bizon2016-05-301-7/+7
| | |/ /
| * | | Merge branch 'style/enable-while-until-do-rubocop-style-cop' into 'master' Robert Speicher2016-05-301-1/+1
| |\ \ \
| | * | | Enable Style/WhileUntilDo rubocop style copstyle/enable-while-until-do-rubocop-style-copGrzegorz Bizon2016-05-301-1/+1
| | |/ /
| * | | Merge branch 'rubocop/enable-redundant-parentheses-cop' into 'master' Robert Speicher2016-05-301-1/+1
| |\ \ \
| | * | | Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-copGrzegorz Bizon2016-05-301-1/+1
| | |/ /
| * | | Enable Style/SpaceBeforeComment rubocop coprubocop/enable-space-before-comment-copGrzegorz Bizon2016-05-301-1/+1
| |/ /
* | | Incorportate feedbackZ.J. van de Weg2016-06-012-8/+12