Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into auto-pipelines-vue | Regis | 2017-01-09 | 2 | -0/+5 |
|\ | |||||
| * | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' | Sean McGivern | 2017-01-09 | 1 | -0/+1 |
| |\ | |||||
| | * | Record and show last used date of SSH Keys | Vincent Wong | 2017-01-09 | 1 | -0/+1 |
| * | | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' | Alfredo Sumaran | 2017-01-06 | 1 | -0/+4 |
| |\ \ | |||||
| | * | | Moved the members (project_members)option to a single controller called members | Jose Ivan Vargas | 2017-01-03 | 1 | -0/+4 |
* | | | | Merge branch 'master' into auto-pipelines-vue | Filipa Lacerda | 2017-01-05 | 1 | -0/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'monkey-patch-comment' into 'master' | Rémy Coutable | 2017-01-05 | 1 | -0/+6 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Explain why there is a monkey-patch | Jacob Vosmaer | 2016-12-27 | 1 | -0/+6 |
| | |/ | |||||
* | | | fix pipelines/index.html.haml merge conflict | Regis | 2017-01-02 | 2 | -3/+2 |
|\ \ \ | |/ / | |||||
| * | | Merged the 'groups' and 'projects' tabs when viewing user profiles | James Gregory | 2016-12-29 | 1 | -1/+0 |
| * | | Fix 500 error when visit group from admin area if group name contains dotdz-improve-admin-group-routing | Dmitriy Zaporozhets | 2016-12-28 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'feature/more-storage-statistics' into 'master' | Sean McGivern | 2016-12-26 | 1 | -1/+1 |
| |\ | |||||
| | * | Add more storage statistics | Markus Koller | 2016-12-21 | 1 | -1/+1 |
* | | | merge master and fix application.rb conflict | Regis | 2016-12-23 | 4 | -5/+32 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'permit-uploadedfile-scalar' into 'master' | Rémy Coutable | 2016-12-23 | 1 | -0/+16 |
| |\ \ | |||||
| | * | | Monkey-patch StrongParameters for ::UploadedFile | Jacob Vosmaer | 2016-12-23 | 1 | -0/+16 |
| * | | | Merge branch '25896-fix-404-katax-fonts' into 'master' | Alfredo Sumaran | 2016-12-22 | 1 | -0/+2 |
| |\ \ \ | |||||
| | * | | | Add KaTeX fonts to assets paths and precompile | Hiroyuki Sato | 2016-12-22 | 1 | -0/+2 |
| * | | | | Merge branch '23638-remove-builds-tab' into 'master' | Kamil Trzciński | 2016-12-21 | 1 | -4/+0 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Changes after review | Filipa Lacerda | 2016-12-21 | 1 | -2/+0 |
| | * | | | Remove builds tab from commit | Filipa Lacerda | 2016-12-21 | 1 | -1/+0 |
| | * | | | Removes builds tab from merge request | Filipa Lacerda | 2016-12-21 | 1 | -1/+0 |
| * | | | | Merge branch 'backport-mr-widget-ci-js' into 'master' | Alfredo Sumaran | 2016-12-21 | 1 | -0/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Remove unneeded bundle refs.backport-mr-widget-ci-js | Bryce Johnson | 2016-12-21 | 1 | -2/+0 |
| | * | | | Backport moving MR widget CI JS out of script tag. | Bryce Johnson | 2016-12-21 | 1 | -0/+3 |
| * | | | | Merge branch 'zj-mattermost-slash-config' into 'master' | Kamil Trzciński | 2016-12-21 | 2 | -1/+3 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 5 | -1/+12 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Improve sources | Kamil Trzcinski | 2016-12-19 | 1 | -1/+1 |
| | * | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 1 | -5/+1 |
| | * | | | Merge branch 'master' into 'zj-mattermost-slash-config' | Zeger-Jan van de Weg | 2016-12-18 | 11 | -10/+43 |
| | |\ \ \ | |||||
| | * | | | | Fix configure route | Luke "Jared" Bennett | 2016-12-17 | 1 | -1/+1 |
| | * | | | | Add tests for auto configure slash commands | Z.J. van de Weg | 2016-12-16 | 1 | -1/+0 |
| | * | | | | Add MattermostController | Z.J. van de Weg | 2016-12-16 | 1 | -0/+6 |
| | * | | | | Base work for auto config MM slash commands | Z.J. van de Weg | 2016-12-16 | 2 | -0/+6 |
| * | | | | | Merge branch 'authentiq-id-oauth-support' into 'master' | Rémy Coutable | 2016-12-21 | 1 | -0/+10 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Added support for Authentiq oauth provider | Alex | 2016-12-21 | 1 | -0/+10 |
| | | |/ / | | |/| | | |||||
* | | | | | Merge branch 'master' into auto-pipelines-vue | Grzegorz Bizon | 2016-12-21 | 11 | -7/+48 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '19703-direct-link-pipelines' into 'master' | Grzegorz Bizon | 2016-12-20 | 1 | -0/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Merge branch 'master' into 19703-direct-link-pipelines | Filipa Lacerda | 2016-12-19 | 8 | -6/+35 |
| | |\ \ \ | | | |/ / | |||||
| | * | | | Render stage dropdown in separate API call as HTML | Kamil Trzcinski | 2016-12-19 | 1 | -0/+1 |
| * | | | | Merge branch '22348-gitea-importer' into 'master' | Rémy Coutable | 2016-12-20 | 2 | -1/+7 |
| |\ \ \ \ | |||||
| | * | | | | Rename Gogs to Gitea, DRY the controller and improve views | Rémy Coutable | 2016-12-19 | 2 | -2/+2 |
| | * | | | | Gogs Importer | Kim "BKC" Carlbäcker | 2016-12-19 | 2 | -1/+7 |
| | | |/ / | | |/| | | |||||
| * | | | | Add terminal UI and controller actions | Fatih Acet | 2016-12-19 | 1 | -0/+2 |
| * | | | | Add a ReactiveCaching concern for use in the KubernetesService | Nick Thomas | 2016-12-19 | 1 | -0/+1 |
| * | | | | Add xterm.js 2.1.0 and a wrapper class to the asset pipeline | Nick Thomas | 2016-12-19 | 1 | -0/+2 |
| |/ / / | |||||
| * | | | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into... | Sean McGivern | 2016-12-17 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741 | Rydkin Maxim | 2016-12-16 | 1 | -1/+1 |
| * | | | | Fix rubocop failureszj-mattermost-session | Kamil Trzcinski | 2016-12-17 | 1 | -2/+2 |
| * | | | | Store mattermost_url in settings | Kamil Trzcinski | 2016-12-17 | 2 | -0/+13 |