home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,943 Commits 48 Branches 340 Tags
54aa0969d40549014bee6e4e500276405fb055ee
Commit Graph
2541 Commits
Author SHA1 Message Date
Douwe Maan 879d66b6ab Merge branch 'git-archive-refactor' into 'master' 
Refactor 'git archive' hand-off to gitlab-workhorse

We have a nicer way now to hand off HTTP responses to gitlab-workhorse.

Companion MR: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/36

See merge request !2675
 2016-02-17 17:16:34 +00:00
Rémy Coutable 3d3ac87af9 Redirect /import to project page if no importing at all and repo exists 
Fixes #13367.
 2016-02-17 15:05:44 +01:00
Jacob Vosmaer a0ccb0731b Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor 2016-02-17 11:30:42 +01:00
Douwe Maan 8db62f2548 Merge branch 'rs-issue-13467' into 'master' 
Ensure Commit#show responds 404 instead of 500 when given an invalid ID

Closes #13467

See merge request !2823
 2016-02-16 11:40:06 +00:00
Robert Speicher ae13389b0b Provide explicit html format when rendering git_not_found page 
Prior, if the request format was, for example, .zip, we'd get an
`ActionView::MissingTemplate` error.
 2016-02-15 16:38:27 -05:00
Robert Speicher 012c75d1b0 Properly render the errors/git_not_found page 2016-02-15 15:52:39 -05:00
Robert Speicher f5ab126fd0 Ensure Commit#show responds 404 instead of 500 when given an invalid ID 
Closes #13467
 2016-02-15 15:48:16 -05:00
Douwe Maan 9022070fac Merge branch 'olirogers/gitlab-ce-project-milestone-order' into 'master' 
Fix milestone order in project and issue edit lists to due_date

_Originally opened at !2579 by @olirogers._

- - -

This MR orders the milestones by due date (earliest first) in the project and edit issue view. These suggestions were made be @orih in #6001 and fixes #6001.

This continues the work of !1934 to order milestones.

I found this annoying when creating milestones, found #6001 but no attached MR. This is my first for this project - comments and criticisms welcome.

See merge request !2780
 2016-02-12 09:32:57 +00:00
Grzegorz Bizon 28b11963b1 Move builds badge implementation to new badges controller 2016-02-11 10:29:15 +01:00
Grzegorz Bizon d51e8e1b77 Inherit build badge access permissions from project 2016-02-11 10:29:15 +01:00
Grzegorz Bizon 479d412e09 Respond to proper format for build badge request 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 52352dccc3 Move badge implementation to builds controller 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 442a49db2b Skip authentication when requesting commit status badge 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 28c4c949a5 Improve CI status badge implementation 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 14f928b730 Add CI status badge implementation to commit controller 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 01a406f5b0 Render 404 if there is no project for old CI status badge 2016-02-11 10:29:14 +01:00
Grzegorz Bizon a2f61368f9 Add deprecation warning for old CI status badge action 
We keep this only for backwards compatibility with projects that have
been migrated from GitLab CI. New project badge will go elsewhere.
 2016-02-11 10:29:14 +01:00
Oliver RogersandRémy Coutable a7567ca152 Fix milestone order in project and issue edit lists to due_date 2016-02-10 17:42:20 +01:00
Douglas Barbosa Alexandre 1353cff5fe Replaces "Create merge request" link with one to the MR when one exists 2016-02-10 10:32:25 -02:00
Dmitriy Zaporozhets 22808a2221 Merge branch 'fix-explore-filter' into 'master' 
Add ajax filtering to all paged project lists. Fixes #13182



See merge request !2728
 2016-02-10 08:31:36 +00:00
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05:00
Josh Frye 120dca0f35 MR feedback 2016-02-09 10:10:41 -05:00
Josh Frye 8b4e9720d9 Extract events rendering to own action. 2016-02-09 10:10:41 -05:00
Josh Frye 30e022a2fe Starred, All, and Trending on explore are paged also group projects. Need ajax filter. 2016-02-09 10:10:41 -05:00
Jason LeeandRémy Coutable 9474e36f46 Add option to include the sender name in body of Notify email. fix #7824 2016-02-09 12:58:13 +01:00
Douwe Maan aacde42d55 Merge branch 'rs-broadcast-markdown' into 'master' 
Allow limited Markdown in Broadcast Messages

Closes #11853

See merge request !2695
 2016-02-09 11:44:08 +00:00
Rémy Coutable 9fdd605fd2 Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master' 
Remember user's inline/tabular diff view preference in a cookie

_Originally opened at !1677 by @kkm._

---

As per #3071, some users (we have a local EE installation) prefer 2-column view in diff. In this MR I add an implementation for this feature, using a cookie.

Fixes #3071.

See merge request !2723
 2016-02-08 13:34:58 +00:00
Robert Speicher 89b3ddd609 Allow limited Markdown in Broadcast Messages 
Closes #11853
 2016-02-06 14:30:07 -05:00
Kamil Trzcinski 170ca8435a Merge branch 'master' into ci-permissions 
# Conflicts:
#	db/schema.rb
 2016-02-05 20:15:32 +01:00
Dmitriy Zaporozhets fed80f25f5 Merge branch 'fix-double-page' into 'master' 
Fix double paging

![Screen_Shot_2016-02-05_at_10.27.34_AM](/uploads/a21ad6c47ddecad29d377497ee2a167d/Screen_Shot_2016-02-05_at_10.27.34_AM.png)

![Screen_Shot_2016-02-05_at_10.27.44_AM](/uploads/3badb423df25f009886138c65cfe8347/Screen_Shot_2016-02-05_at_10.27.44_AM.png)


See merge request !2727
 2016-02-05 16:29:50 +00:00
Dmitriy Zaporozhets b0d5aeaa55 Merge branch 'improve-broadcast-messages' into 'master' 
Improve admin broadcast messages page

* Show latest broadcast messages first on admin page
* Use nice looking pagination

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

Fixes #13211 

cc @rspeicher @DouweM 

See merge request !2725
 2016-02-05 16:16:14 +00:00
Josh Frye 1a9630acc5 Fix double paging 2016-02-05 10:45:22 -05:00
Dmitriy Zaporozhets 989caaebdc Improve admin broadcast messages page 
* Show latest broadcast messages first on admin page
* Use nice looking pagination

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-05 16:01:10 +01:00
Rémy Coutable f6d816f9fe Add a controller test for the new 'diff_view' cookie 2016-02-05 15:40:44 +01:00
kkmandRémy Coutable cf1349adb7 Remember user's inline/tabular diff view preference in a cookie 2016-02-05 15:40:44 +01:00
Josh Frye 3f1bd844f1 Implement changes from MR feedback 2016-02-04 14:02:19 -05:00
Josh Frye 2ad094132d Various filter fixes 2016-02-04 13:03:41 -05:00
Josh Frye 7522ac0b3c Paginate + ajax filter dashboard projects 2016-02-04 11:40:19 -05:00
Josh Frye 87b61db7ed Page project list on dashboard 2016-02-04 11:40:19 -05:00
Dmitriy Zaporozhets d9624bb87a Merge branch 'rs-backport-ldap-2fa' into 'master' 
Support Two-factor Authentication for LDAP users

Closes #12653

See merge request !2688
 2016-02-04 15:19:33 +00:00
Kamil Trzcinski 6fea7c386f Merge remote-tracking branch 'origin/master' into ci-permissions 
# Conflicts:
#	app/views/projects/builds/index.html.haml
 2016-02-04 13:16:48 +01:00
Kamil Trzcinski b4c36130cc Rename allow_guest_to_access_builds to public_builds 2016-02-04 12:57:46 +01:00
Dmitriy Zaporozhets 73bd729ecc Add sort dropdown to dashboard projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-03 20:13:26 +01:00
Robert Speicher d6ef6c634e Support Two-factor Authentication for LDAP users 
Closes #12653
 2016-02-03 13:31:12 -05:00
Stan HuandRémy Coutable 7aa739ddc7 Support download access by PRIVATE-TOKEN header 
Currently there is no way to download a raw file without embedding
the token in the URL, which exposes the token in the URL. There
should be an way of sending this information via the header as the
API does.

Closes https://github.com/gitlabhq/gitlabhq/issues/8137
 2016-02-03 15:42:24 +01:00
Kamil Trzcinski 8670411ae7 Clean Ci::ApplicationController from unused permission related code 2016-02-03 11:24:14 +01:00
Robert Speicher 8a85906a74 Merge branch 'support-akismet' into 'master' 
Support Akismet spam checking for creation of issues via API

Currently any spam detected by Akismet for non-members via API will
be logged in a separate table in the admin page.

Closes #5612

See merge request !2266
 2016-02-03 01:26:30 +00:00
Jacob Vosmaer 752468d55b Merge branch 'git-raw-workhorse' into 'master' 
Send raw Git blobs via gitlab-workhorse



See merge request !2451
 2016-02-02 17:22:04 +00:00
Kamil Trzcinski 627909c2a4 Add CI setting: allow_guest_to_access_builds 
Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
 2016-02-02 17:59:37 +01:00
Jacob Vosmaer b67f8eee0d Use @repository 2016-02-02 15:06:14 +01:00