summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Don't use hard-coded sign_in pathRobert Speicher2015-05-091-1/+1
| * | | | | | | | | | prepend_before_filter -> prepend_before_actionRobert Speicher2015-05-091-1/+1
| * | | | | | | | | | Be consistent with what we call the 2FA featureRobert Speicher2015-05-094-11/+13
| * | | | | | | | | | Update copy for recovery codesRobert Speicher2015-05-091-5/+4
| * | | | | | | | | | Render 2fa recovery codes instead of downloading itDmitriy Zaporozhets2015-05-096-12/+28
| * | | | | | | | | | Add support for backup codesDmitriy Zaporozhets2015-05-096-14/+42
| * | | | | | | | | | Use non-broken version of attr_encryptedDmitriy Zaporozhets2015-05-092-2/+10
| * | | | | | | | | | Turn 2-factor authentication into 2 steps process. Disabled 2fa UI for ldap u...Dmitriy Zaporozhets2015-05-095-18/+59
| * | | | | | | | | | Fix rubocop complainDmitriy Zaporozhets2015-05-093-3/+2
| * | | | | | | | | | Make 2 factor authentication workDmitriy Zaporozhets2015-05-093-9/+37
| * | | | | | | | | | Create Two-factor authentication resource for userDmitriy Zaporozhets2015-05-094-0/+48
| * | | | | | | | | | Init 2 factor authentication for user modelDmitriy Zaporozhets2015-05-094-2/+18
| * | | | | | | | | | Add 2 factor authentication gemsDmitriy Zaporozhets2015-05-092-0/+20
* | | | | | | | | | | Merge branch 'fix-tags-view-with-submodules' into 'master'Douwe Maan2015-05-123-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Bump gitlab_git to 7.1.11 to fix bug where viewing a tag on a project with su...Stan Hu2015-05-043-2/+3
* | | | | | | | | | | 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
View Lorry Controller Status