Commit Graph
13500 Commits
Author SHA1 Message Date
Phil Hughes f62d7d261b Removed console.log from notes 2016-04-04 10:49:08 +01:00
Phil Hughes 1f50833430 Updated tests 2016-04-04 10:48:49 +01:00
Phil Hughes 29f414aa5a Tests update 2016-04-04 10:48:49 +01:00
Phil Hughes 40297b8f11 Reduced focus shadow 2016-04-04 10:48:49 +01:00
Phil Hughes 3b4c4dd7b3 Logged out box 2016-04-04 10:48:49 +01:00
Phil Hughes 0581df2971 Discussion form 2016-04-04 10:48:49 +01:00
Phil Hughes f0d2f370cc Removed css code that isnt used 2016-04-04 10:48:49 +01:00
Phil Hughes af3284d98b Focus style for comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 38e32780a8 Hides current user icon on mobile 2016-04-04 10:48:49 +01:00
Phil Hughes 3c2b0e7572 Added toolbar to comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 0331fa3f3d Restyling on elements in comment form 2016-04-04 10:48:49 +01:00
Phil Hughes b7f0b22b9f Started refactoring of note form 2016-04-04 10:48:49 +01:00
Yorick Peterse 3dd91f55a0 Merge branch 'issue_14853' into 'master'
Fix bug related to filtering Issues by Label/Milestone.

See merge request !3499
2016-04-04 09:05:57 +00:00
Douwe Maan fee7ad8627 Merge branch 'build-updates' into 'master'
Build updates

Fixes #10851 

![build-updates](/uploads/52e09e679ca457f3d818f9a12fd8382b/build-updates.gif)


See merge request !2604
2016-04-03 13:22:27 +00:00
Douwe Maan 136267dd35 Merge branch 'fix-bad-fetch' into 'master'
Don't fetch any tags from a forked repo

Closes #13957

See merge request !3504
2016-04-03 12:17:43 +00:00
Rubén Dávila fd090a2fab Fix bug related to filtering Issues by Label/Milestone.
This problem only was affecting the dev env.
2016-04-02 07:36:41 -05:00
Dmitriy Zaporozhets 2ed6cd9e46 Merge branch 'new-navigation-prototype' into 'master'
Two level hierarchy  in navigation sidebar

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3494
2016-04-02 10:20:17 +00:00
Dmitriy Zaporozhets 31b27adeb8 Fix milestones tab active state and tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-02 11:26:46 +02:00
Stan Hu b43e059748 Don't fetch any tags from a forked repo
Closes #13957
2016-04-02 00:45:07 -07:00
Dmitriy Zaporozhets 847940516b Fix some active tab tests that are broken because of 2 level sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-01 22:35:49 +02:00
Jacob Schatz 13659fe7b6 Merge branch 'dz-fix-nav-block' into 'master'
Remove 1px whitespace between nav tabs and underline when form present

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3489
2016-04-01 20:33:29 +00:00
Dmitriy Zaporozhets 4a8bd9faaf Some tweaks to new sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-01 20:34:42 +02:00
Jacob Schatz 09b7b766cb Merge branch 'notes-actions-colours' into 'master'
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
2016-04-01 18:22:14 +00:00
Dmitriy Zaporozhets de6360f904 Improve styling for new complex sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-01 19:51:18 +02:00
Dmitriy Zaporozhets 03f2dd90ec Hide sidebar completely when collapsed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-01 19:32:39 +02:00
Robert Speicher 5627542fd4 Merge branch 'routing' into 'master'
Added & use Gitlab::Routing for URL helpers

Extracted from !3389

See merge request !3486
2016-04-01 16:51:20 +00:00
Robert Speicher c8038dc243 Merge branch 'memoize-pattern-methods' into 'master'
Memoize reference_pattern/link_reference_pattern

Extracted from !3389

See merge request !3485
2016-04-01 16:49:50 +00:00
Dmitriy Zaporozhets dbc96f05d0 Refactor left navigation sidebar to use 2 levels
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-01 18:24:03 +02:00
Dmitriy Zaporozhets 18dd525d0f Concept of 2 level navigation sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-01 16:58:28 +02:00
Jacob Schatz a4f55888df Merge branch 'revert-e3f0bef5' into 'master'
Revert "Merge branch 'users_should_not_be_able_upvote_downvote' into 'master'"

This reverts merge request !3406

See merge request !3491
2016-04-01 14:56:01 +00:00
Rémy Coutable f9ab215b21 Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into 'master'
Allow temp-oauth-email as notification email

Closes #14559 

/cc @dblessing @rymai 

See merge request !3477
2016-04-01 14:12:42 +00:00
Jacob Schatz 9f27b852af Revert "Merge branch 'users_should_not_be_able_upvote_downvote' into 'master' "
This reverts merge request !3406
2016-04-01 14:05:16 +00:00
Jacob Schatz e3f0bef5ee Merge branch 'users_should_not_be_able_upvote_downvote' into 'master'
Prevent users from being able to both upvote and downvote

closes #14480 

![thumbs](/uploads/d0d64f08dbf271fe969b44c68f424123/thumbs.gif)

See merge request !3406
2016-04-01 13:59:08 +00:00
Jacob Schatz 71d0ef5bd7 Merge branch 'fix_divider_in_dropdown_when_not_needed' into 'master'
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
2016-04-01 13:57:48 +00:00
Dmitriy Zaporozhets ba0c9b863a Remove 1px whitespace between nav tabs and underline when form present
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-01 14:51:27 +02:00
Yorick Peterse 84b0ab7766 Added & use Gitlab::Routing for URL helpers
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.
2016-04-01 11:13:48 +02:00
Yorick Peterse e7849b0b25 Memoize reference_pattern/link_reference_pattern
These methods are called quite often in loops so by memoizing their
output we can reduce timings a bit.
2016-04-01 11:13:30 +02:00
Rémy Coutable de1c81645c Merge branch 'filter-dropdown-bug' into 'master'
Fixes issue with dropdowns not selecting values

Fixes issue with dropdowns not selecting when navigating between tabs

Closes #14813

See merge request !3478
2016-04-01 08:49:27 +00:00
Douwe Maan 2e3c2a355f Merge branch '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
2016-04-01 08:38:16 +00:00
Douwe Maan 670f8540fa Merge branch 'fix-mentions-on-confidential-issues-for-non-members' into 'master'
Mentions on confidential issues doesn't create todos for non-members

Closes #14569 

See merge request !3374
2016-04-01 08:36:20 +00:00
Douwe Maan 98df8aab7e Merge branch 'fix/issue-move-rewrite-uploads' into 'master'
Rewrite uploads when moving issue to another project

Closes #14531

See merge request !3382
2016-04-01 07:17:10 +00:00
connorshea 85cc172959 Remove "Congratulations!" tweet button on newly-created project.
I’ve removed everything related to the feature based on this commit:
ce08f919f34fd8849834365

Resolves #10857.
2016-03-31 17:09:36 -06:00
Arinde Eniola e67ce6cd33 fix divider in dropdown when not needed 2016-04-01 00:02:50 +01:00
Jacob Schatz 1bb7a6c4ab Merge branch 'fix-input-borders' into 'master'
Fix input borders



See merge request !3474
2016-03-31 20:10:15 +00:00
Phil Hughes cc79eedb85 Fixes issue with dropdowns not selecting values
Fixes issue with dropdowns not selecting when navigating between tabs

Closes #14813
2016-03-31 20:19:59 +01:00
Zeger-Jan van de Weg 1e7116b34d Exclude projects pending deletion from all results 2016-03-31 20:20:18 +02:00
Zeger-Jan van de Weg 2c6207135e Allow temp-oauth-email as notification email 2016-03-31 19:59:19 +02:00
Rémy Coutable 95c7aa62de Merge branch 'fix-todos' into 'master'
Destroy related todos when an Issue/MR is deleted

Closes #14550 

Closes #14598

See merge request !3376
2016-03-31 16:43:12 +00:00
Dmitriy Zaporozhets a4a8bfd799 Use border color variables for input
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-31 18:20:23 +02:00
Dmitriy Zaporozhets 6ed46aad15 Fix icons color in the header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-31 18:07:29 +02:00