summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't accidentally unblock auto created users from Active Directory.ad-block_auto_created_usersDouwe Maan2015-05-123-5/+25
* Merge branch 'commit_time_timezone' into 'master'Douwe Maan2015-05-122-1/+2
|\
| * Fix commit time being displayed in the wrong timezone in some casesHannes Rosenögger2015-05-072-1/+2
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-1111-37/+63
|\ \
| * \ Merge branch 'create-merge-request' into 'master'Dmitriy Zaporozhets2015-05-119-29/+52
| |\ \
| | * | Fix commits feed button.create-merge-requestDouwe Maan2015-05-101-4/+4
| | * | Improve create_mr_button? performance.Douwe Maan2015-05-091-5/+4
| | * | Fix spec.Douwe Maan2015-05-091-1/+1
| | * | Add Merge Request button to branches page.Douwe Maan2015-05-092-5/+8
| | * | Add Create Merge Request buttons to commits page and push event.Douwe Maan2015-05-095-21/+41
| | * | Link Commits tab to current branch from Compare page.Douwe Maan2015-05-092-2/+3
| * | | Merge branch 'params-to-sym' into 'master'Dmitriy Zaporozhets2015-05-111-5/+5
| |\ \ \
| | * | | Don't symbolize params.params-to-symDouwe Maan2015-05-111-5/+5
| * | | | Small improvements to style guide.Sytse Sijbrandij2015-05-111-3/+6
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-112-4/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge pull request #8799 from jirutka/group-kerberosJeroen van Baarsen2015-05-112-4/+12
| |\ \ \ \
| | * | | | Update installation instructions, make kerberos optionalJakub Jirutka2015-05-111-3/+11
| | * | | | Make omniauth-kerberos dependency optional (add group 'kerberos')Jakub Jirutka2015-05-111-1/+1
| |/ / / /
* | | | | Merge branch 'migration-style-guide' into 'master'Sytse Sijbrandij2015-05-113-2/+43
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | create migration style guide. Fixes #2305Job van der Voort2015-05-113-2/+43
|/ / / /
* | | | Merge branch 'brakeman-system' into 'master'Dmitriy Zaporozhets2015-05-111-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Follow shell command guidelines in Brakeman taskJacob Vosmaer2015-05-111-1/+1
|/ / /
* | | Merge branch 'bug/fix-duplicate-deploy-keys' into 'master'Marin Jankovski2015-05-104-6/+18
|\ \ \ | |/ / |/| |
| * | Don't show duplicate deploy keys. Fixes #1516Maran2015-05-084-6/+18
* | | Merge branch 'rs-disallow-id-class' into 'master'Dmitriy Zaporozhets2015-05-095-36/+59
|\ \ \
| * | | Remove class and id attributes from SanitizationFilter whitelistrs-disallow-id-classRobert Speicher2015-05-085-36/+59
* | | | Merge pull request #9244 from dreis2211/firefox_issuable_filter_patchDmitriy Zaporozhets2015-05-082-2/+7
|\ \ \ \
| * | | | Fix Firefox problems when it wants to render issuable componentdreis2015-05-052-2/+7
* | | | | Merge branch 'show_project_visibility' into 'master'Dmitriy Zaporozhets2015-05-082-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move project visibility from clone bar to repository details block for non em...Marin Jankovski2015-05-082-2/+4
|/ / / /
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-05-0815-31/+132
|\ \ \ \
| * \ \ \ Merge pull request #9214 from Bugagazavr/hook-eventsValeriy Sizov2015-05-0815-31/+132
| |\ \ \ \
| | * | | | Added X-GitLab-Event header for web hooksbugagazavr2015-05-0815-31/+132
* | | | | | Merge branch 'How_to_Reset_your_root_password' into 'master'Job van der Voort2015-05-082-0/+41
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | make it more obvious what happens in the codeJob van der Voort2015-05-081-4/+4
| * | | | | remove redundant colonJob van der Voort2015-05-081-1/+1
| * | | | | Deleted > and commented "or" outKaren Carias2015-05-071-5/+9
| * | | | | Added link to root password doc correctlyKaren Carias2015-05-071-0/+1
| * | | | | New file to add to security documentation, "How to reset your root password"Karen Carias2015-04-281-0/+36
* | | | | | Merge branch 'quote_string' into 'master'Valery Sizov2015-05-081-1/+2
|\ \ \ \ \ \
| * | | | | | Adding quote_string to migrationquote_stringValery Sizov2015-05-081-1/+2
* | | | | | | Merge branch 'fix_link_in_doc' into 'master'Valery Sizov2015-05-081-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix link to the CI documentationValery Sizov2015-05-081-1/+1
|/ / / / / /
* | | | | | Merge branch 'backup_doc' into 'master'Sytse Sijbrandij2015-05-081-7/+67
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | improved backup docValery Sizov2015-05-081-7/+65
| * | | | | Link to CI backup documentationbackup_docValery Sizov2015-05-071-0/+2
* | | | | | Merge branch 'rs-task_list' into 'master'Dmitriy Zaporozhets2015-05-0841-507/+543
|\ \ \ \ \ \
| * | | | | | Add CHANGELOG entry for latest task listsrs-task_listRobert Speicher2015-05-061-1/+1
| * | | | | | Update Markdown help docs for latest changesRobert Speicher2015-05-062-45/+50
| * | | | | | Fix header link anchorsRobert Speicher2015-05-061-1/+3
View Lorry Controller Status