summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-201-0/+10
|\
| * Add tests for stage API endpointKamil Trzcinski2016-12-201-3/+1
| * Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-191-0/+3
| |\
| * \ Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-1912-88/+141
| |\ \
| * | | Render stage dropdown in separate API call as HTMLKamil Trzcinski2016-12-191-0/+12
* | | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-203-35/+111
|\ \ \ \
| * | | | Namespace access token session key in `Import::GithubController`Rémy Coutable2016-12-192-12/+20
| * | | | Improve Gitlab::ImportSourcesRémy Coutable2016-12-191-1/+1
| * | | | Modify GithubImport to support GiteaRémy Coutable2016-12-191-1/+1
| * | | | Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-194-113/+101
| * | | | Gogs ImporterKim "BKC" Carlbäcker2016-12-192-1/+81
| | |/ / | |/| |
* | | | Add terminal UI and controller actionsFatih Acet2016-12-191-5/+9
* | | | Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-191-1/+24
| |_|/ |/| |
* | | Fix 500 error for invalid path when visiting blame pageJeff Stubler2016-12-171-0/+3
|/ /
* | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-172-2/+2
|\ \
| * | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-162-2/+2
* | | Merge branch '23573-sort-functionality-for-project-member' into 'master' Douglas Barbosa Alexandre2016-12-172-9/+12
|\ \ \
| * | | Fix query in Projects::ProjectMembersController to fetch members23573-sort-functionality-for-project-memberDouglas Barbosa Alexandre2016-12-161-2/+2
| * | | Sort group/project members alphabetically by defaultDouglas Barbosa Alexandre2016-12-161-1/+3
| * | | Fix sort functionality for group/project membersDouglas Barbosa Alexandre2016-12-161-10/+4
| * | | Adds sort dropdown for group membersNur Rony2016-12-162-4/+11
* | | | Merge branch 'fix/keep-compatility-ruby-21' into 'master' Stan Hu2016-12-161-1/+1
|\ \ \ \
| * | | | Avoid use of Hash#dig to keep compatibility with Ruby 2.1fix/keep-compatility-ruby-21Douglas Barbosa Alexandre2016-12-161-1/+1
| | |/ / | |/| |
* | | | Merge branch 'bitbucket-oauth2' into 'master' Douglas Barbosa Alexandre2016-12-162-37/+48
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-167-11/+39
| |\ \ \ | | |/ /
| * | | BB importer: Fixed bug with putting expired token to a project.clone_urlValery Sizov2016-12-151-0/+3
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-1419-42/+113
| |\ \ \
| * | | | Handling OAuth2 errorsValery Sizov2016-12-091-1/+1
| * | | | BitBuckpet importer. Refactoring. Iteration 2Valery Sizov2016-12-071-1/+1
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-11-3022-74/+189
| |\ \ \ \
| * | | | | Fix remaining Bitbucket controller specsStan Hu2016-11-211-1/+1
| * | | | | Address initial review commentsStan Hu2016-11-211-7/+6
| * | | | | Support selection of different namespace and project destinationStan Hu2016-11-211-3/+3
| * | | | | Fix rebase failures with Bitbucket changesStan Hu2016-11-211-2/+2
| * | | | | Remove code to clone Bitbucket repositories using SSHDouglas Barbosa Alexandre2016-11-211-1/+1
| * | | | | Refactoring Bitbucket import controller to use the new OAuth2 clientDouglas Barbosa Alexandre2016-11-211-34/+43
* | | | | | Merge branch '18435-autocomplete-is-not-performant' into 'master' Fatih Acet2016-12-162-33/+48
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Changed autocomplete_sources into an action that returns a single 'at' type o...18435-autocomplete-is-not-performantLuke Bennett2016-12-152-33/+48
* | | | | | Merge branch '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-164-7/+31
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Implement minor changes from @dbalexandre's review.Timothy Andrew2016-12-163-7/+7
| * | | | | Allow creating personal access tokens / OAuth applications with scopes.Timothy Andrew2016-12-164-7/+31
* | | | | | Add GitLab host to 2FA QR and manual infoDrew Blessing2016-12-161-2/+6
|/ / / / /
* | | | | Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan2016-12-151-1/+1
|/ / / /
* | | | Introduce deployment services, starting with a KubernetesServiceNick Thomas2016-12-141-1/+1
| |_|/ |/| |
* | | Merge branch 'issue_13270' into 'master' Sean McGivern2016-12-131-1/+8
|\ \ \
| * | | Allow to delete tag release noteissue_13270Felipe Artur2016-12-121-1/+8
* | | | Merge branch '19990-update-snippets-page-design' into 'master' Fatih Acet2016-12-121-3/+5
|\ \ \ \
| * | | | add scope filters to project snippets pageMike Greiling2016-12-101-3/+5
* | | | | fix: removed signed_out notificationjnoortheen2016-12-121-0/+6
|/ / / /
* | | | Merge branch 'followup-7899' into 'master' Sean McGivern2016-12-091-6/+5
|\ \ \ \