Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'zj-variables-build-job' into 'master' | Kamil Trzciński | 2017-03-07 | 1 | -2/+2 |
|\ | |||||
| * | Rename BUILD to JOB in CI Variableszj-variables-build-job | Z.J. van de Weg | 2017-03-07 | 1 | -2/+2 |
* | | Merge branch '28447-hybrid-repository-storages' into 'master' | Sean McGivern | 2017-03-07 | 4 | -5/+5 |
|\ \ | |||||
| * | | Update storage settings to allow extra values per shard28447-hybrid-repository-storages | Alejandro Rodríguez | 2017-03-03 | 4 | -5/+5 |
* | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect' | Sean McGivern | 2017-03-07 | 3 | -0/+63 |
|\ \ \ | |||||
| * | | | Implement OpenID Connect identity provider | Markus Koller | 2017-03-07 | 3 | -0/+63 |
| | |/ | |/| | |||||
* | | | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat... | Douwe Maan | 2017-03-07 | 3 | -1/+38 |
|\ \ \ | |/ / |/| | | |||||
| * | | apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_token | Tiago Botelho | 2017-03-06 | 1 | -1/+1 |
| * | | applies relevant changes to the code and code structure | Tiago Botelho | 2017-02-28 | 1 | -1/+1 |
| * | | add impersonation token | Simon Vocella | 2017-02-28 | 2 | -0/+19 |
| * | | manage personal_access_tokens through api | Simon Vocella | 2017-02-28 | 2 | -1/+19 |
* | | | Merge branch '26371-native-emojis-v3' into 'master' | Filipa Lacerda | 2017-03-07 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix up @DouweM review | Eric Eastwood | 2017-03-06 | 1 | -1/+1 |
* | | | | Merge branch 'master' into 'rs-carrierwave-db'rs-carrierwave-db | Douwe Maan | 2017-03-06 | 2 | -0/+29 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'zj-create-mattermost-team' into 'master' | Kamil Trzciński | 2017-03-06 | 2 | -0/+29 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into 'zj-create-mattermost-team' | Zeger-Jan van de Weg | 2017-03-06 | 4 | -2/+34 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into zj-create-mattermost-team | Z.J. van de Weg | 2017-03-06 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Minor edits, incorporate review | Z.J. van de Weg | 2017-03-06 | 2 | -6/+4 |
| | * | | | | | Merge branch 'master' into zj-create-mattermost-team | Z.J. van de Weg | 2017-03-02 | 9 | -14/+155 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Improve UX | Z.J. van de Weg | 2017-03-02 | 2 | -7/+11 |
| | * | | | | | | Fix tests | Z.J. van de Weg | 2017-02-24 | 1 | -2/+3 |
| | * | | | | | | Merge branch 'master' into zj-create-mattermost-team | Z.J. van de Weg | 2017-02-24 | 14 | -24/+60 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fix bad merge [ci skip] | Z.J. van de Weg | 2017-02-20 | 2 | -6/+6 |
| | * | | | | | | | Merge branch 'master' into zj-create-mattermost-team | Z.J. van de Weg | 2017-02-20 | 3 | -3/+16 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Improve DRYness of views | Z.J. van de Weg | 2017-02-16 | 1 | -2/+2 |
| | * | | | | | | | | Create MM team for GitLab group | Z.J. van de Weg | 2017-02-16 | 2 | -0/+28 |
* | | | | | | | | | | Add Upload model and UploadChecksumWorker worker | Robert Speicher | 2017-03-06 | 2 | -0/+34 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'pipeline-blocking-actions' into 'master' | Kamil Trzciński | 2017-03-06 | 2 | -1/+20 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Migrate legacy actions in post deployment migration | Grzegorz Bizon | 2017-03-06 | 2 | -1/+1 |
| * | | | | | | | | Merge branch 'master' into pipeline-blocking-actionspipeline-blocking-actions | Grzegorz Bizon | 2017-03-06 | 4 | -2/+34 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | Add migration for manual actions with skipped status | Grzegorz Bizon | 2017-03-06 | 2 | -1/+20 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Remove unecessary defaults for uniq ip block, cleanup refactoring leftovers | Pawel Chojnacki | 2017-03-06 | 2 | -7/+6 |
* | | | | | | | | align schema.rb with upstream and fix rubocop warning about not freezing muta... | Pawel Chojnacki | 2017-03-06 | 1 | -2/+3 |
* | | | | | | | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ... | Pawel Chojnacki | 2017-03-06 | 2 | -7/+7 |
* | | | | | | | | Allow limiting logging in users from too many different IPs. | Pawel Chojnacki | 2017-03-06 | 2 | -1/+21 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Move foreign key to separate migration | Kamil Trzcinski | 2017-03-05 | 3 | -3/+13 |
* | | | | | | | Update db/schema | Kamil Trzcinski | 2017-03-05 | 3 | -3/+6 |
* | | | | | | | Make triggers to be user aware | Kamil Trzcinski | 2017-03-05 | 1 | -1/+1 |
* | | | | | | | Make Pipeline Triggers to be user aware | Kamil Trzcinski | 2017-03-05 | 2 | -0/+19 |
|/ / / / / / | |||||
* | | | | | | Fix the `Gitlab::Seeder` monkey patch to disable mail deliveryrs-dev-seed-time | Robert Speicher | 2017-03-02 | 1 | -2/+2 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'fix/mwbs-to-mwps' into 'master' | Douwe Maan | 2017-03-01 | 3 | -3/+61 |
|\ \ \ \ \ | |||||
| * | | | | | Update occurrences of MWBS to MWPSfix/mwbs-to-mwps | James Lopez | 2017-03-01 | 3 | -3/+61 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Disable the inheritance column of services in DisableInvalidServiceTemplates ... | Rémy Coutable | 2017-03-01 | 1 | -4/+2 |
|/ / / / | |||||
* | | | | Fix migration without DOWNTIME clause specified | Ruben Davila | 2017-02-28 | 1 | -0/+2 |
* | | | | Add development fixtures for nested groupsdz-nested-groups-fixtures | Dmitriy Zaporozhets | 2017-02-27 | 1 | -0/+69 |
* | | | | Merge branch 'dm-fix-web-edit-new-lines' into 'master' | Robert Speicher | 2017-02-24 | 1 | -9/+1 |
|\ \ \ \ | |||||
| * | | | | Rename commit_file, commit_dir and remove_file and update specs | Douwe Maan | 2017-02-24 | 1 | -1/+1 |
| * | | | | Consistently create, update, and delete files, taking CRLF settings into account | Douwe Maan | 2017-02-24 | 1 | -9/+1 |
* | | | | | Remove the default value for the `users.ghost` database column. | Timothy Andrew | 2017-02-24 | 2 | -7/+3 |
* | | | | | Use a `ghost` boolean to track ghost users. | Timothy Andrew | 2017-02-24 | 2 | -0/+16 |
|/ / / / |