Commit Graph
2647 Commits
Author SHA1 Message Date
Grzegorz Bizon bf921d084e Invalidate cache for builds badge
Closes #13982
2016-03-04 10:34:35 +01: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
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
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +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 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
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
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
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
Rémy Coutable cb6af81670 Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'
Tag deletion doesn't use AJAX anymore



See merge request !2986
2016-03-02 13:02:41 +00:00
Douwe Maan 30be3cf5e2 Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' into 'master'
Don't show "Welcome to GitLab" when the search didn't return any projects

Fixes #13785. /cc @pixdrift

### Before

![Screen_Shot_2016-03-02_at_10.55.02](/uploads/b6b6ead2143d01e374ad296e72182d79/Screen_Shot_2016-03-02_at_10.55.02.png)

### After

![Screen_Shot_2016-03-02_at_12.12.33](/uploads/6e16c44e69039c534ea0fc3373c6060b/Screen_Shot_2016-03-02_at_12.12.33.png)

See merge request !3059
2016-03-02 12:15:45 +00:00
Douwe Maan 386d442a18 Merge branch 'fix/deprecated-ci-badge-permissions' into 'master'
Fix permissions for deprecated CI build status badge

This fixes permissions for deprecated status badge, being unavailable even if project is public.

Closes #13324

See merge request !3030
2016-03-02 11:00:25 +00:00
Rémy Coutable a3f0a176ff Don't show "Welcome to GitLab" when the search didn't return any projects 2016-03-02 11:41:35 +01:00
Robert Speicher 6aa50165b0 Merge branch 'logged-out-search' into 'master'
Logged out search

Fixes #13676  

See merge request !3045
2016-03-01 19:57:10 +00:00
Grzegorz Bizon 8b02d962ab Do not require authentication for CI status badge
This changes only deprecated CI badge that we keep for backwards
compatibility. See !3030#note_4041498.
2016-03-01 20:32:30 +01:00
Alfredo Sumaran 9f1c3bb765 Merge branch 'master' into improve-user-tabs 2016-03-01 13:37:03 -05:00
Rubén Dávila 0e1d440805 Reuse query from ProjectsFinder to get projects accessible to current user. 2016-03-01 12:48:09 -05:00
Rémy Coutable 722d74c7e9 Make the tags delete button remote in the tags list 2016-03-01 18:44:01 +01:00
Alfredo Sumaran f0b8779047 Make url and actions to be the same name 2016-03-01 11:43:22 -05:00
Alfredo Sumaran 10eb6d3cd7 Respond with 'show' view. Tab content will be loaded dinamically 2016-03-01 11:22:27 -05:00
Douwe Maan 204a989533 Merge branch 'rs-improve-grace-period' into 'master'
Don't show any "2FA required" message if it's not actually required

Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.

See merge request !3014
2016-03-01 16:01:18 +00:00
Dmitriy Zaporozhets c9a8f2a03e Enable search for logged-out users
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-01 15:57:28 +01:00
Douwe Maan fac1e0e83c Merge branch 'safe-content-type' into 'master'
Explain why we mangle blob content types

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/9079

See merge request !2956
2016-03-01 13:39:26 +00:00
Grzegorz Bizon 814d853a1a Fix deprecated CI build status badge permissions 2016-03-01 13:59:19 +01:00
Douwe Maan dc6099a5fa Merge branch 'fix/contributions-forked-projects' into 'master'
include contributions from forked projects on profile calendar

Shows contributions from forked projects in the calendar

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

See merge request !2918
2016-03-01 10:06:56 +00:00
Alfredo Sumaran b522ef4b69 Respond to .json requests 2016-02-29 16:40:57 -05:00
Robert Speicher b0ec9529e2 Don't show any "2FA required" message if it's not actually required
Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.
2016-02-29 13:58:36 -05:00
Dmitriy Zaporozhets eb9838d38b Merge branch 'issue_13648' into 'master'
Improve implementation to check read access to forks and add pagination.

Fixes #13648 

The following optimizations where made:

- Pagination was added.
- Code to check for read permissions to forks was optimized, in the past we were doing too many queries for each project.


See merge request !2991
2016-02-29 17:00:23 +00:00
James Lopez 8fe72af3dc Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributions-forked-projects 2016-02-29 15:49:00 +01:00
Josh Frye cc9f93f9d2 Add routes and actions for dynamic tab loading 2016-02-29 08:24:07 -05:00
Douwe Maan 2ea8f71bb4 Merge branch '11489-branded-appearance-to-ce' into 'master'
Branded appearance to CE

Closes #11489 

The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too.

TODO:
- [x] Copy docs
- [x] Make new screenshots
- [ ] Remove Custom Welcome message feature?

@rymai: I was unsure what labels to add to ping you, so I just ping you like this 😉 

/cc @DouweM

See merge request !2927
2016-02-29 13:18:29 +00:00
Rubén Dávila 8c948548e1 Logged in user should be able to read internal forks. 2016-02-27 10:04:36 -05:00
Rubén Dávila f96ce4079f Improve implementation to check read access to forks and add pagination. 2016-02-26 19:34:52 -05:00
Zeger-Jan van de Weg 9a2869ab46 Branded login page also in CE
The only major difference with the EE version is the change from a light and dark logo to only a header logo
The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
2016-02-26 15:50:51 +01:00
Alfredo Sumaran 0104ab79b3 Merge branch 'master' into avatar-cropping 2016-02-24 10:42:51 -05:00
Jacob Vosmaer cf2c5396e0 Explain why we mangle blob content types 2016-02-24 11:53:30 +01:00
Robert Speicher dba47f680d Merge branch 'issue_13301_emoji-menu' into 'master'
Load award emoji picker with ajax request

Fixes #13301.

See merge request !2888
2016-02-24 02:50:45 +00:00
Annabel Dunstone 476a804969 Update award_emoji test 2016-02-23 19:37:15 -06:00
Alfredo Sumaran af978cd5bc Merge branch 'master' into avatar-cropping 2016-02-23 16:52:43 -05:00
Robert Speicher 5deb4ac144 Merge branch 'fix-todos' into 'master'
Does not raise an error when Todo  is already marked as done

Closes #13681 

See merge request !2926
2016-02-23 17:47:59 +00:00
Douglas Barbosa Alexandre 28097398c5 Does not raise an error when Todo is already marked as done 2016-02-23 10:43:29 -03:00
Phil Hughes 01b965f6da Correctly checks if tree view is on screen 2016-02-23 13:41:03 +00:00
Phil Hughes d80205b755 Fixes issue with file view rows not clickable on project main view
Fixed an issue where it would only load the first 25 commit data on project main view
Stopped the file view sending 1 too many requests

Fixes #3916
2016-02-23 09:06:26 +00:00