summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add Changelog entry for MySQL compatibility fixfix/migration-helpers-mysql-compatibilityGrzegorz Bizon2016-05-221-0/+3
|
* Extend comment for migrations helper MySQL fixGrzegorz Bizon2016-05-221-1/+8
|
* Add MySQL compatibility fix in migration helpersGrzegorz Bizon2016-05-221-1/+2
|
* Add specs for migration helpers and boolean valuesGrzegorz Bizon2016-05-221-0/+6
|
* Test migration helpers using a migration classGrzegorz Bizon2016-05-221-7/+5
|
* Merge branch 'remove_email_in_group_doc' into 'master' Jeroen van Baarsen2016-05-221-2/+0
|\ | | | | | | | | | | | | fix group members api doc: remove emial "Email" is removed in ae564c97d48bf728745c57720734cb40378fd90f See merge request !4232
| * fix group members api doc: remove emialSanster2016-05-211-2/+0
| |
* | Merge branch 'health_check_docs' into 'master' Achilleas Pipinellis2016-05-223-0/+67
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add health check feature documentation for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3888 @virtuacreative @axil See merge request !4199
| * | Copyedit health check docshealth_check_docsAchilleas Pipinellis2016-05-221-7/+16
| | |
| * | Fix grammar in health_check.md DJ Mountney2016-05-201-1/+1
| | | | | | | | | A access token -> An access token
| * | Fix broken pingdom link in the health_check docsDJ Mountney2016-05-181-1/+1
| | |
| * | Add health check feature documentationDJ Mountney2016-05-183-0/+58
| | |
* | | Merge branch 'fix-docker-registry-integration' into 'master' Yorick Peterse2016-05-214-3/+15
|\ \ \ | | | | | | | | | | | | | | | | Fix docker registry integration See merge request !4229
| * | | Update CHANGELOGfix-docker-registry-integrationKamil Trzcinski2016-05-211-0/+1
| | | |
| * | | Fix container deletion permission issueKamil Trzcinski2016-05-203-3/+14
| | | |
* | | | Merge branch 'gitignore-readme' into 'master' Jeroen van Baarsen2016-05-211-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add README for updating .gitignore templates Add notes to make it clear that users should not file a MR against a specific file here. See merge request !4227
| * | | | Add README for updating .gitignore templatesgitignore-readmeStan Hu2016-05-201-0/+14
| | | | |
* | | | | Merge branch 'patch-1' into 'master' Jeroen van Baarsen2016-05-211-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | fix user.name length in milestones participants tab Spelling mistake of "length" See merge request !4206
| * | | | fix user.name length in milestones participants tabTony Chu2016-05-211-1/+1
|/ / / /
* | | | Merge branch 'dz-fix-fork-counter' into 'master' Jacob Schatz2016-05-212-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix fork counter ui bug for safari ## What does this MR do? Fixes UI bug on safari when fork button has blue arrow ## Screenshots ![Screenshot_2016-05-19_22.10.21](/uploads/d923d8fc6bc12ee8f7052390bd5d7c51/Screenshot_2016-05-19_22.10.21.png)![Screenshot_2016-05-19_22.09.38](/uploads/130eb8b4a09b2ba5b7c5a83fed543dbf/Screenshot_2016-05-19_22.09.38.png) See merge request !4221
| * | | | Fix fork counter ui bug for safaridz-fix-fork-counterDmitriy Zaporozhets2016-05-192-3/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'issuable-new-due-date' into 'master' Jacob Schatz2016-05-214-42/+117
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issuable form due date For some reason, this was never in the original merge request for due date? ![Screen_Shot_2016-04-22_at_21.49.44](/uploads/7d4e2b07f75a33009e3170fdb076a4bd/Screen_Shot_2016-04-22_at_21.49.44.png) Closes #15516 See merge request !3895
| * | | | Replaced line breaksissuable-new-due-datePhil Hughes2016-05-201-6/+6
| | | | |
| * | | | Updated if statementPhil Hughes2016-05-161-1/+1
| | | | |
| * | | | Fixed rubocop issuesPhil Hughes2016-05-161-3/+3
| | | | |
| * | | | Added testsPhil Hughes2016-05-161-1/+59
| | | | |
| * | | | Added due date calendar to new issue formPhil Hughes2016-05-163-41/+58
| | | | | | | | | | | | | | | | | | | | Closes #15516
* | | | | Merge branch 'dropdown-enter-select' into 'master' Jacob Schatz2016-05-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with enter key selecting wrong option in dropdown If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0 ![labels](/uploads/eb29924109947fd63fea32e21471f05a/labels.gif) Closes #17630 See merge request !4210
| * | | | | Fixed issue with enter key selecting wrong option in dropdowndropdown-enter-selectPhil Hughes2016-05-201-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0 Closes #17630
* | | | | Merge branch 'merge-immediately-button-color-fix' into 'master' Jacob Schatz2016-05-211-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with merge button color ![Screen_Shot_2016-05-19_at_12.51.35](/uploads/a2768908553961e88c5a8f0e1f343078/Screen_Shot_2016-05-19_at_12.51.35.png) Closes #17644 See merge request !4211
| * | | | | Fixed issue with merge button colormerge-immediately-button-color-fixPhil Hughes2016-05-201-2/+2
| |/ / / / | | | | | | | | | | | | | | | Closes #17644
* | | | | Merge branch 'fix/style-empty-groups' into 'master' Jacob Schatz2016-05-211-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap "No groups found" message with a .nothing-here-block The "No groups found" message's style is inconsistent with the other empty messages. ## Screenshots ### Empty groups ![Screen_Shot_2016-05-13_at_13.40.34](/uploads/1447c5f60cde7d50d6f8f07c41704e5c/Screen_Shot_2016-05-13_at_13.40.34.png) ### Empty projects ![Screen_Shot_2016-05-13_at_13.40.30](/uploads/c21ff093f3d6bdbafecf7b075fa33d3c/Screen_Shot_2016-05-13_at_13.40.30.png) See merge request !4137
| * | | | Wrap "No groups found" message with a .nothing-here-blockKarlo Soriano2016-05-191-1/+1
| | | | |
* | | | | Merge branch 'zj-gitignore-dropdown'Douwe Maan2016-05-20196-41/+4141
|\ \ \ \ \
| * | | | | Dropdown implementationzj-gitignore-dropdownAlfredo Sumaran2016-05-2011-76/+97
| | | | | |
| * | | | | Update API and fetching taskZeger-Jan van de Weg2016-05-204-41/+51
| | | | | |
| * | | | | Dropdown implementationAlfredo Sumaran2016-05-207-20/+96
| | | | | |
| * | | | | First import of gitignoresZeger-Jan van de Weg2016-05-20181-5/+3780
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add .gitignore dropdown when creating a new .gitignore file Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
| * | | | | Backend for a gitignores dropdownZeger-Jan van de Weg2016-05-2011-9/+227
| | | | | |
* | | | | | Merge branch 'rm-source-branch' into 'master' Douwe Maan2016-05-2014-14/+75
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows MR authors to have the source branch removed when merging the MR closes #13191 The location of the checkbox might not be optimal so any feedback is welcome. Any other feedback too obviously. Screenshot: ![Screenshot_2016-02-17_21.25.24](/uploads/a9c3eaafb39c6f5b4f0949a2278af6da/Screenshot_2016-02-17_21.25.24.png) See merge request !2801
| * | | | | | Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs2016-05-2014-14/+75
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'Douwe Maan2016-05-2019-38/+192
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/services/system_note_service.rb
| * | | | | | Reuse existing SCSS variablesadambutler/gitlab-ce-feature/support-diff-of-issue-title-renameRémy Coutable2016-05-183-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Add documentation for Inline DiffRémy Coutable2016-05-182-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler2016-05-1818-38/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Diff::InlineDiff
* | | | | | | Merge branch 'issue_14684_2' into 'master' Douwe Maan2016-05-201-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | current_user.confirmed_at.present? => current_user.confirmed? fixes: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3862/diffs#4f7b76b1197d6fb073f77957b3b7b70d921ed7e7_42_41 See merge request !4225
| * | | | | | | current_user.confirmed_at.present? => current_user.confirmed?issue_14684_2Felipe Artur2016-05-201-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master' Douwe Maan2016-05-2011-47/+281
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement special GitLab markdown reference for milestones https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions: - Move changelog item to 8.8 - Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829 See merge request !3897
| * | | | | | | | Address Yorick's feedbackeReGeBe/gitlab-ce-feature/milestone-mdRémy Coutable2016-05-182-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Merge remote-tracking branch 'origin/master' into ↵Rémy Coutable2016-05-18767-6387/+11431
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eReGeBe/gitlab-ce-feature/milestone-md Signed-off-by: Rémy Coutable <remy@rymai.me>