summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | update webpack-dev-server to v2.6.1Mike Greiling2017-08-072-21/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | update karma-webpack to v2.0.4Mike Greiling2017-08-072-13/+13
| | | | | | | | | |
| * | | | | | | | | update eslint-import-resolver-webpack to v0.8.3Mike Greiling2017-08-072-7/+13
| | | | | | | | | |
| * | | | | | | | | update babel-loader to v7.1.xMike Greiling2017-08-072-26/+28
| | | | | | | | | |
| * | | | | | | | | upgrade webpack to v3.0.0Mike Greiling2017-08-072-21/+60
| | | | | | | | | |
| * | | | | | | | | replace stats-webpack-plugin with webpack-stats-pluginMike Greiling2017-08-073-13/+19
| | | | | | | | | |
* | | | | | | | | | Merge branch 'github' into 'master'Robert Speicher2017-08-078-47/+74
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitHub importer Closes #27429 See merge request !12886
| * | | | | | | | | | [ci skip] Update CHANGELOGgithubDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Add CHANGELOG entryDouglas Barbosa Alexandre2017-08-071-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Add explanation why we should return early for GitHub importerDouglas Barbosa Alexandre2017-08-071-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Change `project.path_with_namespace` to `project.disk_path`Douglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Allow users to disable SSL verification if not connecting to github.comDouglas Barbosa Alexandre2017-08-071-4/+15
| | | | | | | | | | |
| * | | | | | | | | | Fix small typo on Github::Import#fetch_releasesDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Import GitHub releasesDouglas Barbosa Alexandre2017-08-071-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix Github::Import cache for user idsDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Extrac common timeout to a constant on Github::ClientDouglas Barbosa Alexandre2017-08-071-2/+4
| | | | | | | | | | |
| * | | | | | | | | | Fix small typoe on Github::Client#root_endpointDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Expire content cache when repository fetch failsDouglas Barbosa Alexandre2017-08-071-2/+3
| | | | | | | | | | |
| * | | | | | | | | | Does not fetch repository when importing from GitHub on import serviceDouglas Barbosa Alexandre2017-08-072-26/+12
| | | | | | | | | | |
| * | | | | | | | | | Set the new GitHub import as import sourceDouglas Barbosa Alexandre2017-08-072-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Set the GitHub API token on options hashDouglas Barbosa Alexandre2017-08-071-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix small typoe on GitHub import rake taskDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Move GitHub root endpoint methods to Github::ClientDouglas Barbosa Alexandre2017-08-072-17/+19
| | | | | | | | | | |
| * | | | | | | | | | Use a custom root endpoint if defined on GH ominiauth provider settingsDouglas Barbosa Alexandre2017-08-072-2/+17
| | | | | | | | | | |
| * | | | | | | | | | Use project.import_url to fetch repositories from GithubDouglas Barbosa Alexandre2017-08-072-9/+11
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-0729-120/+603
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow projects to be started from a template Closes #32420 See merge request !13108
| * | | | | | | | | | | Fix html structureFilipa Lacerda2017-08-072-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes test for removed behavior
| * | | | | | | | | | | Port form back to use form_tagZ.J. van de Weg2017-08-073-18/+12
| | | | | | | | | | | |
| * | | | | | | | | | | Fix HAML lint errorszj-project-templatesZ.J. van de Weg2017-08-071-4/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Fix last feature test for project templatesZ.J. van de Weg2017-08-073-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | After merge cleanupZ.J. van de Weg2017-08-079-22/+36
| | | | | | | | | | | |
| * | | | | | | | | | | Fixes race condition in project uploadsTiago Botelho2017-08-073-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally picked as: 3fc0dbcbebcd470fe14f8b5fb7ad55dc3912402e. But given the internals changed, this was changed now. The changelog was removed too.
| * | | | | | | | | | | Fix eslint errorFilipa Lacerda2017-08-071-1/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-071990-14974/+19801
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (623 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
| * | | | | | | | | | | | Minor adjustments after UX reviewFilipa Lacerda2017-08-042-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes scss lint errors
| * | | | | | | | | | | | Fix repo by url stylesFilipa Lacerda2017-08-033-15/+16
| | | | | | | | | | | | |
| * | | | | | | | | | | | Style or separator according to reviewFilipa Lacerda2017-08-033-39/+79
| | | | | | | | | | | | |
| * | | | | | | | | | | | Adds export form and enables export button by defaultFilipa Lacerda2017-08-013-38/+46
| | | | | | | | | | | | |
| * | | | | | | | | | | | Style OR separator properlyFilipa Lacerda2017-08-012-82/+37
| | | | | | | | | | | | |
| * | | | | | | | | | | | Rename GitLabProjectImporterService and misc fixesZ.J. van de Weg2017-08-019-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First round of review, main changes: - templates.title is human readable, #name will be passed around - GitLabProjectImporterService has been renamed
| * | | | | | | | | | | | [ci skip] Adds svgs and css for all iconsFilipa Lacerda2017-08-018-22/+63
| | | | | | | | | | | | |
| * | | | | | | | | | | | Create rake task to create project templatesZ.J. van de Weg2017-08-013-4/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First iteration, and some stuff is missing. But basically this rake task does a clone of a project we've pointed it to. Than creates a project on the GDK, which should be running in the background. This project is exported, after which we move that archive to the location we need it. We clean up by removing the generated project. The first idea was to export the project on .com too, however than we might run into ImportExport versions mismatch. This could've been circumvented by checkout out an older commit locally. This however is not needed yet, so we opted to not go this route yet, instead we will iterate on what we got.
| * | | | | | | | | | | | [ci skip] Removes dummy placeholdersFilipa Lacerda2017-07-311-11/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Adds CSS for desktop and mobileFilipa Lacerda2017-07-314-17/+118
| | | | | | | | | | | | |
| * | | | | | | | | | | | [ci skip] Adds hr between form fieldsFilipa Lacerda2017-07-301-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Styles html according to mockupFilipa Lacerda2017-07-303-56/+90
| | | | | | | | | | | | |
| * | | | | | | | | | | | Allow projects to be started from a templateZ.J. van de Weg2017-07-2814-37/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Started implementation for the first iteration of gitlab-org/gitlab-ce#32420. This will allow users to select a template to start with, instead of an empty repository in the project just created. Internally this is basically a small extension of the ImportExport GitLab projects we already support. We just import a certain import tar archive. This commits includes the first one: Ruby on Rails. In the future more will be added.
* | | | | | | | | | | | | Merge branch 'group-milestone-references-system-notes' into 'master'Robert Speicher2017-08-0722-203/+411
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support group milestone references Closes #34778 See merge request !13289
| * | | | | | | | | | | | DRY up caching in AbstractReferenceFilterSean McGivern2017-08-071-40/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a lot of copied and pasted code, when the different elements were very small and easy to get wrong.
| * | | | | | | | | | | | Show group milestones in autocompleteSean McGivern2017-08-074-2/+42
| | | | | | | | | | | | |
View Lorry Controller Status