summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-232-41/+56
|\
| * Merge branch 'improve-contributions-calendar' into 'master'Dmitriy Zaporozhets2015-03-232-41/+56
| |\
| | * Improve contribution calendar per day infoDmitriy Zaporozhets2015-03-221-2/+2
| | * Contribution calendar will use events instead of commits to count contributionsDmitriy Zaporozhets2015-03-221-12/+7
| | * Refactor contributions events and write tests for calendarDmitriy Zaporozhets2015-03-221-6/+2
| | * Replace commits calendar with contributions calendarDmitriy Zaporozhets2015-03-212-41/+65
* | | Merge pull request #8995 from MichaelAlt/patch-1Douwe Maan2015-03-231-1/+0
|\ \ \ | |/ / |/| |
| * | Faulty LDAP DN name escaping removedMichael Alt2015-03-211-1/+0
* | | Fix OAuth2 issue importing a new project from GitHub and GitLabStan Hu2015-03-223-4/+4
* | | Merge branch 'disable-ref-generation-in-code-blocks' into 'master'Dmitriy Zaporozhets2015-03-221-1/+7
|\ \ \ | |_|/ |/| |
| * | Disable reference creation for comments surrounded by code/preformatted blocksStan Hu2015-03-191-1/+7
* | | Merge branch 'backup-permissions' into 'master'Dmitriy Zaporozhets2015-03-211-18/+25
|\ \ \
| * | | Call chdir() with a blockVinnie Okada2015-03-191-18/+17
| * | | Change permissions on backup filesVinnie Okada2015-03-171-5/+13
* | | | Extend push_tag event to include tag message and last commitKamil Trzcinski2015-03-211-1/+2
| |_|/ |/| |
* | | Revert "Increase timeout for Git-over-HTTP requests."Dmitriy Zaporozhets2015-03-191-13/+0
* | | Merge branch 'bugfix/block_ldap_users_cronjob' into 'master'Dmitriy Zaporozhets2015-03-191-4/+5
|\ \ \
| * | | fixed rake task to block removed ldap usersDaniel Steinborn2015-02-161-4/+5
* | | | Merge branch 'rake_backup' into 'master'Dmitriy Zaporozhets2015-03-191-2/+3
|\ \ \ \
| * | | | backup repo with tar instead of git bundleValery Sizov2015-03-191-2/+3
| | |_|/ | |/| |
* | | | Merge branch 'fewer-constants-more-helpres' into 'master'Dmitriy Zaporozhets2015-03-192-4/+6
|\ \ \ \
| * | | | Fewer constants, more helpers.Douwe Maan2015-03-192-4/+6
| |/ / /
* | | | Dont exit from brakeman rake taskDmitriy Zaporozhets2015-03-191-1/+1
|/ / /
* | | Move application setting to separate variable.Marin Jankovski2015-03-181-2/+4
* | | Handle nil restricted visibility settingsVinnie Okada2015-03-181-1/+5
* | | Merge branch 'new-branch-commits' into 'master'Dmitriy Zaporozhets2015-03-181-8/+7
|\ \ \
| * | | List new commits for newly pushed branch in activity view.Douwe Maan2015-03-181-8/+7
| | |/ | |/|
* | | Extend the commit calendar to show the actual commits for a dateHannes Rosenögger2015-03-181-0/+8
|/ /
* | Merge branch 'atom-xhtml-squashed' into 'master'Douwe Maan2015-03-172-13/+23
|\ \
| * | Fix invalid Atom feeds when using emoji, horizontal rules, or images.Christian Walther2015-03-162-13/+23
* | | Revert "Merge branch 'backup-permissions' into 'master'"Dmitriy Zaporozhets2015-03-161-4/+0
* | | Merge branch 'backup-permissions' into 'master'Dmitriy Zaporozhets2015-03-171-0/+4
|\ \ \
| * | | Change permissions on backup filesVinnie Okada2015-03-151-0/+4
* | | | Merge branch 'fix-restricted-visibility' into 'master'Dmitriy Zaporozhets2015-03-166-29/+35
|\ \ \ \
| * \ \ \ Merge branch 'master' into fix-restricted-visibilityVinnie Okada2015-03-1415-24/+108
| |\ \ \ \ | | |/ / /
| * | | | More restricted visibility changesVinnie Okada2015-03-101-4/+4
| * | | | Enforce restricted visibilities for snippetsVinnie Okada2015-03-082-12/+16
| * | | | Allow admins to override restricted visibilityVinnie Okada2015-03-082-4/+4
| * | | | Move restricted visibility settings to the UIVinnie Okada2015-03-072-11/+13
* | | | | Let the server fix unconfigured gitZeger-Jan van de Weg2015-03-162-10/+31
* | | | | Use `project_member` instead of `team_member`.Douwe Maan2015-03-152-15/+15
* | | | | Use `group_member` instead of `users_group` or `membership`.Douwe Maan2015-03-151-5/+5
* | | | | Fix typoVasilij Schneidermann2015-03-141-1/+1
| |/ / / |/| | |
* | | | Merge branch 'ldap-unblock-user' into 'master'Dmitriy Zaporozhets2015-03-131-0/+1
|\ \ \ \
| * | | | Unblock user if they were unblocked in AD.Douwe Maan2015-03-131-0/+1
* | | | | Merge branch 'tag-branch-hooks' into 'master'Dmitriy Zaporozhets2015-03-131-1/+2
|\ \ \ \ \
| * | | | | Set push data object kind in PushDataBuilder.Douwe Maan2015-03-131-1/+2
| |/ / / /
* | | | | Fix import pages not working after first load.Douwe Maan2015-03-133-3/+3
|/ / / /
* | | | Block user if he/she was blocked in Active DirectoryDmitriy Zaporozhets2015-03-121-1/+8
* | | | Merge branch 'blue-theme' into 'master'Dmitriy Zaporozhets2015-03-121-1/+3
|\ \ \ \