Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 '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 |
|/ / / / | |||||
* | | | | Merge branch 'rs-issue-2152' into 'master' | Dmitriy Zaporozhets | 2015-04-08 | 1 | -0/+41 |
|\ \ \ \ | |||||
| * | | | | Render a 404 when RefsController#logs_tree gets an HTML request | Robert Speicher | 2015-04-06 | 1 | -0/+41 |
| |/ / / | |||||
* | | | | Merge remote-tracking branch 'github.com/master' | Douwe Maan | 2015-04-04 | 2 | -20/+20 |
|\ \ \ \ | |||||
| * | | | | Fix and improve help rendering | Sullivan SENECHAL | 2015-04-03 | 2 | -20/+20 |
| |/ / / | |||||
* | | | | Merge branch 'custom-email-reply-to' into 'master' | Douwe Maan | 2015-04-03 | 1 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | Add ability to configure Reply-To address in gitlab.yml | Stan Hu | 2015-04-03 | 1 | -0/+8 |
* | | | | | Merge branch 'feature_expose_project_labels' into 'master' | Hannes Rosenögger | 2015-04-03 | 1 | -1/+8 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Modified lib/api/entities.rb to expose Project class tag_list property to the... | Cristian Medina | 2015-04-03 | 1 | -1/+8 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'fix-backup-spec-regexp' into 'master' | Douwe Maan | 2015-04-03 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Improve regexp to prevent false positives | Stan Hu | 2015-04-02 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'configurable-attachment-size' into 'master' | Douwe Maan | 2015-04-03 | 2 | -0/+53 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Support configurable attachment size via Application Settings | Stan Hu | 2015-04-02 | 2 | -0/+53 |
| | |/ | |/| | |||||
* | | | Merge branch 'import-current-user' into 'master' | Dmitriy Zaporozhets | 2015-04-02 | 3 | -34/+281 |
|\ \ \ | |||||
| * | | | Add tests.import-current-user | Douwe Maan | 2015-04-01 | 3 | -34/+281 |
* | | | | Merge branch 'repository-archive-worker' into 'master' | Dmitriy Zaporozhets | 2015-04-02 | 3 | -0/+238 |
|\ \ \ \ | |||||
| * | | | | Add tests. | Douwe Maan | 2015-03-31 | 3 | -0/+238 |
| |/ / / | |||||
* | | | | Merge branch 'username-period' into 'master' | Dmitriy Zaporozhets | 2015-04-02 | 5 | -24/+22 |
|\ \ \ \ | |||||
| * | | | | Move files for moved namespaces. | Douwe Maan | 2015-03-31 | 1 | -2/+0 |
| * | | | | Fix tests. | Douwe Maan | 2015-03-27 | 3 | -11/+11 |
| * | | | | Use more specific regexes. | Douwe Maan | 2015-03-27 | 1 | -1/+1 |
| * | | | | Move User.cleanup_username to Namespace.cleanup_path. | Douwe Maan | 2015-03-27 | 2 | -10/+10 |
* | | | | | ability to skip some items in backupbackup_skip_option | Valery Sizov | 2015-04-02 | 1 | -0/+51 |
| |_|_|/ |/| | | |