home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,308 Commits 48 Branches 340 Tags
b277f23a538ffbbf100719f4d7434a9e458d5b5e
Commit Graph
15308 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stan Hu b277f23a53 Improve regexp to prevent false positives 
If a filename happened to contain "db" and enough "rwx" characters before, then
this test would previously fail. For example:

```
drwxr-xr-x gitlab-runner/gitlab-runner      0 2015-04-02 07:46 uploads/tmp/cassidy.stokes8477/gitlabhq/36d972fa55d6b44810fc6fd843473adb/
```

Adding a space before the "db" match string tightens up the regexp and reduces the
chance of unintended match.
 2015-04-02 07:02:47 -07:00
Douwe Maan 2a0d38c03f Merge branch 'rs-icon-symlink' into 'master' 
Check symlink mode as a String for file_type_icon_class

The file mode for a symlink just got changed in `gitlab_git`, see https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69

See merge request !487
 2015-04-02 08:09:02 +00:00
Robert Speicher 6ab8275cd1 Check symlink mode as a String for file_type_icon_class 
See https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69
 2015-04-01 23:34:33 -04:00
Marin Jankovski 254698d6b8 Update CHANGELOG. 2015-04-02 05:06:07 +02:00
Marin Jankovski 897fb55c78 Update changelog for 7.9.2. 2015-04-02 05:04:13 +02:00
Marin Jankovski 16a6ea2d17 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-03-31 19:04:52 -07:00
Marin Jankovski d77f333f9c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 
Conflicts:
	lib/gitlab/markdown.rb
 2015-03-31 19:03:54 -07:00
Marin Jankovski 96d093e59a Merge branch 'email-full-url' 2015-03-31 19:00:59 -07:00
Dmitriy Zaporozhets c14c03a88f Merge branch 'rs-issue-1340' into 'master' 
Unbind task item checkbox events and then rebind them

Fixes #1340

This issue was caused by this line: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/views/projects/issues/update.js.haml#L17

`new Issue()` gets called on every JS-based issue update, and all the binds in the constructor get re-applied without first unbinding the existing ones. Right now my fix is *only* for the checkbox events, and I suspect there are similar issues still present for other events.

See merge request !478
 2015-04-01 01:33:03 +00:00
Dmitriy Zaporozhets 7ed8b76f64 Merge branch 'no-chmod-r' into 'master' 
Don't use chmod_R for backup tars

When creating backup tar files, only change permissions on the `db`, `uploads`, and `repositories` directories, not their contents.  See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1716#note_40472

See merge request !1744
 2015-04-01 01:10:00 +00:00
Dmitriy Zaporozhets dc3b4321ff Merge branch 'group-information-leak' into 'master' 
Don't leak private group existence by redirecting from namespace controller to group controller.

See merge request !440
 2015-04-01 01:01:38 +00:00
Dmitriy Zaporozhets 0622b87537 Merge branch 'admin-user-projects' into 'master' 
Fix admin user projects lists.

The admin user personal projects lists wasn't being rendered anymore.

cc @marin

See merge request !442
 2015-04-01 00:44:09 +00:00
Dmitriy Zaporozhets a9af64855d Merge branch 'refactor-milestones' into 'master' 
Better looking milestone lists

### Before

![milestone-before](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1366ade74d76b067fdc8707d31d2bffc/milestone-before.png)

### After

![milestone-after](https://gitlab.com/gitlab-org/gitlab-ce/uploads/80ae1c1f77eae5dff8ee61c4271bec17/milestone-after.png)

See merge request !484
 2015-04-01 00:37:39 +00:00
Dmitriy Zaporozhets d71fbe713b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-01 02:48:54 +03:00
Dmitriy Zaporozhets 6a790b7963 Better looking milestone lists 2015-04-01 02:45:47 +03:00
Robert Speicher 085f12288d Unbind task item checkbox events and then rebind them 
Fixes #1340
 2015-03-31 17:45:11 -04:00
Dmitriy Zaporozhets eb2339a401 Merge pull request #9023 from dantudor/patch-1 
Allow ability to delete branches with '/` in name
 2015-03-31 19:30:15 +03:00
Dan Tudor a6c6335671 Added the missing comma 2015-03-31 17:08:33 +01:00
Douwe Maan 33a8f53f7a Merge branch 'file-commit-list' into 'master' 
Fixed issue where only 25 commits would load in file listings

Fixes #1310

See https://gitlab.com/gitlab-org/gitlab-ce/tree/master and it will only show the first 25 files commit messages.

See merge request !477
 2015-03-31 08:24:18 +00:00
Douwe Maan 2d5f4458a0 Fix admin user projects lists. 2015-03-31 09:19:08 +02:00
Robert Schilling 28e5c42f80 Merge branch 'doc_issue_closing' into 'master' 
Update documentation on issue closing pattern.

See merge request !475
 2015-03-31 06:50:59 +00:00
Dmitriy Zaporozhets 0191857fac Better legend for contribution calendar pt2 :) 2015-03-31 05:57:36 +03:00
Dmitriy Zaporozhets 549e6c100b Better legend for contribution calendar 2015-03-31 05:50:10 +03:00
Dmitriy Zaporozhets 64c89e6012 Merge branch 'commits-count-badge' into 'master' 
Added badge to commits tab

Fixes #1261

See merge request !465
 2015-03-30 21:52:26 +00:00
Phil Hughes 4d7cd4f329 Added badge to commits tab 2015-03-30 22:46:01 +01:00
Dmitriy Zaporozhets 661c9f0f8f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-30 14:18:19 -07:00
Dmitriy Zaporozhets 6574bffef6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-30 14:18:11 -07:00
Dmitriy Zaporozhets b7e2be247f Fix adding new members to group 2015-03-30 14:17:49 -07:00
Achilleas Pipinellis 7a02b5c20c Missing dot. 2015-03-30 23:55:12 +03:00
Dmitriy Zaporozhets c66c3a34c4 Merge pull request #9056 from mavimo/patch-3 
Fix merge errors on CHANGELOG
 2015-03-30 13:23:08 -07:00
Achilleas Pipinellis 64cd7ebf39 Update documentation on issue closing pattern. 2015-03-30 22:31:07 +03:00
Douwe Maan fe7992a524 Merge branch 'events-paginate' into 'master' 
API: Events paginate

Updated the api method for /project/:id/events, to use the paginate method instead of limiting and offsetting the recent events in the method itself.

This will also change the first page to be 1 instead of 0, but using 0 will still work and will give back the first page.
This also add's the link headers (next/first/last).

See merge request !267
 2015-03-30 19:01:03 +00:00
Phil Hughes 82db3dc8b0 Fixed issue where only 25 commits would load in file listings 2015-03-30 19:31:13 +01:00
Achilleas Pipinellis 5059681f22 Merge branch 'upgrade-dockerfile-7.9.1' into 'master' 
Bump Docker build to GitLab v7.9.1

Upgrade GitLab from v7.9.0 to v7.9.1.

See merge request !476
 2015-03-30 16:18:29 +00:00
Marco Vito Moscaritolo 718661f9aa Fix merge errors on CHANGELOG 
During merges (d554070a and 497fd75d) changelog was "damaged", I restored the tagged 7.9.1 and added the required changes about 7.10.0 (unreleased). I think we need to ensure all PR are rebased on master before merge.
 2015-03-30 18:17:41 +02:00
Stan Hu b06a4ff5a7 Bump Docker build to GitLab v7.9.1 2015-03-30 15:18:43 +00:00
Robert Schilling 43a680b9e9 Merge pull request #9053 from firstrow/patch-1 
LICENSE year update
 2015-03-30 10:05:47 +02:00
Andrew 227535761d LICENSE year update 2015-03-30 11:03:42 +03:00
Dmitriy Zaporozhets 3371e40bd4 Include brakeman in rake test 2015-03-29 18:55:18 -07:00
Dmitriy Zaporozhets 9d6ffcfa5f Refactor star btn logic for non-logged in user and fix tests 2015-03-29 18:50:45 -07:00
Dmitriy Zaporozhets 405f91d2b8 Refactor star/fork buttons 2015-03-29 18:15:54 -07:00
Dmitriy Zaporozhets 6b9f1e1a9f Merge branch 'file-type' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-file-type 2015-03-29 17:23:53 -07:00
Dmitriy Zaporozhets 38dd6bcaae Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-29 17:23:09 -07:00
Dmitriy Zaporozhets 57a49b340e Merge branch 'repo-buttons' into 'master' 
Repo buttons

Fixes #796

Moved the star & fork button to inline with the other buttons.

See merge request !473
 2015-03-29 17:21:31 +00:00
Phil Hughes 6920fd3ddd Alignment fixes for repo buttons 2015-03-29 12:56:45 +01:00
Phil Hughes 7652510c6b Moved download button into sidebar 
Star and fork buttons moved up
 2015-03-29 12:23:56 +01:00
Dmitriy Zaporozhets 40c3675372 Merge branch 'clear-note-form-on-succcess' into 'master' 
Prevent note form from being cleared when submitting failed.

When you try to submit a comment while you're not connected to the internet or while your connection is having trouble, the AJAX request would fail and the note would be deleted 😢

See merge request !468
 2015-03-29 10:58:34 +00:00
Dmitriy Zaporozhets 5e266f84f5 Merge pull request #9041 from tsigo/rs-maintain-test-schema 
Add ActiveRecord::Migration.maintain_test_schema! to spec_helper
 2015-03-29 03:42:58 -07:00
Dmitriy Zaporozhets 275f64fb86 Merge pull request #9044 from tsigo/rs-git-template-env 
Define GIT_TEMPLATE_DIR environment variable in TestEnv
 2015-03-29 03:40:56 -07:00
Dmitriy Zaporozhets 0a634f3481 Merge pull request #9040 from tsigo/rs-refactor-nav-collapse 
Refactor sidebar JS logic
 2015-03-29 03:36:28 -07:00