summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Migrate Repository#local_branches from gitlab-ee.update_repository_from_eeRubén Dávila2016-04-013-10/+33
| | | | | This will help us to avoid posible merge conflicts when merging gitlab-ce to gitlab-ee
* Merge branch 'notes-actions-colours' into 'master' Jacob Schatz2016-04-018-114/+112
|\ | | | | | | | | | | | | Notes/discussions header Part way towards getting the design for issues/merge requests to look more like the design in #3401 - I have standardised the headers for both issues & merge requests comments and discussions. See merge request !3441
| * Fixed alignment of iconsnotes-actions-coloursPhil Hughes2016-03-312-2/+10
| |
| * Tests updatePhil Hughes2016-03-311-4/+4
| |
| * SCSS variablesPhil Hughes2016-03-312-4/+11
| |
| * Standardised the discussion headersPhil Hughes2016-03-312-10/+10
| |
| * Changed some CSS to make it more concise & less overridingPhil Hughes2016-03-316-78/+58
| |
| * Moved project access into note actionsPhil Hughes2016-03-315-35/+38
| | | | | | | | Created a class for note action buttons
* | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceRémy Coutable2016-04-0127-34/+47
|\ \
| * \ Merge branch 'routing' into 'master' Robert Speicher2016-04-0120-21/+34
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Added & use Gitlab::Routing for URL helpers Extracted from !3389 See merge request !3486
| | * | Added & use Gitlab::Routing for URL helpersroutingYorick Peterse2016-04-0120-21/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails' "url_helpers" method creates an anonymous Module (which a bunch of methods) on every call. By caching the output of this method in a dedicated method we can shave off about 10 seconds of loading time for an issue with around 200 comments.
| * | | Merge branch 'memoize-pattern-methods' into 'master' Robert Speicher2016-04-018-13/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memoize reference_pattern/link_reference_pattern Extracted from !3389 See merge request !3485
| | * | | Memoize reference_pattern/link_reference_patternmemoize-pattern-methodsYorick Peterse2016-04-018-13/+13
| | |/ / | | | | | | | | | | | | | | | | These methods are called quite often in loops so by memoizing their output we can reduce timings a bit.
* | | | Add 8.6.3 items to CHANGELOGRémy Coutable2016-04-011-11/+9
|/ / / | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'fix/fogbugz-import' into 'master' Robert Speicher2016-04-012-1/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec and fix for fogbugz lonely user problem Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14766 I encountered this issue while manually testing all import types for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3066 This is really due to a horrible API ``` { 'people' => { 'person' => array_of_people_or_single_person_as_hash } } ``` See merge request !3457
| * | | updated specfix/fogbugz-importJames Lopez2016-03-311-1/+1
| | | |
| * | | spec and fix for fogbugz lonely user problemJames Lopez2016-03-302-1/+25
| | | |
* | | | Merge branch 'revert-e3f0bef5' into 'master' Jacob Schatz2016-04-012-14/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'users_should_not_be_able_upvote_downvote' into 'master'" This reverts merge request !3406 See merge request !3491
| * | | | Revert "Merge branch 'users_should_not_be_able_upvote_downvote' into 'master' "Jacob Schatz2016-04-012-14/+3
| | | | | | | | | | | | | | | This reverts merge request !3406
* | | | | Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into ↵Rémy Coutable2016-04-013-0/+10
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allow temp-oauth-email as notification email Closes #14559 /cc @dblessing @rymai See merge request !3477
| * | | | Allow temp-oauth-email as notification emailerror-when-ldap-doesn-t-supply-an-email-address-14559Zeger-Jan van de Weg2016-03-313-0/+10
| | | | |
* | | | | Merge branch 'users_should_not_be_able_upvote_downvote' into 'master' Jacob Schatz2016-04-012-3/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent users from being able to both upvote and downvote closes #14480 ![thumbs](/uploads/d0d64f08dbf271fe969b44c68f424123/thumbs.gif) See merge request !3406
| * | | | | prevent users from being able to both upvote and downvoteusers_should_not_be_able_upvote_downvoteArinde Eniola2016-03-312-3/+14
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix_divider_in_dropdown_when_not_needed' into 'master' Jacob Schatz2016-04-011-6/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix divider in dropdown when not needed closes #14533 ## Before ![Screen_Shot_2016-03-25_at_12.35.21_AM](/uploads/20f386c9c45c9ee8716835ccfa0066ed/Screen_Shot_2016-03-25_at_12.35.21_AM.png) ## After ![Screen_Shot_2016-03-25_at_12.37.27_AM](/uploads/22db62db920017da5fe1da7670fbbb0e/Screen_Shot_2016-03-25_at_12.37.27_AM.png) See merge request !3394
| * | | | | fix divider in dropdown when not neededfix_divider_in_dropdown_when_not_neededArinde Eniola2016-04-011-6/+11
| | |_|_|/ | |/| | |
* | | | | Merge branch 'filter-dropdown-bug' into 'master' Rémy Coutable2016-04-015-9/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with dropdowns not selecting values Fixes issue with dropdowns not selecting when navigating between tabs Closes #14813 See merge request !3478
| * | | | | Fixes issue with dropdowns not selecting valuesfilter-dropdown-bugPhil Hughes2016-03-315-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with dropdowns not selecting when navigating between tabs Closes #14813
* | | | | | Merge branch ↵Douwe Maan2016-04-017-30/+54
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764' into 'master' Fix Error 500 when searching for a comment in a project snippet Closes #14764. /cc @stanhu, and thank you for the spec! ;) See merge request !3468
| * | | | | | Fix view of notes in search results when noteable is a snippetsnippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764Rémy Coutable2016-03-314-26/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, streamline the view. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Rename Note#for_project_snippet? to #for_snippet?Rémy Coutable2016-03-314-4/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'fix-mentions-on-confidential-issues-for-non-members' into ↵Douwe Maan2016-04-013-25/+79
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Mentions on confidential issues doesn't create todos for non-members Closes #14569 See merge request !3374
| * | | | | | Mentions on confidential issues doesn't create todos for non-membersfix-mentions-on-confidential-issues-for-non-membersDouglas Barbosa Alexandre2016-03-303-25/+79
| | | | | | |
* | | | | | | Merge branch 'fix/issue-move-rewrite-uploads' into 'master' Douwe Maan2016-04-019-24/+200
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite uploads when moving issue to another project Closes #14531 See merge request !3382
| * | | | | | | Fix rubocop offenses in upload rewriter specsfix/issue-move-rewrite-uploadsGrzegorz Bizon2016-03-311-1/+1
| | | | | | | |
| * | | | | | | Add Changelog entry for uploads fix when moving issueGrzegorz Bizon2016-03-311-0/+3
| | | | | | | |
| * | | | | | | Merge branch 'master' into fix/issue-move-rewrite-uploadsGrzegorz Bizon2016-03-3147-194/+9317
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (27 commits) Fix commit comment alignment minor cleanup in system_hook_spec Pre-calculate Emoji digests Clear .todo listener Change window.location to use turbolinks Make entire todo row clickable Add 8.6.2 CHANGELOG items Ensure uploads dir exists when running backup specs Move CarrierWave test env config to separate file Remove console logs Off the event initially Collapsed sidebar opens over instead of pushing content. Sidebar collapse update issue User selection from collapsed sidebar Add json response for user avatar in merge request Make changed values visible in minimized sidebar. Fixed MergeRequestController spec We need `sha` reference from `diff_base_commit` to generate the diff Use `diff_base_commit` instead of `target_branch` to generate diffs Isolate CarrierWave uploads in test enviroment ...
| * | | | | | | Improve specs for issue move serviceGrzegorz Bizon2016-03-311-2/+2
| | | | | | | |
| * | | | | | | Extend specs for GFM uploads rewriterGrzegorz Bizon2016-03-312-11/+32
| | | | | | | |
| * | | | | | | Remove reduntant `move_to_store` overrideGrzegorz Bizon2016-03-303-16/+10
| | | | | | | |
| * | | | | | | Add method that returns markdown in file uploaderGrzegorz Bizon2016-03-303-2/+6
| | | | | | | |
| * | | | | | | Check if GFM rewriters need rewrite internallyGrzegorz Bizon2016-03-303-2/+4
| | | | | | | |
| * | | | | | | Add support for not Active Record based factoriesGrzegorz Bizon2016-03-301-4/+12
| | | | | | | |
| * | | | | | | Refactor uploads rewriter used when moving issueGrzegorz Bizon2016-03-305-39/+27
| | | | | | | |
| * | | | | | | Get FileUploader into test harness using factoryGrzegorz Bizon2016-03-303-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This attempts to get CarrierWave's uploader - `FileUploader` into test harness using a factory. that makes it easier to build an instance of it. Along with !3435 it may be easier to use uploaders in tests
| * | | | | | | Add uploads rewriter and use it when moving issueGrzegorz Bizon2016-03-304-12/+151
| | | | | | | |
| * | | | | | | Add markdown pattern for uploads to file uploaderGrzegorz Bizon2016-03-301-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'remove-twitter-congrats' into 'master' Rémy Coutable2016-04-0113-43/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "Congratulations!" tweet button on newly-created project. I’ve removed everything related to the feature based on this commit: ce08f919bfab73178b2f8c584f34fd8849834365 Resolves #10857. See merge request !3451
| * | | | | | | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-3113-43/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857.
* | | | | | | Merge branch 'clean-up-user-controller-spec' into 'master' Robert Speicher2016-03-311-12/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor clean up on admin/users_controller_spec Extracted from !3439 See merge request !3460
| * | | | | | | Minor clean up on admin/users_controller_specZeger-Jan van de Weg2016-03-311-12/+3
| | | | | | | |
View Lorry Controller Status