summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fieldsRobert Schilling2017-02-22222-1125/+898
|\ | | | | | | # Conflicts: # doc/api/v3_to_v4.md
| * Merge branch '28458-present-gitlab-version-for-v4-changes-on-docs' into ↵Sean McGivern2017-02-222-21/+28
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Present GitLab version for each V3 to V4 API change on v3_to_v4.md Closes #28458 See merge request !9425
| | * Add Merge Request link to the v3 to v4 documentation28458-present-gitlab-version-for-v4-changes-on-docsToon Claes2017-02-221-20/+20
| | | | | | | | | | | | | | | Similar to changelog, mention the Merge Request id & link for each change.
| | * Present GitLab version for each V3 to V4 API change on v3_to_v4.mdOswaldo Ferreira2017-02-222-1/+8
| | |
| * | Merge branch 'connection-pool-host' into 'master'Rémy Coutable2017-02-222-4/+24
| |\ \ | | | | | | | | | | | | | | | | Allow setting of a custom connection pool host See merge request !9445
| | * | Allow setting of a custom connection pool hostYorick Peterse2017-02-222-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows you to set a custom host when calling Gitlab::Database.create_connection_pool. This is necessary for load balancing as in this case we want to inherit all settings except for the hostname.
| * | | Merge branch 'feature/brand-logo-in-emails' into 'master' Sean McGivern2017-02-2217-335/+333
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom brand header logo in emails Closes #24969 and #25570 See merge request !9049
| | * | | restrict height of the custom brand logo in emailsAlexis Reigel2017-02-222-2/+5
| | | | |
| | * | | add changelog entryAlexis Reigel2017-02-221-0/+4
| | | | |
| | * | | add documentation for custom brand logo in emailAlexis Reigel2017-02-225-0/+16
| | | | |
| | * | | use custom brand logo in pipeline mailsAlexis Reigel2017-02-223-1/+47
| | | | |
| | * | | extract pipeline mails layoutAlexis Reigel2017-02-229-335/+264
| | | | |
| * | | | Merge branch 'add_mr_info_to_issues_list' into 'master'Sean McGivern2017-02-2212-12/+61
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add merge request count to each issue on issues list Closes #19786 and #23208 See merge request !9252
| | * | | | Refactored specsblackst0ne2017-02-221-2/+2
| | | | | |
| | * | | | Refactored specsblackst0ne2017-02-221-8/+8
| | | | | |
| | * | | | Added space indentation in models/merge_requests_closing_issues.rbblackst0ne2017-02-221-2/+2
| | | | | |
| | * | | | Refactored count_for_collection() for using pluck instead of selectblackst0ne2017-02-212-5/+5
| | | | | |
| | * | | | Merge remote-tracking branch 'upstream/master' into add_mr_info_to_issues_listblackst0ne2017-02-21489-2692/+4704
| | |\ \ \ \
| | * | | | | Improved specsblackst0ne2017-02-211-7/+11
| | | | | | |
| | * | | | | Fixed rubocop offensesblackst0ne2017-02-181-4/+4
| | | | | | |
| | * | | | | Remove empty line in noteblackst0ne2017-02-181-1/+0
| | | | | | |
| | * | | | | Added specsblackst0ne2017-02-181-0/+13
| | | | | | |
| | * | | | | Merge branch 'add_mr_info_to_issues_list' of gitlab.com:blackst0ne/gitlab-ce ↵blackst0ne2017-02-170-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into add_mr_info_to_issues_list
| | | * | | | | Add merge request count to each issue on issues listblackst0ne2017-02-1711-12/+44
| | | | | | | |
| | * | | | | | Added second parameter to @issuable_meta_data variablesblackst0ne2017-02-172-2/+2
| | | | | | | |
| | * | | | | | Merge branch 'add_mr_info_to_issues_list' of gitlab.com:blackst0ne/gitlab-ce ↵blackst0ne2017-02-17311-2985/+4256
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into add_mr_info_to_issues_list
| | | * | | | | | Add merge request count to each issue on issues listblackst0ne2017-02-179-10/+42
| | | |/ / / / /
| | * | | | | | Add merge request count to each issue on issues listblackst0ne2017-02-179-10/+42
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'upstream/master'blackst0ne2017-02-158-10/+41
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'blackst0ne2017-02-151010-15779/+26415
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:blackst0ne/gitlab-ceblackst0ne2017-02-061-0/+1
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceblackst0ne2016-10-210-0/+0
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Added item to CHANGELOGblackst0ne2016-10-211-0/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Don't use Hash#slice since it's not supported in Ruby 2.1Rémy Coutable2016-10-211-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | | * | | | | | | | | [ci skip] Add a comment explaining validate_board_limit callbackDouglas Barbosa Alexandre2016-10-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callback associations are not common to see around. We want to make clear that the `before_add` callback uses the number before the addition, in this particular case 1.
| | | * | | | | | | | | Fix GitLab project import when a user has access only to their default ↵Adam Niedzielski2016-10-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | namespace. Render a hidden field with namespace ID so it can be read by JavaScript and passed to "/import/gitlab_project/new" screen.
| | | * | | | | | | | | Test GitLab project import for a user with only their default namespace.Adam Niedzielski2016-10-211-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the spec file: - remove hardcoded record IDs - avoid top-level let if not used in all scenarios - prefer expect { ... }.to change { ... }.from(0).to(1) over checking that there are no records at the beginning of the test
| | | * | | | | | | | | Create protected branches bundleAlfredo Sumaran2016-10-218-0/+4
| | | | | | | | | | | |
| | | * | | | | | | | | Only create refs for new deploymentsZ.J. van de Weg2016-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes sure GitLab does not save the refs to the filesystem each time the deployment is updated. This will save some IO although I expect the impact to be minimal.
| | | * | | | | | | | | Use deployment IID when saving refsZ.J. van de Weg2016-10-213-4/+4
| | | | | | | | | | | |
| | | * | | | | | | | | We want to release this in 8.13.0Lin Jen-Shin2016-10-211-2/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Add CHANGELOG entry [ci skip]Lin Jen-Shin2016-10-211-0/+2
| | | | | | | | | | | |
| | | * | | | | | | | | Preserve note_type and position for notes from emailsLin Jen-Shin2016-10-214-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #23208
| | | * | | | | | | | | Update duration at the end of pipelineKamil Trzcinski2016-10-212-3/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Add CHANGELOG.md entryAirat Shigapov2016-10-211-0/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Return truncation for notification descriptions, fix minor bugs with renderingAirat Shigapov2016-10-212-12/+17
| | | | | | | | | | | |
| | | * | | | | | | | | Use guard clause instead of if-else statementAirat Shigapov2016-10-211-13/+12
| | | | | | | | | | | |
| | | * | | | | | | | | Tests for markdown HipChat notificationsDavid Eisner2016-10-211-6/+6
| | | | | | | | | | | |
| | | * | | | | | | | | Clean up Banzai HTML for HipChatDavid Eisner2016-10-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `class` and `data-*` attributes are meaningless in HipChat, and it would probably be better to limit the tags, too. For example, we could avoid block-level elements in `render_line`.
| | | * | | | | | | | | Ensure absolute URLs for single lines from Banzai for HipChatDavid Eisner2016-10-211-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "pipeline: :single_line" leaves the protocol/host part out of the URLs and caches them that way. To avoid giving those out to HipChat, markdown is always rendered with "pipeline: :email" first. There must be a better way to do this, but I can't see how to avoid the link caching.
View Lorry Controller Status