Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add helper for accessing lfs_objects for projectbvl-export-import-lfs | Bob Van Landuyt | 2018-04-04 | 6 | -5/+30 |
| | | | | | | | | | | | | | | This makes accessing LFS Objects for a project easier project.lfs_storage_project.lfs_objects` becomes project.lfs_objects_for_project This will make the refactor in https://gitlab.com/gitlab-org/gitlab-ce/issues/39769 easier to deal with. | ||||
* | Download LFS-files from object storage for exports | Bob Van Landuyt | 2018-04-04 | 3 | -2/+38 |
| | | | | | Downloading the stream directly to the archive. In order to avoid conflicts with the cache. | ||||
* | Import projects with LFS objects | Bob Van Landuyt | 2018-04-04 | 7 | -3/+195 |
| | | | | | If the LFS object already exist, we'll link it tot he existing one, if not we'll create it. | ||||
* | Export LFS Objects when exporting a project | Bob Van Landuyt | 2018-04-04 | 6 | -3/+137 |
| | | | | The LFS files will be included in the `lfs-objects` directory in the archive. | ||||
* | Merge branch 'feature_detect_co_authored_commits' into 'master' | Douwe Maan | 2018-04-04 | 8 | -4/+386 |
|\ | | | | | | | | | | | | | Add banzai filter to detect commit message trailers and properly link the users Closes #31640 See merge request gitlab-org/gitlab-ce!17919 | ||||
| * | Add banzai filter to detect commit message trailers and properly link the users | Omar Mekky | 2018-04-04 | 8 | -4/+386 |
|/ | |||||
* | Merge branch 'sh-gitlab-sidekiq-logger' into 'master' | Sean McGivern | 2018-04-04 | 9 | -1/+294 |
|\ | | | | | | | | | | | | | Add support for Sidekiq JSON logging Closes #20060 See merge request gitlab-org/gitlab-ce!18121 | ||||
| * | Add support for Sidekiq JSON logging | Stan Hu | 2018-04-04 | 9 | -1/+294 |
| | | | | | | | | Closes #20060 | ||||
* | | Merge branch 'zj-revert-bad-grouping' into 'master' | Grzegorz Bizon | 2018-04-04 | 3 | -5/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | Revert "Allow CI/CD Jobs being grouped on version strings" Closes #44615 See merge request gitlab-org/gitlab-ce!18170 | ||||
| * | | Revert changelog entry for removed feature | Zeger-Jan van de Weg | 2018-04-04 | 1 | -1/+0 |
| | | | |||||
| * | | Revert "Allow CI/CD Jobs being grouped on version strings" | Zeger-Jan van de Weg | 2018-04-04 | 2 | -4/+2 |
| |/ | | | | | | | This reverts commit 4f2cdb51df0f2729055ec4dc6960ae347163da16. | ||||
* | | Merge branch 'zj-feature-gate-remove-http-api' into 'master' | Douwe Maan | 2018-04-04 | 4 | -2/+61 |
|\ \ | |/ |/| | | | | | Allow feature gate removal through the API See merge request gitlab-org/gitlab-ce!18146 | ||||
| * | Allow feature gate removal through the APIzj-feature-gate-remove-http-api | Zeger-Jan van de Weg | 2018-04-03 | 4 | -2/+61 |
| | | | | | | | | | | | | Features could be listed and added through the api, now also removed. This was needed in the case of gitlab.com as the number of gates that were ever used just grows and cleaning up is hard. | ||||
* | | Merge branch 'ide-pending-tab' into 'master' | Tim Zallmann | 2018-04-04 | 23 | -178/+478 |
|\ \ | | | | | | | | | | | | | Added pending tabs to IDE See merge request gitlab-org/gitlab-ce!17936 | ||||
| * | | Updated components to PascalCase | Phil Hughes | 2018-04-04 | 4 | -10/+13 |
| | | | | | | | | | | | | Added comment for `key` usage | ||||
| * | | Merge branch 'master' into ide-pending-tab | Phil Hughes | 2018-04-03 | 389 | -2911/+8500 |
| |\ \ | | |/ | |||||
| * | | fixed karma | Phil Hughes | 2018-03-28 | 2 | -1/+4 |
| | | | |||||
| * | | removed file changes that have no changes to make diff easier | Phil Hughes | 2018-03-28 | 8 | -97/+71 |
| | | | | | | | | | | | | | | | | | | simplified SET_FILE_ACTIVE openFiles map use .find in router so that it returns early instead of looping all the values | ||||
| * | | refactor ADD_PENDING_TAB to stop multiple state changes | Phil Hughes | 2018-03-28 | 3 | -43/+26 |
| | | | |||||
| * | | remove italics from tab | Phil Hughes | 2018-03-28 | 1 | -4/+0 |
| | | | |||||
| * | | fixed issue with spec because store wasn't getting reset | Phil Hughes | 2018-03-28 | 1 | -1/+3 |
| | | | |||||
| * | | added specs | Phil Hughes | 2018-03-28 | 4 | -16/+229 |
| | | | |||||
| * | | replace the tab with the review pending tab | Phil Hughes | 2018-03-28 | 1 | -12/+17 |
| | | | |||||
| * | | stops opening a pending tab if current tab is in review mode already | Phil Hughes | 2018-03-28 | 2 | -3/+11 |
| | | | |||||
| * | | remove pending tab when opening a file from the left sidebar | Phil Hughes | 2018-03-28 | 4 | -43/+17 |
| | | | |||||
| * | | remove extra state property | Phil Hughes | 2018-03-28 | 6 | -54/+50 |
| | | | | | | | | | | | | pending tabs now get added into openfiles & just filtered correctly | ||||
| * | | fixed eslint inconsistent return | Phil Hughes | 2018-03-28 | 1 | -2/+3 |
| | | | |||||
| * | | updated specs | Phil Hughes | 2018-03-28 | 12 | -30/+40 |
| | | | |||||
| * | | correctly toggle between tabs | Phil Hughes | 2018-03-28 | 4 | -9/+18 |
| | | | |||||
| * | | opens the next open tab correctly | Phil Hughes | 2018-03-28 | 6 | -76/+101 |
| | | | | | | | | | | | | | | | fixes model being cached as undefined fixed open files not being correctly mutated | ||||
| * | | fixed opening next tab being a pending tab | Phil Hughes | 2018-03-28 | 2 | -12/+33 |
| | | | | | | | | | | | | clears any active files when opening pending tab | ||||
| * | | fix closing & reopening pending tabs | Phil Hughes | 2018-03-28 | 9 | -50/+71 |
| | | | |||||
| * | | toggling viewer mode closes the pending tab | Phil Hughes | 2018-03-28 | 5 | -7/+33 |
| | | | | | | | | | | | | then opens the file in edit mode | ||||
| * | | Added pending tabs to IDE | Phil Hughes | 2018-03-28 | 11 | -203/+209 |
| | | | | | | | | | | | | | | | | | | | | | Pending tabs are normal tabs that are opened from the right sidebar. They are opened in diff mode and when changed to edit mode they get closed & the actual file gets opened. | ||||
* | | | Merge branch '20394-protected-branches-wildcard' into 'master' | Rémy Coutable | 2018-04-04 | 6 | -6/+21 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Protected branches count is wrong when a wildcard includes several protected branches" Closes #20394 See merge request gitlab-org/gitlab-ce!17920 | ||||
| * | | | Resolve "Protected branches count is wrong when a wildcard includes several ↵ | Jan | 2018-04-04 | 6 | -6/+21 |
|/ / / | | | | | | | | | | protected branches" | ||||
* | | | Merge branch 'update_code_quality_job' into 'master' | Rémy Coutable | 2018-04-04 | 2 | -25/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | Use standard codequality job See merge request gitlab-org/gitlab-ce!18070 | ||||
| * | | | Use standard codequality job | Olivier Gonzalez | 2018-04-04 | 2 | -25/+8 |
|/ / / | |||||
* | | | Merge branch '39880-merge-method-api' into 'master' | Rémy Coutable | 2018-04-04 | 5 | -1/+76 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Allow the configuration of a project's merge method via the API" Closes #39880 See merge request gitlab-org/gitlab-ce!18031 | ||||
| * | | | Resolve "Allow the configuration of a project's merge method via the API" | Jan | 2018-04-04 | 5 | -1/+76 |
|/ / / | |||||
* | | | Merge branch 'dz-improve-app-settings-5' into 'master' | Filipa Lacerda | 2018-04-04 | 4 | -60/+88 |
|\ \ \ | | | | | | | | | | | | | | | | | Redesign application settings to match project settings (part 5) See merge request gitlab-org/gitlab-ce!18159 | ||||
| * | | | Move network related app settings to expandable blocks | Dmitriy Zaporozhets | 2018-04-04 | 4 | -60/+88 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' ↵ | Sean McGivern | 2018-04-04 | 17 | -121/+164 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Use shard name in Git::GitlabProjects instead of shard path Closes gitaly#1110 See merge request gitlab-org/gitlab-ce!18015 | ||||
| * | | | | Use shard name in Git::GitlabProjects instead of shard path | Ahmad Sherif | 2018-04-03 | 17 | -121/+164 |
| | | | | | | | | | | | | | | | | | | | | Closes gitaly#1110 | ||||
* | | | | | Merge branch 'blackst0ne-rails5-rename-sort-methods' into 'master' | Sean McGivern | 2018-04-04 | 22 | -35/+35 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Rename `sort` methods to `sort_by_attribute` See merge request gitlab-org/gitlab-ce!18142 | ||||
| * | | | | | [Rails5] Rename `sort` methods to `sort_by_attribute` | blackst0ne | 2018-04-04 | 22 | -35/+35 |
|/ / / / / | |||||
* | | | | | Merge branch 'fj-174-better-ldap-connection-handling' into 'master' | Douwe Maan | 2018-04-04 | 10 | -31/+156 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add better LDAP connection handling See merge request gitlab-org/gitlab-ce!18039 | ||||
| * | | | | | Add better LDAP connection handling | Francisco Javier López | 2018-04-04 | 10 | -31/+156 |
|/ / / / / | |||||
* | | | | | Merge branch 'blackst0ne-rails5-update-gemfile-rails5-lock' into 'master' | Rémy Coutable | 2018-04-04 | 1 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Update Gemfile.rails5.lock See merge request gitlab-org/gitlab-ce!18164 | ||||
| * | | | | | [Rails5] Update Gemfile.rails5.lock [ci skip]blackst0ne-rails5-update-gemfile-rails5-lock | blackst0ne | 2018-04-04 | 1 | -4/+4 |
| | | | | | |