summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix bug related to filtering Issues by Label/Milestone.issue_14853Rubén Dávila2016-04-023-1/+28
* Merge branch 'notes-actions-colours' into 'master' Jacob Schatz2016-04-018-114/+112
|\
| * 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
* | 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 helpersroutingYorick Peterse2016-04-0120-21/+34
| * | | Merge branch 'memoize-pattern-methods' into 'master' Robert Speicher2016-04-018-13/+13
| |\ \ \
| | * | | Memoize reference_pattern/link_reference_patternmemoize-pattern-methodsYorick Peterse2016-04-018-13/+13
| | |/ /
* | | | Add 8.6.3 items to CHANGELOGRémy Coutable2016-04-011-11/+9
|/ / /
* | | Merge branch 'fix/fogbugz-import' into 'master' Robert Speicher2016-04-012-1/+25
|\ \ \
| * | | 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' "Jacob Schatz2016-04-012-14/+3
* | | | | Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into 'ma...Rémy Coutable2016-04-013-0/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 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 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 valuesfilter-dropdown-bugPhil Hughes2016-03-315-9/+15
* | | | | | Merge branch 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-...Douwe Maan2016-04-017-30/+54
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | Rename Note#for_project_snippet? to #for_snippet?Rémy Coutable2016-03-314-4/+4
| |/ / / / /
* | | | | | Merge branch 'fix-mentions-on-confidential-issues-for-non-members' into 'mast...Douwe Maan2016-04-013-25/+79
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | 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
| * | | | | | | 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.connorshea2016-03-3113-43/+6
|/ / / / / / /
* | | | | | | Merge branch 'clean-up-user-controller-spec' into 'master' Robert Speicher2016-03-311-12/+3
|\ \ \ \ \ \ \
| * | | | | | | Minor clean up on admin/users_controller_specZeger-Jan van de Weg2016-03-311-12/+3
View Lorry Controller Status