| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Added missing capitalisation changeprojects-section-button-capitalization | Jose Ivan Vargas | 2017-04-05 | 8 | -32/+54 |
| | | |||||
| * | Fixed rspec and spinach tests | Jose Ivan Vargas | 2017-04-05 | 10 | -51/+63 |
| | | |||||
| * | Fixed rspec tests | Jose Ivan Vargas | 2017-04-05 | 9 | -45/+60 |
| | | |||||
| * | Fixed spinach feature tests | Jose Ivan Vargas | 2017-04-05 | 17 | -34/+34 |
| | | |||||
| * | Fixed button capitalization for Projects in views | Jose Ivan Vargas | 2017-04-05 | 19 | -32/+32 |
| | | |||||
| * | Merge branch 'master' into 'button-capitalization' | Jose Ivan Vargas Lopez | 2017-04-05 | 123 | -378/+52978 |
| |\ | | | | | | | # Conflicts: # app/views/groups/merge_requests.html.haml | ||||
| | * | Merge branch 'dz-fix-group-move' into 'master' | Douwe Maan | 2017-04-05 | 3 | -15/+50 |
| | |\ | | | | | | | | | | | | | | | | | | | Fix subgroup repository disappearance if group was moved Closes #30261 See merge request !10414 | ||||
| | | * | Fix subgroup repository disappearance if group was moveddz-fix-group-move | Dmitriy Zaporozhets | 2017-04-05 | 3 | -15/+50 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Merge branch 'gitaly-refs' into 'master' | Robert Speicher | 2017-04-05 | 25 | -87/+280 |
| | |\ \ | | | | | | | | | | | | | | | | | Implement Gitaly refs client See merge request !9291 | ||||
| | | * | | Rename {create,inizialize}_raw_repositorygitaly-refs | Jacob Vosmaer | 2017-04-05 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | Incorporate Gitaly client for refs service | Alejandro Rodríguez | 2017-04-04 | 25 | -87/+280 |
| | | | | | |||||
| | * | | | Merge branch 'emoji-menu-duplicated-search-icon' into 'master' | Filipa Lacerda | 2017-04-05 | 2 | -2/+6 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the duplicated search icon in emoji menu Closes #30416 and #30016 See merge request !10472 | ||||
| | | * | | | Removes the duplicated search icon in emoji menuemoji-menu-duplicated-search-icon | Phil Hughes | 2017-04-05 | 2 | -2/+6 |
| | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | The search emojis title had the same class as the search input which caused a duplicated icon. Closes #30416 | ||||
| | * | | | Merge branch 'render-pdfs-in-gitlab' into 'master' | Jacob Schatz | 2017-04-05 | 13 | -1/+51299 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Render PDFs in GitLab See merge request !10419 | ||||
| | | * | | | Use PDFLab to render PDFs in GitLab | Sam Rose | 2017-04-05 | 13 | -1/+51299 |
| | |/ / / | |||||
| | * | | | Merge branch 'docs-polling-query-params' into 'master' | Sean McGivern | 2017-04-05 | 1 | -0/+6 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Document how ETag caching middleware handles query parameters See merge request !10482 | ||||
| | | * | | | Document how ETag caching middleware handles query parameters | Adam Niedzielski | 2017-04-05 | 1 | -0/+6 |
| | | | | | | |||||
| | * | | | | Merge branch 'wildcard-routes-in-etag-middleware' into 'master' | Sean McGivern | 2017-04-05 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware See merge request !10478 | ||||
| | | * | | | | Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middlewarewildcard-routes-in-etag-middleware | Adam Niedzielski | 2017-04-05 | 1 | -1/+1 |
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | NamespaceValidator::WILDCARD_ROUTES is less restrictive than ProjectPathValidator::RESERVED and we really have to avoid only routes that contain wildcard names. | ||||
| | * | | | | Merge branch 'sh-fix-award-emoji-transient-spec' into 'master' | Rémy Coutable | 2017-04-05 | 1 | -1/+3 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Potential fix for intermittent spec failure in award emoji specs Closes #30399 See merge request !10476 | ||||
| | | * | | | | Potential fix for intermittent spec failure in award emoji specssh-fix-award-emoji-transient-spec | Stan Hu | 2017-04-05 | 1 | -1/+3 |
| | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | Hover and then click seems to make this work more reliably. Closes #30399 | ||||
| | * | | | | Merge branch 'sketch-preview-files' into 'master' | Jacob Schatz | 2017-04-05 | 11 | -2/+293 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Load a preview of Sketch 43 files See merge request !10470 | ||||
| | | * | | | | Load a preview of Sketch 43 filessketch-preview-files | Jacob Schatz | 2017-04-05 | 11 | -2/+293 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sketch 43 files are technically a zip file, so the JavaScript opens the zip file & locates a preview.png which is just a quick preview of the last sketch page edited. After that is loaded it simply places the image into the DOM | ||||
| | * | | | | | Merge branch 'fix-groups-long-url' into 'master' | Jacob Schatz | 2017-04-05 | 2 | -2/+6 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make group skip validation in the frontend Closes #29236 See merge request !10426 | ||||
| | | * | | | | Make group skip validation in the frontend | Alfredo Sumaran | 2017-04-05 | 2 | -2/+6 |
| | |/ / / / | |||||
| | * | | | | Merge branch ↵ | Jacob Schatz | 2017-04-05 | 20 | -40/+213 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '20841-getting-started-better-empty-state-for-merge-requests-view' into 'master' MR empty state Closes #20854 and #20841 See merge request !7342 | ||||
| | | * | | | | MR empty state | Luke "Jared" Bennett | 2017-04-05 | 20 | -40/+213 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'gitlab-ci-multi-runner-2284' into 'master' | Rémy Coutable | 2017-04-05 | 2 | -0/+29 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return an empty array when dependencies is an empty array Closes #30316 and gitlab-ci-multi-runner#2284 See merge request !10359 | ||||
| | | * | | | | Return an empty array when dependencies is an empty array | Mike Wyatt | 2017-04-05 | 2 | -0/+29 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'mock-deployments' into 'master' | Rémy Coutable | 2017-04-05 | 10 | -2/+124 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Added mock deployment and monitoring service with environments fixtures See merge request !10379 | ||||
| | | * | | | | Added mock deployment and monitoring service with environments fixtures | Kamil Trzciński | 2017-04-05 | 10 | -2/+124 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'issue-boards-list-template-in-js' into 'master' | Filipa Lacerda | 2017-04-05 | 6 | -140/+382 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Issue boards list template in JS file See merge request !9958 | ||||
| | | * | | | | Changed order in Vue file | Phil Hughes | 2017-04-05 | 1 | -77/+78 |
| | | | | | | | |||||
| | | * | | | | Added specs for board list component | Phil Hughes | 2017-04-05 | 3 | -6/+210 |
| | | | | | | | |||||
| | | * | | | | Issue boards list template in JS file | Phil Hughes | 2017-04-05 | 5 | -138/+175 |
| | | | |/ / | | |/| | | | | | | | | | | | | This is one step closer to making the transition to .vue files for issue boards | ||||
| | * | | | | Merge branch 'fix/import-namespace' into 'master' | Sean McGivern | 2017-04-05 | 5 | -12/+212 |
| | |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Create subgroups if they don't exist while importing projects See merge request !10406 | ||||
| | | * | | | Create subgroups if they don't exist while importing projects | James Lopez | 2017-04-05 | 5 | -12/+212 |
| | |/ / / | |||||
| | * | | | Merge branch 'fix_wiki_commit_message' into 'master' | Sean McGivern | 2017-04-05 | 4 | -1/+33 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wiki commit message Closes #20389 See merge request !10464 | ||||
| | | * | | | Fix wiki commit message | blackst0ne | 2017-04-05 | 4 | -1/+33 |
| | | | | | | |||||
| | * | | | | Merge branch 'issue_91_ee_backport' into 'master' | Sean McGivern | 2017-04-05 | 3 | -12/+4 |
| | |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Do not set closed_at to nil when issue is reopened See merge request !10453 | ||||
| | | * | | | Do not set closed_at to nil when issue is reopenedissue_91_ee_backport | Felipe Artur | 2017-04-04 | 3 | -12/+4 |
| | | | | | | |||||
| | * | | | | Merge branch 'sh-fix-ssh-keys-with-spaces' into 'master' | Sean McGivern | 2017-04-05 | 3 | -1/+14 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Handle SSH keys that have multiple spaces between each marker See merge request !10466 | ||||
| | | * | | | | Handle SSH keys that have multiple spaces between each marker | Stan Hu | 2017-04-04 | 3 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notice what happens when a user adds a key with a space in between: ``` irb(main):004:0> 'ssh-rsa foobar'.split(/ /) => ["ssh-rsa", "", "foobar"] ``` This would cause gitlab-shell to receive a blank argument for the actual key, leading to users unable to login. | ||||
| | * | | | | | Update CHANGELOG.md for 9.0.3 | James Lopez | 2017-04-05 | 15 | -58/+17 |
| | |/ / / / | | | | | | | | | | | [ci skip] | ||||
| | * | | | | Merge branch 'backport-transient-failure-1567' into 'master' | Rémy Coutable | 2017-04-04 | 1 | -0/+4 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes of ee fix for transient failure in environments spec See merge request !10459 | ||||
| | | * | | | | Backport changes of ee fix for transient failure in environments spec | Filipa Lacerda | 2017-04-04 | 1 | -0/+4 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'simple-ci-sourcemaps' into 'master' | Clement Ho | 2017-04-04 | 1 | -1/+2 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a less memory-intensive sourcemap when running in CI See merge request !10460 | ||||
| | | * | | | | | use a less memory-intensive sourcemap when running in CI | Mike Greiling | 2017-04-04 | 1 | -1/+2 |
| | | |/ / / / | |||||
| * | | | | | | Merge branch 'groups-section-capitalization-fix' into 'button-capitalization' | Clement Ho | 2017-04-05 | 8 | -9/+9 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Groups section capitalization fix See merge request !10431 | ||||
| | * | | | | | | Groups section capitalization fix | Jose Ivan Vargas Lopez | 2017-04-05 | 8 | -9/+9 |
| |/ / / / / / | |||||
