summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
...
* Update for readabilityIzaak Alpert2013-09-221-3/+7
| | | | | fixed a test a broke in the configurable theme PR Change-Id: Id894506941bc01ab0d259d48ca7ff9b80bb2c57e
* Allows username only updates to ldap propertiesIzaak Alpert2013-09-221-1/+10
| | | | | | | | | -when logging in if users are allowed to login with just usernames in ldap we will update uid of the user if their uid is out of date Conflicts: spec/lib/auth_spec.rb Change-Id: Ia171b3d5133da86edc18c0d08ecfaf6a174f2574
* Remove code that was accidently added in ↵Dmitriy Zaporozhets2013-09-141-66/+0
| | | | 5dae40f579f66fdc060de633b183ede7bd8b2ce4
* Removed private scopeIzaak Alpert2013-09-111-1/+1
| | | | Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
* Update to only provide one way to get a default userIzaak Alpert2013-09-111-0/+66
| | | | | | -calling build_user will now apply defaults and only override them if as: :admin is set Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
* Improve commit diffDmitriy Zaporozhets2013-09-041-2/+14
| | | | | * show highlights when replace empty line with content * show inline diff when replace line with spaces with content
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-09-041-1/+1
|\
| * Add 'notes' to path blacklist, fixes #4967Robert Schilling2013-09-031-1/+1
| |
* | Refactor Gitlab::AuthDmitriy Zaporozhets2013-09-041-54/+1
| |
* | Inherit Gitlab::LDAP::User from Gitlab::OAuth::UserDmitriy Zaporozhets2013-09-041-67/+33
| |
* | Added Gitlab::OAuth::User classDmitriy Zaporozhets2013-09-041-0/+85
| | | | | | | | Authenticate or create users from OAuth providers
* | Remove include of grack_ldapDmitriy Zaporozhets2013-09-021-2/+0
| |
* | Move ldap auth to LDAP::User. Removed unused codeDmitriy Zaporozhets2013-09-023-40/+28
| |
* | Mode User+LDAP functionality from Gitlab::AuthDmitriy Zaporozhets2013-09-022-17/+92
|/
* Improve admin user show pageDmitriy Zaporozhets2013-08-271-0/+4
| | | | | | Show permissions for all project. Add ability to remove user from group if not an owner Remove unnecessary admin controller
* Allow markdown tablesDmitriy Zaporozhets2013-08-261-1/+1
|
* Fix issue when developers are able to push to protected branchDmitriy Zaporozhets2013-08-261-3/+3
| | | | | When that branch contain a '/' in the branch name. Fix for git over HTTP
* Link issues from comments and automatically close themash wilson2013-08-251-0/+59
| | | | | | | | | | 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.
* Add 'hooks' to path blacklist.Robert Schilling2013-08-221-1/+1
|
* Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-08-201-1/+1
|\
| * Searching for issue/mr by iid in markdownDmitriy Zaporozhets2013-08-201-1/+1
| |
* | Added Gitlab::Access moduleDmitriy Zaporozhets2013-08-201-0/+48
|/
* Fixes grack authentification under relative_url_rootamouhzi2013-08-151-1/+9
| | | | | | | | | | | | | | | | | | | | | | 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)
* Allow project name, path etc start with number. Fixed specsDmitriy Zaporozhets2013-08-131-2/+2
|
* Merge branch 'master' into karlhungus-mr-on-forkDmitriy Zaporozhets2013-08-084-3/+80
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Fix edit filesDmitriy Zaporozhets2013-08-051-1/+1
| |
| * Move diff parsing to own class. Correctly identify note diff lineDmitriy Zaporozhets2013-08-041-0/+77
| |
| * Fix broken user link in emailDmitriy Zaporozhets2013-08-041-1/+1
| |
| * Add 'repository' to path blacklist, fixes #4591Robert Schilling2013-07-301-1/+1
| |
* | Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into ↵Dmitriy Zaporozhets2013-08-081-2/+2
|\ \ | | | | | | | | | karlhungus-mr-on-fork
| * | Removed some debug codeIzaak Alpert2013-07-301-2/+0
| | | | | | | | | | | | Change-Id: Ibd0088f498faccc72acda2783b61bbea19bd835d
| * | Updated format_patch to use '..' rather than '...'Izaak Alpert2013-07-301-2/+4
| | | | | | | | | | | | | | | | | | Was incorrectly including commits reachable from rev2. Change-Id: I3560e5d5ce474ba3d374f29ae16190b1f74989be
* | | Remove ugly button and truncate too long project names. Remove unecessary ↵Dmitriy Zaporozhets2013-07-301-3/+5
| | | | | | | | | | | | newlines
* | | Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into ↵Dmitriy Zaporozhets2013-07-303-35/+146
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | 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
| * Raise Error for diff_between/commit_between for non fork mr's in satelliteIzaak Alpert2013-07-171-4/+2
| | | | | | | | | | | | | | -Fixed tests to account for this -Trigger update after update_branches for list:update selecting first commit, have it also trigger sha lookup Change-Id: Ie4c3d4fbf57aeadd7d141d3704f4ea0f0684a7a5
| * Refactor merge api createIzaak Alpert2013-07-171-1/+0
| | | | | | | | | | | | | | -Made the api method a little more readable -removed some missed extra newline's Change-Id: Ic38baafc813aaeda0a8b283f39916182c8ec37d5
| * Style changes from review with @randxIzaak Alpert2013-07-172-7/+5
| | | | | | | | | | | | -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
| * MR on fork: Email fixes, style fixesIzaak Alpert2013-07-171-3/+0
| | | | | | | | | | | | | | | | | | -Removed many extra spaces I added -Fixed email templates to be consistent/better looking GITLAB-894, GITLAB-895, (GITLAB-858) Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
| * MR on fork: Some cleanup, test updatesIzaak Alpert2013-07-172-20/+17
| | | | | | | | | | | | | | | | | | | | -The forked merge request test now tests it's componenets again, and seems to work every time (did this by reordering the branch updates so their is more time for update_branches to run) -- this could still technically fail, but after several runs it doesn't seem to. -Removed todo in merge_request, pushed wrapping of grit down to the satellite -updated action test to check flock status, made it nolonger pending -moved all logging on failure to helper method in satellite GITLAB-592 Change-Id: If0554ca35eedc3d3e8461f7d93d4b3939fa2cd75
| * MR on Fork multiple fixesIzaak Alpert2013-07-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
| * Merge Request on forked projectsIzaak Alpert2013-07-173-28/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix typosJohannes Schleifenbaum2013-07-293-3/+3
| |
* | Use gitlab-shell authorized_keys truncation. Fix issue with authorized_keys ↵Dmitriy Zaporozhets2013-07-181-0/+9
|/ | | | stored in different location
* Move repo tags to own controller. add ability to remove tagsDmitriy Zaporozhets2013-07-161-0/+25
|
* Add create_branch, rm_branch methods to Gitlab::Shell classDmitriy Zaporozhets2013-07-161-0/+25
|
* Add LDAP support to /api/sessionDmitriy Zaporozhets2013-07-162-13/+15
|
* Merge branch 'master' into 6-0-devDmitriy Zaporozhets2013-07-121-1/+1
|\
| * fix bug when project named: mediawikiwuweixin2013-07-061-1/+1
| | | | | | | | | | | | | | | | | | mediawiki.wiki.git mediawiki.git /.wiki$/ match awiki, so when your project named mediawiki it will be find project named: "medi" use /\.wiki$/ fix this bug
* | Merge branch 'master' into 6-0-devDmitriy Zaporozhets2013-07-081-1/+1
|\ \ | |/ | | | | | | | | Conflicts: Gemfile Gemfile.lock
| * Add 'services' to path blacklist, fixes #4470Robert Schilling2013-07-031-1/+1
| |
View Lorry Controller Status