home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,684 Commits 48 Branches 340 Tags
bd269eaab993c4f2faa03e0e3a5cef72a82d3f2b
Commit Graph
24684 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitriy Zaporozhets 1e717988d7 Use helper for font-awesome icons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-03 16:38:15 +01:00
Rémy Coutable 00cb4a9714 Merge branch 'renaming-repository-caching' into 'master' 
Flush repository caches before renaming projects

This should hopefully solve gitlab-org/gitlab-ce#13790. Once I know the exact steps to reproduce the problem I should be able to confirm this.

cc @dblessing @inem 

See merge request !2974
 2016-03-03 15:35:11 +00:00
Dmitriy Zaporozhets 1a0a687f21 Improve UI for explore projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-03 16:25:22 +01:00
Dmitriy Zaporozhets 617bb1096d Revert "Sort starred projects on dashboard based on last activity by default" 
This reverts commit 70d6455284.
 2016-03-03 15:58:00 +01:00
Dmitriy Zaporozhets 70d6455284 Sort starred projects on dashboard based on last activity by default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-03 15:56:29 +01:00
Dmitriy Zaporozhets 11b6aeafba Merge branch 'refactor-projects-list' into 'master' 
Refactor projects list

1. Fix double bottom border if pagination
2. Fix broken search on forks page
4. Remove duplicate js logic
4. Remove unused show all link
5. Remove duplicate “no project” message in different views

After this merge request you can easily render shared projects template
with all necessary html/js included to make searchable list with
pagination. All you need to provide is controller that returns
projects list with seach nad pagination and render html form with
project-filter-form id and text field with filter_projects name.

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

cc @jschatz1 @DouweM 

See merge request !3075
 2016-03-03 14:35:41 +00:00
Douwe Maan 1cb4f810a5 Merge branch 'issue_13648' into 'master' 
Reuse query from ProjectsFinder to get projects accessible to current user.

Fixes #13648

This is a refactor to reuse the existing query from our `ProjectsFinder` class

See merge request !3049
 2016-03-03 14:28:25 +00:00
Dmitriy Zaporozhets 0ca056eb99 Merge branch 'todos-counter' into 'master' 
Use normal font weight for todos counter

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

See merge request !3076
 2016-03-03 14:15:33 +00:00
Dmitriy Zaporozhets 022e38540a Remove unnecessary project limit argument from group projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-03 13:47:32 +01:00
Dmitriy Zaporozhets 2320499d9d Use normal font weight for todos counter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-03 13:39:14 +01:00
Dmitriy Zaporozhets 7455d950bc Refactor projects list 
1. Fix double bottom border if pagination
2. Fix broken search on forks page
4. Remove duplicate js logic
4. Remove unused show all link
5. Remove duplicate “no project” message in different views

After this merge request you can easily render shared projects template
with all necessary html/js included to make searchable list with
pagination. All you need to provide is controller that returns
projects list with seach nad pagination and render html form with
project-filter-form id and text field with filter_projects name.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-03 13:09:58 +01:00
Dmitriy Zaporozhets 7e710acc1c Merge branch 'issue_4095' into 'master' 
Don't show Issues/MRs from archived projects in Groups view

Fixes #4095 

See merge request !2980
 2016-03-03 09:53:06 +00:00
Phil Hughes 29169696a2 Removed page specific variables 2016-03-03 08:40:57 +00:00
Phil Hughes 7ea4948df7 Heading spacing 2016-03-03 08:40:12 +00:00
Phil Hughes 11d58825d5 Moved colour values into scss variables 
Fixed bold issue with headings
 2016-03-03 08:40:12 +00:00
Phil Hughes c4b9905805 Emails settings 
Closes #13857
 2016-03-03 08:40:12 +00:00
Jacob Schatz 1fa7671f44 Merge branch 'improve-user-tabs' into 'master' 
Add routes and actions for dynamic tab loading. Closes #13588 and #13584



See merge request !2961
 2016-03-03 00:13:19 +00:00
Alfredo Sumaran d4981e9b4a Re-use previous line 2016-03-02 19:00:12 -05:00
Rubén Dávila 7dd2e37a9d Update CHANGELOG. 2016-03-02 17:38:25 -05:00
Robert Speicher 89270f77ed Merge branch 'rs-quick-submit-teaching' into 'master' 
Contextually teach the user about the quick submit hotkey

When a user tabs to the submit button (i.e., the "wrong" way), we
display a tooltip with the quick submit hotkey so they can learn the
"right" way.

See merge request !2802
 2016-03-02 20:48:24 +00:00
Alfredo Sumaran e677bac933 Place pagination outside .search-results 2016-03-02 15:46:37 -05:00
Robert Speicher 97c909bd01 Contextually teach the user about the quick submit hotkey 
When a user tabs to the submit button (i.e., the "wrong" way), we
display a tooltip with the quick submit hotkey so they can learn the
"right" way.
 2016-03-02 15:11:44 -05:00
Robert Speicher 76ed2afcfc Change js-quick-submit behavior to expect the class on the form 
Now it will work on any field inside that form, and it's easier to scope
new behavior, which is what we're adding next!
 2016-03-02 15:11:15 -05:00
Jacob Schatz b5738edade Merge branch 'notification-settings' into 'master' 
Notifications settings UI

Closes #13859 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/125e8e3b14319b6cf95e9aa31659681a/notification-settings.png)

See merge request !3035
 2016-03-02 20:00:55 +00:00
Jacob Schatz b8e5c62101 Merge branch 'preferences-view' into 'master' 
Preferences view

Closes #13861 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/133ae7a1b4a0e931d5a6b19922eb2703/preferences-settings.png)

See merge request !3036
 2016-03-02 19:57:35 +00:00
Alfredo Sumaran c3d3e34e81 Remove unnecesary assignment 2016-03-02 14:53:46 -05:00
Jacob Schatz 3be20afa9f Merge branch 'audit-log-ui' into 'master' 
Audit log UI

Closes #13862

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a6d6d1c3661173b95df9ec95f8e2f644/audit-log-settings.png)

See merge request !3037
 2016-03-02 19:52:21 +00:00
Alfredo Sumaran bb1eb4b5de Set actions dinamically and offer defaultAction as a optional parameter 2016-03-02 14:37:09 -05:00
Alfredo Sumaran 3c9e860f5e Provide defaults and make sure we everything is container into a parent element 2016-03-02 14:08:03 -05:00
Rubén Dávila b41a274b62 Don't list merge requests from archived projects in Group view. 2016-03-02 12:51:29 -05:00
Rubén Dávila 0b86b46a2c Don't list issues from archived projects in Group view. 2016-03-02 12:51:29 -05:00
Robert Speicher cbe8b70908 Merge branch 'patch-1' into 'master' 
Typo in API documentation

[ci skip]

See merge request !3058
 2016-03-02 17:43:05 +00:00
Rubén Dávila 49e4ef3b41 Add specs to ForksController#index. 
* Also refactor query to get projects accessible for current user.
  ProjectsFinder actually return public projects when no user is passed.
 2016-03-02 12:35:56 -05:00
Alfredo Sumaran 85e672b150 Turn off existing event listeners 2016-03-02 12:30:01 -05:00
Alfredo Sumaran 7ff635d946 Remove trailing slashes 2016-03-02 12:26:02 -05:00
Rémy Coutable 2883d8b35d Add 8.5.2 items in CHANGELOG 
[ci skip]
 2016-03-02 18:25:02 +01:00
Robert Speicher 076956cb2b Merge branch 'issue_13501' into 'master' 
Add link to open merge requests on label index

Closes #13501 

See merge request !3057
 2016-03-02 17:18:03 +00:00
Phil Hughes 61c30061e7 audit log UI update 
Closes #13862
 2016-03-02 17:06:01 +00:00
Phil Hughes c6b36e3efd Preferences view 
Closes #13861
 2016-03-02 17:05:04 +00:00
Phil Hughes 6bd85ee6d0 Notifications settings UI 
Closes #13859
 2016-03-02 17:02:45 +00:00
Jacob Schatz 1fe9b93329 Merge branch 'profile-settings-ui' into 'master' 
Profile settings

Closes #13853 

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

See merge request !3038
 2016-03-02 16:49:19 +00:00
Phil Hughes a03b0e1bda Changed link colour to match 2016-03-02 15:54:08 +00:00