summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Standardize the way we check for and display form errorsrs-form_errorsRobert Speicher2016-04-0432-153/+59
* Merge branch 'new-navigation-prototype' into 'master' Dmitriy Zaporozhets2016-04-0211-100/+98
|\
| * Fix milestones tab active state and testsnew-navigation-prototypeDmitriy Zaporozhets2016-04-021-1/+1
| * Fix some active tab tests that are broken because of 2 level sidebarDmitriy Zaporozhets2016-04-011-1/+1
| * Some tweaks to new sidebarDmitriy Zaporozhets2016-04-015-18/+19
| * Improve styling for new complex sidebarDmitriy Zaporozhets2016-04-015-51/+31
| * Hide sidebar completely when collapsedDmitriy Zaporozhets2016-04-015-52/+27
| * Refactor left navigation sidebar to use 2 levelsDmitriy Zaporozhets2016-04-015-109/+109
| * Concept of 2 level navigation sidebarDmitriy Zaporozhets2016-04-012-113/+155
* | Merge branch 'dz-fix-nav-block' into 'master' Jacob Schatz2016-04-011-1/+2
|\ \
| * | Remove 1px whitespace between nav tabs and underline when form presentdz-fix-nav-blockDmitriy Zaporozhets2016-04-011-1/+2
| |/
* | Merge branch 'notes-actions-colours' into 'master' Jacob Schatz2016-04-017-110/+108
|\ \
| * | Fixed alignment of iconsnotes-actions-coloursPhil Hughes2016-03-312-2/+10
| * | 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 'routing' into 'master' Robert Speicher2016-04-015-6/+6
|\ \ \
| * | | Added & use Gitlab::Routing for URL helpersroutingYorick Peterse2016-04-015-6/+6
* | | | 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
| |/ / /
* | | | 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-011-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow temp-oauth-email as notification emailerror-when-ldap-doesn-t-supply-an-email-address-14559Zeger-Jan van de Weg2016-03-311-0/+2
* | | | | 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-013-13/+9
|\ \ \ \ \
| * | | | | 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-311-11/+7
| * | | | | Rename Note#for_project_snippet? to #for_snippet?Rémy Coutable2016-03-312-2/+2
| |/ / / /
* | | | | Merge branch 'fix-mentions-on-confidential-issues-for-non-members' into 'mast...Douwe Maan2016-04-011-4/+20
|\ \ \ \ \
| * | | | | Mentions on confidential issues doesn't create todos for non-membersfix-mentions-on-confidential-issues-for-non-membersDouglas Barbosa Alexandre2016-03-301-4/+20
* | | | | | Merge branch 'fix/issue-move-rewrite-uploads' into 'master' Douwe Maan2016-04-012-18/+27
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fix/issue-move-rewrite-uploadsGrzegorz Bizon2016-03-3119-48/+148
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Remove reduntant `move_to_store` overrideGrzegorz Bizon2016-03-301-4/+4
| * | | | | | Add method that returns markdown in file uploaderGrzegorz Bizon2016-03-301-0/+4
| * | | | | | Check if GFM rewriters need rewrite internallyGrzegorz Bizon2016-03-301-1/+1
| * | | | | | Refactor uploads rewriter used when moving issueGrzegorz Bizon2016-03-301-17/+6
| * | | | | | Get FileUploader into test harness using factoryGrzegorz Bizon2016-03-301-2/+2
| * | | | | | Add uploads rewriter and use it when moving issueGrzegorz Bizon2016-03-301-12/+27
| * | | | | | Add markdown pattern for uploads to file uploaderGrzegorz Bizon2016-03-301-0/+1
* | | | | | | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-316-36/+0
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'fix-input-borders' into 'master' Jacob Schatz2016-03-314-8/+10
|\ \ \ \ \ \
| * | | | | | Use border color variables for inputfix-input-bordersDmitriy Zaporozhets2016-03-312-3/+4
| * | | | | | Fix icons color in the headerfix-header-colorsDmitriy Zaporozhets2016-03-313-5/+6
* | | | | | | Exclude projects pending deletion from all resultsZeger-Jan van de Weg2016-03-313-11/+15
| |_|_|_|_|/ |/| | | | |
View Lorry Controller Status