Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Fix and improve help rendering" | Robert Speicher | 2015-04-15 | 2 | -20/+20 |
* | Make sure user has access to namespace in import tests. | Douwe Maan | 2015-04-15 | 5 | -5/+25 |
* | Merge branch 'sstanovnik-openssh_fix' into 'master' | Dmitriy Zaporozhets | 2015-04-15 | 1 | -0/+12 |
|\ | |||||
| * | Refactor key fingerprint generation. | Douwe Maan | 2015-04-14 | 1 | -0/+12 |
* | | Merge branch 'emailsonpush-replyto' into 'master' | Dmitriy Zaporozhets | 2015-04-15 | 1 | -0/+15 |
|\ \ | |||||
| * | | Set EmailsOnPush reply-to address to committer email when enabled.emailsonpush-replyto | Douwe Maan | 2015-04-14 | 1 | -0/+15 |
* | | | Merge branch 'emailsonpush-hellip' into 'master' | Dmitriy Zaporozhets | 2015-04-15 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.emailsonpush-hellip | Douwe Maan | 2015-04-14 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'ldap-block_auto_created_users' into 'master' | Dmitriy Zaporozhets | 2015-04-15 | 1 | -7/+60 |
|\ \ \ | |||||
| * | | | Add config var to block auto-created LDAP users. | Douwe Maan | 2015-04-14 | 1 | -7/+60 |
| |/ / | |||||
* | | | Merge branch 'invitation' into 'master' | Dmitriy Zaporozhets | 2015-04-15 | 3 | -22/+148 |
|\ \ \ | |||||
| * | | | Follow newline guidelines. | Douwe Maan | 2015-04-14 | 1 | -3/+0 |
| * | | | Remove duplication between Group and ProjectMember. | Douwe Maan | 2015-04-14 | 1 | -2/+37 |
| * | | | Let invites be declined. | Douwe Maan | 2015-04-14 | 1 | -0/+17 |
| * | | | Add invite logic to Member. | Douwe Maan | 2015-04-14 | 1 | -0/+79 |
| * | | | Track who created a group or project member. | Douwe Maan | 2015-04-14 | 1 | -2/+0 |
| |/ / | |||||
* | | | Merge branch 'google-code-import' into 'master' | Douwe Maan | 2015-04-15 | 6 | -2/+592 |
|\ \ \ | |/ / |/| | | |||||
| * | | Import Google Code issue assignee when mapped.google-code-import | Douwe Maan | 2015-04-14 | 2 | -3/+12 |
| * | | Allow user map to be specified. | Douwe Maan | 2015-04-14 | 1 | -2/+9 |
| * | | Add comment number to imported Google Code comments. | Douwe Maan | 2015-04-14 | 1 | -0/+1 |
| * | | Remove author link since all code.google.com links will be shut down. | Douwe Maan | 2015-04-14 | 1 | -2/+0 |
| * | | Show Google Code image attachments inline. | Douwe Maan | 2015-04-04 | 2 | -1/+7 |
| * | | Fix tests. | Douwe Maan | 2015-04-03 | 2 | -4/+2 |
| * | | Allow projects to be imported from Google Code. | Douwe Maan | 2015-04-03 | 6 | -0/+571 |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-14 | 1 | -79/+3 |
|\ \ \ | |||||
| * \ \ | Merge branch 'revert_fix_email_images' into 'master' | Douwe Maan | 2015-04-14 | 1 | -79/+3 |
| |\ \ \ | |||||
| | * | | | Revert "Merge branch 'fix_email_images' into 'master'" | Hannes Rosenögger | 2015-04-13 | 1 | -79/+3 |
* | | | | | Merge branch 'rs-remove-invalid-key-factories' into 'master' | Dmitriy Zaporozhets | 2015-04-14 | 3 | -22/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Remove the invalid key factories | Robert Speicher | 2015-04-11 | 3 | -22/+9 |
* | | | | | | Merge branch 'rs-link-to-performance' into 'master' | Dmitriy Zaporozhets | 2015-04-14 | 1 | -11/+15 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Speed up the overridden `link_to` helper | Robert Speicher | 2015-04-12 | 1 | -11/+15 |
* | | | | | | Merge branch 'ldap_migration' | Dmitriy Zaporozhets | 2015-04-13 | 1 | -14/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove test for 'ldap' provider special case | Jacob Vosmaer | 2015-04-13 | 1 | -14/+0 |
* | | | | | | | Merge branch 'reference-access-control' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 3 | -112/+121 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Update tests. | Douwe Maan | 2015-04-03 | 2 | -48/+54 |
| * | | | | | | Fix errors. | Douwe Maan | 2015-04-02 | 2 | -79/+82 |
* | | | | | | | Merge branch 'public-deploy-keys' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 3 | -8/+25 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Add admin deploy keys tests.public-deploy-keys | Douwe Maan | 2015-04-03 | 1 | -0/+3 |
| * | | | | | | Fix failing specs. | Douwe Maan | 2015-04-03 | 1 | -2/+1 |
| * | | | | | | Allow admin to create public deploy keys that are accessible to any project. | Douwe Maan | 2015-04-03 | 1 | -6/+21 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'rs-issue-1942' into 'master' | Dmitriy Zaporozhets | 2015-04-12 | 1 | -10/+33 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Upon successful login, clear `reset_password_token` field | Robert Speicher | 2015-04-08 | 1 | -10/+33 |
* | | | | | | | Rename last uses of Buildbox to Buildkite | Robert Speicher | 2015-04-11 | 1 | -2/+2 |
* | | | | | | | Move buildbox_service files to buildkite_service | Robert Speicher | 2015-04-11 | 1 | -0/+0 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-10 | 4 | -1/+79 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Merge branch 'fix-submodules-with-relative-links' into 'master' | Douwe Maan | 2015-04-10 | 1 | -0/+35 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix broken file browsing with a submodule that has a relative link | Stan Hu | 2015-04-09 | 1 | -0/+35 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'ci_fork' into 'master' | Dmitriy Zaporozhets | 2015-04-09 | 3 | -1/+44 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | CI forking: tests | Valery Sizov | 2015-04-06 | 3 | -1/+44 |
* | | | | | | Move lib/gitlab/oauth to lib/gitlab/o_auth | Robert Speicher | 2015-04-09 | 2 | -0/+0 |
|/ / / / / |