summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add check if run from gitlab development kit root directory.pre-commit-prettierJacob Schatz2018-01-021-0/+7
|
* Check for symlink instead of file before install.Jacob Schatz2018-01-021-1/+4
|
* Update script to work only when run in the gitlab directory.Jacob Schatz2018-01-021-2/+13
|
* Remove changelogJacob Schatz2018-01-021-5/+0
|
* Remove `-f` to not ruin other people's existing pre-commit files.Jacob Schatz2017-12-201-1/+1
|
* Add changelog and newlinesJacob Schatz2017-12-203-2/+7
|
* Add script to enable code formattersJacob Schatz2017-12-201-0/+4
|
* Remove JSX since we don't use it.Jacob Schatz2017-12-201-1/+1
|
* Initial installJacob Schatz2017-12-203-0/+16
|
* Merge branch 'layout-nav-es-module' into 'master'Filipa Lacerda2017-12-202-42/+33
|\ | | | | | | | | Changed layout_nav to ES module See merge request gitlab-org/gitlab-ce!16003
| * Merge branch 'master' into layout-nav-es-modulelayout-nav-es-moduleFilipa Lacerda2017-12-2061-212/+594
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (21 commits) Prevent some specs from mangling the gitlab-shell checkout Line up search dropdown with other nav dropdowns Fix onion-skin re-entering state Remove related links in MR widget when empty state Show inline edit button for issues Fix tags in the Activity tab not being clickable Fix shortcut links on help page Don't link LFS-objects multiple times. [CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rb Tidy up the documentation of Gitlab HA/Gitlab Application Make sure two except won't overwrite each other Update axios.md Remove transitionend event from GL dropdown Preserve gem path so that we use the same gems Load commit in batches for pipelines#index BlobViewer::PackageJson - if private link to homepage Do not generate links for private NPM modules in blob view Remove block styling from search dropdown Fix sidebar height when performance bar enabled Remove all dropdown animations and set display: none if they're not open ...
| * | Changed layout_nav to ES modulePhil Hughes2017-12-192-42/+33
| | |
* | | Merge branch '38318-search-merge-requests-with-api' into 'master'Rémy Coutable2017-12-205-2/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Search merge-requests with API" Closes #38318 See merge request gitlab-org/gitlab-ce!16029
| * | | Add optional `search` param for Merge Requests APIMark Fletcher2017-12-204-0/+28
| | | |
| * | | Employ declared_params in finder methods for MR and Issue API listsMark Fletcher2017-12-202-2/+2
| | | | | | | | | | | | | | | | - Ensure that unwanted params are no passed to actual finder classes
* | | | Merge branch 'docs-qa-extend-how-to-run-specific-test' into 'master'Grzegorz Bizon2017-12-201-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Specify how we're utilizing rspec for bin/qa See merge request gitlab-org/gitlab-ce!16040
| * | | | Specify how we're utilizing rspec heredocs-qa-extend-how-to-run-specific-testLin Jen-Shin2017-12-201-1/+8
| | |_|/ | |/| |
* | | | Merge branch ↵Douwe Maan2017-12-208-67/+95
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhausted' into 'master' Fork and Import jobs only get marked as failed when the number of Sidekiq retries were exhausted Closes #39246 See merge request gitlab-org/gitlab-ce!15844
| * | | | Fork and Import jobs only get marked as failed when the number of Sidekiq ↵39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhaustedTiago Botelho2017-12-158-67/+95
| | | | | | | | | | | | | | | | | | | | retries were exhausted
* | | | | Merge branch 'rs-blocks-json-serialization' into 'master'Douwe Maan2017-12-2020-32/+66
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add BlocksJsonSerialization model concern and include it in User Closes #37947 See merge request gitlab-org/gitlab-ce!14350
| * | | | Call the correct method in the BlocksJsonSerialization specrs-blocks-json-serializationRobert Speicher2017-12-191-1/+1
| | | | |
| * | | | Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-1911-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this would include the entire User record in the update hash, which was rendered in the response using `to_json`, erroneously exposing every attribute of that record, including their (now removed) private token. Now we only include the user ID, and perform the lookup on-demand.
| * | | | Add a JsonSerializationError class instead of raising SecurityErrorRobert Speicher2017-12-192-4/+6
| | | | |
| * | | | Use UserSerializer instead of `User.to_json`Robert Speicher2017-12-195-7/+6
| | | | |
| * | | | Accept arguments to blocked JSON serialization methodsRobert Speicher2017-12-191-1/+1
| | | | |
| * | | | Add BlocksJsonSerialization model concern and include it in UserRobert Speicher2017-12-194-0/+33
| | |/ / | |/| |
* | | | Merge branch '41186-sidebar-too-much-vertical-scroll' into 'master'Phil Hughes2017-12-206-55/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove animations from dropdowns Closes #41186 See merge request gitlab-org/gitlab-ce!15968
| * | | | Line up search dropdown with other nav dropdowns41186-sidebar-too-much-vertical-scrollAnnabel Dunstone Gray2017-12-192-8/+5
| | | | |
| * | | | Remove transitionend event from GL dropdownPhil Hughes2017-12-191-16/+8
| | | | |
| * | | | Remove block styling from search dropdownAnnabel Dunstone Gray2017-12-181-7/+0
| | | | |
| * | | | Fix sidebar height when performance bar enabledAnnabel Dunstone Gray2017-12-182-0/+6
| | | | |
| * | | | Remove all dropdown animations and set display: none if they're not openAnnabel Dunstone Gray2017-12-182-14/+2
| | | | |
| * | | | Remove extra height declarations in CSS; remove block styling from dropdownsAnnabel Dunstone Gray2017-12-184-15/+1
| | | | |
* | | | | Merge branch 'bvl-fix-unlinking-with-lfs-objects' into 'master'Douwe Maan2017-12-203-1/+27
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Don't link LFS-objects multiple times. Closes #41241 See merge request gitlab-org/gitlab-ce!16006
| * | | | Don't link LFS-objects multiple times.bvl-fix-unlinking-with-lfs-objectsBob Van Landuyt2017-12-193-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Unlinking a fork would fail somewhere after this, the LFS objects might still be linked. Which would cause issues when trying to destroy a project.
* | | | | Merge branch '41264-gitlab-projects-spec-failures' into 'master'Robert Speicher2017-12-193-10/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spec failures in spec/lib/gitlab/git/gitlab_projects_spec.rb Closes #41264 See merge request gitlab-org/gitlab-ce!16015
| * | | | | Prevent some specs from mangling the gitlab-shell checkoutNick Thomas2017-12-192-8/+5
| | | | | |
| * | | | | [CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rbValery Sizov2017-12-191-2/+4
| |/ / / /
* | | | | Merge branch 'fix-onion-skin-reenter' into 'master'Jacob Schatz2017-12-193-13/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix onion-skin re-entering state Closes #38533 See merge request gitlab-org/gitlab-ce!15815
| * | | | | Fix onion-skin re-entering stateClement Ho2017-12-193-13/+35
|/ / / / /
* | | | | Merge branch 'remove-links-mr-empty-state' into 'master'Jacob Schatz2017-12-197-14/+84
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove related links in MR widget when empty state Closes #36764 See merge request gitlab-org/gitlab-ce!15888
| * | | | | Remove related links in MR widget when empty stateClement Ho2017-12-197-14/+84
|/ / / / /
* | | | | Merge branch 'show-inline-edit-btn' into 'master'Jacob Schatz2017-12-197-21/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show inline edit button for issues Closes #37474 See merge request gitlab-org/gitlab-ce!15812
| * | | | | Show inline edit button for issuesClement Ho2017-12-197-21/+10
|/ / / / /
* | | | | Merge branch '33028-event-tag-links' into 'master'Rémy Coutable2017-12-193-1/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix tags in the Activity tab not being clickable Closes #33028 See merge request gitlab-org/gitlab-ce!15996
| * | | | | Fix tags in the Activity tab not being clickableMario de la Ossa2017-12-193-1/+62
|/ / / / /
* | | | | Merge branch '36020-private-npm-modules' into 'master'Douwe Maan2017-12-195-4/+81
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not generate links for private NPM modules in blob view Closes #36020 See merge request gitlab-org/gitlab-ce!16002
| * | | | | BlobViewer::PackageJson - if private link to homepageMario de la Ossa2017-12-183-7/+14
| | | | | |
| * | | | | Do not generate links for private NPM modules in blob viewMario de la Ossa2017-12-185-4/+74
| | | | | |
* | | | | | Merge branch 'zj-gitaly-pipelines-n-1' into 'master'Robert Speicher2017-12-1914-49/+184
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of Pipelines#index.json See merge request gitlab-org/gitlab-ce!14846
View Lorry Controller Status