home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,733 Commits 48 Branches 340 Tags
834b5d49ecb486065e3ecbf8b36becb416eff366
Commit Graph
24733 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rubén Dávila 834b5d49ec Refactor Merge Requests tab into a custom partial 2016-03-04 22:37:03 -05:00
Rubén Dávila e805becfe8 Eager load Issues/MRs project for Milestone. 
With this change we avoid doing N+1 queries when viewing Milestone's
Issues/MRs from a Group context.
 2016-03-04 22:37:03 -05:00
Rubén Dávila 37d92d0b7b Refactor Merge Requests tab into a custom partial 2016-03-04 22:37:03 -05:00
Rubén Dávila 70028d36be Recator Issues Tab into a custom partial. 2016-03-04 22:37:03 -05:00
Rubén Dávila a056dfa9a0 Refactor GlobalMilestone queries. 
Make methods return ActiveRecord Relations instead of Arrays.
 2016-03-04 22:37:03 -05:00
Douwe Maan 3231ea10b7 Merge branch 'fix/sentry-1182' into 'master' 
In UsersController#calendar_activities, when Date isn't parsable, fallback to Date.today

For some reason, GoogleBot accesses `/u/:username/calendar_activities` without
a `:date` param, but then the view was trying to call `#to_s(:short)` which
doesn't exist on `nil`, leading to the following Sentry report:
https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/

See merge request !3074
 2016-03-04 20:59:58 +00:00
Jacob Schatz ec68d673b2 Merge branch 'ctr-enter-textarea-mac' into 'master' 
ctrl+enter on mac correctly submits forms

Closes #4177

See merge request !3089
 2016-03-04 20:29:04 +00:00
Jacob Schatz cb73470b93 Merge branch 'dropdown-design-update' into 'master' 
Updated dropdown CSS

This is a start on #3279 by updating the CSS for the dropdown menu. This doesnt include any CSS for the title bar or filter field

![Screen_Shot_2016-03-04_at_12.23.49](/uploads/6f2047ec1b72974334fa56e6895a32be/Screen_Shot_2016-03-04_at_12.23.49.png)

See merge request !3092
 2016-03-04 18:05:53 +00:00
Rémy Coutable a697b015f7 Remove "(unreleased)" from 8.5.4 changelog 
[ci skip]
 2016-03-04 16:10:47 +01:00
Jacob Schatz 1400f19793 Merge branch 'dashboard-search-field-tabindex' into 'master' 
Added tabindex to filter field

Based on however I changed the tabindex of the search field so that it goes search field -> filter field & then back to browser default. I dont think we should override the default tabindex of the page too much.

Closes #3706 

See merge request !3093
 2016-03-04 14:54:53 +00:00
Phil Hughes c10bb7b50a Dropdown caret color in variable 2016-03-04 14:00:04 +00:00
Phil Hughes 298971ed58 Updated CSS so .open doesnt have to be on a dropdown element 2016-03-04 13:49:23 +00:00
Dmitriy Zaporozhets 954b98377f Merge remote-tracking branch 'origin/issue_5854' 2016-03-04 14:29:57 +01:00
Dmitriy Zaporozhets d6f26e41db Merge remote-tracking branch 'origin/sort-starred-projects' 2016-03-04 14:24:22 +01:00
Phil Hughes 144f8eff89 Added tabindex to filter field 
Based on however I changed the tabindex of the search field so that it goes search field -> filter field & then back to browser default. I dont think we should override the default tabindex of the page too much
Closes #3706
 2016-03-04 12:39:18 +00:00
Phil Hughes 8c0f551f49 Updated dropdown CSS 
This is a start on #3279 by updating the CSS for the dropdown menu. This doesnt include any CSS for the title bar or filter field
 2016-03-04 12:20:20 +00:00
Rémy Coutable b763c65eff Merge branch 'fix/invalidate-builds-badge-cache' into 'master' 
Invalidate cache for builds badge

This fixes cache issue with badges (we should not cache badge images).

Closes #13982

See merge request !3086
 2016-03-04 12:18:47 +00:00
Phil Hughes 692773c5a0 ctrl+enter on mac correctly submits forms 
Closes #4177
 2016-03-04 10:11:15 +00:00
Grzegorz Bizon 0196c949f7 Add Changelog entry for badges cache fix 2016-03-04 10:38:15 +01:00
Grzegorz Bizon bf921d084e Invalidate cache for builds badge 
Closes #13982
 2016-03-04 10:34:35 +01:00
Jacob Schatz f8c4dc9723 Merge branch 'issue_13300' into 'master' 
Increase the notes polling timeout over time

Originally by @roperzh at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2821

Fixes #13300 

See merge request !3071
 2016-03-04 02:15:34 +00:00
Robert Speicher f2a9455c38 Merge branch 'ssh-key-settings' into 'master' 
SSH keys settings

Closes #13860

See merge request !3034
 2016-03-04 01:30:06 +00:00
Robert Speicher 518dd9347b Improve consistency of SSH Keys title in administration area 2016-03-03 16:14:00 -05:00
Robert Speicher 70d2fde492 Restructure SSH key table partial rendering 
Prior, we were double-checking `@keys.any?`, and unnecessarily assigning
`is_admin` in a view where it wasn't needed.
 2016-03-03 16:14:00 -05:00
Robert Speicher 1b10724e08 Don't abuse the flash store for displaying SSH Key form errors 2016-03-03 16:13:59 -05:00
Robert Speicher 01b89ee8f1 Remove Profile::KeysController#new action 2016-03-03 16:13:59 -05:00
Robert Speicher 9db57bc65a Move SSH key JS to Profile CS class 2016-03-03 16:13:56 -05:00
Phil HughesandRobert Speicher 2c760487be SSH key ellipsis on mobile 2016-03-03 16:13:56 -05:00
Phil HughesandRobert Speicher 0f237dd8fa Changed link colour 2016-03-03 16:13:56 -05:00
Phil HughesandRobert Speicher 034ad4e201 Content link colour in profile settings 2016-03-03 16:13:56 -05:00
Phil HughesandRobert Speicher 36aad293b9 Fixed heading bold 
Button transparent colours
 2016-03-03 16:13:55 -05:00
Phil HughesandRobert Speicher 1d4418bc5f Fixed failing ssh key tests 2016-03-03 16:13:55 -05:00
Phil HughesandRobert Speicher 1efe105415 SSH keys settings 
Closes #13860
 2016-03-03 16:13:55 -05:00
Robert Speicher 77c7b5619f Merge branch 'update-spring' into 'master' 
Update spring to 1.6.4 to fix support for Bundler 1.11

See merge request !3083
 2016-03-03 21:03:20 +00:00
Alfredo Sumaran 74d41f8950 Use camelCase for variable names 2016-03-03 15:20:02 -05:00
Alfredo Sumaran aaaebd392f Update CHANGELOG 2016-03-03 15:20:01 -05:00
Alfredo Sumaran d9a1b6629d Set @max_polling_steps to 4 so the last interval will be 120 seconds 2016-03-03 15:20:01 -05:00
Alfredo Sumaran 948ebfeb01 Provide @max_polling_steps instead of @limit_polling_interval 2016-03-03 15:20:01 -05:00
Alfredo Sumaran 5bd22b28fa Prevent multiple refreshes if a refresh is happening 2016-03-03 15:20:01 -05:00
Roberto DipandAlfredo Sumaran 3fbdca214c Increase the notes polling timeout over time 
A file called notes is loaded every ~15 seconds which checks for
updates to content on the page. This commit increases the polling
timeout over time (15, 30, 60, 120 seconds) and resets
it to 15 seconds if the AJAX call returns new notes

Fixes issue #13300
 2016-03-03 15:20:00 -05:00
Gabriel Mazetto 1ecefd3718 Update spring to 1.6.4 to fix support for Bundler 1.11 2016-03-03 17:08:16 -03:00
Jacob Schatz ba869ae50d Merge branch 'password-settings' into 'master' 
Password settings page

Closes #13858 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ebb9b67d69daa8872d79626b85f99b52/password-settings.png)

See merge request !3033
 2016-03-03 19:37:20 +00:00
Jacob Vosmaer bd269eaab9 Merge branch 'lazy-diffs' into 'master' 
Lazy diffs

Needs https://gitlab.com/gitlab-org/gitlab_git/merge_requests/65

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/10785

-   Use Gitlab::Git::DiffCollection which limits the result set size.
    This avoids loading unnecessary data from Git/SQL into memory.
-   Remove left-over Grit timeout handling code.
-   Use Gitlab::Git::Count.lines to count lines in strings.
-   Use more iterators.

See merge request !2705
 2016-03-03 19:23:50 +00:00
Jacob Schatz 47b0c6b574 Merge branch 'comment-button-status-refresh' into 'master' 
Correcly updates the status of the comment buttons on reload

Closes #5534 

![comment-reload](/uploads/413df488222cacfb02a5ea7592abfd11/comment-reload.gif)

See merge request !3081
 2016-03-03 19:23:28 +00:00
Jacob Schatz 9f0349ae39 Merge branch 'email-settings' into 'master' 
Emails settings

Closes #13857 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87ee4b0abf970c1fbb5e8a8c02740c/email-settings.png)

See merge request !3032
 2016-03-03 18:43:48 +00:00
Jacob Schatz f2f35849ad Merge branch 'issue_13933' into 'master' 
Include pagination for other than projects search

Pagination for projects results is already added on views/shared/projects/_list.html.haml

Fixes #13933

See merge request !3056
 2016-03-03 18:07:32 +00:00
Phil HughesandJacob Schatz 741cf430f7 Correcly updates the status of the comment buttons on reload 
Closes #5534
 2016-03-03 12:39:50 -05:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Dmitriy Zaporozhets e1bc808746 Merge branch 'fix-explore-projects' into 'master' 
Improve UI for explore projects page

Move visibility and tags filter inline with navigation links

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

cc @jschatz1 @skyruler 

See merge request !3079
 2016-03-03 16:44:01 +00:00
Rémy Coutable f1abc10a88 Add 8.5.3 CHANGELOG items 
[ci skip]
 2016-03-03 17:18:48 +01:00