summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Add back bottom margins for integration formrefactor-cluster-show-page-conservativeMatija Čupić2018-01-051-2/+2
|
* Update Remove cluster subtitle and alertMatija Čupić2018-01-041-2/+2
|
* Update Advanced cluster settings subtitleMatija Čupić2018-01-041-1/+1
|
* Rename enabled partial to integration_formMatija Čupić2017-12-213-2/+3
|
* Environment pattern -> Environment scopeMatija Čupić2017-12-212-2/+2
|
* Add environment_scope to enabled partialMatija Čupić2017-12-213-17/+25
|
* Remove environment_scope in user/gcp show partialMatija Čupić2017-12-212-8/+0
|
* Merge branch 'bvl-patch-mr-serializer' into 'master'Douwe Maan2017-12-211-1/+1
|\ | | | | | | | | | | | | Fall back to the `MergeRequestWidgetEntity` Closes #41296 See merge request gitlab-org/gitlab-ce!16074
| * Fall back to the `MergeRequestWidgetEntity`Bob Van Landuyt2017-12-211-1/+1
| | | | | | | | When no serializer was passed.
* | Resolve "Decouple multi-file editor from file list"Tim Zallmann2017-12-2186-1098/+2158
| |
* | LDAP extern_uids are not normalized when updated via APIFrancisco Javier López2017-12-211-0/+10
|/
* Restore missing language code in datetime_utility.jsWinnie Hellmann2017-12-211-5/+13
|
* Merge branch '40063-markdown-editor-improvements' into 'master'Filipa Lacerda2017-12-214-17/+26
|\ | | | | | | | | | | | | Hide toolbar in markdown preview mode Closes #40063 See merge request gitlab-org/gitlab-ce!15994
| * Add spec for previewing a note40063-markdown-editor-improvementsAnnabel Dunstone Gray2017-12-202-2/+2
| |
| * Hide & show toolbar on MR pageAnnabel Dunstone Gray2017-12-182-4/+4
| |
| * Fix formattingAnnabel Dunstone Gray2017-12-182-12/+12
| |
| * Hide toolbar in markdown preview modeAnnabel Dunstone Gray2017-12-183-11/+20
| |
* | Merge branch 'rs-remove-useless-definition' into 'master'Douwe Maan2017-12-211-5/+0
|\ \ | | | | | | | | | | | | Remove a redundant `InvalidPathError` definition See merge request gitlab-org/gitlab-ce!16064
| * | Remove a redundant `InvalidPathError` definitionrs-remove-useless-definitionRobert Speicher2017-12-201-5/+0
| | | | | | | | | | | | | | | This is already defined in `ExtractsPath`, which this controller includes.
* | | Merge branch '38356-add-last_commit_sha-to-the-commit-api' into 'master'Douwe Maan2017-12-214-20/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add new last_commit_id param for create commit endpoint Closes #38356 See merge request gitlab-org/gitlab-ce!15922
| * | | Updates from last code review:38356-add-last_commit_sha-to-the-commit-apiRubén Dávila2017-12-204-27/+33
| | | | | | | | | | | | | | | | | | | | | | | | - Apply some refactoring for code reuse - Add file status validation for Files::DeleteService - Write additional specs
| * | | Check if file has been modified for each action provided.Rubén Dávila2017-12-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | When commiting multiple files we're now checking if any of those files has been modified by another commit and we're rejecting the new commit in this case.
* | | | Merge branch '36958-enable-ordering-projects-subgroups-by-name' into 'master'Rémy Coutable2017-12-213-21/+12
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Enables ordering groups and their children by name in the web interface Closes #24962 et #36958 See merge request gitlab-org/gitlab-ce!16045
| * | | Enable sorting by name in the Groups dropdownMark Fletcher2017-12-201-0/+2
| | | |
| * | | Employ Groups dropdown in admin viewMark Fletcher2017-12-202-19/+7
| | | |
| * | | Accept options hash for Groups dropdownMark Fletcher2017-12-201-2/+3
| |/ /
* | | Merge branch 'jivl-replace-d3-v3-v4' into 'master'Mike Greiling2017-12-207-64/+105
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update d3 to v4 to enable tree shaking (and reduce the size of our webpack bundles) Closes #37013 See merge request gitlab-org/gitlab-ce!15585
| * | | added minChunks to the common_d3 bundlejivl-replace-d3-v3-v4Jose Ivan Vargas2017-12-182-7/+1
| | | |
| * | | Removed fills from stat_contributors_graphJose Ivan Vargas2017-12-181-3/+0
| | | |
| * | | cleaned up date_time_formattersJose Ivan Vargas2017-12-181-17/+8
| | | |
| * | | Restored the timeScaleFormat for the prometheus dashboardJose Ivan Vargas2017-12-182-6/+41
| | | |
| * | | Refactored d3 modules to instead of having a common_d3 dir, to use the micro ↵Jose Ivan Vargas2017-12-187-121/+73
| | | | | | | | | | | | | | | | modules instead
| * | | corrected functionality from the stat_contributors_graphJose Ivan Vargas2017-12-183-10/+25
| | | |
| * | | fixed specs and the non-rendering stat_graph_contributors_graphJose Ivan Vargas2017-12-182-7/+6
| | | |
| * | | optimized d3 v4 with a custom made bundleJose Ivan Vargas2017-12-186-6/+46
| | | |
| * | | Modified contributors graph to use d3 v4Jose Ivan Vargas2017-12-182-24/+38
| | | |
| * | | Update d3 to v4 and migrated the prometheus dashboardJose Ivan Vargas2017-12-183-43/+47
| | |/ | |/|
* | | Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"revert-b655a4a7Kim Carlbäcker2017-12-202-7/+11
| | | | | | | | | This reverts merge request !15712
* | | 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-2029-128/+183
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ↵Douwe Maan2017-12-204-36/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-154-36/+29
| | | | | | | | | | | | | | | | | | | | | | | | retries were exhausted
* | | | | | Merge branch 'rs-blocks-json-serialization' into 'master'Douwe Maan2017-12-209-10/+26
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add BlocksJsonSerialization model concern and include it in User Closes #37947 See merge request gitlab-org/gitlab-ce!14350
| * | | | | Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-2/+4
| | | | | |
| * | | | | 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-192-0/+15
| | |_|_|/ | |/| | |
* | | | | 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
View Lorry Controller Status