Commit Graph
727 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre 1e76245d4e Add commit_id to todos 2016-03-18 11:00:53 -03:00
Douglas Barbosa Alexandre 42834095bc Change target_id to null on todos 2016-03-18 11:00:53 -03:00
Douglas Barbosa Alexandre abb77d0f6c Add a confidential flag to issues 2016-03-17 20:55:38 -03:00
Douwe Maan 21af7459ab Merge branch '4009-external-users' into 'master'
External Users

The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.

Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users)


![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png)

See merge request !3171
2016-03-17 14:15:38 +00:00
Yorick Peterse af4d5458a9 Added an index on ci_runners.token
On PostgreSQL the index is created concurrently.

Fixes gitlab-org/gitlab-ce#14325
2016-03-16 13:38:47 +01:00
Zeger-Jan van de Weg 59064aeeef Merge branch 'master' into 4009-external-users 2016-03-15 19:16:16 +01:00
Douwe Maan ea7d062fa6 Merge branch 'auto-gc' into 'master'
Run 'git gc' every 10 pushes

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

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

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/254

Associated gitlab-shell MR:
https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/44

See merge request !3206
2016-03-15 10:51:38 +00:00
Zeger-Jan van de Weg 88f8d3a4d6 Merge branch 'master' into 4009-external-users 2016-03-14 20:08:02 +01:00
Dmitriy Zaporozhets d324bf8434 Merge branch 'share-project-ce' into 'master'
Bring from EE: Share Project with Group

- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests

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

For #12831 

cc @DouweM @rspeicher @vsizov

See merge request !3186
2016-03-14 16:38:52 +00:00
Jacob Vosmaer 021d53c96d Run 'git gc' every 10 pushes 2016-03-14 16:49:24 +01:00
Zeger-Jan van de Weg 42fcd3881f External Users
The user has the rights of a public user execpt it can never create a project,
 group, or team. Also it cant view internal projects.
2016-03-13 19:08:04 +01:00
Robert Speicher 01f6db4f64 Disallow blank (non-null) values for a Note's line_code attribute
It's unclear how these blank values got added, but GitLab.com had a few:

```
irb(main):002:0> Note.where("line_code IS NOT NULL AND line_code = ''").count
=> 439
```

We've added a migration to convert any existing records to use a NULL
value when blank, and updated Note to set blank values to nil before
validation.
2016-03-11 17:46:50 -05:00
Yorick PeterseandRobert Speicher 67143e25a2 More detailed trigram migration error message
This explains the user what they need to run and where to go in case
they want to learn more about "CREATE EXTENSION".
2016-03-11 15:26:32 -05:00
Yorick PeterseandRobert Speicher 2080fd395c Updated schema to include Pg operator classes
This also includes e.g. the appearances table which apparently wasn't
already included in the schema.
2016-03-11 15:25:22 -05:00
Yorick PeterseandRobert Speicher d24ee2a206 Added trigram indexes for various searched columns
This allows the LIKE condition to use an index. Without a GIN + trigram
index LIKE queries using a wildcard at the start _won't_ use an index
and instead perform a sequence scan.
2016-03-11 15:25:21 -05:00
Dmitriy Zaporozhets 9a95b15552 Add share project from group lock
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-11 19:03:19 +01:00
Dmitriy Zaporozhets ea5f4cae53 Bring ProjectGroupLink model and migrations from EE
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-11 17:47:05 +01:00
Douglas Barbosa Alexandre 22140ced0b Remove invalid todos from database 2016-03-09 11:18:13 -03:00
Yorick Peterse c666441d40 Added main_language to the schema
This wasn't included in gitlab-org/gitlab-ce!3000.
2016-03-09 12:35:24 +01:00
Dmitriy Zaporozhets bc14d81af0 Merge branch 'rs-snippets-dont-expire' into 'master'
Remove `Snippet#expires_at`

This was removed from the interface in
https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation
lingered around for two years.

See merge request !3103
2016-03-09 09:02:17 +00:00
tiagonbotelhoandYorick Peterse c2c5572e22 adds swp and swo to gitignore and improves migration for project main_language 2016-03-07 21:59:39 +01:00
tiagonbotelhoandYorick Peterse a14b98f858 implements project languages saving them onto the database 2016-03-07 21:59:39 +01:00
Robert Speicher 836d593033 Remove Snippet#expires_at
This was removed from the interface in
https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation
lingered around for two years.
2016-03-05 18:12:17 -05:00
Robert Speicher 599a6d7873 Allow the initial admin to set a password
Closes #1980
2016-03-04 17:37:57 -05:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Dmitriy Zaporozhets 7e5e825a65 Fix broken migration
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-29 16:41:45 +01: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
Douglas Barbosa Alexandre 3d52e139b1 Rename Tasks to Todos 2016-02-20 12:39:27 -02:00
Douglas Barbosa Alexandre 1d476b0656 Create a pending task when a user is mentioned on a note 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 41d8f5649e Add task model 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
Rubén DávilaandRobert Speicher f56ee9d3b9 Save merge commit id when MR is merged 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher 720e52d9d9 Add merge_commit_sha column to merge_requests. 2016-02-19 13:14:48 -05:00
Grzegorz Bizon 293999cabb Fix name of build erasable, remove superfluous method from it 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon 433de7baca Remove boolean erase column from ci build and foreign key 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon bae3701073 Add build eraseable columns to ci builds table 2016-02-19 17:24:59 +01:00
Tap 2e81b1558b Label description and Label row
- Add label description
- Show label row when filtering issues or merge requests by label
2016-02-17 21:52:12 +08:00
Grzegorz Bizon eb7721e183 Add second build for each commit in build seeds 2016-02-11 10:29:14 +01:00
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05:00
Douwe Maan a52c5778bb Merge branch 'index_snippet' into 'master'
Add index for snippet's updated_at

@DouweM We are ordering by `updated_at` but there is no index.

cc @yorickpeterse 

See merge request !2768
2016-02-09 16:12:58 +00:00
Douwe Maan 706b101f51 Merge branch 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master'
Add option to include the sender name in body of Notify email

_Originally opened at !2495 by @huacnlee._

- - -

Fixes #7824.

See merge request !2767
2016-02-09 14:12:56 +00:00
Douwe Maan 80352b783c Merge branch '3kami3/gitlab-ce-root_email' into 'master'
Add an option to supply root email through an environmental variable.

_Originally opened at !2499 by @3kami3._

---

Add an option to supply root email through an environmental variable.

See merge request !2751
2016-02-09 13:55:52 +00:00
Valery Sizov 6c3cd241e8 Add index for snippet's updated_at 2016-02-09 15:10:22 +02: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 a5c2e7a486 Merge branch 'fix/atom-url-issue' into 'master'
do not rename .aToM but only .atom projects in migration

Sorry @DouweM forgot to add this.

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2651/diffs#bc35672f73f4ee025132aee428f383acdf0f755e_0_51

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

See merge request !2712
2016-02-09 10:39:20 +00:00
3kami3andRémy Coutable cdcedd5b26 Add an option to supply root email through an environmental variable. 2016-02-08 18:26:29 +01:00
Kamil Trzcinski 170ca8435a Merge branch 'master' into ci-permissions
# Conflicts:
#	db/schema.rb
2016-02-05 20:15:32 +01:00
James Lopez c663ca434f remove unnecessary lower function on SQL 2016-02-04 18:38:11 +01:00
Douwe Maan ac923b4fb4 Merge branch 'fix/atom-url-issue' into 'master'
Fix atom url issue on projects

This MR adds prevents a project to have a path ending in .atom that conflicts with the feed

and 

Adds a migration to migrate old .atom projects to a different path

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

See merge request !2651
2016-02-04 16:12:47 +00:00
James Lopez 5dc77d7577 refactored migration based on feedback 2016-02-04 15:35:03 +01:00