summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Fix bug of network graph(#2847) and trivial code clean up.Sato Hiroyuki2013-01-311-8/+15
|
* Merge pull request #2847 from hiroponz/improve-overlap-linesDmitriy Zaporozhets2013-01-302-21/+71
|\ | | | | Improve overlap of lines in network graph
| * Improve overlap of lines in network graphSato Hiroyuki2013-01-302-21/+71
| |
* | Switchable the main branch on network graphSato Hiroyuki2013-01-301-3/+4
|/
* satellites logsDmitriy Zaporozhets2013-01-292-1/+21
|
* keys to gitolite via sidekiq nowDmitriy Zaporozhets2013-01-281-2/+16
|
* Async perform for add/remove team membersDmitriy Zaporozhets2013-01-281-7/+19
|
* Do gitolite calls async. Remove satellite with project removeDmitriy Zaporozhets2013-01-284-28/+54
|
* refactor add to teamDmitriy Zaporozhets2013-01-251-3/+1
|
* Fix teams + gitolite accessDmitriy Zaporozhets2013-01-251-5/+3
|
* Fix removeing project if repo not existsDmitriy Zaporozhets2013-01-251-1/+4
|
* Move team project management to own controllerAndrey Kumanyaev2013-01-241-0/+14
|
* Move admin team members management to own controllerAndrey Kumanyaev2013-01-241-0/+32
|
* Team core managementAndrey Kumanyaev2013-01-241-0/+93
|
* Improve network graphSato Hiroyuki2013-01-231-4/+6
|
* Use subproccess instead subshell for git callsDmitriy Zaporozhets2013-01-221-14/+18
|
* Uncomment forgotten codeDmitriy Zaporozhets2013-01-191-3/+3
|
* Remove chdir inside runtime. Improved gitolite shell commandsDmitriy Zaporozhets2013-01-191-14/+30
|
* raise exception if gitolite is brokenDmitriy Zaporozhets2013-01-191-1/+14
|
* Fixed developer push to protected branch. Closes #2647Dmitriy Zaporozhets2013-01-191-1/+1
|
* Fix branch remove on automergeDmitriy Zaporozhets2013-01-171-1/+1
|
* Fix parsing of ref-like Urls in links and images in GFMRiyad Preukschas2013-01-161-7/+18
| | | | Fixes #2166
* Use image Urls for Emoji in GFMRiyad Preukschas2013-01-161-1/+1
| | | | Fixes #2617
* Use Urls for references in GFMRiyad Preukschas2013-01-161-5/+5
|
* Fix #2576Riyad Preukschas2013-01-161-1/+1
|
* Merge pull request #1586 from Bregor/ber_to_stringDmitriy Zaporozhets2013-01-161-2/+3
|\ | | | | Auth: Net::BER::BerIdentifiedStrings to Strings
| * Auth: Net::BER::BerIdentifiedStrings to StringsMaxim Filatov2012-09-281-2/+3
| |
* | Store repo satellites outside of tmp directoryDmitriy Zaporozhets2013-01-161-1/+1
| |
* | Merge branch 'master' into discussionsRiyad Preukschas2013-01-151-16/+48
|\ \
| * | Public HTTP clones and remove auth request for public projectsJeremy Slater2013-01-141-20/+48
| | |
| * | Public git read-only access via httpDmitriy Zaporozhets2013-01-131-6/+10
| | |
* | | Merge commit 'master' into discussionsRiyad Preukschas2013-01-159-32/+58
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/assets/stylesheets/sections/notes.scss app/contexts/notes/load_context.rb app/models/project.rb app/observers/note_observer.rb app/roles/votes.rb app/views/commit/show.html.haml app/views/merge_requests/_show.html.haml app/views/merge_requests/diffs.js.haml app/views/merge_requests/show.js.haml app/views/notes/_note.html.haml features/steps/project/project_merge_requests.rb spec/models/note_spec.rb
| * | Merge branch 'raphael-update' of https://github.com/koenpunt/gitlabhq into ↵Dmitriy Zaporozhets2013-01-051-2/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | koenpunt-raphael-update Conflicts: Gemfile.lock
| | * | Updated graph tooltips and labelsKoen Punt2013-01-041-2/+4
| | | |
| * | | Raise exception and show message to user if repo missing satelliteDmitriy Zaporozhets2013-01-051-3/+9
| | | |
| * | | Merge pull request #2207 from koenpunt/system-to-fileutilsDmitriy Zaporozhets2013-01-051-5/+6
| |\ \ \ | | | | | | | | | | replaced system() calls with FileUtils.* methods
| | * | | replaced system() calls with FileUtils.* methodKoen Punt2013-01-031-5/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also makes that 'mv: cannot stat `/ho..' is not shown in the test :) consistent spacing require fileutils Revert "require fileutils" This reverts commit 54313d3bbaa60cfc5b405be50cc00b7f6b0cb715. new hash notation FileUtils.mv in begin/rescue block
| * | | Continue refactoring. Use repostory and teamDmitriy Zaporozhets2013-01-043-6/+6
| |/ /
| * | Use project with namespace in email subjectDmitriy Zaporozhets2012-12-311-2/+2
| | |
| * | added RAILS_RELATIVE_URL_ROOT supportChris Frohoff2012-12-281-4/+0
| | |
| * | Allow spaces in project nameDmitriy Zaporozhets2012-12-281-1/+1
| | |
| * | Add Project name validationAndrey Kumanyaev2012-12-261-0/+4
| | |
| * | Merge pull request #2260 from hiroponz/improve-network-graphDmitriy Zaporozhets2012-12-231-9/+20
| |\ \ | | | | | | | | Improve network-graph
| | * | Improve network-graphSato Hiroyuki2012-12-131-9/+20
| | | |
| * | | Log if satellite creation failedDmitriy Zaporozhets2012-12-221-1/+7
| | | |
* | | | Merge branch 'master' into discussionsRiyad Preukschas2012-12-239-43/+44
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/assets/stylesheets/main.scss app/models/project.rb app/views/notes/_common_form.html.haml app/views/notes/_per_line_form.html.haml lib/gitlab/markdown.rb spec/models/note_spec.rb
| * | | Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into ↵Dmitriy Zaporozhets2012-12-212-10/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | koenpunt-gh-issue-1509 Conflicts: vendor/assets/javascripts/branch-graph.js
| | * | | Updated branch-graph, abstracted some code in seperate functionsKoen Punt2012-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | Removed unused Raphael.fn.popup
| | * | | BranchGraph now loads asyncKoen Punt2012-12-072-10/+9
| | |/ / | | | | | | | | | | | | Centralized keyboard and drag events for BranchGraph
| * | | Update uses of Gitolite.config.foo settingsRiyad Preukschas2012-12-204-7/+7
| | | |
View Lorry Controller Status