home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,943 Commits 48 Branches 340 Tags
54aa0969d40549014bee6e4e500276405fb055ee
Commit Graph
3539 Commits
Author SHA1 Message Date
Douwe Maan 95f0440a78 Merge branch 'master' into rs-redactor-filter 2015-10-15 11:26:58 +02:00
Robert Speicher 976400c1e6 Merge branch 'incoming-email-config' into 'master' 
Make Reply by email easier to configure

Builds on !1566.

Omnibus companion MR: gitlab-org/omnibus-gitlab!510 (cc @marin)

See merge request !1580
 2015-10-14 20:38:36 +00: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
Douwe Maan 528d2823e9 Remove unused Gitlab::Markdown#cached? method 2015-10-14 21:52:41 +02:00
Douwe Maan 925dc5925b Cache rendered contents of issues, MRs and notes 2015-10-14 21:29:35 +02:00
Douwe Maan 539de0dd81 Merge branch 'master' into rs-redactor-filter 2015-10-14 20:23:36 +02:00
Douwe Maan b093cb35d1 Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelines 2015-10-14 20:18:49 +02:00
Douwe Maan da9746e59a Enable caching of Gitlab::Markdown rendered result 2015-10-14 19:28:46 +02:00
Douwe Maan ed41333a6e Use Gitlab::Markdown.render with :pipeline option rather than different methods 2015-10-14 19:28:09 +02:00
Zeger-Jan van de WegandZeger-Jan van de Weg 8db063b579 Scalable way of requesting all repos 2015-10-14 19:11:09 +02:00
Zeger-Jan van de Weg 54e6c0045b Added three rake tasks for repository maintainance 
Tasks added:
gitlab:git:repack
gitlab:git:gc
gitlab:git:prune
 2015-10-14 19:11:09 +02:00
Valery Sizov 8f584d5f2c Fix: Images cannot show when projects' path was changed 2015-10-14 18:50:35 +03:00
Valery Sizov a2f0a3650b Merge remote-tracking branch 'origin/cernvcs_hide_passwrd' 2015-10-14 18:40:58 +03:00
Valery Sizov 6c1faf4b33 Merge remote-tracking branch 'origin/inified_404_error' 2015-10-14 18:21:27 +03:00
Valery Sizov 4117d9b310 Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-ce 2015-10-14 14:15:34 +03:00
Han Loong Liauw 0bea5ced8b Made suggested content changes based on MR Review 
Changed the authentication method for removing fork through API
Reflected changes to new auth method in API specs
 2015-10-14 20:19:41 +11:00
Jacob VosmaerandGitLab 033a879cc9 Fix NGINX API download regex 
Users are allowed to supply namespace%2Fproject instead of a numeric ID
 2015-10-14 11:14:43 +02:00
Douwe Maan d313a7681b Explicitly only parse references by specified filter 2015-10-14 09:46:06 +02:00
Douwe Maan d6fb96b927 Have Issue#participants load all users mentioned in notes using a single query 2015-10-14 09:17:05 +02:00
Douwe Maan cd2583a3be Code cleanup 2015-10-13 23:03:53 +02:00
Douwe Maan 93fcddd7a7 Allow ReferenceExtractor to efficiently load references from multiple texts at once 2015-10-13 22:53:05 +02:00
Valery Sizov 8346dde052 Only render 404 page from /public 2015-10-13 20:12:34 +03:00
Douwe Maan 251e13666d Efficiently load multiple references of one type. 2015-10-13 18:23:49 +02:00
sue445 a092d27025 [ci skip] Fix wrong comment 
According to `attributes_for_keys` and API doc, `POST /projects/:id/merge_requests`
is received `target_project_id` (NOT `target_project`)
 2015-10-14 00:36:54 +09:00
Douwe Maan 5dd77358f6 Pass project to RedactorFilter 2015-10-13 13:36:47 +02:00
Douwe Maan 712d17684b Make Reply by email easier to configure 2015-10-13 13:10:49 +02:00
Han Loong Liauw df99ddbba1 Adds ability to remove the forked relationship 
This was previously possible through the API but can now be done
through the project#edit settings screen if the current user is
the owner of the project.
Update changelog
 2015-10-13 21:42:17 +11:00
Kamil Trzcinski daca1c6511 Fix broken tests 2015-10-12 22:32:29 +02:00
Kamil Trzcinski c61dc13150 Fix some changes 2015-10-12 16:41:36 +02:00
Kamil Trzcinski 789fe7b489 Update rendering 2015-10-12 16:32:58 +02:00
Kamil Trzcinski 69c04498ef Small bug fixes 2015-10-12 15:55:12 +02:00
Alex Lossent 024e34e94d Hide passwords to non-admin users in the services API 
In order to be consistent with !1490 doing it for the web interface
 2015-10-12 15:24:00 +02:00
Kamil Trzcinski 0aefeeb882 Add Commit Status documentation 2015-10-12 12:42:27 +02:00
Kamil Trzcinski 7ef156a242 Add author to statuses 2015-10-12 12:16:55 +02:00
Kamil Trzcinski 887494761e Fix commit status POST URL 2015-10-12 12:15:35 +02:00
Douwe Maan b0164771ec Simplify code around (cross)-references 2015-10-12 11:54:46 +02:00
Kamil Trzcinski 914cfbd2f1 Implement Commit Status API 2015-10-12 11:53:49 +02:00
Robert Speicher 42603af326 Merge branch 'fix_email_downcasing' into 'master' 
LDAP email address downcasing

Fixes #2960

In the event we cannot match an LDAP user by DN we attempt to find an identity by email address and then update the DN. In this case the identity is matched by email address. 

If the user's email address in LDAP has an upper case character we cannot find a match in the GitLab database. GitLab downcases emails before the user object is saved.

This merge request downcases the email from LDAP before we lookup by email. I also added a test to prevent a regression.

See merge request !1550
 2015-10-11 22:53:11 +00:00
Stan Hu 2df573dac3 Fix bug where merge request comments created by API would not trigger notifications 
Closes https://github.com/gitlabhq/gitlabhq/issues/9715
 2015-10-10 10:59:02 -07:00
Douwe Maan df3ae4ef13 Merge branch 'rs-issue-2970' into 'master' 
Normalize space-like characters in keys before output to gitlab-shell

gitlab-shell expects only one tab separator per key, and an SSH key with
a tab character in the comment, for example, would break things.

Closes #2970

See merge request !1552
 2015-10-09 11:38:59 +00:00
Jacob Vosmaer 6e1ec3b9af Merge branch 'rs-2fa-task' into 'master' 
Add task to disable 2FA for all users

Addresses #2971 

See merge request !1532
 2015-10-09 08:04:34 +00:00
Robert Speicher cd46f4c367 Add output and confirmation to gitlab:two_factor:disable_for_all_users 2015-10-08 23:19:56 -04:00
Robert Speicher 69b41ba043 Normalize space-like characters in keys before output to gitlab-shell 
gitlab-shell expects only one tab separator per key, and an SSH key with
a tab character in the comment, for example, would break things.

Closes #2970
 2015-10-08 20:34:50 -04:00
Drew Blessing b7def88c02 Fix ldap email downcasing bug 2015-10-08 14:59:46 -05: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
Yorick Peterse c8f18fc562 Added dedicated Rake task for setting up Postgres 
This ensures any PostgreSQL specific schema changes (e.g. expression
indexes) are created when setting up the database.
 2015-10-08 14:35:36 +02:00
Douwe Maan 9d066bc941 Raise error when a ReferenceFilter doesn't implement referenced_by 2015-10-08 13:00:49 +02:00
Douwe Maan e6419cecf4 Update inline doc 2015-10-08 13:00:49 +02:00
Robert Speicher e0f9d3a547 Update ReferenceFilter docs 
[ci skip]
 2015-10-07 18:40:54 -04:00
Yorick Peterse 85c6a3743a Added methods for detecting MySQL/PostgreSQL 
These two methods remove the need for manually going into
ActiveRecord::Base.connection all over the place.
 2015-10-07 23:32:14 +02:00