home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
744 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 8fcdd6bfaf Merge branch 'no_pg_socket' into 'master' 
Remove 'socket' example PostgreSQL parameter
 2014-07-02 16:25:45 +00:00
Jacob Vosmaer 6b101abaef Remove 'socket' example PostgreSQL parameter 
The ActiveRecord PostgreSQL adapter does not have a 'socket' option;
see:

https://github.com/rails/rails/blob/4-1-2/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L20
 2014-07-01 18:27:50 +02:00
Sytse Sijbrandij e12a517e83 Improve the documentation of the signup item, password items is outdated now since people are used to the behaviour. 2014-07-01 16:20:07 +02:00
Sytse Sijbrandij b5543be19d Move standard login form to the auth settings where users expect them. 2014-07-01 14:49:40 +02:00
Dmitriy Zaporozhets 8fb76a8308 Merge branch 'group_milestones' into 'master' 
Group milestones
 2014-07-01 07:18:15 +00:00
Marin Jankovski ca6fd8841e Add group milestones routes and controller. 2014-06-30 09:42:28 +02:00
Dmitriy Zaporozhets 76dca50abe Fix password change. Fix test settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:40:08 +03:00
Dmitriy Zaporozhets f86afb732b Fix dev env. Fix MR creation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 18:40:13 +03:00
Dmitriy Zaporozhets 1dab15940d Remove protected_atrributes gem and start moving to strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 14:30:07 +03: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