Commit Graph
772 Commits
Author SHA1 Message Date
Jacob Vosmaer b70606287b Create one big regular expresion for Rack::Attack 2014-08-22 09:56:39 +02:00
Marin JankovskiandJacob Vosmaer 52e903e99f Change rack attack example. 2014-08-22 09:56:39 +02:00
Jacob Vosmaer ec381a9308 Use new git max_size in the settings initializer 2014-08-15 11:38:32 +02:00
Dmitriy Zaporozhets 7120af7251 Merge pull request #7281 from skv-headless/diff-unfold
unfold commits
2014-08-15 09:34:12 +03:00
Dmitriy Zaporozhets 45da59daab Mention username option for developers in gitlab.yml
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-14 15:15:48 +03:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
Jan-Willem van der Meer 88773498b9 Disable debug assets
It's good for debugging javacsript, but creates massive amounts of http request
by adding each javascript individually. Only turn it on while debugging js code.
2014-08-12 18:10:16 +02:00
Dmitriy Zaporozhets f82b9e48ec Dont stub gitlab-shell calls. Make test environment closer to real one 2014-07-31 15:39:01 +03:00
Dmitriy Zaporozhets 048a21974e Add create/update to Labels controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 13:12:11 +03:00
Jacob Vosmaer 03ae6b89bd Log Sidekiq arguments 2014-07-28 16:46:36 +02:00
Sytse Sijbrandij 3c420ae17b Merge branch 'test_regex_with_rubular' into 'master'
Add a tip on how to test regular expressions

See merge request !994
2014-07-27 16:06:42 +00:00
Dmitriy Zaporozhets 974b5a7b2f Most starred projects page for Explore area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-25 22:05:23 +03:00
Jacob Vosmaer e03ab14f78 Add a tip on how to test regular expressions 2014-07-25 18:26:04 +02:00
Dmitriy Zaporozhets e21ca9f8b1 Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-07-24 10:54:42 +03:00
Dmitriy Zaporozhets ed234e344e Merge pull request #7316 from ayr-ton/master
Add support to set satellites timeout
2014-07-23 19:17:31 +03:00
Dmitriy Zaporozhets 367445fdcd Refactor explore area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-23 12:03:49 +03:00
Dmitriy Zaporozhets 1df0345e9e Explore area
Create one place for exploring GitLab instance projects and groups for
both signed in and anonymous users

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-23 11:13:33 +03:00
Dmitriy Zaporozhets 6b4d5d21be Merge branch 'public-groups' of https://github.com/innogames/gitlabhq into 7-2-dev 2014-07-22 13:19:45 +03:00
Ayrton Araújo 07537faca7 Add support to set satellites timeout 2014-07-21 11:50:29 -04:00
Jacob Vosmaer 285bb09b98 Move signup_enabled and signin_enabled back
This partially reverts b5543be19d by restoring the nesting
for the signup_enabled and signin_enabled attributes.
2014-07-21 17:10:28 +02:00
Ciro Santilli 714f7201d3 Add project stars. 2014-07-17 22:47:16 +02:00
Dmitriy Zaporozhets a6546f51e2 Default gix max size to 20mb
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-15 20:59:47 +03:00
Dmitriy Zaporozhets 3780444ccb Increase grit memory limit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-15 15:27:54 +03:00
dreis 1da2262efd Added public groups area to enhance searching and exploring of projects
fixed whitespaces and quotes

fixed whitespaces

fixed devise.html.haml

fixed method parenthesis in app/models/group.rb

removed links from header

removed links from devise.html

added tests
2014-07-15 08:19:27 +02:00
Marin Jankovski 07b9d80604 Use devise stored_location to redirect after signing for both public and private pages. 2014-07-11 19:53:10 +02:00
Marin Jankovski 55efb2d9f2 Revert "Merge branch 'redirect_after_login' into 'master'"
This reverts commit 5aaa35656e, reversing
changes made to 5b8c176767.
2014-07-11 19:53:10 +02:00
Marin Jankovski 108be8a666 Update to accomodate devise deprecations and backward incompatible changes. 2014-07-10 13:56:35 +02:00
Marin Jankovski 4024aa8e81 Try to keep token authenticable compatibility 2014-07-09 14:42:25 +02:00
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