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
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 Hughes and Robert Speicher
2c760487be
SSH key ellipsis on mobile
2016-03-03 16:13:56 -05:00
Phil Hughes and Robert Speicher
0f237dd8fa
Changed link colour
2016-03-03 16:13:56 -05:00
Phil Hughes and Robert Speicher
034ad4e201
Content link colour in profile settings
2016-03-03 16:13:56 -05:00
Phil Hughes and Robert Speicher
36aad293b9
Fixed heading bold
...
Button transparent colours
2016-03-03 16:13:55 -05:00
Phil Hughes and Robert Speicher
1d4418bc5f
Fixed failing ssh key tests
2016-03-03 16:13:55 -05:00
Phil Hughes and Robert Speicher
1efe105415
SSH keys settings
...
Closes #13860
2016-03-03 16:13:55 -05:00
Alfredo Sumaran
74d41f8950
Use camelCase for variable names
2016-03-03 15:20:02 -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 Dip and Alfredo 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
Jacob Schatz
ba869ae50d
Merge branch 'password-settings' into 'master'
...
Password settings page
Closes #13858
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
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
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 Hughes and Jacob 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
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
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
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
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
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
See merge request !3037
2016-03-02 19:52:21 +00:00
Grzegorz Bizon
Jacob Schatz
Robert Speicher
Phil HughesandRobert Speicher
Alfredo Sumaran
Roberto DipandAlfredo Sumaran
Jacob Vosmaer
Dmitriy Zaporozhets
Rémy Coutable
Douwe Maan
