summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'broader-message-matching' of ↵Dmitriy Zaporozhets2013-10-022-4/+5
|\ | | | | | | /home/git/repositories/gitlab/gitlabhq
| * Correct spelling mistake.Sytse Sijbrandij2013-10-021-1/+1
| |
| * Also update example.Sytse Sijbrandij2013-10-011-3/+4
| |
| * Also match if it is at the end or in the middle of a sentence.Sytse Sijbrandij2013-10-011-1/+1
| |
* | Use peer-based authentication for PostgreSQLJacob Vosmaer2013-10-021-2/+2
| |
* | Streamline MySQL setup in installation.mdJacob Vosmaer2013-10-021-1/+1
| |
* | Update code to work with gitlab_git 3Dmitriy Zaporozhets2013-10-011-3/+0
|/
* Merge branch 'rack_attack' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-013-0/+20
|\
| * Add documentation to help section, rack_attack as exampleMarin Jankovski2013-09-304-5/+19
| |
| * Enable rack attack and add a throttle.Marin Jankovski2013-09-252-0/+6
| |
* | Merge pull request #5200 from pfaro/bugfix-signupDmitriy Zaporozhets2013-09-301-1/+2
|\ \ | | | | | | Add check if the signup setting is enabled. fixes #4832
| * | Add check if the signup setting is enabled. fixes #4832 Perry Faro2013-09-271-1/+2
| | |
* | | Changed wording in application.rb and gitlab.yml.example to match ↵Thomas Misilo2013-09-292-4/+4
| | | | | | | | | | | | unicorn.rb. This is for when using a non-root path
* | | Updated at the request of @f0kThomas Misilo2013-09-281-1/+7
| | |
* | | Added reference to the line "ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"" , ↵Thomas Misilo2013-09-271-0/+3
|/ / | | | | | | as it talked about in the gitlab.yml.example
* | Public projects feature - step2Dmitriy Zaporozhets2013-09-241-2/+0
|/ | | | | | | | | * Render right layout depends on current_user * show sample git username/email when repo is empty * Show extra info when browsing public area * Fixed some tests related to public projects * show comments in read-only for public projects * Remove old public routing
* Defaulted theme to MARSIzaak Alpert2013-09-222-2/+2
| | | | Change-Id: I02814fb47edcc915309183547cc8dcb165100f4f
* Make users theme configurableIzaak Alpert2013-09-222-0/+9
| | | | | | | | | | | GITLAB-1262 Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a Conflicts: app/models/user.rb config/initializers/1_settings.rb spec/models/user_spec.rb
* Don't quote the default issue closing regex.Ash Wilson2013-09-151-1/+1
| | | | | It turns out that regex escapes and YAML quoted-scalar escapes don't play nicely together.
* Merge pull request #5084 from spudstud/patch-2Dmitriy Zaporozhets2013-09-141-1/+1
|\ | | | | Update unicorn.rb.example
| * Update unicorn.rb.exampleSpencer2013-09-131-1/+1
| |
* | Drop support of root namespace in routingHiroyuki Sato2013-09-131-12/+12
|/
* Enable UsersGroup observer, Add group_member methods to NotificationServiceDmitriy Zaporozhets2013-09-121-0/+1
|
* make public/private setting for project creation configurableAngus MacArthur2013-09-092-0/+2
|
* Improve admin user show pageDmitriy Zaporozhets2013-08-271-5/+1
| | | | | | Show permissions for all project. Add ability to remove user from group if not an owner Remove unnecessary admin controller
* Link issues from comments and automatically close themash wilson2013-08-252-0/+6
| | | | | | | | | | Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown references in descriptions, titles, or attached Notes creates a back-reference Note that links to the original referencer. Furthermore, pushing commits with commit messages that match a (configurable) regexp to a project's default branch will close any issues mentioned by GFM in the matched closing phrase. If accepting a merge request would close any Issues in this way, a banner is appended to the merge request's main panel to indicate this.
* Merge pull request #4845 from mmoll/unicorn_localhostDmitriy Zaporozhets2013-08-251-1/+1
|\ | | | | bind unicorn listener to 127.0.0.1
| * bind unicorn listener to 127.0.0.1Michael Moll2013-08-221-1/+1
| | | | | | | | otherwise it will listen on 0.0.0.0
* | Fix the `service gitlab restart` commandJacob Vosmaer2013-08-231-13/+13
|/ | | | | | | This commit addresses two related issues: - Sidekiq should shut down completely before we restart it; - If we restart unicorn with USR2 we need to kill the old master and worker processes.
* Remove can_create_team code from userDmitriy Zaporozhets2013-08-212-2/+0
|
* Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-08-201-1/+1
|\
| * Show iid in event feed and uatocomplete as default id for issues, mrDmitriy Zaporozhets2013-08-191-1/+1
| |
* | Relative root needs to be changed in three places.Sytse Sijbrandij2013-08-192-2/+15
| |
* | Fix confusing situation where install guide told you to install init.d ↵Sytse Sijbrandij2013-08-191-93/+0
| | | | | | | | script for puma.
* | Configure the relative path only one time.Sytse Sijbrandij2013-08-192-7/+3
|/
* Fixes grack authentification under relative_url_rootamouhzi2013-08-153-1/+7
| | | | | | | | | | | | | | | | | | | | | | Ref: https://github.com/gitlabhq/gitlabhq/commit/e6159b8725f99af78f446f8d33fa0e52b7780430 Ref: https://github.com/gitlabhq/gitlabhq/pull/3204 Ref: https://github.com/gitlabhq/gitlabhq/issues/1228 Add Rails' variable in application.rb to support relative url This variable is used by assets compilation and other modules. Note that user needs to change application.rb too Restrict session cookie to the relative path if set. Ref: https://github.com/gitlabhq/gitlabhq/commit/2c2f1e31856a4decdae469974f5bea8245316f7e Fix Update attachment_uploader.rb bug with relative URL See: https://github.com/gitlabhq/gitlabhq/commit/161afda3fa4fca58f396e9c3acbd72bc14490ace Fix Wall relative bug with attachement files (javascript)
* Fix caching when using remote redis serverRobin Gloster2013-08-141-1/+8
|
* Fix for Resque forking might cause stuck workers for the threaded Sidekiq.Sytse Sijbrandij2013-08-101-36/+0
|
* Merge branch 'master' into karlhungus-mr-on-forkDmitriy Zaporozhets2013-08-081-1/+6
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: app/contexts/filter_context.rb app/contexts/search_context.rb app/models/merge_request.rb app/models/note.rb app/views/shared/_merge_requests.html.haml spec/controllers/commit_controller_spec.rb spec/services/notification_service_spec.rb
| * Refactor recent branches pageDmitriy Zaporozhets2013-08-051-1/+6
| |
* | Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into ↵Dmitriy Zaporozhets2013-07-301-0/+1
|\ \ | |/ |/| | | | | | | | | | | | | karlhungus-mr-on-fork Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml
| * Merge Request on forked projectsIzaak Alpert2013-07-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
* | Public area: Project#show page prototypeDmitriy Zaporozhets2013-07-271-0/+2
| |
* | Default allow username or email login to falseIzaak Alpert2013-07-181-0/+2
| | | | | | | | | | | | -If not specified in the gitlab.yml default this setting to false Change-Id: I3551df364498dd84ccbd18c90797522e77159f05
* | Update the proc/lamda to be consistentIzaak Alpert2013-07-181-3/+3
| | | | | | | | Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3
* | Allow the ldap logins with email or usernameIzaak Alpert2013-07-182-1/+9
|/ | | | Change-Id: I73b4aa4c46afd56ae02fb24abcd673c0724547e4
* Ability to create new branch via UIDmitriy Zaporozhets2013-07-171-2/+2
|
* Move repo tags to own controller. add ability to remove tagsDmitriy Zaporozhets2013-07-161-2/+1
|
* Move branches list to own controller with pagination. Ability to remove ↵Dmitriy Zaporozhets2013-07-161-0/+1
| | | | branches from UI
* Rename Group#people to Group#membersDmitriy Zaporozhets2013-07-121-1/+1
|
View Lorry Controller Status