summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Use new git max_size in the settings initializerJacob Vosmaer2014-08-151-1/+1
|
* Merge pull request #7281 from skv-headless/diff-unfoldDmitriy Zaporozhets2014-08-151-1/+3
|\ | | | | unfold commits
| * diff unfoldskv2014-08-141-1/+3
| |
* | Mention username option for developers in gitlab.ymlDmitriy Zaporozhets2014-08-141-0/+5
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Disable debug assetsJan-Willem van der Meer2014-08-121-1/+1
| | | | | 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.
* Dont stub gitlab-shell calls. Make test environment closer to real oneDmitriy Zaporozhets2014-07-311-0/+6
|
* Add create/update to Labels controllerDmitriy Zaporozhets2014-07-301-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Log Sidekiq argumentsJacob Vosmaer2014-07-281-0/+4
|
* Merge branch 'test_regex_with_rubular' into 'master'Sytse Sijbrandij2014-07-271-0/+1
|\ | | | | | | | | | | Add a tip on how to test regular expressions See merge request !994
| * Add a tip on how to test regular expressionsJacob Vosmaer2014-07-251-0/+1
| |
* | Most starred projects page for Explore areaDmitriy Zaporozhets2014-07-251-0/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into ↵Dmitriy Zaporozhets2014-07-241-0/+1
|\ | | | | | | | | | | | | | | | | cirosantilli-star Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * Add project stars.Ciro Santilli2014-07-171-0/+1
| |
* | Merge pull request #7316 from ayr-ton/masterDmitriy Zaporozhets2014-07-232-0/+2
|\ \ | | | | | | Add support to set satellites timeout
| * | Add support to set satellites timeoutAyrton Araújo2014-07-212-0/+2
| |/
* | Refactor explore areaDmitriy Zaporozhets2014-07-231-5/+13
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Explore areaDmitriy Zaporozhets2014-07-231-1/+2
| | | | | | | | | | | | | | 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>
* | Merge branch 'public-groups' of https://github.com/innogames/gitlabhq into ↵Dmitriy Zaporozhets2014-07-221-0/+1
|\ \ | | | | | | | | | 7-2-dev
| * | Added public groups area to enhance searching and exploring of projectsdreis2014-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Move signup_enabled and signin_enabled backJacob Vosmaer2014-07-211-10/+10
| |/ |/| | | | | | | This partially reverts b5543be19dc4e6c546e5f by restoring the nesting for the signup_enabled and signin_enabled attributes.
* | Default gix max size to 20mbDmitriy Zaporozhets2014-07-151-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Increase grit memory limitDmitriy Zaporozhets2014-07-151-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Use devise stored_location to redirect after signing for both public and ↵Marin Jankovski2014-07-111-1/+1
| | | | | | | | private pages.
* | Revert "Merge branch 'redirect_after_login' into 'master'"Marin Jankovski2014-07-111-1/+1
|/ | | | | This reverts commit 5aaa35656edaf309354528e197a54461f584ed21, reversing changes made to 5b8c1767676b94f58558e6de320965c68b57de42.
* Update to accomodate devise deprecations and backward incompatible changes.Marin Jankovski2014-07-101-0/+3
|
* Try to keep token authenticable compatibilityMarin Jankovski2014-07-091-4/+0
|
* Merge branch 'no_pg_socket' into 'master'Dmitriy Zaporozhets2014-07-021-4/+0
|\ | | | | | | Remove 'socket' example PostgreSQL parameter
| * Remove 'socket' example PostgreSQL parameterJacob Vosmaer2014-07-011-4/+0
| | | | | | | | | | | | | | 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
* | Improve the documentation of the signup item, password items is outdated now ↵Sytse Sijbrandij2014-07-011-3/+5
| | | | | | | | since people are used to the behaviour.
* | Move standard login form to the auth settings where users expect them.Sytse Sijbrandij2014-07-011-9/+8
|/
* Merge branch 'group_milestones' into 'master'Dmitriy Zaporozhets2014-07-011-0/+2
|\ | | | | | | Group milestones
| * Add group milestones routes and controller.Marin Jankovski2014-06-301-0/+2
| |
* | Fix password change. Fix test settingsDmitriy Zaporozhets2014-06-261-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix dev env. Fix MR creationDmitriy Zaporozhets2014-06-262-6/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove protected_atrributes gem and start moving to strong paramsDmitriy Zaporozhets2014-06-261-6/+0
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use an error page when oauth fails.Marin Jankovski2014-06-241-0/+3
|
* Merge pull request #7140 from Mik-die/masterDmitriy Zaporozhets2014-06-241-0/+86
|\ | | | | Add Gitlab to Teatro.io
| * teatro setupMikdiet2014-06-171-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | create teatro db before setup force teatro setup config for teatro teatro setup rename gitlab.yml.teatro -> gitlab.teatro.yml
* | Add option for admin to remove users secondary emails.Marin Jankovski2014-06-231-0/+1
| |
* | Merge branch 'redirect_after_login' into 'master'Dmitriy Zaporozhets2014-06-231-1/+1
|\ \ | | | | | | | | | Redirect after login
| * | Set return url as param.Marin Jankovski2014-06-191-1/+1
| |/
* | Remove rails observers from applicationDmitriy Zaporozhets2014-06-171-3/+0
| |
* | Remove user observerDmitriy Zaporozhets2014-06-171-2/+1
| |
* | Remove SystemHook observerDmitriy Zaporozhets2014-06-171-2/+1
| |
* | Remove NotesObserverDmitriy Zaporozhets2014-06-171-2/+1
| |
* | Remove project observerDmitriy Zaporozhets2014-06-171-1/+0
| |
* | Remove UsersGroup observerDmitriy Zaporozhets2014-06-171-1/+0
| |
* | Remove ProjectActivityCacheObserverDmitriy Zaporozhets2014-06-171-2/+1
|/
* Enable identicon for gravatar by defaultDmitriy Zaporozhets2014-06-172-4/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Wipe wall notes featureDmitriy Zaporozhets2014-06-133-8/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>