home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,474 Commits 48 Branches 340 Tags
0723bf1afaaf13ddcb58c211161389052d18e501
Commit Graph
736 Commits
Author SHA1 Message Date
Marin Jankovski ca6fd8841e Add group milestones routes and controller. 2014-06-30 09:42:28 +02:00
Marin JankovskiandDmitriy Zaporozhets 49c9e8ec02 Use an error page when oauth fails. 2014-06-24 15:30:29 +03:00
Dmitriy Zaporozhets 66541d8d6f Merge pull request #7140 from Mik-die/master 
Add Gitlab to Teatro.io
 2014-06-24 10:29:59 +03:00
Marin Jankovski 37425618bc Add option for admin to remove users secondary emails. 2014-06-23 09:45:26 +02:00
Dmitriy Zaporozhets 5aaa35656e Merge branch 'redirect_after_login' into 'master' 
Redirect after login
 2014-06-23 06:38:24 +00:00
Marin Jankovski 26d1bd7c2a Set return url as param. 2014-06-19 14:20:25 +02:00
Dmitriy Zaporozhets 2d87556847 Remove rails observers from application 2014-06-17 22:51:43 +03:00
Dmitriy Zaporozhets a90a201d0e Remove user observer 2014-06-17 22:32:35 +03:00
Dmitriy Zaporozhets a7d5052cd4 Remove SystemHook observer 2014-06-17 22:20:10 +03:00
Dmitriy Zaporozhets 6149dba518 Remove NotesObserver 2014-06-17 22:09:01 +03:00
Dmitriy Zaporozhets a7f3672b75 Remove project observer 2014-06-17 21:53:26 +03:00
Dmitriy Zaporozhets 9e3094b232 Remove UsersGroup observer 2014-06-17 21:36:40 +03:00
Dmitriy Zaporozhets b3a90aba41 Remove ProjectActivityCacheObserver 2014-06-17 21:23:43 +03:00
Mikdiet 94266f1f66 teatro setup 
create teatro db before setup

force teatro setup

config for teatro

teatro setup

rename gitlab.yml.teatro -> gitlab.teatro.yml
 2014-06-17 11:21:49 +03:00
Dmitriy Zaporozhets 7be80fd899 Enable identicon for gravatar by default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-17 09:27:50 +03:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:24:54 +03:00
Dmitriy Zaporozhets 5b2193555b Describe unicorn timeout value in git over http 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 22:53:42 +03:00
Dmitriy Zaporozhets 0b00b3dac3 Add sorting to merge requests on milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 17:11:52 +03:00
Dmitriy Zaporozhets dd86ce3f06 Sort issues in milestone 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 14:09:45 +03:00
Dmitriy Zaporozhets c4b02642d2 Replace milestone observer with services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 18:07:52 +03:00
Dmitriy Zaporozhets 3dc0bce947 Add users to /:id route 
So now when you type site/:username it redirects you to users page.
And if you type site/:groupname it redirects you to group page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-07 15:06:55 +03:00
Marin Jankovski 18b1f171bd Rename snippets scopes to plural names. 2014-06-04 08:37:19 +02:00
Marin Jankovski ecfd33c12f Add acts-as-taggable-on-patch for gem version 2.4.1 and Rails 4.1. 2014-06-03 11:37:23 +02:00
Marin Jankovski e18d5be55a Remove active_record.auto_explain_treshold_in_seconds, rails 4.0 deprecation 2014-06-03 11:37:23 +02:00
Marin Jankovski 9abee4eac8 Add a state_machine patch for rails 4.1. 2014-06-03 11:37:23 +02:00
Jeroen van Baarsen 65cf5957de Removed the Support Email setting 
This setting was not longer used in GitLab, so i think it can be
removed.

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-05-30 20:11:07 +02:00
Dmitriy Zaporozhets 5b26b45dcb Improve group settings UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-29 21:30:20 +03:00
Marin Jankovski 17a696a98b We need shortcuts route. 2014-05-29 12:01:34 +02:00
Marin Jankovski a9580a157a Use the correct links, replace in search. 2014-05-29 08:44:25 +02:00
Job van der VoortandMarin Jankovski fd476cf620 render items from doc 2014-05-29 08:44:25 +02:00
Jacob Vosmaer 7dfb678df9 Revert "Actually use the 'user_filter' configuration option" 
This reverts commit e9d4587ff1, which is
incompatible with GitLab's built in LDAP user filter: a GitLab LDAP
filter is [added on top of the other filters used to find the
user](https://gitlab.com/gitlab-org/gitlab-ce/blob/982d4d51e8110bec280eb00db0fb756b062103d9/lib/gitlab/ldap/adapter.rb#L61)

Example GitLab LDAP filter: `(memberOf=cn=foo,dc=bar)`.

In contrast, an omniauth-ldap filter [replaces the 'normal'
filters](https://gitlab.com/gitlab-org/omniauth-ldap/blob/76d77543dec0c585bb4e974262f43675f9810953/lib/omniauth/strategies/ldap.rb#L55)

Example omniauth-ldap user filter:
`(&(uid=%{username})(memberOf=cn=foo,dc=bar))`.
 2014-05-27 15:53:04 +02:00
dosire 040b3be5b1 Give a hint where to find the email settings. 2014-05-26 16:15:12 +02:00
Dmitriy Zaporozhets 695fd3cf2c Move protected branches to Project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 14:25:55 +03:00
Earle Bunao & Neil Calabrosoanderbunao 6a85cdf162 Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08:00
Marin Jankovski dbd88d453b Update the examples to example.com 2014-05-16 12:57:32 +02:00
Marin Jankovski 636ec6d3a0 Update warnings about relative url support. 2014-05-13 17:59:08 +02:00
Marin Jankovski d41fba4d37 Add warning to gitlab.yml related to gzip assets and relative links. 2014-05-13 17:08:59 +02:00
sue445 a3d8be09c6 Fix can not automerge if description is too long 2014-05-11 23:50:14 +09:00
Dmitriy Zaporozhets e640481625 Merge branch 'files_in_wiki' into 'master' 
Add support to show files from wiki repository on wiki pages
 2014-05-06 10:21:05 +00:00
Dmitriy Zaporozhets c51ac0484f Merge pull request #5962 from skv-headless/editing-preview 
editing preview
 2014-04-29 10:00:29 +03:00
Marin Jankovski c4b1a5f5ea Allow nested files in wiki. 2014-04-28 16:22:31 +02:00
Dmitriy Zaporozhets 5dd4fb82e8 Merge pull request #6847 from Philzen/patch-2 
gitlab.yml description Typo
 2014-04-24 20:56:30 +03:00
Marin Jankovski fe1ca61601 Make sure that tests pass when aws group is used. 2014-04-24 13:23:17 +02:00
Dmitriy Zaporozhets e54b457ea3 Improve ssh_host settings 2014-04-23 16:22:49 +02:00
Dmitriy Zaporozhets 2134e18ec6 Fix default ssh_host setting 2014-04-23 16:19:59 +02:00
Dmitriy Zaporozhets 7c1c03888c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce 2014-04-23 09:21:52 +00:00
Dmitriy Zaporozhets 3bb8c17cc3 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-04-23 09:09:45 +00:00
Dmitriy Zaporozhets 3295a4db9d Merge branch 'email_in_gravatar_urls' into 'master' 
allow passing user's email address in custom Gravatar urls

Some custom avatar systems use the user's email address rather than its hash. This merge request will allow the administrator to configure gitlab-ce to use the user's email address gravatar.plain_url and  gravatar.ssl_url in the config file like this:

```
gravatar:
    enabled: true
    plain_url: "http://company.com/avatar/?mail=%{email}&size=%{size}"
    ssl_url: "https://company.com/avatar/?mail=%{email}&size=%{size}"
```

It's a only a 2 word patch.
 2014-04-23 08:52:15 +00:00
Dmitriy Zaporozhets 972e40cc47 Merge branch 'bug-to-ldap-configuration' into 'master' 
LDAP Configuration Fix

This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/180 in new installations of version 6.8 (installations upgraded from 6.7 still have the issue, however).
 2014-04-23 08:49:09 +00:00
Dmitriy Zaporozhets e680911767 Merge pull request #6827 from demisx/master 
Add ability to set different ssh host, if different from http/https
 2014-04-23 10:04:08 +03:00