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
19,876 Commits 48 Branches 340 Tags
eea8a6d0620e47fb4c009eefb73fa100fa2ba3e8
Commit Graph
2127 Commits
Author SHA1 Message Date
Kamil Trzcinski e0eb51e945 Fix broken Runners admin page 2015-10-23 16:25:23 +02:00
Kamil Trzcinski 6b7d01d9ff Allow developer to manage builds 2015-10-23 16:25:22 +02:00
Kamil Trzcinski f855755999 Fix small CI UI regressions 2015-10-23 16:25:21 +02:00
Robert SpeicherandRobert Speicher 8fe4352eba Merge branch 'project-path-case-sensitivity' into 'master' 
Prefer project with exact path to differently cased one when both exist.

Fixes #3113.

See merge request !1649
 2015-10-22 15:05:54 +02:00
Robert SpeicherandRobert Speicher 613f368ce5 Merge branch 'fix-ci-services-editing' into 'master' 
Fix 500 when editing CI services

Fixes #3090

See merge request !1663
 2015-10-22 14:04:30 +02:00
Dmitriy ZaporozhetsandRobert Speicher 595fc4d906 Merge branch 'handle-no-http-referer' into 'master' 
Redirect to a default path if HTTP_REFERER is not set

Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode,
and it's possible load balancers/proxies strip the HTTP_REFERER from
the request header. In these cases, default to some default path.

Closes #3122

Closes https://github.com/gitlabhq/gitlabhq/issues/9731

See merge request !1646
 2015-10-20 18:38:33 +02:00
Douwe MaanandRobert Speicher acc1af5f0f Merge branch 'remove-duplicate-repos-in-github-import' into 'master' 
Fix duplicate repositories in GitHub import page

By default, all the current user's repositories are accessible via the
/users endpoint. There's no need to traverse all the organization
repositories as well.

See:

* http://www.rubydoc.info/github/pengwynn/octokit/Octokit/Client/Repositories#repositories-instance_method
* https://developer.github.com/v3/repos/#list-your-repositories

Closes #2523

See merge request !1644
 2015-10-20 18:30:57 +02:00
Dmitriy ZaporozhetsandRobert Speicher 44d35a8225 Merge branch 'merge-request-deleted-file' into 'master' 
Correctly find last known blob for file deleted in MR.

Fixes #3092.

When building a new MR, `@merge_request.commits.last` would fail because this delegates to `merge_request_diff` which is still `nil` at that point. I fixed that, and changed some of the logic because showing deleted blob contents didn't previously work for the Compare page, and the UI would show the wrong commit sha for "View File @...".

See merge request !1647
 2015-10-20 18:28:15 +02:00
Robert Speicher f2a6e876e2 Merge branch 'grzesiek/gitlab-ce-fix/non-member-notification-button' 2015-10-19 14:17:33 +02:00
Robert SpeicherandRobert Speicher 955f424834 Merge branch 'jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify' into 'master' 
Send an email to admin email when a user is reported for spam

Replaces !1547.

Fixes #2839.

See merge request !1634
 2015-10-19 14:07:34 +02:00
Douwe MaanandRobert Speicher 0a156d5e74 Merge branch 'cross-reference-mr-on-issues' into 'master' 
Show merge requests which close current issue

Closes #2903

### What does this MR do
If an issue is to be closed by a merge request the current user has access to, this will be displayed when the user looks at the issue.

![Screenshot_from_2015-10-12_12-10-37](https://gitlab.com/zj/gitlab-ce/uploads/52e429704e73067b24b69801f13ad7bc/Screenshot_from_2015-10-12_12-10-37.png)

/cc @DouweM

See merge request !1569
 2015-10-19 12:10:19 +02:00
Dmitriy ZaporozhetsandRobert Speicher 84f288c7c5 Merge branch 'redirect-ci-page' into 'master' 
Redirect old CI project route to GitLab project

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

See merge request !1629
 2015-10-17 17:44:25 -04:00
Dmitriy ZaporozhetsandRobert Speicher 73547ae613 Merge branch 'redirect-ci-dash' into 'master' 
Temporary bring /ci page page with help information

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

See merge request !1630
 2015-10-17 17:40:33 -04:00
Kamil Trzcinski 0d09b5fefc Fix builds view count indicator 2015-10-15 15:50:40 +02:00
Valery Sizov 62bf2eb862 Merge branch 'fix/improve_reset_service_password_v2' into 'master' 
Improve invalidation of stored service password if the endpoint URL is changed (V2)

New version of !1583, using the same failproof logic but this time mirroring the name and behaviour of the change-tracking methods of ActiveModel::Dirty in order to make it clearer and more natural.

Added more tests to clarify the expected behaviour.

This is an alternative to !1594

/cc @vsizov @rspeicher

See merge request !1600
 2015-10-15 13:47:37 +00:00
Dmitriy Zaporozhets c0a6836be4 Merge branch 'view-issue-performance' 2015-10-15 14:37:04 +02:00
Douwe Maan 4b28f2d999 Merge branch 'git-archive-golang' into 'master' 
Let gitlab-git-http-server handle archive downloads

This change relies on changes in gitlab_git and gitlab-git-http-server.

fixes #2429

See merge request !1548
 2015-10-15 11:43:14 +00:00
Kamil Trzciński daccc54d25 Merge branch 'builds-view' into 'master' 
Added builds view

![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png)

/cc @dzaporozhets @vsizov 


See merge request !1593
 2015-10-15 11:35:57 +00:00
Dmitriy Zaporozhets 524b3db30c Merge branch 'fix-path-with-leading-dot-error' into 'master' 
Fix error preventing displaying of commit data for a directory with a leading dot

Directories with leading dots erroneously get rejected by the route controller if git
ref regex is used in constraints. This prevents commit data from being loaded. The regex verification is now done in controller.

Closes https://github.com/gitlabhq/gitlabhq/issues/8763


See merge request !1574
 2015-10-15 10:36:24 +00:00
Alex Lossent 98e666ab6a Improve invalidation of stored service password if the endpoint URL is changed 
Password can now be specified at the same time as the new URL, and the service
template admin pages now work.
 2015-10-15 12:07:59 +02:00
Yorick Peterse e5925d073e Renamed Note.inc_associations to with_associations 2015-10-15 12:05:01 +02:00
Yorick Peterse 1554786c6a Eager load various issue/note associations 
This ensures we don't end up running N+1 queries for the objects in the
affected collections.
 2015-10-15 12:05:01 +02:00
Douwe Maan c993481d99 Merge branch 'master' into git-archive-golang 2015-10-15 11:47:36 +02:00
Robert Speicher 123669a551 Merge branch 'simplify-cross-references' into 'master' 
Simplify code around (cross)-references

See merge request !1568
 2015-10-14 20:10:34 +00:00
Kamil Trzcinski d9ece71ef0 Fix specs 2015-10-14 17:38:26 +02:00
Kamil Trzcinski 7af4f5215e Show warning if build doesn't have runners with specified tags or runners didn't connect recently 
Slightly refactor runner status detection: moving it to Runner class

Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
 2015-10-14 17:29:18 +02:00
Kamil Trzcinski 4d69c6a336 Refactor builds view 2015-10-14 17:28:38 +02:00
Kamil Trzcinski a957eca6f3 Added builds view 2015-10-14 17:28:38 +02:00
Jacob Vosmaer a74915a4ad Always return HTML in git_not_found 
This allows us to give a nice 404 for e.g. archive.zip.
 2015-10-14 15:22:03 +02:00
Valery Sizov 8346dde052 Only render 404 page from /public 2015-10-13 20:12:34 +03:00
Stan Hu d02d02c672 Fix error preventing displaying of commit data for a directory with a leading dot 
Closes https://github.com/gitlabhq/gitlabhq/issues/8763
 2015-10-12 22:24:19 -07:00
teuneboon 5479797f0a Make group deleted text consistent with group created and updated texts 2015-10-12 14:37:56 +02:00
teuneboon d6a523d785 Fix typo(missing quote) when deleting groups 2015-10-12 14:37:07 +02:00
Douwe Maan b0164771ec Simplify code around (cross)-references 2015-10-12 11:54:46 +02:00
Jacob Vosmaer cb13980db8 Let gitlab-git-http-server handle archive downloads 
This change relies on changes in gitlab_git and gitlab-git-http-server.
 2015-10-08 17:12:00 +02:00
Dmitriy Zaporozhets 030b5038b1 Merge branch 'cleanup-ci-pages' into 'master' 
Cleanup CI pages

- [x] Remove `ci/projects/:id` page
- [x] Remove Continuous integration from project menu
- [x] Remove unused css/js
- [x] Remove Ci::Commit and Ci::Build controllers
- [x] Move CI services to project settings area


cc @ayufan 

Part of #2594

See merge request !1529
 2015-10-07 17:04:54 +00:00
Dmitriy Zaporozhets 7f63a8787c Fix tests and few CI features 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 17:54:49 +02:00
Dmitriy Zaporozhets a30b68fe1d Move CI services to project settings area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 16:20:31 +02:00
Dmitriy Zaporozhets 1e06cabf4a Remove Ci::Commit and Ci::Build controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 15:24:32 +02:00
Dmitriy Zaporozhets e52de6771f Remove Continuous Integration from project menu 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 14:43:58 +02:00
Stan Hu 0ab6ca93aa Add directory feature button 
Change "+" icon under "Files" section to have three options:

* Create file
* Upload file
* New directory

Upload file is no longer accessible from the "Create file" page.
Users can now select a target branch in upload file as well.

Closes #2799: Fixes a bug where file modes were overwritten after a commit

Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files
can no longer be overwritten in the "Create file" section.

Closes #2557
 2015-10-07 04:22:55 -07:00
Dmitriy Zaporozhets 82b6a17ca7 Fix ci build routing and few tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 21:41:37 +02:00
Dmitriy Zaporozhets 27b75b2b2d Refactor commit/build tests and fix CI cancel 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 20:36:22 +02:00
Dmitriy Zaporozhets 04c7dc2a9e Cleanup CI code after refactoring and fix several 500 errors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 20:15:06 +02:00
Dmitriy Zaporozhets f6223ffb31 Move CI build page to CE project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 19:34:21 +02:00
Dmitriy Zaporozhets ad627e40dc Merge branch 'ci-commit-page' into 'master' 
Render CI statuses on commit page

This MR merges CI commit page into CE commit page.

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

See merge request !1519
 2015-10-06 17:31:54 +00:00
Kamil Trzcinski 17de909a42 Fix broken grouping sql clause when rendering commits for CI 2015-10-06 16:25:27 +02:00
Dmitriy Zaporozhets 697b34d786 Render CI statuses on commit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 16:10:17 +02:00
Kamil Trzcinski fc795d6ee2 Fix graphical glitches 2015-10-05 21:20:54 +02:00
Dmitriy Zaporozhets b2803a5e05 Merge branch 'master' of github.com:gitlabhq/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-05 20:15:43 +02:00