home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,537 Commits 48 Branches 340 Tags
d4e327a592df080588ed8fe616979310000cb288
Commit Graph
2616 Commits
Author SHA1 Message Date
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
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
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
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
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
Annabel Dunstone 7bb378b33d Create EmojisController 2016-02-22 20:16:00 -06:00
James Lopez 303e9eb5bf include contributions from forked projects on profile calendar 2016-02-22 15:46:29 +01:00
Douglas Barbosa Alexandre f37765efa2 Use before_action instead of before_filter 2016-02-21 12:52:37 -03:00
Douwe Maan d53ae7f14d Add "Mark all as done" button 2016-02-20 11:59:19 -08:00
Douglas Barbosa Alexandre f42b1fa6e5 Fix rubucop offenses 2016-02-20 13:10:37 -02:00
Douglas Barbosa Alexandre 3d52e139b1 Rename Tasks to Todos 2016-02-20 12:39:27 -02:00
Douglas Barbosa Alexandre ce78813c2a Create or mark task pending as soon the action happens 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 07eb334c25 Add filters by project, author, type, and action to task queue page list 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 917081fe9d Fix rubocop offenses 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 48ddf9a407 Remove task abilities, since we will only ever show the user their own 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 38026e5f77 Add pending tasks badge on top right next to the new and logout button 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 77d7910b8b Allow user to mark each task as done manually 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 7cafa2ce92 Add tasks queue list page 2016-02-20 12:10:26 -02:00
Douwe Maan 31682eb987 Merge branch 'visibletrap/gitlab-ce-label' 2016-02-19 17:54:13 -08:00
Douwe Maan 3a97a5ddfd Merge branch 'rs-blob' into 'master' 
Add a `Blob` model that wraps `Gitlab::Git::Blob`

This allows us to take advantage of Rails' `to_partial_path` to render
the correct partial based on the Blob type, rather than cluttering the
view with conditionals.

It also allows (and will allow in the future) better encapsulation for
Blob-related logic which makes sense for our Rails app but might not
make as much sense for the core `gitlab_git` library, such as detecting
if the blob is an SVG.

See merge request !2887
 2016-02-20 01:12:52 +00:00
Jacob Schatz de84fa365e Merge branch 'issue_3276' into 'master' 
Labels should be visible in milestone view

Closes #3276 

See merge request !2599
 2016-02-19 19:44:13 +00:00
Rubén DávilaandRobert Speicher cc5ff3b5a4 Use the adequate success path on the JSON endpoint. 
I forgot to update this and some spinach specs were failing.
 2016-02-19 13:15:43 -05:00
Rubén DávilaandRobert Speicher 5ef3f80d41 More updates from the last code review. 2016-02-19 13:15:42 -05:00
Rubén DávilaandRobert Speicher b8295fc323 Fix build and add specs 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher 328b52d58a Some updates after last code review. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 38e708f0ce Add link to fork if user can't revert MR. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 9d4c105ab0 Remove code introduced when endpoint was in MR controller. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher a28eef1d1a Update copy and URLs used when reverting MRs. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 1469b72c46 Check that target_branch is present. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 4dc8350517 Reuser revert commit modal in MR detail page. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher b36319a17c Make MRs with revert commit work. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 8061399368 Add RevertService class with basic logic to revert commit 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 34e26b8212 Add button to revert commit on Commit detail page. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher b6fe51b901 Some updates from last code review. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher df5f362c34 Add some specs plus some refactor. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher ae46d6ea04 Explain why MR can't be reverted. 2016-02-19 13:14:49 -05:00