summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Add Project#gitea_import?22348-gitea-importerRémy Coutable2016-12-192-4/+4
* Improve Gitlab::ImportSourcesRémy Coutable2016-12-191-12/+28
* Modify GithubImport to support GiteaRémy Coutable2016-12-197-141/+143
* Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-194-66/+3
* Gogs ImporterKim "BKC" Carlbäcker2016-12-1910-21/+96
* Merge branch 'fix/import-export-build-token' into 'master' Grzegorz Bizon2016-12-191-0/+2
|\
| * Fix duplicated build token problem and added relevant specfix/import-export-build-tokenJames Lopez2016-12-191-0/+2
* | Merge branch 'fix/detailed-status-groups' into 'master' Lin Jen-Shin (godfat)2016-12-194-10/+11
|\ \
| * | Improve how we calculate detailed status group nameGrzegorz Bizon2016-12-161-1/+1
| * | Update status group name for success with warningsGrzegorz Bizon2016-12-161-1/+1
| * | Make CI/CD detailed status group concept explicitGrzegorz Bizon2016-12-163-8/+9
* | | Merge branch '25301-git-2.11-force-push-bug' into 'master' Douglas Barbosa Alexandre2016-12-197-10/+71
|\ \ \ | |_|/ |/| |
| * | Implement final review comments from @rymai.25301-git-2.11-force-push-bugTimothy Andrew2016-12-162-7/+9
| * | Implement review comments from @dbalexandre.Timothy Andrew2016-12-161-10/+12
| * | Check the exit code while invoking git in the force push check.Timothy Andrew2016-12-161-2/+7
| * | Validate environment variables in `Gitlab::Git::RevList`Timothy Andrew2016-12-161-3/+13
| * | Accept environment variables from the `pre-receive` script.Timothy Andrew2016-12-167-9/+51
| |/
* | Merge branch 'dockerfile-templates' into 'master' Rémy Coutable2016-12-192-4/+38
|\ \
| * \ Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-18220-2810/+6547
| |\ \
| * | | Update templates.rbKamil Trzciński2016-12-161-1/+1
| * | | Refactored JSLuke "Jared" Bennett2016-11-081-1/+4
| * | | Allow to use Dockerfile templatesKamil Trzcinski2016-11-082-5/+36
* | | | Merge branch 'update-nginx-config-for-websockets' into 'master' Kamil Trzciński2016-12-182-0/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | Upgrade NGINX configuration files to add websocket supportNick Thomas2016-12-122-0/+15
* | | | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-171-1/+1
|\ \ \ \
| * | | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-161-1/+1
| | |_|/ | |/| |
* | | | Fix rubocop failureszj-mattermost-sessionKamil Trzcinski2016-12-171-15/+21
* | | | Store mattermost_url in settingsKamil Trzcinski2016-12-171-8/+9
* | | | Improve Mattermost Session specsKamil Trzcinski2016-12-171-11/+12
* | | | Ensure the session is destroyedZ.J. van de Weg2016-12-171-3/+5
* | | | Improve session testsZ.J. van de Weg2016-12-171-3/+6
* | | | Setup mattermost sessionZ.J. van de Weg2016-12-171-0/+102
* | | | Avoid use of Hash#dig to keep compatibility with Ruby 2.1Douglas Barbosa Alexandre2016-12-164-10/+10
* | | | Fix import issues methodDouglas Barbosa Alexandre2016-12-161-4/+4
* | | | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-1622-37/+372
|\ \ \ \ | |/ / /
| * | | Merge branch '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-165-25/+72
| |\ \ \
| | * | | Rename the `token_has_scope?` method.Timothy Andrew2016-12-161-3/+3
| | * | | Convert AccessTokenValidationService into a class.Timothy Andrew2016-12-162-3/+3
| | * | | Refactor access token validation in `Gitlab::Auth`Timothy Andrew2016-12-161-2/+10
| | * | | Implement minor changes from @dbalexandre's review.Timothy Andrew2016-12-162-12/+15
| | * | | Validate access token scopes in `Gitlab::Auth`Timothy Andrew2016-12-161-3/+11
| | * | | Calls to the API are checked for scope.Timothy Andrew2016-12-165-30/+58
| * | | | Merge branch 'issue_22269' into 'master' Kamil Trzciński2016-12-161-1/+9
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Change SlackService to SlackNotificationsServiceissue_22269_fix_eeissue_22269Felipe Artur2016-12-151-1/+9
| * | | | Merge branch 'katex-math-fixup' into 'master' Sean McGivern2016-12-161-4/+0
| |\ \ \ \
| | * | | | Don't open Asciidoc module twiceMunken2016-12-151-4/+0
| * | | | | Merge branch '25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs...Kamil Trzciński2016-12-151-1/+1
| |\ \ \ \ \
| | * | | | | Rename `issue create` slash command to `issue new`25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentationPedro Moreira da Silva2016-12-151-1/+1
| | * | | | | Improve `issue create …` slash command with user input keys to create a new...Pedro Moreira da Silva2016-12-151-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'show-commit-status-from-latest-pipeline' into 'master' Grzegorz Bizon2016-12-151-2/+2
| |\ \ \ \ \
View Lorry Controller Status