home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,387 Commits 48 Branches 340 Tags
74e1add2fcbd47ec748e04c65d3eb947dba73cf2
Commit Graph
2475 Commits
Author SHA1 Message Date
Robert Speicher 2b1ddb0f80 Merge branch 'mr-merge-base' into 'master' 
Correctly determine MR diff base when MR has merge conflicts

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

See merge request !2632
 2016-01-28 21:08:41 +00:00
Robert Speicher 0e79b5f396 Merge branch 'highlight-blame' into 'master' 
Fix highlighting in blame view.

See merge request !2630
 2016-01-28 20:30:21 +00:00
Robert Speicher 789e048352 Merge branch 'rs-ldap-user' into 'master' 
Backport LDAP user assignment changes from EE

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146

See merge request !2641
 2016-01-28 19:09:52 +00:00
Robert Speicher 1e666ce695 Backport LDAP user assignment changes from EE 
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146
 2016-01-28 13:31:48 -05:00
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master' 
Show list of forks for a given Project

Closes #2406

See merge request !2376
 2016-01-28 16:58:38 +00:00
Dmitriy Zaporozhets 3f6bb7bc86 Merge branch 'issue_5546' into 'master' 
Save list sort in a cookie

Closes #5546 

See merge request !2537
 2016-01-28 16:21:04 +00:00
Douwe Maan b7ec476205 Merge branch 'master' into mr-merge-base 2016-01-28 15:12:24 +01:00
Douwe Maan 590e237d55 Merge branch 'master' into highlight-blame 2016-01-28 14:49:34 +01:00
Douwe Maan b636f83e59 Move blame group logic to dedicated class 2016-01-28 14:49:21 +01:00
Robert Speicher bba7e786a6 Merge branch 'events-performance' into 'master' 
Improve performance of retrieving last update times for events

See 75195eefcca4cb3961986c90c8e837da02f30134 and
https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317
for the juicy details.

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415

See merge request !2613
 2016-01-27 21:20:16 +00:00
Robert Speicher 614025da38 Merge branch 'rs-skip-2fa-on-signout' into 'master' 
Skip the 2FA requirement during logout

See merge request !2581
 2016-01-27 21:17:31 +00:00
Robert Speicher 56538f9cc1 Merge branch 'fix/unexistent-group-500' into 'master' 
Return a 404 instead of a 500 when accessing a non-existent group

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

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

See merge request !2614
 2016-01-27 20:19:35 +00:00
Dmitriy Zaporozhets 7e6da7b91a Merge branch 'rs-2fa-requirement-wording' into 'master' 
Update wording for 2FA requirement notice



See merge request !2582
 2016-01-27 19:04:44 +00:00
Douwe Maan 5cce1278ad Correctly determine MR diff base when MR has merge conflicts 2016-01-27 17:23:59 +01:00
Douwe Maan 4be80f8aa3 Fix highlighting in blame view. 2016-01-27 16:15:24 +01:00
James Lopez afde800b25 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/unexistent-group-500 2016-01-27 11:35:13 +01:00
James Lopez eef9c9d447 update fix based on feedback 2016-01-27 10:44:24 +01:00
James Lopez d6a186135f fix for failing spec 2016-01-26 15:43:09 +01:00
Douwe Maan 28e2d2142c Merge branch 'rs-groups-index' into 'master' 
Make the `/groups` route behave as expected

The route is supposed to redirect the Groups#index request based on
whether or not a user was logged in. If they are, we redirect them to
their groups dashboard; if they're not, we redirect them to the public
Explore page.

But due to overly aggressive `before_action`s that weren't excluding (or including) the
`index` action, the request always resulted in a 404, whether a user was
logged in or not.

Closes #12660

See merge request !2580
 2016-01-26 11:59:05 +00:00
James Lopez 89aeed183c feature and fix for 500 on group missing 2016-01-26 12:16:47 +01:00
Yorick Peterse 128a6411d2 Don't pluck project IDs for events 
By instead using a sub-query we save ourselves the overhead of loading
any data into memory only to pass it on to another query.
 2016-01-26 10:51:53 +01:00
Douglas Barbosa Alexandre 46c36e0e01 Fixi import redirect loop 2016-01-25 21:00:23 -02:00
Robert Speicher fcab1345da Update wording for 2FA requirement notice 2016-01-23 17:56:18 -08:00
Robert Speicher fdf68a8d4d Skip the 2FA requirement during logout 2016-01-23 16:44:46 -08:00
Robert Speicher a7c4d0da8c Make the /groups route behave as expected 
The route is supposed to redirect the Groups#index request based on
whether or not a user was logged in. If they are, we redirect them to
their groups dashboard; if they're not, we redirect them to the public
Explore page.

But due to overly aggressive `before_action`s that weren't excluding the
`index` action, the request always resulted in a 404, whether a user was
logged in or not.

Closes #12660
 2016-01-23 16:10:13 -08:00
Rubén Dávila c3c92c7317 Make default sorting preference work for Issues and MRs. 2016-01-22 18:43:21 -05:00
Rubén Dávila 9ef468922c Merge branch 'master' into issue_5546 2016-01-22 17:54:37 -05:00
Rubén Dávila 7c520c7803 Make sorting preference reusable for all projects. 2016-01-22 17:00:35 -05:00
Dmitriy Zaporozhets 56b527093d Merge branch 'fix-comment-on-diff-ajax-loading' 2016-01-22 10:20:19 -08:00
Robert Speicher 5f0d7e2e3b Merge branch 'fix-mr-diff-edit-button' into 'master' 
Fix MR diff 'Edit' button

It now works and has the right size.

See merge request !2542
 2016-01-22 07:39:33 +00:00
Douwe Maan 150b4f66e6 Make sure non-highlighted diffs are still escaped 2016-01-22 01:47:17 +01:00
Douwe Maan 9369b7ec1f Fix MR diff 'Edit' button 2016-01-21 22:46:49 +01:00
Rubén Dávila eccaa099d1 Make cookie suffix more simpler. 2016-01-21 15:06:07 -05:00
Rubén Dávila 0f79620ccb Little refactor plus some specs. 2016-01-21 12:54:10 -05:00
Rubén Dávila 4d345bc400 Remember last sort option used. 2016-01-20 17:29:53 -05:00
Rémy Coutable 8a829c9738 Merge remote-tracking branch 'origin/master' into fix-comment-on-diff-ajax-loading 2016-01-20 22:42:07 +01:00
Rubén Dávila 985297d82a Merge branch 'master' into issue_3945 2016-01-20 15:07:00 -05:00
Robert Speicher 1553c560e0 Merge branch 'feature/check-against-rbl-only' into 'master' 
Split from !2455

References #9092

See merge request !2515
 2016-01-20 14:24:20 -05:00
Douwe Maan 7d347ae564 Merge branch 'master' into issue_3945 2016-01-20 20:04:15 +01:00
Douwe Maan 577f2fb47a Save and use actual diff base commit for MR diff highlighting 2016-01-20 18:44:27 +01:00
Douwe Maan 0ad6b44a27 Send user context to Sentry 2016-01-20 16:15:19 +01:00
Tomasz Maczukin 8536e083f7 Add IP blocking against DNSBL at sign-up 2016-01-20 15:28:19 +01:00
Douwe Maan c23ca0b0b5 Merge branch 'master' into issue_3945 2016-01-20 14:53:41 +01:00
Rubén Dávila 91bd0bf99e Some CSS and sorting fixes. 2016-01-20 00:17:21 -05:00
Rubén Dávila 40e1ad9052 Add ability to sort forks. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila b2e5b57fab Add fork button and implement ability to distinguish between public and protected forks. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila 2b05bf4be5 Use Project creator's avatar in fork listing. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila 7765ce1875 Setup new fork link in sidebar and routes. #2406 2016-01-20 00:14:58 -05:00
Rémy Coutable 491c2248c0 Fix diff comments loaded by AJAX to load comment with diff in discussion tab 
This commits also fixes two minor issues:
- Ensure notes that the current user is not allowed to see are not
  returned in the AJAX notes loading
- Ensure the notes counter badge is decremented of 1 instead of 2
 2016-01-19 18:22:01 +01:00
Jeroen Nijhof 85e0fce9ee Add sentry integration 2016-01-18 17:15:10 +01:00